Ben Steffensmeier
f92d021e96
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Brian.Dyke
0a497fc015
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
2014-09-29 11:20:57 -04:00
Mark Peters
549cf2a2b1
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: e196f02cf7533498280b252e9c345f9b3c4a3629
2014-09-26 14:50:03 -05:00
Brian.Dyke
41921f7db2
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 60756ddb841a0daa347493047b76d2fcb93f7f4a
2014-09-26 15:15:57 -04:00
Brian.Dyke
8245370186
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
2014-09-26 13:02:49 -04:00
Richard Peter
941305b33d
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
...
Former-commit-id: 3daaa4e6b33bd284a088f290b40b7f63b4c27a43
2014-09-26 11:44:41 -05:00
Ron Anderson
b032f7f24e
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 67d19df57e57a77a0a1a83e695631a7a9cb22368
2014-09-26 11:39:06 -05:00
Richard Peter
a4668b64a6
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: acbc667cfeab1ab6449a93967896e6e303bb238d
2014-09-26 11:27:53 -05:00
Brian.Dyke
586a504500
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
2014-09-26 11:47:38 -04:00
Ron Anderson
92575e8db3
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 8f687189a5c71f3bd04b5e31f6a45606fe456386
2014-09-26 15:19:08 +00:00
Shawn.Hooper
da77322fd0
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
2014-09-25 16:25:43 -04:00
Ron Anderson
7020daa55a
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 8c177752b8e2baa2e739fc69320c4e4b31d972c7
2014-09-25 13:48:11 -05:00
Ana Rivera
39fc13eb38
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
...
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: cf3d9a81a52c19977371e3abee755d1c239b1f8a
2014-09-25 18:18:21 +00:00
Kevin.Johnson
5a38528711
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
...
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: c36b732cc8057cf7b830de647998f679725760da
2014-09-25 10:50:07 -04:00
Nate Jensen
364aff9278
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: e2f23221c3f8301460df2945deb8c760cdf216e9
2014-09-25 08:44:50 -05:00
Baoyu Yin
dea223412e
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
...
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: 847ecb836cf5d7bad28817dd68e752e4ba79f6c4
2014-09-25 09:44:21 -04:00
Slav Korolev
7b1a4c6774
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: d7a921d6206f5b09e7a6784c7e86b9167b74685f
2014-09-25 09:02:27 -04:00
Nate Jensen
4cf93c0acb
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 8f743862722b2af08e6659ca3beb0366095bcf79
2014-09-24 15:20:17 -05:00
Ana Rivera
535f254357
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
fb8dc9fe7d
Issue #3560 Fixed slow memory leak in registry
...
Former-commit-id: 918119b26864ee246ac2571baa4e380ae21f2ded
2014-09-24 14:36:34 -05:00
Brian.Dyke
4b418918d4
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
2014-09-24 11:05:37 -04:00
Slav Korolev
443c7c7482
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
2014-09-24 09:34:43 -04:00
Steve Harris
374a8cf99b
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 03a52fa50e7e51eccf7ccc8d80c851c3ab221fdb
2014-09-23 21:43:25 -05:00
Ron Anderson
429de3224f
Issue #3648 Improve GFE error handling for getAllAvailableParms.
...
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
2014-09-23 18:47:38 -05:00
Ron Anderson
25a41ff9db
Issue #3648 Change GFE version purging to be event driven.
...
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e
Former-commit-id: ad725686f80a1f67ca6865859ad4f072edd1c54f
2014-09-23 13:43:14 -05:00
David Friedman
a6acf71a0a
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
2014-09-23 18:39:22 +00:00
Nate Jensen
c9033dc300
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 21ad2f0d0229235495edc9319e8493d8a6b4d6b4
2014-09-23 12:15:56 -05:00
Mark Peters
bd5996a599
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65
Former-commit-id: 1350720111ceeb83893c5c0129eb41d662d16211
2014-09-23 12:12:22 -05:00
Steve Harris
7692e3f21d
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Nate Jensen
39f330b583
Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
...
Former-commit-id: 39c26499805dc23b232397a2f9349ed17564ae13
2014-09-23 09:52:22 -05:00
Shawn.Hooper
99f6ff6d0a
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
...
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7
2014-09-23 10:44:38 -04:00
Nate Jensen
2a675e48dd
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 677421b80157aa32c2ccf484eebe8e0a6a4c304f
2014-09-23 09:00:59 -05:00
Steve Harris
3301300c7e
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
...
Former-commit-id: 68ff0acbe3739e2fd3aa89b13ed070c39db48551
2014-09-22 22:18:26 -05:00
Steve Harris
38daf108e6
Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
...
Former-commit-id: 9bc599dd5481360d7a00b9c8455805893922127d
2014-09-22 22:06:05 -05:00
Nate Jensen
e163ae0e5b
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: ca8195c7835b9d96158d048fdd548cc744ba96bc
2014-09-22 13:00:04 -05:00
Ron Anderson
5407eb6a71
Issue #3526 Fix errors found during testing in SS
...
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157
Former-commit-id: 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7
2014-09-22 11:34:31 -05:00
Nate Jensen
9ac3ad9890
Omaha #3356 fix ingestDat startup issues
...
Change-Id: I47b66fd753513230849dd2710f518511895602fc
Former-commit-id: f5ca6846eee39074abc856a1d2c9f6ed58ae0cff
2014-09-22 10:59:10 -05:00
Brian.Dyke
c0dc990974
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
2014-09-19 16:59:12 -04:00
Brian.Dyke
4db67c581c
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Mark Peters
3f1e21107b
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f
Former-commit-id: 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc
2014-09-19 14:02:54 -05:00
Baoyu Yin
8568cd8419
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
...
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
2014-09-19 15:02:23 -04:00
Brian.Dyke
6ad8d500ef
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
2014-09-19 14:42:29 -04:00
Brian.Dyke
7f49052445
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
2014-09-19 13:08:06 -04:00
Darrel Kingfield
1cabae50b1
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
...
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
2014-09-19 11:14:09 -05:00
Steve Harris
07a7645fcd
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: c72e05b87f6eb6d094bde5e7caec3cccb20476ce
2014-09-19 11:13:46 -05:00
Steve Harris
091555cf10
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: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Nate Jensen
dc49c41b39
Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
...
Former-commit-id: fba50e36f951594f6c8bb069ceb9b8a82a02ad89
2014-09-17 15:27:50 -05:00
Brian.Dyke
e1c88f287a
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
2014-09-17 15:50:13 -04:00
Brian.Dyke
a155bbd8c1
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0813f96fbb673fdbbdb2c0f049ec722a80b212f9
2014-09-17 15:45:27 -04:00
Ron Anderson
e8db5a1bbf
Omaha #3623 Created command line utilities to activate/deactivate sites
...
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408
Former-commit-id: 670a9bd71874fbd6fecd0c9df5567ad342892333
2014-09-17 14:35:47 -05:00
