Commit graph

6820 commits

Author SHA1 Message Date
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
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 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
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
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
Nate Jensen
9bfbabcd4d Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
Former-commit-id: c52a832f1a [formerly 6273bfd13e] [formerly c52a832f1a [formerly 6273bfd13e] [formerly cdcaf9962d [formerly 0ff3f331f61b98e5132dc497d247a61828a8fdf0]]]
Former-commit-id: cdcaf9962d
Former-commit-id: 632fa47154 [formerly bfa3d7d8e2]
Former-commit-id: 8133f5958e
2014-09-16 17:40:58 -05:00
Ron Anderson
d5f59333f8 Issue #3592 Fix issue with priority of file updates
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58

Former-commit-id: f560ef000f [formerly f0c5e465b8] [formerly f560ef000f [formerly f0c5e465b8] [formerly d8471fce1f [formerly 554ea4118615055d4f2e0d80c58788f55c4b41e9]]]
Former-commit-id: d8471fce1f
Former-commit-id: 3976f40935 [formerly 28ad0619d2]
Former-commit-id: d858187c73
2014-09-16 17:25:43 -05:00
Mark Peters
2c4d9a098c Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I10eb6cb16dda6390480bc9498af55ad9838592c7

Former-commit-id: a8e70e107b [formerly d406dc21d0] [formerly a8e70e107b [formerly d406dc21d0] [formerly 78ade15843 [formerly 854dfd074dba9a8ed68835c53118cc197e83488f]]]
Former-commit-id: 78ade15843
Former-commit-id: cbf8bc76c7 [formerly 27f9153442]
Former-commit-id: ec4ecf6718
2014-09-16 16:42:56 -05:00
Mark Peters
85569b7c11 Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I129b1f21a1f79b891c5e07eed7bfe3fe52b3162e

Former-commit-id: 0cffb9ad15 [formerly cd7a497567] [formerly 0cffb9ad15 [formerly cd7a497567] [formerly 87cc635b90 [formerly b50ab6a6235559165b9b8ff15af0a8cb4b44be36]]]
Former-commit-id: 87cc635b90
Former-commit-id: 610e7d0d44 [formerly e414a740d4]
Former-commit-id: f9895d7013
2014-09-16 16:37:45 -05:00
Mark Peters
1eb5f9d8bc Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I6693580dfea3f3ba0181e560e42aa224f30d3058

Former-commit-id: cb72912515 [formerly 0f5623bfeb] [formerly cb72912515 [formerly 0f5623bfeb] [formerly 0a80edf171 [formerly d2916cd882afc4c3f8aaf7f6eb1e645ca9514235]]]
Former-commit-id: 0a80edf171
Former-commit-id: 43c1c33c50 [formerly bf0051e79e]
Former-commit-id: a4c48319de
2014-09-16 16:23:01 -05:00
Richard Peter
ff3fc2f423 Merge "Omaha #3593 Fixing UEngine version for a proper side by side comparison." into omaha_14.4.1
Former-commit-id: b9117350b9 [formerly 2a4882ec8b] [formerly b9117350b9 [formerly 2a4882ec8b] [formerly e0af8ad1be [formerly 6566dbd9d3b8ac0aebf9a7aa45ac17164341efb5]]]
Former-commit-id: e0af8ad1be
Former-commit-id: 4f9e85d28b [formerly 8c19f4a261]
Former-commit-id: 947521e2ed
2014-09-16 14:33:05 -05:00
Nate Jensen
1f5d08157e Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1
Former-commit-id: a86ed5386d [formerly 1716c4e3dc] [formerly a86ed5386d [formerly 1716c4e3dc] [formerly d6b05aa608 [formerly 5470de5efc2969ef47b177716bc3b2b72662b27c]]]
Former-commit-id: d6b05aa608
Former-commit-id: eedd77f22d [formerly 5b6b58ef83]
Former-commit-id: dc03b86539
2014-09-16 14:07:49 -05:00
Nate Jensen
74f8cded8d Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
Former-commit-id: 4477974eb7 [formerly 51d80b21ca] [formerly 4477974eb7 [formerly 51d80b21ca] [formerly 0ba58db5c7 [formerly cbc6fa33887bef0bfa692a967b273d4257430f8a]]]
Former-commit-id: 0ba58db5c7
Former-commit-id: fe5b3be5cd [formerly 2914258f94]
Former-commit-id: fe9027f064
2014-09-16 13:54:08 -05:00
Nate Jensen
89ea61abb0 Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: 877aab446c [formerly b516c4b8c8] [formerly 877aab446c [formerly b516c4b8c8] [formerly b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]]
Former-commit-id: b89781c419
Former-commit-id: 5d7897e9bc [formerly 57851af7d6]
Former-commit-id: 1370795313
2014-09-16 13:24:46 -05:00
Ron Anderson
e7f683e3eb Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30

