Steve Harris
4c56844e29
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
Nate Jensen
51bbc3351b
Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
...
Former-commit-id: fba50e36f951594f6c8bb069ceb9b8a82a02ad89
2014-09-17 15:27:50 -05:00
Ron Anderson
b09244975e
Omaha #3623 Created command line utilities to activate/deactivate sites
...
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408
Former-commit-id: 670a9bd71874fbd6fecd0c9df5567ad342892333
2014-09-17 14:35:47 -05:00
Richard Peter
e2bd527996
Merge "Omaha #2707 LSR rework" into omaha_14.4.1
...
Former-commit-id: e9636595208e033882c6f7ec85329845a99cb66b
2014-09-17 11:22:45 -05:00
Brian Clements
6fd51c01fe
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: 9950454fbe4158bcfcb9d3ce25abafad4d012556
2014-09-17 10:57:07 -05:00
Brian Clements
246dcda707
Omaha #3015 improved exception handling for MPE lightning
...
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636
Former-commit-id: 57f997f93e7e063ad6f24074ab3d1b8f02962bb8
2014-09-17 10:30:08 -05:00
Nate Jensen
cdcaf9962d
Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
...
Former-commit-id: 0ff3f331f61b98e5132dc497d247a61828a8fdf0
2014-09-16 17:40:58 -05:00
Mark Peters
78ade15843
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I10eb6cb16dda6390480bc9498af55ad9838592c7
Former-commit-id: 854dfd074dba9a8ed68835c53118cc197e83488f
2014-09-16 16:42:56 -05:00
Mark Peters
87cc635b90
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I129b1f21a1f79b891c5e07eed7bfe3fe52b3162e
Former-commit-id: b50ab6a6235559165b9b8ff15af0a8cb4b44be36
2014-09-16 16:37:45 -05:00
Mark Peters
0a80edf171
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: I6693580dfea3f3ba0181e560e42aa224f30d3058
Former-commit-id: d2916cd882afc4c3f8aaf7f6eb1e645ca9514235
2014-09-16 16:23:01 -05:00
Nate Jensen
d6b05aa608
Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1
...
Former-commit-id: 5470de5efc2969ef47b177716bc3b2b72662b27c
2014-09-16 14:07:49 -05:00
Nate Jensen
b89781c419
Omaha #3356 fix ingestGrib level factory initialization order
...
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2
2014-09-16 13:24:46 -05:00
Ron Anderson
19bd85af5e
Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
...
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30
Former-commit-id: bb859073c6ab56141434b84dc104857759a81d82
2014-09-16 13:20:40 -05:00
Mark Peters
d3620ffea7
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
...
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8
Former-commit-id: 27ec90f83560909acdb27893528e28e3dd58fd6b
2014-09-16 12:13:33 -05:00
Richard Peter
01d33b408c
Merge "Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done" into omaha_14.4.1
...
Former-commit-id: 86993ed870a523bf7b595e6db9ed74e1d0f18d13
2014-09-16 10:07:14 -05:00
Steve Harris
57f0a992d9
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf
2014-09-15 21:13:56 -05:00
Ron Anderson
073435a715
Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done
...
Change-Id: I5130a548bc8ed28e507ded8ef555ae9e966ec3e2
Former-commit-id: 5a4a1a9a377f11b78ce7a477f205d47c3d763edd
2014-09-15 12:24:39 -05:00
Brian Clements
8bf3b0372b
Omaha #3583 productsrv no longer uses serialization util for JAXB
...
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18
Former-commit-id: e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f
2014-09-12 15:22:48 -05:00
Mark Peters
b8dc6d37d8
Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
...
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c
Former-commit-id: 4d5b0516d227eb7b892850753c6bb94f67f01a2d
2014-09-12 13:23:40 -05:00
Mark Peters
b34220fca5
Omaha #3582 Clean up SerializationUtil's JAXB/XML support
...
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431
Former-commit-id: fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc
2014-09-12 11:46:40 -05:00
Nate Jensen
cbe3d885a2
Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
...
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166
Former-commit-id: 64f5c249ed837f854db743e1b90f2194c01cdbfd
2014-09-12 09:14:01 -05:00
Richard Peter
dad8f4c869
Merge "Omaha #3615 Register 2D metar fields" into omaha_14.4.1
...
Former-commit-id: bb317434e32d73c2f1caa2bc335a117be17a2d07
2014-09-11 11:20:43 -05:00
Mark Peters
fb33786001
Omaha #3548 PluginDataObjectFilter fails to start in spring
...
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0
Former-commit-id: e9d50c287b6327ea03437a98fb1077b904daeecd
2014-09-11 10:32:11 -05:00
Nathan Bowler
ab09b948a6
Omaha #3615 Register 2D metar fields
...
Change-Id: Ic6cfcbfd1fcbab921732366c8803d54ea493845a
Former-commit-id: 3101fdbde5e8023fdc33ff18ad25c9a8c830693a
2014-09-11 11:20:40 -04:00
Richard Peter
0608175d2d
Merge "Omaha #3356 updates for improved level lookup" into omaha_14.4.1
...
Former-commit-id: 74f89af8dda533b6b905c86be1afac3e2633923b
2014-09-10 14:32:32 -05:00
Ron Anderson
b91141ef7b
Issue #3592 Fixed several localization issue in GFE
...
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7
Former-commit-id: a5ef55df33009948fec139e7729dd53ae4251667
2014-09-09 16:10:53 -05:00
Mark Peters
735cafee83
Omaha #3548 PluginDataObjectFilter fails to start in spring
...
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641
Former-commit-id: 4d059172e0d822a2fb740d602265da6a91e15ccc
2014-09-09 16:09:04 -05:00
Nate Jensen
62b84b2fb3
Omaha #3356 updates for improved level lookup
...
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b
2014-09-09 15:38:53 -05:00
Brian.Dyke
01dfe503f5
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Nate Jensen
7920053e2f
Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: 90e8451dd089de67278368ca665da0cfc5bb6740
2014-09-09 09:23:28 -05:00
Brian Clements
21ded3ea69
Omaha #3570 http client API changes
...
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: d4edd51d41a306010a7fec2a7ed2c0cd6186506a
2014-09-09 08:47:32 -05:00
Nate Jensen
b46f23d01b
Omaha #3356 more removal of unnecessary register buddies
...
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526
2014-09-08 17:18:22 -05:00
Nate Jensen
88e11a4909
Merge "Omaha #2926 switched text subscription to thrift client" into omaha_14.4.1
...
Former-commit-id: 51c60cf39cc950771597ff652c0e683c73812d91
2014-09-08 13:58:02 -05:00
Brian.Dyke
af477df90e
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 7b49ea6d9c45c0624017bbe7ffb1297a402ee875
2014-09-08 14:54:16 -04:00
Brian Clements
a0d663530b
Omaha #3518 each JVM gets a unique user prefs folder
...
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619
Former-commit-id: 856b223352b99e3f96df6dab84aea313885b3c37
2014-09-08 13:16:13 -05:00
Brian Clements
0087580736
Omaha #2926 switched text subscription to thrift client
...
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6
Former-commit-id: 410ef2954d6cfff11a4718056983ccaecf186fd3
2014-09-05 16:52:38 -05:00
Brian Clements
c77b4f4e8b
Omaha #2926 moved TextDBRequest to common
...
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c
Former-commit-id: 924e512c327c838d866b353ec8da8f7e5534db49
2014-09-05 12:56:04 -05:00
Brian.Dyke
702dd65aa7
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 876c6fc4db3901fdcd8dd9a6fb343d2f65254569
2014-09-05 11:13:12 -04:00
Brian.Dyke
9f7fabb002
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: c1f870d9df7579741e5a1d79cdec77293115e968
2014-09-05 10:57:14 -04:00
Ana Rivera
a8b04b8e63
VLab Issue #4601 - Update to SMS DR #16720 ; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
...
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 084970f8445dbb6b76bbad84b5dc986d961d2383
2014-09-05 13:27:29 +00:00
Greg Armendariz
a5359e4547
Omaha #3545 - Add log and fail message when directories are missing
...
Former-commit-id: 05d45b0c005ce7c8cca51c367754e7e6bca6c085
2014-09-04 11:52:13 -05:00
Brian.Dyke
d695dd0084
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a
2014-09-03 21:14:27 -04:00
Brian.Dyke
cfe03adff6
ASM #15697 - Fix Hydro Perspective Issue
...
Former-commit-id: 82d7bbe6bf005e543e1ad6772c6a18024f1b0764
2014-09-03 21:10:16 -04:00
Nate Jensen
3a2558eac8
Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
...
Former-commit-id: fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24
2014-09-03 17:13:06 -05:00
Steve Harris
afa45bf919
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
...
Former-commit-id: 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4
2014-09-03 15:22:00 -05:00
Matt Nash
980d7bf5ad
Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
...
Former-commit-id: dd691896f03ba16d683a284a26b8ef923e364834
2014-09-03 14:11:15 -05:00
Richard Peter
af87813ea9
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
...
Former-commit-id: 5f9298d52d0a11775588ed3742f2c2d3f19da1d0
2014-09-03 09:42:34 -05:00
Nate Jensen
80cc58cf25
Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
...
Former-commit-id: e393e1f0455d466edde925608b6f0f1e35351141
2014-09-03 09:21:28 -05:00
Nate Jensen
c23071f48c
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
...
Former-commit-id: 9e0f31fc6601a39938deeaf7e1c8ed8849e43288
2014-09-02 17:34:59 -05:00
Brian.Dyke
14e64881a1
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
...
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
2014-09-02 16:32:54 -04:00
