Chris Cody
1f9c825de5
Omaha #3365 Realign AWIPS2_baseline tests
...
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f
Former-commit-id: 947bc37728f62ff4375f23b9eb8bc7142e220a90
2014-09-30 12:53:20 -05:00
Nate Jensen
3b0296cc99
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
...
Former-commit-id: 5861d0f99dd2f89a37f72736e139233ea3337605
2014-09-30 11:58:02 -05:00
Richard Peter
02fb12501e
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
...
Former-commit-id: cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4
2014-09-30 11:45:25 -05:00
Mark Peters
776420f2d9
Omaha #3629 Replacing matchElement()
...
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 6f898cc3d7f30651846847c5645ec26ac448ec83
2014-09-30 11:39:40 -05:00
Ron Anderson
1c6fa09d4f
Omaha #3622 Fix null pointer in ServiceBackupLockManager
...
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: e6ae629d1667943ae7bf25598f32e2b479e748b1
2014-09-30 11:32:30 -05:00
Nate Jensen
6a1ee6a5d0
Omaha #3671 turn on LZF compression of satellite hdf5 data
...
Change-Id: I6709fa5a262a0119d81d2b22745c2d4f67d649aa
Former-commit-id: 2f79d47e4ed5aaf316d54a442123b9906fa8d2b9
2014-09-30 10:58:21 -05:00
Ron Anderson
3e3a2c2f70
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
...
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: 525cffa1ec2a999d97a5fc3ca2153c8241c534be
2014-09-30 08:44:01 -05:00
Nate Jensen
8c0a087bf0
Omaha #3663 move features that contain primarily ncep plugins to ncep
...
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: f785d88ee1c388b564921c3ecd8c931329639f04
2014-09-29 17:24:34 -05:00
Ron Anderson
245804a21a
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
...
Former-commit-id: 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0
2014-09-29 16:10:37 -05:00
Steve Harris
3b6a8a1447
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Nate Jensen
c3648d1989
Omaha #2975 optimize lookup of edit areas and gfe configs
...
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7
2014-09-29 12:29:25 -05:00
Ben Steffensmeier
5b10ac2f36
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Mark Peters
0c657c2a49
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
Richard Peter
1656522716
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
43d3aca5ea
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
23747ad042
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: acbc667cfeab1ab6449a93967896e6e303bb238d
2014-09-26 11:27:53 -05:00
Ron Anderson
dd4f22789a
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 8f687189a5c71f3bd04b5e31f6a45606fe456386
2014-09-26 15:19:08 +00:00
Nate Jensen
987060f56c
Omaha #3571 better error handling of invalid geom with map caching
...
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 0f2066e985dcbcedd2794ce226232efe999b1312
2014-09-25 11:30:27 -05:00
Nate Jensen
174b036c56
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
Slav Korolev
ce2ef5019b
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
36556fc48b
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
Brian.Dyke
87fa32d2d4
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
Nate Jensen
53afb3815c
Merge "Omaha #3009 make ffmp play nice with collaboration" into omaha_14.4.1
...
Former-commit-id: b89acc052d5c0065e12c9e13cde1d4fffd115729
2014-09-23 16:17:27 -05:00
Nate Jensen
e34c1a6fe8
Omaha #3009 make ffmp play nice with collaboration
...
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: ac15b82ed3c493a5ea8cca01ba304e95c965365e
2014-09-23 15:37:09 -05:00
Steve Harris
6cf62253a8
Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: 230f4413d69d25ca4e8cafc23ec80b3bb79fea63
2014-09-23 15:30:55 -05:00
Nate Jensen
3ae54c26c6
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
9176913542
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
Richard Peter
f474c55155
Merge "Omaha #3591 Convert scripts to use DAF." into omaha_14.4.1
...
Former-commit-id: f782f11484b5aa1c9f64028a6d9241fa5b593453
2014-09-23 12:09:05 -05:00
Steve Harris
c8bee38fc7
Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: 785a6cb7ef5856e0bc0beb3fcf5657f74934111b
2014-09-23 12:02:08 -05:00
Steve Harris
b979960b7b
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
Lee Venable
114010674f
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
...
Former-commit-id: a158d4dbdf27311a04684bbda1afb3991fb0e09a
2014-09-23 10:56:20 -05:00
Nathan Bowler
36bb7fcd57
Omaha #3591 Convert scripts to use DAF.
...
Change-Id: I05978c21d74949e2654dcfd62cb40a6738392a66
Former-commit-id: b5838370b90da43f953c5189a161640b3239418f
2014-09-23 11:42:35 -04:00
Nate Jensen
29ee81f50c
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
Nathan Bowler
ce15b03ce4
Omaha #3591 Adding original, unaltered scripts.
...
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8
Former-commit-id: ee00a93cac391a1c8e0f9236815b5ed270e9f9fb
2014-09-23 10:43:01 -04:00
Nate Jensen
16f91ce391
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
Nate Jensen
568559f2ce
Omaha #3356 remove unnecessary import
...
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: ad3753d57709fe8efeab2fb400d92b6ec61c2a3e
2014-09-23 08:21:18 -05:00
Nate Jensen
e637963736
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
Nate Jensen
cbd5b270b5
Omaha #3356 fix ingestDat startup issues
...
Change-Id: I47b66fd753513230849dd2710f518511895602fc
Former-commit-id: f5ca6846eee39074abc856a1d2c9f6ed58ae0cff
2014-09-22 10:59:10 -05:00
Brian.Dyke
1018c65552
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
8d665b93b5
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
Ben Steffensmeier
217caaba15
Omaha #3300 Fix component and mosaic merge problems
...
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
2014-09-19 15:08:21 -05:00
Mark Peters
c5da5ccb9b
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
28b7e8d6e2
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
9c33ae6d2c
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
9435507b27
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
2014-09-19 13:14:13 -04:00
Brian.Dyke
e601d3fa51
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
2014-09-19 13:08:06 -04:00
Mark Peters
26e4f86248
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1
2014-09-19 12:01:07 -05:00
Steve Harris
4c56844e29
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
Ana Rivera
56f409717f
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
...
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 3af534fb2778268fee650c09c5aa0346df746ce8
2014-09-19 15:17:46 +00:00
Nate Jensen
83cc50ad69
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
...
Former-commit-id: 55219fea5034bdc8e9aab3fb2142933e5d65b739
2014-09-18 14:52:17 -05:00
