Steve Harris
26155d4251
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
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
Lee Venable
b82ea41f9d
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
87865f6a95
Omaha #3591 Convert scripts to use DAF.
...
Change-Id: I05978c21d74949e2654dcfd62cb40a6738392a66
Former-commit-id: b5838370b90da43f953c5189a161640b3239418f
2014-09-23 11:42:35 -04:00
Matthew Howard
e977069a71
Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
...
Former-commit-id: 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7
2014-09-23 10:23:16 -05:00
Brian.Dyke
e3276358dc
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 74df3dae5b1d0644ee5c82a0bb65054eb3541427
2014-09-23 11:08:20 -04: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
Nathan Bowler
1a0aa971ef
Omaha #3591 Adding original, unaltered scripts.
...
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8
Former-commit-id: ee00a93cac391a1c8e0f9236815b5ed270e9f9fb
2014-09-23 10:43:01 -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
Nate Jensen
41fcd2b7b6
Omaha #3356 remove unnecessary import
...
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: ad3753d57709fe8efeab2fb400d92b6ec61c2a3e
2014-09-23 08:21:18 -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
Brian.Dyke
5d0347f589
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 414a695e6423fa291936d15a999113f4a518b097
2014-09-22 16:51:47 -04:00
Sean.Webb
4d2c798cc2
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
...
Former-commit-id: 3592653ff850b2950d3ca4c0fead17292b58f971
2014-09-22 14:23:18 -05:00
Sean.Webb
9b164205c0
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
...
Former-commit-id: d5f0fa6d025ec11eb83b9ceceb8309a23f80820b
2014-09-22 14:22:58 -05:00
Sean.Webb
00479a436d
ASM #16761 - Fixed typo on variable character
...
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36
2014-09-22 14:10:28 -04: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
Sean.Webb
47aef24f6f
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 721bead655f9a384ea12444617774b7ef404feb0
2014-09-22 07:18:21 -04: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
Ben Steffensmeier
72f5799c44
Omaha #3300 Fix component and mosaic merge problems
...
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
2014-09-19 15:08:21 -05:00
Shawn Hooper
2df3755d31
Merge changes Ia37804af,I1649c38e,I9dc84e7e,Ie9e2ab55 into asm_14.2.3
...
* changes:
ASM #16761 - Fixed typo on variable character
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
ASM #16761 - Added retrans code updates from ISG
ASM #16761 - Updated ldm spec to add retrans
Former-commit-id: fc69e9debbbad3f8b82a8670f700a158fb68c12b
2014-09-19 14:05:35 -05:00
Slav Korolev
71c4d8db07
Issue #2757 - Updated handlers for dialog buttons.
...
Former-commit-id: 69a82633c287bf18c9f436014bb552829dcb62ea
2014-09-19 15:02:59 -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
Sean.Webb
4368f4650b
ASM #16761 - Fixed typo on variable character
...
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: 5c541f50dcc68a856e8c81bff8577334abf1ff75
2014-09-19 13:43:45 -04:00
Brian.Dyke
88d5f872ae
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
7f49052445
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
048e8339fd
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1
2014-09-19 12:01:07 -05: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
Ana Rivera
9d8c08a09a
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
Sean.Webb
b0b01694f7
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
...
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: 031c41d4f7801c8a5127cf007358856bf771593a
2014-09-19 09:29:31 -04:00
Sean.Webb
5c84cadaf6
ASM #16761 - Added retrans code updates from ISG
...
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 165b9a9b3481b3fa1d31b771eead03180430be59
2014-09-19 07:25:18 -04:00
Nate Jensen
b1ba40e577
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
Nate Jensen
71823085b4
Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
...
Former-commit-id: 676cffd04cae5ead141e20130c0c682a563d3e85
2014-09-18 14:22:22 -05:00
Nate Jensen
8ec8b13aac
Omaha #2735 unpack plugins that contribute spring xml to viz
...
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07
Former-commit-id: f88da1dfebb37e60e7a32ce283495e45366f4975
2014-09-18 12:27:33 -05:00
Nate Jensen
2cc83b3d33
Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
...
Former-commit-id: 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878
2014-09-18 11:53:11 -05:00
Brian.Dyke
c6b0adfc53
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
2014-09-18 12:43:01 -04:00
Chip Gobs
0d046a56e8
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
2014-09-18 12:12:42 -04:00
Brian Clements
3d790a851b
Omaha #3531 fixed localization perspective refresh issue
...
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 3cda9077130f30c21dbee5e8d16b59937a896cdd
2014-09-18 10:56:32 -05:00
Matthew Howard
27c31ea90f
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
...
Former-commit-id: 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc
2014-09-18 10:36:17 -05:00
Qinglu.Lin
10da99d3f7
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
...
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Sean.Webb
35bfd8269c
ASM #16761 - Updated ldm spec to add retrans
...
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: bb9d431a842511b0081660224f3ddefd947f76fd
2014-09-18 09:33:47 -04:00
Richard Peter
1d9c11a889
Merge "Omaha #3593 Change scripts to use DAF." into omaha_14.4.1
...
Former-commit-id: edace9e4909f83ac213bbd29c28352e1bf4cc11f
2014-09-17 22:28:03 -05:00
