Nate Jensen
8dfb9649d2
Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
...
Former-commit-id: 011089ab359f7aef5f3e011089ab359f7aef5f3e2a18111bdc2a18111bdcc07ae4fa3af8386f0570b868f3416b
2014-07-09 09:47:07 -05:00
Nate Jensen
ed4cfdb1f3
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: c3bd61a2c00c397d2b7ec3bd61a2c00c397d2b7e5547ea1c7d5547ea1c7dd5f944d203af08cc189f9931cfdf84
2014-07-09 09:24:31 -05:00
Ron Anderson
a1a980ed6e
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
...
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 4b4629a2fd111b04296c4b4629a2fd111b04296c5efba034745efba03474e39615ab7a1cc0ff4ab70a7c4c855e
2014-07-09 08:56:06 -05:00
Nate Jensen
a4d8924e25
Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
...
Former-commit-id: c818bca5c325f5e8f2e0c818bca5c325f5e8f2e0b9b26f1b54b9b26f1b549dd837e39d8e83a7d2781e0e752c2c
2014-07-08 13:29:37 -05:00
Dave Hladky
f2ad4695d9
Omaha #3357 Ingest JVM shouldn't pull in DPA beans
...
Change-Id: I59d0cf13a7704499093b401328bda5867197c525
Former-commit-id: 36b0428ff953f26636f736b0428ff953f26636f7a0d305355ba0d305355be83c58641dd8fb83d4430add67c080
2014-07-08 12:29:04 -05:00
steve.naples
10e2eaa6ed
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
...
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 29ca2338b875969ceec229ca2338b875969ceec224b0d49a5b24b0d49a5b94e246b619ea071e81f523ff3f3fe7
2014-07-08 16:32:08 +00:00
Bryan Kowal
ec5f9c6623
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
...
Former-commit-id: 58a2ae8bc898a310f4a758a2ae8bc898a310f4a76a197f845d6a197f845dac1b94c63f0fdfc0fd4ad1898937e0
2014-07-08 09:31:21 -05:00
Ben Steffensmeier
e859b8f822
Merge "Omaha #3356 remove common register buddies to uf.viz.core" into omaha_15.1.1
...
Former-commit-id: 3394a6230e3bbf29f6393394a6230e3bbf29f6399eb9abd3f49eb9abd3f4fb17181baa956e9bb5b0eca19918dc
2014-07-07 18:48:49 -05:00
Nate Jensen
d0399c82b8
Omaha #3356 remove common register buddies to uf.viz.core
...
Change-Id: I8da0d7bb51c7aa3585c29ada43ba9d6470ec41e4
Former-commit-id: 57635e6f3f5148898b2357635e6f3f5148898b23886aee2bf9886aee2bf9aad51b7f112a55f0db4eac8e3f3fd5
2014-07-07 17:32:37 -05:00
Brian Clements
f3735af783
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 91b136c2a0572d95e78a91b136c2a0572d95e78ae4795f6a13e4795f6a139afb344828e1d5d86d29b2a4b1da71
2014-07-07 15:13:28 -05:00
Brian.Dyke
f14f792377
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: a33fdeb5582ef4767652a33fdeb5582ef476765289c0457b1d89c0457b1d6be18f0dd4a2dc10847ce9e9abd3db
2014-07-07 13:33:35 -04:00
Brian Clements
2bebd393d8
Omaha #1255 fixed collaboration colors
...
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: aeb093ad950d4cd4bab8aeb093ad950d4cd4bab8da53d9ccc7da53d9ccc72cea766aede6e84d2c719a1bc8c521
2014-07-07 12:29:12 -05:00
Richard Peter
1399f0cd57
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 4219dbeec8ba1bd204074219dbeec8ba1bd204078c17e9cef28c17e9cef23e19911306741fc59f34b4e4629d24
2014-07-07 09:39:28 -05:00
Richard Peter
48d293abd6
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: 4312c9c56942ec8874c84312c9c56942ec8874c806a1d1555c06a1d1555cd27ebb1175804e9d1035b97f693554
2014-07-07 09:30:09 -05:00
Richard Peter
5d650dcab2
Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
...
Former-commit-id: 8a5608d851a50a5b16638a5608d851a50a5b166398d82de23198d82de231e57ce89b6bce245ac8cf72f61418a3
2014-07-07 09:21:02 -05:00
Ron Anderson
6935f82cfa
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: fd16321f828d50f9d15afd16321f828d50f9d15a24faa4823324faa48233ae401db2ab87664d86a59a873532ad
2014-07-07 09:02:14 -05:00
Roger Ferrel
0554d1834c
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 1964c7c4f76305bfdcb61964c7c4f76305bfdcb6f064f0d102f064f0d10274f5c7eb827649930247da45f3e5e2
2014-07-07 08:52:50 -05:00
Steve Harris
6aa24992e2
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: e7de4b71309886a6aa5fe7de4b71309886a6aa5f77259e5c1877259e5c187071f50293853d8035279ef301c4b3
2014-07-07 08:35:33 -05:00
Brian Clements
55bcd816ff
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: c3a25024aebfd9f59de8c3a25024aebfd9f59de8e4c9a13adbe4c9a13adb50d2c6e24cbd9520f4fe276dd801f2
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
9058a06b0e
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: c6c2f9240eba0472caadc6c2f9240eba0472caad7960578e2c7960578e2c600a6c245a29f98ed5abeaf031c3dd
2014-07-03 12:53:22 -05:00
Nate Jensen
5a7e3697e4
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: e101d99ba2bd46c43240e101d99ba2bd46c43240063ccb25e6063ccb25e64cb1e42ddb4dc36437fa998c6e4253
2014-07-03 11:07:41 -05:00
David Friedman
c44e9f88f6
ASM #15052 - WarnGen: service backup should use config.xml from failed site
...
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 8784501bbaa45fe1dad08784501bbaa45fe1dad0db8977e281db8977e2815270711c5dd36834080e4f53bbd556
2014-07-03 13:58:24 +00:00
Bryan Kowal
171785fb9e
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: d0d5a0805738d2431518d0d5a0805738d2431518a83301c1e9a83301c1e9712ee6ea96fa496a44f68c2556649b
2014-07-02 15:58:50 -05:00
Roger Ferrel
862a065051
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 2723c9216702d96098622723c9216702d96098621869745cce1869745cce37c05adfaf7f50b8fb93a7daeebc77
2014-07-02 14:27:28 -05:00
Brian Clements
c502009375
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: fdec99abc5013292ce9dfdec99abc5013292ce9d2773cf89352773cf8935767d8abd20648ffac1466dea5ec026
2014-07-02 14:20:10 -05:00
Juliya Dynina
d3073a02a7
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
...
Former-commit-id: 67580e73cd244b2f5f3a67580e73cd244b2f5f3a470d50b4e4470d50b4e4d705c8c8a4b1cec7d40e3f043077b3
2014-07-02 14:17:11 -05:00
Steve Harris
a19a11998f
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
...
Former-commit-id: 9b7f820b06136af3f7e29b7f820b06136af3f7e20ef8a057f90ef8a057f9cb8192cfaf9f61f60f65a12a736737
2014-07-02 13:38:08 -05:00
Brian.Dyke
71c5365af3
Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
...
Former-commit-id: 0fc76ff807d56843d0e80fc76ff807d56843d0e8658cf3dd56658cf3dd56c75320efc4380b1d75dea94ec2062f
2014-07-02 13:18:10 -04:00
Richard Peter
6710269555
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 9c41b7c23e59325cf1f19c41b7c23e59325cf1f127ba90594727ba905947a22847695d127ce13eb8a357fc835b
2014-07-02 11:51:26 -05:00
Nate Jensen
54a1daffc6
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: e193fe4719324194117ae193fe4719324194117a14b514df2c14b514df2cbe426fc965f39f6858e2760adb2b77
2014-07-02 11:20:26 -05:00
Nate Jensen
f4540db824
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 15d6ff7f79f6cbccdc5c15d6ff7f79f6cbccdc5c74e2bd167074e2bd1670db24013aa6e9b31a4429db9550e367
2014-07-02 11:18:59 -05:00
steve.naples
9f52699bd2
ASM #253 Update RadarBiasTableDialog to remove old code.
...
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 3d75da3db066c3241bc43d75da3db066c3241bc44e959af1b44e959af1b4f1c92f1e353cfabd29bc93c8f822cc
2014-07-02 15:30:48 +00:00
Brian Clements
2cd0d94e5d
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 08724fefd78b5ad1ec3308724fefd78b5ad1ec33eac871eed7eac871eed7ea1ac8ee8fcd282ef018d066846c3f
2014-07-02 10:02:52 -05:00
Nate Jensen
ef967d42e3
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 1373af3e55a93af621d81373af3e55a93af621d8765ac1258b765ac1258bbbd50040a5264ac4d8a3d1d3aa94a6
2014-07-02 10:01:05 -05:00
Nate Jensen
b54a9694ee
Issue #3337 disable logback packaging data in cave
...
Former-commit-id: 56363ffc4ac003d7016856363ffc4ac003d70168939fde1575939fde1575c421e2de75a2cfcd871675ffabbcc2
2014-07-02 09:24:15 -05:00
Steve Harris
984b7b1df4
Merge branch 'master_14.1.3' into master_14.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 4882158177483a69c58d4882158177483a69c58dfcecd75dfdfcecd75dfdc59b92895c29c2cc0c29998c9a4084
2014-07-01 18:05:43 -05:00
Nate Jensen
8c99b38625
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: a16d8689e9f10efa300ca16d8689e9f10efa300cf32bf19eb7f32bf19eb7ec64800f2855dcecc7a7e659a0702d
2014-07-01 17:37:08 -05:00
Richard Peter
5e343e9cf4
Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
...
Former-commit-id: 57ec1df5a5b8f2fddd9557ec1df5a5b8f2fddd958dfa9696af8dfa9696af93ef55e65ed8687baba7b7db53b921
2014-07-01 16:03:36 -05:00
Richard Peter
0ccb573e31
Omaha 3300 Fix merge issue in gfe-spring.xml
...
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea
Former-commit-id: b38dd722be40c01d05d4b38dd722be40c01d05d4eacaf068a7eacaf068a77961742ee6a4beeb4d1b5b0667e61f
2014-07-01 15:43:46 -05:00
Richard Peter
342192e967
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 6636b301e593bbd98cbc6636b301e593bbd98cbc8ecc27f7148ecc27f714552ac6d640fc27824dbc0fefdc7cd6
2014-07-01 15:34:39 -05:00
Roger Ferrel
481617bff0
Omaha #3230 Recursive search for model files.
...
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49
Former-commit-id: 69fab4d289cd3720035d69fab4d289cd3720035da8c93f7783a8c93f7783bb6e08ae2ff7fe138cc184fcb66cd0
2014-07-01 15:33:30 -05:00
Brian.Dyke
d58b49a14a
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 7b205d97ca3ed9e07c447b205d97ca3ed9e07c44f8759e2317f8759e2317d5352e6909f58b4d01a47d03e29db6
2014-07-01 15:41:10 -04:00
Steve Harris
15267970e4
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: f68e0519381c8dc56d49f68e0519381c8dc56d4930cdbff7f830cdbff7f8a4d91c59d66f9129ac78d600ed9acf
2014-07-01 13:38:18 -05:00
Ron Anderson
ac6b3b0b10
Omaha #3296 A few more minor performance tweaks and some addtional logging.
...
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: c7a74ab5b12c5f910f90c7a74ab5b12c5f910f904123073c4e4123073c4e0329b4d8f4892eb70952bb91362572
2014-07-01 13:56:41 -04:00
Ron Anderson
2b33bfac7d
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
...
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 9818d9b485beee08c32b9818d9b485beee08c32b487c7ee30a487c7ee30a699f2aa9bfc16fc8ee7f8314f40ec3
2014-07-01 13:56:05 -04:00
Nate Jensen
7d03309e18
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 81ca7a9e9fc0d36e9a6981ca7a9e9fc0d36e9a691183c0538e1183c0538e52d5edac63cb9e715aec10dee29029
2014-07-01 10:30:54 -05:00
Nate Jensen
73bdd3a339
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: ac0f0e22980a9fc691b9ac0f0e22980a9fc691b9fbda7c4489fbda7c4489fe1f9e89779e6433f44b6f0d007112
2014-07-01 10:22:25 -05:00
Greg Armendariz
900bd92331
Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
...
Former-commit-id: 134f0e2e8b82fe8608e0134f0e2e8b82fe8608e00688e9db1b0688e9db1b471814e891fa76c0c1df36252d33b2
2014-07-01 10:17:11 -05:00
Nate Jensen
5ed2cdc4ec
Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
...
Former-commit-id: 3b2dc2915e35e36265273b2dc2915e35e36265271d2ae81ff61d2ae81ff614d368f33b8a03a5ecb9c0096b0570
2014-07-01 10:12:14 -05:00
Steve Harris
8fb747ad27
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37d4dc1723c12f2958df37d4dc1723c17acd9ab2dd7acd9ab2dd7fb4663d75dcbab5621f71357da9d2
2014-07-01 11:08:46 -04:00