Former-commit-id: 7a5f911ae2 [formerly 5c7290bf7c] [formerly 7a5f911ae2 [formerly 5c7290bf7c] [formerly 19bd85af5e [formerly bb859073c6ab56141434b84dc104857759a81d82]]]
Former-commit-id: 19bd85af5e
Former-commit-id: dee7bf8c3b [formerly 8f9f4608f1]
Former-commit-id: 43f2eb63b0
2014-09-16 13:20:40 -05:00
Mark Peters
4287a8dc20 Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8

Former-commit-id: 469a54f9fc [formerly 47598b6967] [formerly 469a54f9fc [formerly 47598b6967] [formerly d3620ffea7 [formerly 27ec90f83560909acdb27893528e28e3dd58fd6b]]]
Former-commit-id: d3620ffea7
Former-commit-id: 14c3ec8f97 [formerly 3ac06c97b1]
Former-commit-id: 354f7b86fd
2014-09-16 12:13:33 -05:00
Nathan Bowler
2e3762330e Omaha #3593 Fixing UEngine version for a proper side by side comparison.
Change-Id: Iff7a54df2d48ae7c51e37f5652d46934e3503323

Former-commit-id: 096a487c43 [formerly 6d238aab03] [formerly 096a487c43 [formerly 6d238aab03] [formerly 9943a4bc7b [formerly eac5ba546276b60d0705c6d7d94f8958fbddf5d9]]]
Former-commit-id: 9943a4bc7b
Former-commit-id: 2ca05845a8 [formerly a2fdc243c1]
Former-commit-id: d6f19ba3bd
2014-09-16 13:06:38 -04:00
Nate Jensen
e824a98ca4 Merge "Omaha #3593 Adding original, unaltered scripts." into omaha_14.4.1
Former-commit-id: b2ef9ffe81 [formerly 98ba1abb57] [formerly b2ef9ffe81 [formerly 98ba1abb57] [formerly 141f3b8e92 [formerly 90992e67d53421c336956f79883593af8ad99c1a]]]
Former-commit-id: 141f3b8e92
Former-commit-id: 0369a23d43 [formerly 26edac430a]
Former-commit-id: d264e0bbad
2014-09-16 11:13:45 -05:00
Richard Peter
d284429d0b Merge "Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done" into omaha_14.4.1
Former-commit-id: 1368d52348 [formerly 28ac00b003] [formerly 1368d52348 [formerly 28ac00b003] [formerly 01d33b408c [formerly 86993ed870a523bf7b595e6db9ed74e1d0f18d13]]]
Former-commit-id: 01d33b408c
Former-commit-id: 3131f862ad [formerly 8d3c4ae17f]
Former-commit-id: 9d2cd9e516
2014-09-16 10:07:14 -05:00
Nathan Bowler
02a295edf8 Omaha #3593 Adding original, unaltered scripts.
Change-Id: Idc74da95132ddf294bc38fce251792c3fc1c0555

Former-commit-id: e270f17fb4 [formerly 228476974a] [formerly e270f17fb4 [formerly 228476974a] [formerly 6268a339c7 [formerly f2f4f2c7ef0e0d0f9b6ead90eae6e72a96702b69]]]
Former-commit-id: 6268a339c7
Former-commit-id: 843dd0c930 [formerly 3c688c5001]
Former-commit-id: d616e9c2ba
2014-09-16 10:57:36 -04:00
Steve Harris
ac2e3f00d3 Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: eb0a05ab81 [formerly d5c0049ba2] [formerly eb0a05ab81 [formerly d5c0049ba2] [formerly 57f0a992d9 [formerly 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf]]]
Former-commit-id: 57f0a992d9
Former-commit-id: 12f78cfbb7 [formerly e8b733fc93]
Former-commit-id: 9d32386e33
2014-09-15 21:13:56 -05:00
Slav Korolev
4c3ef86cc7 Issue #2757 - Removed unnecessary dialogs.
Former-commit-id: 3ee0058def [formerly d682a69b8d] [formerly 3ee0058def [formerly d682a69b8d] [formerly 65d1cca6fd [formerly 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61]]]
Former-commit-id: 65d1cca6fd
Former-commit-id: dcda070d33 [formerly 5e84bc687e]
Former-commit-id: d122ed79db
2014-09-15 17:46:10 -04:00
Roger Ferrel
681b93eb57 Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
Former-commit-id: e121422e82 [formerly a31f3e670f] [formerly e121422e82 [formerly a31f3e670f] [formerly bab69dc58c [formerly f7fe3c9351d354046ef5038ae561db469421a442]]]
Former-commit-id: bab69dc58c
Former-commit-id: 42882fa28e [formerly 4385e34dd8]
Former-commit-id: e289919fca
2014-09-15 13:00:02 -05:00
Ron Anderson
8afea02a3b Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done
Change-Id: I5130a548bc8ed28e507ded8ef555ae9e966ec3e2

