Brian.Dyke
88d5f872ae
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
2014-09-19 13:14:13 -04:00
Brian.Dyke
7f49052445
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
2014-09-19 13:08:06 -04:00
Mark Peters
048e8339fd
Omaha #3300 Merge fixes for 14.4.1
...
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1
2014-09-19 12:01:07 -05:00
Darrel Kingfield
1cabae50b1
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
...
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
2014-09-19 11:14:09 -05:00
Steve Harris
07a7645fcd
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: c72e05b87f6eb6d094bde5e7caec3cccb20476ce
2014-09-19 11:13:46 -05:00
Steve Harris
091555cf10
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
Ana Rivera
9d8c08a09a
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
...
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 3af534fb2778268fee650c09c5aa0346df746ce8
2014-09-19 15:17:46 +00:00
Sean.Webb
b0b01694f7
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
...
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: 031c41d4f7801c8a5127cf007358856bf771593a
2014-09-19 09:29:31 -04:00
Sean.Webb
5c84cadaf6
ASM #16761 - Added retrans code updates from ISG
...
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 165b9a9b3481b3fa1d31b771eead03180430be59
2014-09-19 07:25:18 -04:00
Nate Jensen
b1ba40e577
Merge "Omaha #2735 unpack plugins that contribute spring xml to viz" into omaha_14.4.1
...
Former-commit-id: 55219fea5034bdc8e9aab3fb2142933e5d65b739
2014-09-18 14:52:17 -05:00
Nate Jensen
71823085b4
Merge "Omaha #3531 fixed localization perspective refresh issue" into omaha_14.4.1
...
Former-commit-id: 676cffd04cae5ead141e20130c0c682a563d3e85
2014-09-18 14:22:22 -05:00
Nate Jensen
8ec8b13aac
Omaha #2735 unpack plugins that contribute spring xml to viz
...
Change-Id: Iaa9340cb255650d3980daef10f30667b1224ac07
Former-commit-id: f88da1dfebb37e60e7a32ce283495e45366f4975
2014-09-18 12:27:33 -05:00
Nate Jensen
2cc83b3d33
Merge "Omaha #3356 fix service loader lookup for event bus" into omaha_14.4.1
...
Former-commit-id: 60b40cc4edbbcd7094e31ff3f5e496b8b5baf878
2014-09-18 11:53:11 -05:00
Brian.Dyke
c6b0adfc53
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
2014-09-18 12:43:01 -04:00
Chip Gobs
0d046a56e8
VLab Issue #4611
...
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
2014-09-18 12:12:42 -04:00
Brian Clements
3d790a851b
Omaha #3531 fixed localization perspective refresh issue
...
paths were compared by string prefixes instead of path prefixes
Change-Id: I6dd55001f505dda65df21e54727f262e247a30ba
Former-commit-id: 3cda9077130f30c21dbee5e8d16b59937a896cdd
2014-09-18 10:56:32 -05:00
Matthew Howard
27c31ea90f
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
...
Former-commit-id: 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc
2014-09-18 10:36:17 -05:00
Qinglu.Lin
10da99d3f7
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
...
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Sean.Webb
35bfd8269c
ASM #16761 - Updated ldm spec to add retrans
...
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: bb9d431a842511b0081660224f3ddefd947f76fd
2014-09-18 09:33:47 -04:00
Richard Peter
1d9c11a889
Merge "Omaha #3593 Change scripts to use DAF." into omaha_14.4.1
...
Former-commit-id: edace9e4909f83ac213bbd29c28352e1bf4cc11f
2014-09-17 22:28:03 -05:00
Nate Jensen
9860c2e5ec
Omaha #3356 fix service loader lookup for event bus
...
Change-Id: I9d53f7aaf1046c43cd90dfe7bbc957cbf9d1df12
Former-commit-id: f6aa0b18cdc26d8cad5f3e35d134a784fb11f4d5
2014-09-17 16:56:39 -05:00
Nate Jensen
2ed2275797
Merge "Omaha #3632 fixed index out of bounds for TCSResource" into omaha_14.4.1
...
Former-commit-id: 5bf4208ce50052e64d76c4227f237d85b72cb285
2014-09-17 16:26:52 -05:00
Matthew Howard
7b369e5ccc
Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: 45a5185657de4c3e3c330a5a8604078fe1ccde2a
2014-09-17 15:40:40 -05:00
Nate Jensen
dc49c41b39
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
Brian.Dyke
e1c88f287a
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
2014-09-17 15:50:13 -04:00
Brian.Dyke
a155bbd8c1
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0813f96fbb673fdbbdb2c0f049ec722a80b212f9
2014-09-17 15:45:27 -04:00
Brian.Dyke
546b43dff6
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
...
Former-commit-id: 0448deecda7c53ac65bc66bc9751ec0e7f83eee1
2014-09-17 15:39:57 -04:00
Ron Anderson
e8db5a1bbf
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
Steve Harris
cf24ea5d59
Merge branch 'master_14.2.4' (14.2.4-11) into omaha_14.2.4
...
Former-commit-id: 3aced28e0b4fe7e9b64445c050d119f47844e136
2014-09-17 14:09:33 -05:00
Nate Jensen
03c74e966d
Merge "Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin" into omaha_14.4.1
...
Former-commit-id: 0d36eda2778db9a2848fb84864181da0688df55f
2014-09-17 14:07:58 -05:00
Andrew Benak
898eaf114c
Omaha #3638 Moved kml graphics extensions into own plugins separate from the kml core plugin
...
Change-Id: I7b16a52cfee029fa10fba0ec837e8d05b4849d6b
Former-commit-id: 511721cfcab0aa64bc1b3b82cbe025c433fab34a
2014-09-17 14:06:02 -05:00
Zhidong.Hao
237b09c2ad
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
...
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 52d355b81fd7f7376d26f43ca6abe4d2ee744adf
2014-09-17 15:02:13 -04:00
Brian.Dyke
cb7a266271
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: dcfe2369455e6b7f27039418b090c9c577400a63
2014-09-17 14:39:56 -04:00
Brian.Dyke
4bd417b313
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 1f186fb314e78d93adefe03faaa71f348ee207c7
2014-09-17 13:32:25 -04:00
Roger Ferrel
7e4c964863
Omaha #3609 Correct same spelling as in 14.3.1-backports
...
Former-commit-id: 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096
2014-09-17 11:31:01 -05:00
Richard Peter
cf7fee3b58
Merge "Omaha #2707 LSR rework" into omaha_14.4.1
...
Former-commit-id: e9636595208e033882c6f7ec85329845a99cb66b
2014-09-17 11:22:45 -05:00
Brian Clements
4a93d0e571
Omaha #3632 fixed index out of bounds for TCSResource
...
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907
Former-commit-id: 1c96a60c25091ddec997f5d9e3b604c0fd7689bc
2014-09-17 11:16:55 -05:00
Brian Clements
423421175f
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
eccfebaa96
Omaha #3015 improved exception handling for MPE lightning
...
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636
Former-commit-id: 57f997f93e7e063ad6f24074ab3d1b8f02962bb8
2014-09-17 10:30:08 -05:00
Qinglu.Lin
0e2be5afd8
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
2014-09-17 10:26:25 -04:00
Nathan Bowler
71435084ef
Omaha #3593 Change scripts to use DAF.
...
Change-Id: I2fcf3b455335826cdf9cd8d3755c4dd72cba8974
Former-commit-id: 3daf987c89f4ed6e943dd7a9394f5617ec5690bf
2014-09-17 10:24:48 -04:00
Nate Jensen
6273bfd13e
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
Ron Anderson
f0c5e465b8
Issue #3592 Fix issue with priority of file updates
...
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58
Former-commit-id: 554ea4118615055d4f2e0d80c58788f55c4b41e9
2014-09-16 17:25:43 -05:00
Mark Peters
d406dc21d0
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
cd7a497567
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
0f5623bfeb
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
Richard Peter
2a4882ec8b
Merge "Omaha #3593 Fixing UEngine version for a proper side by side comparison." into omaha_14.4.1
...
Former-commit-id: 6566dbd9d3b8ac0aebf9a7aa45ac17164341efb5
2014-09-16 14:33:05 -05:00
Nate Jensen
1716c4e3dc
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
51d80b21ca
Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
...
Former-commit-id: cbc6fa33887bef0bfa692a967b273d4257430f8a
2014-09-16 13:54:08 -05:00
Nate Jensen
b516c4b8c8
Omaha #3356 fix ingestGrib level factory initialization order
...
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2
2014-09-16 13:24:46 -05:00
