Steve Harris
bd9067626f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a893b9b08a05de3fbe54a893b9b08a05de3fbe54a43ffbe052a43ffbe0526920a273e5202c1a03167bf6b4de06
2014-07-14 12:08:09 -05:00
Steve Harris
ff86c20fb8
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 27b08f8bcd0cb8d202f527b08f8bcd0cb8d202f54df5ae5a604df5ae5a60bf236d5aa151d4907b768f9ab0a62c
2014-07-14 11:54:53 -05:00
Nate Jensen
fd9475853b
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
...
Former-commit-id: a55162c74b2531649c55a55162c74b2531649c559f58d2e08b9f58d2e08b289a4bf786363766fccaad23d7e95d
2014-07-14 11:15:01 -05:00
Brian Clements
b08210f013
Omaha #2587 update script to set reftime as non null in db
...
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4
Former-commit-id: fbf4111d6c2a5af8ce1ffbf4111d6c2a5af8ce1ffaa29355b0faa29355b0b52e7ef948ade89ff05d9d739ff37f
2014-07-14 08:40:37 -05:00
Brian Clements
d8ce5db467
Omaha #3371 all subprocesses now killed when cave.sh is killed
...
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: 0973e5ac417e70fbda270973e5ac417e70fbda27ae5fa893a9ae5fa893a9a1bce34fdae72c34d361272c0a2e2d
2014-07-14 08:05:18 -05:00
Richard Peter
878c3fe29e
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
...
Former-commit-id: 88419fb8f30222a89cd488419fb8f30222a89cd41c40dc11ef1c40dc11efd16ddba2f52b75d79e0fd1af1f615d
2014-07-11 17:46:14 -05:00
Brian Clements
b384c87dff
Omaha #3333 added grid lightning to cave
...
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: 555251982ba50f1e8e70555251982ba50f1e8e7029fc7e7ec429fc7e7ec4140a4a4b15e25961a39adb47c98989
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
0c80abcc15
Omaha #3379 Removing DWR
...
Former-commit-id: cc9e9b427ad110e8428bcc9e9b427ad110e8428b4e1d93abf84e1d93abf85eea01272806e73cd55f11a8186cbc
2014-07-11 11:56:44 -05:00
Brian Clements
f9af313995
Omaha #3364 added jmap -heap to capture script
...
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153
Former-commit-id: 146318e49e82cf017cbe146318e49e82cf017cbed5506736dfd5506736df10a01f35562c4fb16c12c134d1f514
2014-07-11 10:20:48 -05:00
Richard Peter
4b45d26b40
Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
...
Former-commit-id: 57318e4446c3740f0f1157318e4446c3740f0f1198d7cbab0d98d7cbab0d1dac01c298d9ea2c328cc69d97ffb2
2014-07-10 17:47:50 -05:00
Nate Jensen
4b61b6b5f8
Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
...
Former-commit-id: 205b90cb2468170f4a3e205b90cb2468170f4a3ef92d9eb817f92d9eb817c69237b1b80f254686cb0a9e037818
2014-07-10 17:02:48 -05:00
Nate Jensen
dc92b58bd7
Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
...
Former-commit-id: c3e7b245afffa31a72abc3e7b245afffa31a72abb267109497b2671094972f163afff855d87b62605ab8718156
2014-07-10 16:32:02 -05:00
Brian Clements
f2d27e2f8b
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: 987d514fa3871a8655c8987d514fa3871a8655c80113e109d30113e109d3ed9ba91d4ec32592fd1c94f5989af7
2014-07-10 16:31:11 -05:00
Roger Ferrel
e197f2e62c
Omaha #3318 Delta script for GEFS h5 file updates
...
Former-commit-id: 577790589fd007725e9a577790589fd007725e9a9eaeb016249eaeb016244449133a46ee1a95ceb1a1a4ed75bc
2014-07-10 16:30:03 -05:00
Everett Kladstrup
4e95dec1a1
Omaha #3165 update manifests for ll.netcdf rename
...
Former-commit-id: 9cf007e5464e3b76ae299cf007e5464e3b76ae29febe13a241febe13a241c5e71e2348e18ad7caec3768d18a0d
2014-07-10 16:19:42 -05:00
Bryan Kowal
5f3d74f37f
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: 32aa07f1fc984842331d32aa07f1fc984842331d49ffec76ff49ffec76ff4e295dba499fa0118ce9f2242a2bda
2014-07-10 11:16:19 -05:00
Nate Jensen
fdad2eb28b
Omaha #3165 fix bad manifests
...
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a
Former-commit-id: b874c80f93c323b72f48b874c80f93c323b72f48eef97e7ec0eef97e7ec07ceb81ec48aef963a64eab38f37d7f
2014-07-10 09:20:24 -05:00
Ron Anderson
f7b8803180
Issue #3146 Added check for duplicate smartInit.
...
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 9f4e89347a0c0739bd729f4e89347a0c0739bd72468668e19b468668e19bed7f6f731ea917ea16a47877809108
2014-07-09 16:42:43 -05:00
Brian Clements
5e7da3ffac
Omaha #3214 fixed cache object usage in lightning resource
...
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: dba1fb3fc1994226e82bdba1fb3fc1994226e82bac8f861112ac8f861112f9dad29ad8e74fcfbce197451515b6
2014-07-09 14:13:47 -05:00
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
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
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 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
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
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
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
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