Former-commit-id: 69789ef17b [formerly 6a8c82891a] [formerly 69789ef17b [formerly 6a8c82891a] [formerly 073435a715 [formerly 5a4a1a9a377f11b78ce7a477f205d47c3d763edd]]]
Former-commit-id: 073435a715
Former-commit-id: a16699cb7c [formerly 44da6b8f04]
Former-commit-id: 2bc0836f03
2014-09-15 12:24:39 -05:00
Nate Jensen
da45eedb8d Merge "Omaha #3531 added localization perspective link to volume browser menus" into omaha_14.4.1
Former-commit-id: 023138feef [formerly ee4d566f0f] [formerly 023138feef [formerly ee4d566f0f] [formerly e76eb99b1e [formerly ef837132263e16954c571ab5028c24d8fec2d093]]]
Former-commit-id: e76eb99b1e
Former-commit-id: 6989640e65 [formerly f02a7a1dcc]
Former-commit-id: f4ef843a63
2014-09-15 11:01:49 -05:00
Brian Clements
dda89f79ec Omaha #3531 added localization perspective link to volume browser menus
Change-Id: I876d3c562a6c7d9d02396519d1d214a97ffa5be9

Former-commit-id: 88826380e5 [formerly ba64a77fe4] [formerly 88826380e5 [formerly ba64a77fe4] [formerly 06a6124b64 [formerly b25d8f970caa04375f27f30d86df07542783e24a]]]
Former-commit-id: 06a6124b64
Former-commit-id: ab9720903b [formerly 0494d42b57]
Former-commit-id: 07ef84c212
2014-09-15 09:13:20 -05:00
Brian Clements
b21ad76754 Omaha #3583 productsrv no longer uses serialization util for JAXB
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18

Former-commit-id: 1d06a876d7 [formerly b984f9e3ed] [formerly 1d06a876d7 [formerly b984f9e3ed] [formerly 8bf3b0372b [formerly e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f]]]
Former-commit-id: 8bf3b0372b
Former-commit-id: 6e8af95e7b [formerly d0a741a083]
Former-commit-id: 86442d1b24
2014-09-12 15:22:48 -05:00
Roger Ferrel
54064b034c Issue #3516 ColorMapTree change listener now only gets colormaps changes.
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023

Former-commit-id: 76011cb3eb [formerly fa91c4ac44] [formerly 76011cb3eb [formerly fa91c4ac44] [formerly 28347129a1 [formerly bb265611d13e6cb9812aca3966d9fe2a20990a36]]]
Former-commit-id: 28347129a1
Former-commit-id: 7daab1afa3 [formerly 7b052e61ca]
Former-commit-id: e4d01737e2
2014-09-12 15:03:13 -05:00
Mark Peters
75de69198c Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c

Former-commit-id: 9045bb4df8 [formerly 004bc1692a] [formerly 9045bb4df8 [formerly 004bc1692a] [formerly b8dc6d37d8 [formerly 4d5b0516d227eb7b892850753c6bb94f67f01a2d]]]
Former-commit-id: b8dc6d37d8
Former-commit-id: fa39b6b0e5 [formerly 520b5a9a8f]
Former-commit-id: 7f85e1c94c
2014-09-12 13:23:40 -05:00
Mark Peters
eaf4ad4ffc Omaha #3582 Clean up SerializationUtil's JAXB/XML support
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431

Former-commit-id: 5abd331ae3 [formerly 63f44c571d] [formerly 5abd331ae3 [formerly 63f44c571d] [formerly b34220fca5 [formerly fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc]]]
Former-commit-id: b34220fca5
Former-commit-id: 70c41915ae [formerly 3f251f55bf]
Former-commit-id: a9a6b39f29
2014-09-12 11:46:40 -05:00
Nate Jensen
c915f2b618 Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166

Former-commit-id: 85119e5610 [formerly 0bde7e01fb] [formerly 85119e5610 [formerly 0bde7e01fb] [formerly cbe3d885a2 [formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]]]
Former-commit-id: cbe3d885a2
Former-commit-id: c377150a59 [formerly 64140e614a]
Former-commit-id: a214a90337
2014-09-12 09:14:01 -05:00
Roger Ferrel
e6dd284481 Issue #3516 - Get Color Maps for levels off the dispatch thread.
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc

Former-commit-id: fffec40c30 [formerly c885873b25] [formerly fffec40c30 [formerly c885873b25] [formerly 246bc4770f [formerly a67a429eb2d266e66a99b6c18916193cd0d20d9d]]]
Former-commit-id: 246bc4770f
Former-commit-id: 9236b1f1fb [formerly 775dd2520d]
Former-commit-id: 5aefd5d28d
2014-09-11 14:36:50 -05:00