Commit graph

6873 commits

Author SHA1 Message Date
Richard Peter
f91697cc5b Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
Former-commit-id: c9c4dda54c [formerly a4668b64a6] [formerly c9c4dda54c [formerly a4668b64a6] [formerly 23747ad042 [formerly acbc667cfeab1ab6449a93967896e6e303bb238d]]]
Former-commit-id: 23747ad042
Former-commit-id: fffd7c6f48 [formerly 554f75dc16]
Former-commit-id: 6f644ed32e
2014-09-26 11:27:53 -05:00
Ron Anderson
708b4d43fa Omaha #3622 Fix duplicate SiteActivationNotifications.
Change-Id: I647bf118f558721867722cfc13d889e637237911

Former-commit-id: 71aad3ecff [formerly 92575e8db3] [formerly 71aad3ecff [formerly 92575e8db3] [formerly dd4f22789a [formerly 8f687189a5c71f3bd04b5e31f6a45606fe456386]]]
Former-commit-id: dd4f22789a
Former-commit-id: c4b97646fc [formerly 891e864f00]
Former-commit-id: 3c3547ffcf
2014-09-26 15:19:08 +00:00
Nate Jensen
e83580e13a Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8

Former-commit-id: 1ec55dfc22 [formerly c0b7fc0ac7] [formerly 1ec55dfc22 [formerly c0b7fc0ac7] [formerly 987060f56c [formerly 0f2066e985dcbcedd2794ce226232efe999b1312]]]
Former-commit-id: 987060f56c
Former-commit-id: 06c02a04b6 [formerly aa370e474e]
Former-commit-id: 3028f3ab1f
2014-09-25 11:30:27 -05:00
Nate Jensen
3c7d92703e Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: e74bfdc195 [formerly 364aff9278] [formerly e74bfdc195 [formerly 364aff9278] [formerly 174b036c56 [formerly e2f23221c3f8301460df2945deb8c760cdf216e9]]]
Former-commit-id: 174b036c56
Former-commit-id: d1171b2e18 [formerly ad6bd4e7ff]
Former-commit-id: eb077c4bcf
2014-09-25 08:44:50 -05:00
Slav Korolev
27f8c438d2 Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: 1120f9a440 [formerly 7b1a4c6774] [formerly 1120f9a440 [formerly 7b1a4c6774] [formerly ce2ef5019b [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 7e739e4197 [formerly 11ee774939]
Former-commit-id: 3033eba2f3
2014-09-25 09:02:27 -04:00
Nate Jensen
8096bd8fdc Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219

Former-commit-id: 86b76b399d [formerly 4cf93c0acb] [formerly 86b76b399d [formerly 4cf93c0acb] [formerly 36556fc48b [formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]]
Former-commit-id: 36556fc48b
Former-commit-id: f2432e5a47 [formerly 98d47a8dd2]
Former-commit-id: 6bfa9cd589
2014-09-24 15:20:17 -05:00
Nate Jensen
4931a17df2 Merge "Omaha #3009 make ffmp play nice with collaboration" into omaha_14.4.1
Former-commit-id: bf601df1e0 [formerly 8db243045c] [formerly bf601df1e0 [formerly 8db243045c] [formerly 53afb3815c [formerly b89acc052d5c0065e12c9e13cde1d4fffd115729]]]
Former-commit-id: 53afb3815c
Former-commit-id: 0a2823cda1 [formerly 34ba7003f0]
Former-commit-id: c9d4c9750b
2014-09-23 16:17:27 -05:00
Nate Jensen
d1aaffd9c2 Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174

Former-commit-id: 9a70b28032 [formerly 8ac422d642] [formerly 9a70b28032 [formerly 8ac422d642] [formerly e34c1a6fe8 [formerly ac15b82ed3c493a5ea8cca01ba304e95c965365e]]]
Former-commit-id: e34c1a6fe8
Former-commit-id: a0180bad18 [formerly 93432f2a4d]
Former-commit-id: 85d4a24b2b
2014-09-23 15:37:09 -05:00
Steve Harris
47b52b025a 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: 9891be174d [formerly e09f3ab040] [formerly 9891be174d [formerly e09f3ab040] [formerly 6cf62253a8 [formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]]]
Former-commit-id: 6cf62253a8
Former-commit-id: d1c57e9e29 [formerly 653369048a]
Former-commit-id: 2c07c98fc7
2014-09-23 15:30:55 -05:00
Nate Jensen
79609628d0 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: 5582df03b9 [formerly c9033dc300] [formerly 5582df03b9 [formerly c9033dc300] [formerly 3ae54c26c6 [formerly 21ad2f0d0229235495edc9319e8493d8a6b4d6b4]]]
Former-commit-id: 3ae54c26c6
Former-commit-id: 2fe7f33be9 [formerly 64edefbf51]
Former-commit-id: 0a72a384a8
2014-09-23 12:15:56 -05:00
Mark Peters
71fdd40be2 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 27f5ae502d [formerly bd5996a599] [formerly 27f5ae502d [formerly bd5996a599] [formerly 9176913542 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]]]
Former-commit-id: 9176913542
Former-commit-id: 6ce445d20b [formerly c9e8228954]
Former-commit-id: 757ecb423c
2014-09-23 12:12:22 -05:00
Richard Peter
2ccb9e94d9 Merge "Omaha #3591 Convert scripts to use DAF." into omaha_14.4.1
Former-commit-id: ed84871cc8 [formerly c3880f78b2] [formerly ed84871cc8 [formerly c3880f78b2] [formerly f474c55155 [formerly f782f11484b5aa1c9f64028a6d9241fa5b593453]]]
Former-commit-id: f474c55155
Former-commit-id: 88fa9da7d4 [formerly f7772790b7]
Former-commit-id: 591eca891c
2014-09-23 12:09:05 -05:00
Steve Harris
bc71a024da Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: f29bef4f34 [formerly 26155d4251] [formerly f29bef4f34 [formerly 26155d4251] [formerly c8bee38fc7 [formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]]]
Former-commit-id: c8bee38fc7
Former-commit-id: a2e1cdf346 [formerly 3cca5caf09]
Former-commit-id: 363467f328
2014-09-23 12:02:08 -05:00
Steve Harris
d3169a96b0 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: 2e2072a963 [formerly 7692e3f21d] [formerly 2e2072a963 [formerly 7692e3f21d] [formerly b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]
Former-commit-id: b979960b7b
Former-commit-id: e5f8a8f74f [formerly 50d6dccd09]
Former-commit-id: f831536854
2014-09-23 11:41:10 -05:00
Lee Venable
ec2e68f901 Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: cfb35a88f9 [formerly b82ea41f9d] [formerly cfb35a88f9 [formerly b82ea41f9d] [formerly 114010674f [formerly a158d4dbdf27311a04684bbda1afb3991fb0e09a]]]
Former-commit-id: 114010674f
Former-commit-id: b4f2aed1b0 [formerly f88f41446a]
Former-commit-id: 192b865509
2014-09-23 10:56:20 -05:00
Nathan Bowler
a7a8058660 Omaha #3591 Convert scripts to use DAF.
Change-Id: I05978c21d74949e2654dcfd62cb40a6738392a66

Former-commit-id: ac4d93f32e [formerly 87865f6a95] [formerly ac4d93f32e [formerly 87865f6a95] [formerly 36bb7fcd57 [formerly b5838370b90da43f953c5189a161640b3239418f]]]
Former-commit-id: 36bb7fcd57
Former-commit-id: 0577dd9983 [formerly c477e39037]
Former-commit-id: 71b0c2d045
2014-09-23 11:42:35 -04:00
Nate Jensen
bdf1411f78 Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
Former-commit-id: 3e82c0f768 [formerly 39f330b583] [formerly 3e82c0f768 [formerly 39f330b583] [formerly 29ee81f50c [formerly 39c26499805dc23b232397a2f9349ed17564ae13]]]
Former-commit-id: 29ee81f50c
Former-commit-id: 991276ab34 [formerly 45e8f476ed]
Former-commit-id: 30f1398f14
2014-09-23 09:52:22 -05:00
Nathan Bowler
f6abb030d5 Omaha #3591 Adding original, unaltered scripts.
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8

Former-commit-id: 53495a767b [formerly 1a0aa971ef] [formerly 53495a767b [formerly 1a0aa971ef] [formerly ce15b03ce4 [formerly ee00a93cac391a1c8e0f9236815b5ed270e9f9fb]]]
Former-commit-id: ce15b03ce4
Former-commit-id: 416c83769d [formerly 01ed47b7be]
Former-commit-id: 41f434fb46
2014-09-23 10:43:01 -04:00
Nate Jensen
13e59f358b 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: 54fa54ef31 [formerly 2a675e48dd] [formerly 54fa54ef31 [formerly 2a675e48dd] [formerly 16f91ce391 [formerly 677421b80157aa32c2ccf484eebe8e0a6a4c304f]]]
Former-commit-id: 16f91ce391
Former-commit-id: 96f1e6e690 [formerly 1b20c02c9c]
Former-commit-id: de1d5f8477
2014-09-23 09:00:59 -05:00
Nate Jensen
4b16070472 Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac

Former-commit-id: 92c1027ff7 [formerly 41fcd2b7b6] [formerly 92c1027ff7 [formerly 41fcd2b7b6] [formerly 568559f2ce [formerly ad3753d57709fe8efeab2fb400d92b6ec61c2a3e]]]
Former-commit-id: 568559f2ce
Former-commit-id: b30c3d1b7c [formerly 9f04152945]
Former-commit-id: 4e8a58e91e
2014-09-23 08:21:18 -05:00
Nate Jensen
ff738247f3 Omaha #3356 fix apps_dir setting detection in viz/cave
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3

Former-commit-id: 9ef3bce809 [formerly e163ae0e5b] [formerly 9ef3bce809 [formerly e163ae0e5b] [formerly e637963736 [formerly ca8195c7835b9d96158d048fdd548cc744ba96bc]]]
Former-commit-id: e637963736
Former-commit-id: 0ef93eb57a [formerly 9c316ec38c]
Former-commit-id: 6ff3a4435d
2014-09-22 13:00:04 -05:00
Nate Jensen
c489974c74 Omaha #3356 fix ingestDat startup issues
Change-Id: I47b66fd753513230849dd2710f518511895602fc

Former-commit-id: b7f93f7a4d [formerly 9ac3ad9890] [formerly b7f93f7a4d [formerly 9ac3ad9890] [formerly cbd5b270b5 [formerly f5ca6846eee39074abc856a1d2c9f6ed58ae0cff]]]
Former-commit-id: cbd5b270b5
Former-commit-id: 6e6f38b2fb [formerly 41945b820a]
Former-commit-id: 8ea5d99bf4
2014-09-22 10:59:10 -05:00
Ben Steffensmeier
4e6c331288 Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 766fdd80a8 [formerly 72f5799c44] [formerly 766fdd80a8 [formerly 72f5799c44] [formerly 217caaba15 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]]
Former-commit-id: 217caaba15
Former-commit-id: 66eae6f360 [formerly c02072c2e2]
Former-commit-id: f4fef04e89
2014-09-19 15:08:21 -05:00
Mark Peters
11a05cae90 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: 68044d2dd7 [formerly 3f1e21107b] [formerly 68044d2dd7 [formerly 3f1e21107b] [formerly c5da5ccb9b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]]
Former-commit-id: c5da5ccb9b
Former-commit-id: 01fa82955b [formerly edc2745d1f]
Former-commit-id: 54640500a6
2014-09-19 14:02:54 -05:00
Mark Peters
494a7bc745 Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd

Former-commit-id: e99d90307b [formerly 048e8339fd] [formerly e99d90307b [formerly 048e8339fd] [formerly 26e4f86248 [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]]
Former-commit-id: 26e4f86248
Former-commit-id: 16961860a8 [formerly c49df63363]
Former-commit-id: 08a3acb2d4
2014-09-19 12:01:07 -05:00
Steve Harris
f4ea796cea 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: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
2014-09-19 10:28:57 -05:00
Nate Jensen
28e5123de5 Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
Former-commit-id: 2c31cb32d3 [formerly b1ba40e577] [formerly 2c31cb32d3 [formerly b1ba40e577] [formerly 83cc50ad69 [formerly 55219fea5034bdc8e9aab3fb2142933e5d65b739]]]
Former-commit-id: 83cc50ad69
Former-commit-id: a5beee8a4f [formerly 8a4fb073d3]
Former-commit-id: 3dfb463f88
2014-09-18 14:52:17 -05:00
Nate Jensen
b0688a4cb0 Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
Former-commit-id: ccafb51aef [formerly 71823085b4] [formerly ccafb51aef [formerly 71823085b4] [formerly 81b78b957b [formerly 676cffd04cae5ead141e20130c0c682a563d3e85]]]
Former-commit-id: 81b78b957b
Former-commit-id: ff2ee0bd72 [formerly 38e2cd0362]
Former-commit-id: 49be820832
2014-09-18 14:22:22 -05:00
Nate Jensen
66d0304173 Omaha #2735 unpack plugins that contribute spring xml to viz
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07

Former-commit-id: d5d6a85ea8 [formerly 8ec8b13aac] [formerly d5d6a85ea8 [formerly 8ec8b13aac] [formerly 820f1ae0b8 [formerly f88da1dfebb37e60e7a32ce283495e45366f4975]]]
Former-commit-id: 820f1ae0b8
Former-commit-id: 297a64e586 [formerly 42b2ec5955]
Former-commit-id: 299a95988d
2014-09-18 12:27:33 -05:00
Nate Jensen
5233d7eac2 Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
Former-commit-id: 3276af7678 [formerly 2cc83b3d33] [formerly 3276af7678 [formerly 2cc83b3d33] [formerly cd7c46dbd6 [formerly 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878]]]
Former-commit-id: cd7c46dbd6
Former-commit-id: 5bbe8cdf69 [formerly 68d116ee7e]
Former-commit-id: e538787826
2014-09-18 11:53:11 -05:00
Brian.Dyke
64435ea860 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e70a9db68c [formerly c6b0adfc53] [formerly e70a9db68c [formerly c6b0adfc53] [formerly 8b0603cdb8 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 87dfb0e978 [formerly d5f57cd98e]
Former-commit-id: 37ffb37db6
2014-09-18 12:43:01 -04:00
Chip Gobs
35439f3173 VLab Issue #4611
Adding missing changed file.

Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e

Former-commit-id: 0e4b8d2e9b [formerly 0d046a56e8] [formerly 0e4b8d2e9b [formerly 0d046a56e8] [formerly 31efce6b8f [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]
Former-commit-id: 31efce6b8f
Former-commit-id: aa838b2230 [formerly a287a95ef9]
Former-commit-id: 552430bda0
2014-09-18 12:12:42 -04:00
Brian Clements
cc965c830f Omaha #3531 fixed localization perspective refresh issue
paths were compared by string prefixes instead of path prefixes

Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba

Former-commit-id: 7268d3dc76 [formerly 3d790a851b] [formerly 7268d3dc76 [formerly 3d790a851b] [formerly 673ccf5851 [formerly 3cda9077130f30c21dbee5e8d16b59937a896cdd]]]
Former-commit-id: 673ccf5851
Former-commit-id: 1720b40335 [formerly bbd2eddcf5]
Former-commit-id: 986b66c850
2014-09-18 10:56:32 -05:00
Richard Peter
7da16a6d62 Merge "Omaha #3593 Change scripts to use DAF." into omaha_14.4.1
Former-commit-id: 3fb7554532 [formerly 1d9c11a889] [formerly 3fb7554532 [formerly 1d9c11a889] [formerly 1c46a59a35 [formerly edace9e4909f83ac213bbd29c28352e1bf4cc11f]]]
Former-commit-id: 1c46a59a35
Former-commit-id: e0e7284078 [formerly 0247f9305d]
Former-commit-id: 52161887eb
2014-09-17 22:28:03 -05:00
Nate Jensen
f313e845c1 Omaha #3356 fix service loader lookup for event bus
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12

Former-commit-id: 406aff37e9 [formerly 9860c2e5ec] [formerly 406aff37e9 [formerly 9860c2e5ec] [formerly 27fee9b714 [formerly f6aa0b18cdc26d8cad5f3e35d134a784fb11f4d5]]]
Former-commit-id: 27fee9b714
Former-commit-id: e41212dd39 [formerly 656a038922]
Former-commit-id: b4776d072f
2014-09-17 16:56:39 -05:00
Nate Jensen
56d557ae89 Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
Former-commit-id: 22a5011456 [formerly 2ed2275797] [formerly 22a5011456 [formerly 2ed2275797] [formerly c9e08540d1 [formerly 5bf4208ce50052e64d76c4227f237d85b72cb285]]]
Former-commit-id: c9e08540d1
Former-commit-id: 1b0c069cc5 [formerly f0b3bb04fa]
Former-commit-id: 584ad613a7
2014-09-17 16:26:52 -05:00
Nate Jensen
f3350006ed Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
Former-commit-id: 7d574ec247 [formerly dc49c41b39] [formerly 7d574ec247 [formerly dc49c41b39] [formerly 51bbc3351b [formerly fba50e36f951594f6c8bb069ceb9b8a82a02ad89]]]
Former-commit-id: 51bbc3351b
Former-commit-id: 0baaaf933f [formerly e0784838ee]
Former-commit-id: b7b86fafd7
2014-09-17 15:27:50 -05:00
Brian.Dyke
c95be437eb Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1c0d6624a3 [formerly e1c88f287a] [formerly 1c0d6624a3 [formerly e1c88f287a] [formerly 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]
Former-commit-id: 57a361073d
Former-commit-id: 47feda6450 [formerly 4476b9d19e]
Former-commit-id: 7e53a1d558
2014-09-17 15:50:13 -04:00
Brian.Dyke
76c056ce3f Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 125760432b [formerly a155bbd8c1] [formerly 125760432b [formerly a155bbd8c1] [formerly 0f6b0f3d9d [formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]]]
Former-commit-id: 0f6b0f3d9d
Former-commit-id: 9db11b3211 [formerly e43ea5e966]
Former-commit-id: 84a511359b
2014-09-17 15:45:27 -04:00
Brian.Dyke
6f708b2b87 VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 9d2eaef5e7 [formerly 546b43dff6] [formerly 9d2eaef5e7 [formerly 546b43dff6] [formerly 05145d2f0d [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]]]
Former-commit-id: 05145d2f0d
Former-commit-id: 75284bdd1b [formerly 60a61086d5]
Former-commit-id: 5516c71d4e
2014-09-17 15:39:57 -04:00
Ron Anderson
ae8e1937a9 Omaha #3623 Created command line utilities to activate/deactivate sites
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408

Former-commit-id: f0e06502ee [formerly e8db5a1bbf] [formerly f0e06502ee [formerly e8db5a1bbf] [formerly b09244975e [formerly 670a9bd71874fbd6fecd0c9df5567ad342892333]]]
Former-commit-id: b09244975e
Former-commit-id: 15dabca55b [formerly 9a0371457a]
Former-commit-id: f71d1932bd
2014-09-17 14:35:47 -05:00
Nate Jensen
d0deab9b7c Merge "Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin" into omaha_14.4.1
Former-commit-id: c7710f39b0 [formerly 03c74e966d] [formerly c7710f39b0 [formerly 03c74e966d] [formerly 6225047ff0 [formerly 0d36eda2778db9a2848fb84864181da0688df55f]]]
Former-commit-id: 6225047ff0
Former-commit-id: 81ce6a8206 [formerly 5403b31f5d]
Former-commit-id: c5a11bc792
2014-09-17 14:07:58 -05:00
Andrew Benak
48d3884e28 Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin
Change-Id: I7b16a52cfee029fa10fba0ec837e8d05b4849d6b

Former-commit-id: 2c0eb1b447 [formerly 898eaf114c] [formerly 2c0eb1b447 [formerly 898eaf114c] [formerly d38d9ceaea [formerly 511721cfcab0aa64bc1b3b82cbe025c433fab34a]]]
Former-commit-id: d38d9ceaea
Former-commit-id: a040ccfe8e [formerly 6d9c357a8b]
Former-commit-id: e88d5fdc3a
2014-09-17 14:06:02 -05:00
Brian.Dyke
484ebfd9c9 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: c44811098f [formerly cb7a266271] [formerly c44811098f [formerly cb7a266271] [formerly 97fc11f099 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]
Former-commit-id: 97fc11f099
Former-commit-id: 050fb83ec8 [formerly e8e2549284]
Former-commit-id: 8f0d1e9dc5
2014-09-17 14:39:56 -04:00
Roger Ferrel
5b3d257154 Omaha #3609 Correct same spelling as in 14.3.1-backports
Former-commit-id: 88576d1bdf [formerly 7e4c964863] [formerly 88576d1bdf [formerly 7e4c964863] [formerly a560d254f8 [formerly 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096]]]
Former-commit-id: a560d254f8
Former-commit-id: bf7192f71e [formerly b4d7c2ad5b]
Former-commit-id: 65811e5943
2014-09-17 11:31:01 -05:00
Richard Peter
8182268b50 Merge "Omaha #2707 LSR rework" into omaha_14.4.1
Former-commit-id: 1304c2b343 [formerly cf7fee3b58] [formerly 1304c2b343 [formerly cf7fee3b58] [formerly e2bd527996 [formerly e9636595208e033882c6f7ec85329845a99cb66b]]]
Former-commit-id: e2bd527996
Former-commit-id: 61d4471b80 [formerly 5e68587405]
Former-commit-id: 74a99c6344
2014-09-17 11:22:45 -05:00
Brian Clements
179e35c5dd Omaha #3632 fixed index out of bounds for TCSResource
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907

Former-commit-id: a1b3579cf5 [formerly 4a93d0e571] [formerly a1b3579cf5 [formerly 4a93d0e571] [formerly 0808a6b662 [formerly 1c96a60c25091ddec997f5d9e3b604c0fd7689bc]]]
Former-commit-id: 0808a6b662
Former-commit-id: 520d4fdd5c [formerly a410a42e4d]
Former-commit-id: 8df79c9b1d
2014-09-17 11:16:55 -05:00
Brian Clements
eeda187c02 Omaha #2707 LSR rework
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct

Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73

Former-commit-id: 84f85d1436 [formerly 423421175f] [formerly 84f85d1436 [formerly 423421175f] [formerly 6fd51c01fe [formerly 9950454fbe4158bcfcb9d3ce25abafad4d012556]]]
Former-commit-id: 6fd51c01fe
Former-commit-id: 34d9bee33d [formerly c4abe5b471]
Former-commit-id: 0944f06460
2014-09-17 10:57:07 -05:00
Brian Clements
c0898880f6 Omaha #3015 improved exception handling for MPE lightning
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636

Former-commit-id: 9aa1cb03e1 [formerly eccfebaa96] [formerly 9aa1cb03e1 [formerly eccfebaa96] [formerly 246dcda707 [formerly 57f997f93e7e063ad6f24074ab3d1b8f02962bb8]]]
Former-commit-id: 246dcda707
Former-commit-id: 678d98f5d8 [formerly 86361da448]
Former-commit-id: 4bbad8b2f1
2014-09-17 10:30:08 -05:00
Nathan Bowler
9fbaeeb68f Omaha #3593 Change scripts to use DAF.
Change-Id: I2fcf3b455335826cdf9cd8d3755c4dd72cba8974

Former-commit-id: 05148089db [formerly 71435084ef] [formerly 05148089db [formerly 71435084ef] [formerly e3d47f6016 [formerly 3daf987c89f4ed6e943dd7a9394f5617ec5690bf]]]
Former-commit-id: e3d47f6016
Former-commit-id: 3397c0e9a0 [formerly 14fbd034c3]
Former-commit-id: fc0791687a
2014-09-17 10:24:48 -04:00