Steve Harris
|
fdc523a026
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 091555cf10 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 4c56844e29
Former-commit-id: 214b48dcb8
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
a31d3d702e
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: 3d9a3de6e4 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 01dfe503f5
Former-commit-id: c42733eb39
|
2014-09-09 11:44:30 -04:00 |
|
Roger Ferrel
|
7e3024f4f2
|
Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: c7a6040792 [formerly c7a6040792 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]
Former-commit-id: e451dd2814
Former-commit-id: 6f566c0f38
|
2014-08-25 13:23:44 -05:00 |
|
Roger Ferrel
|
1905640a3a
|
Omaha #3137 - Add checks to prevent NullPointerException.
(cherry picked from commit 936f0278683f54bbb27127d40d0b9fb6e195bbb7 [formerly b235e56e28] [formerly 3331d58e1c [formerly 3331d58e1c [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]])
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java
Former-commit-id: 43117cf31b [formerly 43117cf31b [formerly deb766cbc3c173d4ec3593b22b8e371c79789e7a]]
Former-commit-id: 01b30e76c4
Former-commit-id: 128b060e9f
|
2014-08-05 08:49:12 -05:00 |
|
Roger Ferrel
|
3521636c64
|
Issue #2881 configuration changes.
(cherry picked from commit f95000685b2ac45dc375132aaf8bbd8635fe7f18 [formerly 365c886263] [formerly e6b3733fc5 [formerly e6b3733fc5 [formerly a36e9351bec9150ba4ade456de76af8701048bcb]]])
Former-commit-id: f9bc73fe2b [formerly f9bc73fe2b [formerly eff6d0e5e4595be857fbd9ba303a8a5a5c11ab3a]]
Former-commit-id: dd6d7878dc
Former-commit-id: 82ec47c4a3
|
2014-08-05 08:47:45 -05:00 |
|
Roger Ferrel
|
7dfeadf032
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 034fd9ddf208942f5ef84e2c4383a0512874e8b9 [formerly 3af564a653] [formerly 8ce590c31c [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
Former-commit-id: 8171a30330 [formerly 8171a30330 [formerly 14922cb75f4f37b0edfa930bf575eba7e3d55806]]
Former-commit-id: 0a09094ac0
Former-commit-id: cb1b8bba84
|
2014-08-05 08:43:23 -05:00 |
|
Roger Ferrel
|
36a1b87087
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit 41c889ce01087a1848a114aa936c54e0767e65ad [formerly cfea0489d7] [formerly 5570261d74 [formerly 5570261d74 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]])
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
Former-commit-id: 0e2dca458c [formerly 0e2dca458c [formerly e03e26e2e155df1cf9193fc6ecbd36b9c0bd9df5]]
Former-commit-id: a0e8aa94d8
Former-commit-id: 7185b58ef3
|
2014-08-05 08:39:07 -05:00 |
|
Roger Ferrel
|
cc6d27d307
|
Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908
(cherry picked from commit c5bcf0ac19359b841b6fc7c757d73f5e3183377e [formerly c86d738d5b] [formerly 226b1be015 [formerly 226b1be015 [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]])
Conflicts:
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
Former-commit-id: 4e779917d5 [formerly 4e779917d5 [formerly bbb27ce26ae368854fb27c39d58de3e665193fb1]]
Former-commit-id: 30e00a443b
Former-commit-id: b7f70f8f50
|
2014-08-05 08:30:50 -05:00 |
|
Nate Jensen
|
a834abb826
|
Omaha #3211 changes to support improved authentication/authorization
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172
Former-commit-id: 4fdb6df9a1 [formerly 4fdb6df9a1 [formerly c4eeb1730778f7f18aa4d74587ebcddb3932c6e6]]
Former-commit-id: 1e362625e5
Former-commit-id: 5a484063ac
|
2014-05-29 15:28:53 -05:00 |
|
Roger Ferrel
|
02ad70e080
|
Omaha #3137 - Add checks to prevent NullPointerException.
Former-commit-id: 3331d58e1c [formerly 3331d58e1c [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]
Former-commit-id: b235e56e28
Former-commit-id: 009f4b8d21
|
2014-05-28 09:54:37 -05:00 |
|
Steve Harris
|
3e4e9365ca
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 1a06d18686 [formerly 1a06d18686 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]
Former-commit-id: c83753b4d3
Former-commit-id: 1b709fb6c3
|
2014-05-15 08:31:27 -05:00 |
|
Roger Ferrel
|
59d4dcd739
|
Issue #2881 configuration changes.
Former-commit-id: e6b3733fc5 [formerly e6b3733fc5 [formerly a36e9351bec9150ba4ade456de76af8701048bcb]]
Former-commit-id: 365c886263
Former-commit-id: f2d8dee5ea
|
2014-05-14 16:35:33 -05:00 |
|
Richard Peter
|
401a880686
|
Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: d5ec01f7c0 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]
Former-commit-id: adff7b5684
Former-commit-id: 7a7b65860b
|
2014-05-08 09:06:31 -05:00 |
|
Richard Peter
|
24a3fe1466
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 44b1782461 [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 32957285fc
Former-commit-id: 80d4153878
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
c6d3fe6952
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: fb1f5aa593 [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: 3524838f9f
Former-commit-id: 029f5753ad
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
b234142252
|
Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: 37342cba87 [formerly 37342cba87 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: caccf6ca52
|
2014-04-24 19:11:50 -05:00 |
|
Roger Ferrel
|
2e98b24e91
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 8ce590c31c [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]
Former-commit-id: 3af564a653
Former-commit-id: 1214aac2a2
|
2014-04-17 08:57:15 -05:00 |
|
Roger Ferrel
|
ac1946609e
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 5570261d74 [formerly 5570261d74 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]
Former-commit-id: cfea0489d7
Former-commit-id: d66a346c65
|
2014-04-11 16:07:58 -05:00 |
|
Richard Peter
|
b667e0509f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 95eba8dcf6 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: b15d288530
Former-commit-id: 73aab15d85
|
2014-04-09 16:00:54 -05:00 |
|
Roger Ferrel
|
388ea1349a
|
Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908
Former-commit-id: 226b1be015 [formerly 226b1be015 [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]
Former-commit-id: c86d738d5b
Former-commit-id: 0d85ae72e0
|
2014-04-09 13:57:55 -05:00 |
|
Brian.Dyke
|
be574897cc
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 6a28fcb156 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: dd98c213c7
Former-commit-id: 9f37f61cf8
|
2014-04-04 12:57:32 -04:00 |
|
Steve Harris
|
61af779433
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 873bd6b889 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: f60aba35d6
Former-commit-id: 708485427e
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
36a0533f19
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 069093884f [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 96658d8ce0
|
2014-03-06 08:39:43 -06:00 |
|
Richard Peter
|
9b3f8f9649
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 0e25ae35c1 [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 1c150e6e8b
Former-commit-id: f13c86bc3e
|
2014-02-27 15:18:26 -06:00 |
|
Brian.Dyke
|
1b359c2564
|
OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: 10b723647b
Former-commit-id: 64044e7ce5
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
68e03bf02f
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 32bcf9d0d0 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 14a082a4e9
Former-commit-id: d4ba9eba94
|
2014-02-18 10:45:20 -06:00 |
|
Brian.Dyke
|
d1db845406
|
14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 1d6a9456b7
Former-commit-id: c5857c30f2
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
948fffa361
|
14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 23280af290
Former-commit-id: 947ec5fd96
|
2014-02-04 12:33:46 -05:00 |
|
Steve Harris
|
2a967fc9b5
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 24ab7cff49 [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]
Former-commit-id: 69dc3d835b
Former-commit-id: 252c7ee40a
|
2014-01-21 12:36:54 -06:00 |
|
Ron Anderson
|
5076217d8f
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: ba7a25a88f [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: 62c445d872
Former-commit-id: 624375267e
|
2014-01-13 17:45:20 -06:00 |
|
Max Schenkelberg
|
789a279475
|
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: 16046a4dde [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]
Former-commit-id: cc2080449c
Former-commit-id: f58795f460
|
2014-01-06 17:03:45 -06:00 |
|
Steve Harris
|
a2bdee5cc1
|
14.1.1-14 baseline
Former-commit-id: f2ad9da4eb [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 43cc501e0d
|
2014-01-06 14:02:30 -05:00 |
|
Richard Peter
|
fd93b7d85e
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: 0c4ae068ad [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: da027298d4
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
36d788890a
|
14.1.1-10 baseline
Former-commit-id: ca0f65bd9a [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
42ece4fb6a
|
14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
|
2013-11-13 12:32:17 -05:00 |
|
Richard Peter
|
c8ef435295
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 306bd6fae1 [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
|
2013-11-12 11:11:36 -06:00 |
|
Richard Peter
|
910464ea6a
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: fa7d77ae97 [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
930b6ddb77
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 108a4d908d [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 50d60d8101
|
2013-11-06 18:31:05 -06:00 |
|
Richard Peter
|
c9f1b21c01
|
Issue #2478: Remove blank lines in debug
Former-commit-id: 357eb79519 [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]
Former-commit-id: 18eff02d7a
Former-commit-id: 46f19c22ea
|
2013-11-06 16:03:45 -06:00 |
|
Richard Peter
|
7dcd8afea2
|
Issue #2478: Update log message
Former-commit-id: f9faa53eb4 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]
Former-commit-id: b0746db723
Former-commit-id: f1a67f4dc1
|
2013-11-06 15:45:23 -06:00 |
|
Ben Steffensmeier
|
afe014af99
|
Issue #2493 remove mesowest.
Former-commit-id: d0b7966458 [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]
Former-commit-id: 36916fedcd
Former-commit-id: baebe37ba6
|
2013-11-06 13:42:38 -06:00 |
|
Steve Harris
|
647b908fed
|
14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 4fff87723f
Former-commit-id: 48df058653
|
2013-11-06 14:16:14 -05:00 |
|
Roger Ferrel
|
df1dc51d0d
|
Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784
Former-commit-id: 07a7dd63c3 [formerly 07a7dd63c3 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]
Former-commit-id: e01b524542
Former-commit-id: 274d52a694
|
2013-11-06 13:13:02 -06:00 |
|
Richard Peter
|
0317d65b98
|
Issue #2499: Update Wes2Bridge Configuration and logging.
Change-Id: I95a530bc8b647c58cff36f449d55bff39943fbc9
Former-commit-id: 73d0d1236c [formerly 73d0d1236c [formerly 9449bc5f562fd638e0a02ea6c2dc4c6828e73561]]
Former-commit-id: 55b226e104
Former-commit-id: 0be00ed984
|
2013-11-05 15:08:23 -06:00 |
|
Roger Ferrel
|
eaf32e4faa
|
Issue #2497 Change process root directory to /archive.
Change-Id: Ib5cecb7c0af0e844c4ee37b5dc7fb129023048dc
Former-commit-id: acacd515a6 [formerly acacd515a6 [formerly 6c932f08915704fcdf44b66ad396175ccd7f544f]]
Former-commit-id: 2f8903478e
Former-commit-id: 553e189b05
|
2013-11-05 12:45:37 -06:00 |
|
Bryan Kowal
|
eaaa3d022c
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: feaacd9356 [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
|
2013-10-31 15:34:46 -05:00 |
|
Steve Harris
|
98ae84da42
|
14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
|
2013-10-28 10:55:16 -04:00 |
|
Roger Ferrel
|
029eec5dc4
|
Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: 7f7064d457 [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]
Former-commit-id: 42705e4dfa
Former-commit-id: 4c27adcc53
|
2013-10-03 12:33:26 -05:00 |
|
Roger Ferrel
|
0d86e00182
|
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: a76fc08e93 [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]
Former-commit-id: e65b8a9f6e
Former-commit-id: 71737f069d
|
2013-10-01 16:36:34 -05:00 |
|
Roger Ferrel
|
029f2e28b8
|
Issue #2224 Add enable flag to archive purger and move properties to plug-in.
Change-Id: I6fd80f4b5f1326a173bd8e980735781d9ec03898
Former-commit-id: af1be4b9a4 [formerly af1be4b9a4 [formerly b48e7521377834d9301ca058893f2a5293cc8d74]]
Former-commit-id: dcfc88a94a
Former-commit-id: a2222ad404
|
2013-09-12 12:49:10 -05:00 |
|