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: b979960b7b7692e3f21d
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: 114010674fb82ea41f9d
2014-09-23 10:56:20 -05:00
Nate Jensen
3e82c0f768
Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
...
Former-commit-id: 29ee81f50c39f330b583
2014-09-23 09:52:22 -05:00
Nathan Bowler
53495a767b
Omaha #3591 Adding original, unaltered scripts.
...
Change-Id: Ia1f60b645d283674985be542054c4dd20c2c5fa8
Former-commit-id: ce15b03ce41a0aa971ef
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: 16f91ce3912a675e48dd
2014-09-23 09:00:59 -05:00
Nate Jensen
92c1027ff7
Omaha #3356 remove unnecessary import
...
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: 568559f2ce41fcd2b7b6
2014-09-23 08:21:18 -05:00
Nate Jensen
9ef3bce809
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: e637963736e163ae0e5b
2014-09-22 13:00:04 -05:00
Nate Jensen
b7f93f7a4d
Omaha #3356 fix ingestDat startup issues
...
Change-Id: I47b66fd753513230849dd2710f518511895602fc
Former-commit-id: cbd5b270b59ac3ad9890
2014-09-22 10:59:10 -05:00
Ben Steffensmeier
766fdd80a8
Omaha #3300 Fix component and mosaic merge problems
...
Former-commit-id: 217caaba1572f5799c44
2014-09-19 15:08:21 -05: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: c5da5ccb9b3f1e21107b
2014-09-19 14:02:54 -05:00
Mark Peters
e99d90307b
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 26e4f86248048e8339fd
2014-09-19 12:01:07 -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: 4c56844e29091555cf10
2014-09-19 10:28:57 -05:00
Nate Jensen
2c31cb32d3
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
...
Former-commit-id: 83cc50ad69b1ba40e577
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: 81b78b957b71823085b4
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: 820f1ae0b88ec8b13aac
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: cd7c46dbd62cc83b3d33
2014-09-18 11:53:11 -05:00
Brian.Dyke
e70a9db68c
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 8b0603cdb8c6b0adfc53
2014-09-18 12:43:01 -04:00
Chip Gobs
0e4b8d2e9b
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: 31efce6b8f0d046a56e8
2014-09-18 12:12:42 -04:00
Brian Clements
7268d3dc76
Omaha #3531 fixed localization perspective refresh issue
...
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 673ccf58513d790a851b
2014-09-18 10:56:32 -05:00
Richard Peter
3fb7554532
Merge "Omaha #3593 Change scripts to use DAF." into omaha_14.4.1
...
Former-commit-id: 1c46a59a351d9c11a889
2014-09-17 22:28:03 -05:00
Nate Jensen
406aff37e9
Omaha #3356 fix service loader lookup for event bus
...
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12
Former-commit-id: 27fee9b7149860c2e5ec
2014-09-17 16:56:39 -05:00
Nate Jensen
22a5011456
Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
...
Former-commit-id: c9e08540d12ed2275797
2014-09-17 16:26:52 -05:00
Nate Jensen
7d574ec247
Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
...
Former-commit-id: 51bbc3351bdc49c41b39
2014-09-17 15:27:50 -05:00
Brian.Dyke
1c0d6624a3
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 57a361073de1c88f287a
2014-09-17 15:50:13 -04:00
Brian.Dyke
125760432b
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0f6b0f3d9da155bbd8c1
2014-09-17 15:45:27 -04:00
Brian.Dyke
9d2eaef5e7
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
...
Former-commit-id: 05145d2f0d546b43dff6
2014-09-17 15:39:57 -04:00
Ron Anderson
f0e06502ee
Omaha #3623 Created command line utilities to activate/deactivate sites
...
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408
Former-commit-id: b09244975ee8db5a1bbf
2014-09-17 14:35:47 -05:00
Nate Jensen
c7710f39b0
Merge "Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin" into omaha_14.4.1
...
Former-commit-id: 6225047ff003c74e966d
2014-09-17 14:07:58 -05:00
Andrew Benak
2c0eb1b447
Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin
...
Change-Id: I7b16a52cfee029fa10fba0ec837e8d05b4849d6b
Former-commit-id: d38d9ceaea898eaf114c
2014-09-17 14:06:02 -05:00
Brian.Dyke
c44811098f
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 97fc11f099cb7a266271
2014-09-17 14:39:56 -04:00
Roger Ferrel
88576d1bdf
Omaha #3609 Correct same spelling as in 14.3.1-backports
...
Former-commit-id: a560d254f87e4c964863
2014-09-17 11:31:01 -05:00
Richard Peter
1304c2b343
Merge "Omaha #2707 LSR rework" into omaha_14.4.1
...
Former-commit-id: e2bd527996cf7fee3b58
2014-09-17 11:22:45 -05:00
Brian Clements
a1b3579cf5
Omaha #3632 fixed index out of bounds for TCSResource
...
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907
Former-commit-id: 0808a6b6624a93d0e571
2014-09-17 11:16:55 -05:00
Brian Clements
84f85d1436
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: 6fd51c01fe423421175f
2014-09-17 10:57:07 -05:00
Brian Clements
9aa1cb03e1
Omaha #3015 improved exception handling for MPE lightning
...
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636
Former-commit-id: 246dcda707eccfebaa96
2014-09-17 10:30:08 -05:00
Nathan Bowler
05148089db
Omaha #3593 Change scripts to use DAF.
...
Change-Id: I2fcf3b455335826cdf9cd8d3755c4dd72cba8974
Former-commit-id: e3d47f601671435084ef
2014-09-17 10:24:48 -04:00
Nate Jensen
c52a832f1a
Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
...
Former-commit-id: cdcaf9962d6273bfd13e
2014-09-16 17:40:58 -05:00
Ron Anderson
f560ef000f
Issue #3592 Fix issue with priority of file updates
...
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58
Former-commit-id: d8471fce1ff0c5e465b8
2014-09-16 17:25:43 -05:00
Mark Peters
a8e70e107b
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I10eb6cb16dda6390480bc9498af55ad9838592c7
Former-commit-id: 78ade15843d406dc21d0
2014-09-16 16:42:56 -05:00
Mark Peters
0cffb9ad15
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I129b1f21a1f79b891c5e07eed7bfe3fe52b3162e
Former-commit-id: 87cc635b90cd7a497567
2014-09-16 16:37:45 -05:00
Mark Peters
cb72912515
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I6693580dfea3f3ba0181e560e42aa224f30d3058
Former-commit-id: 0a80edf1710f5623bfeb
2014-09-16 16:23:01 -05:00
Richard Peter
b9117350b9
Merge "Omaha #3593 Fixing UEngine version for a proper side by side comparison." into omaha_14.4.1
...
Former-commit-id: e0af8ad1be2a4882ec8b
2014-09-16 14:33:05 -05:00
Nate Jensen
a86ed5386d
Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1
...
Former-commit-id: d6b05aa6081716c4e3dc
2014-09-16 14:07:49 -05:00
Nate Jensen
4477974eb7
Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
...
Former-commit-id: 0ba58db5c751d80b21ca
2014-09-16 13:54:08 -05:00
Nate Jensen
877aab446c
Omaha #3356 fix ingestGrib level factory initialization order
...
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: b89781c419b516c4b8c8
2014-09-16 13:24:46 -05:00
Ron Anderson
7a5f911ae2
Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
...
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30
Former-commit-id: 19bd85af5e5c7290bf7c
2014-09-16 13:20:40 -05:00
Mark Peters
469a54f9fc
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8
Former-commit-id: d3620ffea747598b6967
2014-09-16 12:13:33 -05:00
Nathan Bowler
096a487c43
Omaha #3593 Fixing UEngine version for a proper side by side comparison.
...
Change-Id: Iff7a54df2d48ae7c51e37f5652d46934e3503323
Former-commit-id: 9943a4bc7b6d238aab03
2014-09-16 13:06:38 -04:00
Nate Jensen
b2ef9ffe81
Merge "Omaha #3593 Adding original, unaltered scripts." into omaha_14.4.1
...
Former-commit-id: 141f3b8e9298ba1abb57
2014-09-16 11:13:45 -05:00
Richard Peter
1368d52348
Merge "Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done" into omaha_14.4.1
...
Former-commit-id: 01d33b408c28ac00b003
2014-09-16 10:07:14 -05:00
