Commit graph

7180 commits

Author SHA1 Message Date
Nate Jensen
9a70b28032 Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174

Former-commit-id: e34c1a6fe8 [formerly ac15b82ed3c493a5ea8cca01ba304e95c965365e]
Former-commit-id: 8ac422d642
2014-09-23 15:37:09 -05:00
Steve Harris
9891be174d 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: 6cf62253a8 [formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]
Former-commit-id: e09f3ab040
2014-09-23 15:30:55 -05:00
Ron Anderson
b0bb1aba4b Issue #3648 Change GFE version purging to be event driven.
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e

Former-commit-id: 580db71dc8 [formerly ad725686f80a1f67ca6865859ad4f072edd1c54f]
Former-commit-id: 25a41ff9db
2014-09-23 13:43:14 -05:00
David Friedman
0ed1ce5726 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead

Former-commit-id: 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]
Former-commit-id: a6acf71a0a
2014-09-23 18:39:22 +00:00
Nate Jensen
5582df03b9 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: 3ae54c26c6 [formerly 21ad2f0d0229235495edc9319e8493d8a6b4d6b4]
Former-commit-id: c9033dc300
2014-09-23 12:15:56 -05:00
Mark Peters
27f5ae502d Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 9176913542 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]
Former-commit-id: bd5996a599
2014-09-23 12:12:22 -05:00
Richard Peter
ed84871cc8 Merge "Omaha #3591 Convert scripts to use DAF." into omaha_14.4.1
Former-commit-id: f474c55155 [formerly f782f11484b5aa1c9f64028a6d9241fa5b593453]
Former-commit-id: c3880f78b2
2014-09-23 12:09:05 -05:00
Steve Harris
f29bef4f34 Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: c8bee38fc7 [formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]
Former-commit-id: 26155d4251
2014-09-23 12:02:08 -05:00
Steve Harris
2e2072a963 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: b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]
Former-commit-id: 7692e3f21d
2014-09-23 11:41:10 -05:00
Lee Venable
cfb35a88f9 Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: 114010674f [formerly a158d4dbdf27311a04684bbda1afb3991fb0e09a]
Former-commit-id: b82ea41f9d
2014-09-23 10:56:20 -05:00
Nathan Bowler
ac4d93f32e Omaha #3591 Convert scripts to use DAF.
Change-Id: I05978c21d74949e2654dcfd62cb40a6738392a66

Former-commit-id: 36bb7fcd57 [formerly b5838370b90da43f953c5189a161640b3239418f]
Former-commit-id: 87865f6a95
2014-09-23 11:42:35 -04:00
Matthew Howard
80fd57e0b6 Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
Former-commit-id: df9b5f74c8 [formerly 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7]
Former-commit-id: e977069a71
2014-09-23 10:23:16 -05:00
Brian.Dyke
7033a8e1b1 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a32d406af3 [formerly 74df3dae5b1d0644ee5c82a0bb65054eb3541427]
Former-commit-id: e3276358dc
2014-09-23 11:08:20 -04:00
Nate Jensen
3e82c0f768 Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
Former-commit-id: 29ee81f50c [formerly 39c26499805dc23b232397a2f9349ed17564ae13]
Former-commit-id: 39f330b583
2014-09-23 09:52:22 -05:00
Shawn.Hooper
77b4daa18e ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e

Former-commit-id: 94b3acd437 [formerly 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7]
Former-commit-id: 99f6ff6d0a
2014-09-23 10:44:38 -04:00
Nathan Bowler
53495a767b Omaha #3591 Adding original, unaltered scripts.
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8

Former-commit-id: ce15b03ce4 [formerly ee00a93cac391a1c8e0f9236815b5ed270e9f9fb]
Former-commit-id: 1a0aa971ef
2014-09-23 10:43:01 -04:00
Nate Jensen
54fa54ef31 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: 16f91ce391 [formerly 677421b80157aa32c2ccf484eebe8e0a6a4c304f]
Former-commit-id: 2a675e48dd
2014-09-23 09:00:59 -05:00
Nate Jensen
92c1027ff7 Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac

Former-commit-id: 568559f2ce [formerly ad3753d57709fe8efeab2fb400d92b6ec61c2a3e]
Former-commit-id: 41fcd2b7b6
2014-09-23 08:21:18 -05:00
Steve Harris
fa6f4c608d Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: 00eda3f982 [formerly 68ff0acbe3739e2fd3aa89b13ed070c39db48551]
Former-commit-id: 3301300c7e
2014-09-22 22:18:26 -05:00
Steve Harris
7aa6719ca2 Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
Former-commit-id: b1931ae7dc [formerly 9bc599dd5481360d7a00b9c8455805893922127d]
Former-commit-id: 38daf108e6
2014-09-22 22:06:05 -05:00
Brian.Dyke
a1dd6b20ab Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7996916e36 [formerly 414a695e6423fa291936d15a999113f4a518b097]
Former-commit-id: 5d0347f589
2014-09-22 16:51:47 -04:00
Sean.Webb
fde36e7456 Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: 5dfd94a2dd [formerly 3592653ff850b2950d3ca4c0fead17292b58f971]
Former-commit-id: 4d2c798cc2
2014-09-22 14:23:18 -05:00
Sean.Webb
fb6e633cfc Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: dd31b930b3 [formerly d5f0fa6d025ec11eb83b9ceceb8309a23f80820b]
Former-commit-id: 9b164205c0
2014-09-22 14:22:58 -05:00
Sean.Webb
be3bb99abe ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: a9dddb44ce [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]
Former-commit-id: 00479a436d
2014-09-22 14:10:28 -04:00
Nate Jensen
9ef3bce809 Omaha #3356 fix apps_dir setting detection in viz/cave
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3

Former-commit-id: e637963736 [formerly ca8195c7835b9d96158d048fdd548cc744ba96bc]
Former-commit-id: e163ae0e5b
2014-09-22 13:00:04 -05:00
Ron Anderson
12dbec98fd Issue #3526 Fix errors found during testing in SS
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157

Former-commit-id: ba501a4210 [formerly 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7]
Former-commit-id: 5407eb6a71
2014-09-22 11:34:31 -05:00
Nate Jensen
b7f93f7a4d Omaha #3356 fix ingestDat startup issues
Change-Id: I47b66fd753513230849dd2710f518511895602fc

Former-commit-id: cbd5b270b5 [formerly f5ca6846eee39074abc856a1d2c9f6ed58ae0cff]
Former-commit-id: 9ac3ad9890
2014-09-22 10:59:10 -05:00
Sean.Webb
07589bbdda ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: 4c936b9bc8 [formerly 721bead655f9a384ea12444617774b7ef404feb0]
Former-commit-id: 47aef24f6f
2014-09-22 07:18:21 -04:00
Brian.Dyke
b94198ffb3 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1018c65552 [formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]
Former-commit-id: c0dc990974
2014-09-19 16:59:12 -04:00
Brian.Dyke
75f3bb31d5 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]
Former-commit-id: 4db67c581c
2014-09-19 16:56:50 -04:00
Ben Steffensmeier
766fdd80a8 Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 217caaba15 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]
Former-commit-id: 72f5799c44
2014-09-19 15:08:21 -05:00
Shawn Hooper
da5d9169ee 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: ce704601ae [formerly fc69e9debbbad3f8b82a8670f700a158fb68c12b]
Former-commit-id: 2df3755d31
2014-09-19 14:05:35 -05:00
Slav Korolev
d2dd00d2ae Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: 23ec338be0 [formerly 69a82633c287bf18c9f436014bb552829dcb62ea]
Former-commit-id: 71c4d8db07
2014-09-19 15:02:59 -04:00
Mark Peters
68044d2dd7 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: c5da5ccb9b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]
Former-commit-id: 3f1e21107b
2014-09-19 14:02:54 -05:00
Baoyu Yin
957c12653b VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d

Former-commit-id: 28b7e8d6e2 [formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]
Former-commit-id: 8568cd8419
2014-09-19 15:02:23 -04:00
Brian.Dyke
9fc3eb20c1 Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]
Former-commit-id: 6ad8d500ef
2014-09-19 14:42:29 -04:00
Sean.Webb
502f7520a7 ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: e0abd14986 [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]
Former-commit-id: 4368f4650b
2014-09-19 13:43:45 -04:00
Brian.Dyke
813d2be68e Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9435507b27 [formerly aaae61509d743553186cdefdea0557158b139527]
Former-commit-id: 88d5f872ae
2014-09-19 13:14:13 -04:00
Brian.Dyke
279f67ff54 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: e601d3fa51 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]
Former-commit-id: 7f49052445
2014-09-19 13:08:06 -04:00
Mark Peters
e99d90307b Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd

Former-commit-id: 26e4f86248 [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]
Former-commit-id: 048e8339fd
2014-09-19 12:01:07 -05:00
Darrel Kingfield
3eeaa8f359 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]
Former-commit-id: 1cabae50b1
2014-09-19 11:14:09 -05:00
Steve Harris
0ef8105b04 Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
Former-commit-id: fbab75af66 [formerly c72e05b87f6eb6d094bde5e7caec3cccb20476ce]
Former-commit-id: 07a7645fcd
2014-09-19 11:13:46 -05:00
Steve Harris
da530db540 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: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
2014-09-19 10:28:57 -05:00
Ana Rivera
2a25376398 VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06

Former-commit-id: 56f409717f [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]
Former-commit-id: 9d8c08a09a
2014-09-19 15:17:46 +00:00
Sean.Webb
c90c45f303 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: 6ffb17540e [formerly 031c41d4f7801c8a5127cf007358856bf771593a]
Former-commit-id: b0b01694f7
2014-09-19 09:29:31 -04:00
Sean.Webb
7f898635f9 ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 51380a2363 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]
Former-commit-id: 5c84cadaf6
2014-09-19 07:25:18 -04:00
Nate Jensen
2c31cb32d3 Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
Former-commit-id: 83cc50ad69 [formerly 55219fea5034bdc8e9aab3fb2142933e5d65b739]
Former-commit-id: b1ba40e577
2014-09-18 14:52:17 -05:00
Nate Jensen
ccafb51aef Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
Former-commit-id: 81b78b957b [formerly 676cffd04cae5ead141e20130c0c682a563d3e85]
Former-commit-id: 71823085b4
2014-09-18 14:22:22 -05:00
Nate Jensen
d5d6a85ea8 Omaha #2735 unpack plugins that contribute spring xml to viz
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07

Former-commit-id: 820f1ae0b8 [formerly f88da1dfebb37e60e7a32ce283495e45366f4975]
Former-commit-id: 8ec8b13aac
2014-09-18 12:27:33 -05:00
Nate Jensen
3276af7678 Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
Former-commit-id: cd7c46dbd6 [formerly 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878]
Former-commit-id: 2cc83b3d33
2014-09-18 11:53:11 -05:00