Mike Duff
327f695d0c
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
...
This reverts commit 0d73c880f8b96034bf1f9b443aeb8dfcad2be382 [formerly 30655cf2cae3b7a99388b5b61650d3e3b7a99388b5b61650d330655cf2cac8bfcd54a3a35529bba4c8bfcd54a3a35529bba473c75303a873c75303a86b1031a9276f18256c5608275089f5
2014-07-10 16:01:56 -05:00
Melissa Porricel
60bae53945
ASM #15557 - Restore ability to display HPCGuide2.5
...
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: 1e5bef6820d3c29b834d1e5bef6820d3c29b834d1f7cf4a1651f7cf4a165c6a7e3bf85055dd5133f408f192088
2014-07-10 16:15:12 -04: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
Mike Duff
918b247d79
Issue #3370 - Fix for mulitple shef types in same file.
...
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: e3b7a99388b5b61650d3e3b7a99388b5b61650d330655cf2ca30655cf2ca7a988c92fa69fb1ccf352c0488534a
2014-07-10 10:05:05 -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
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
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
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
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
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
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.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
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
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
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
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
Nathan Bowler
d54fa442d8
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.
...
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317
Former-commit-id: f3fc00fb3243f164e682f3fc00fb3243f164e68260998152726099815272f667260f7c175f879042047fc6ec88
2014-07-01 09:19:15 -04:00
Benjamin Phillippe
3abde21053
Omaha #3255 Updated Proxy classes to include all java proxy config settings
...
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79
Former-commit-id: 15b1fb71dd36ef9e7a1a15b1fb71dd36ef9e7a1a0dd62628620dd62628622a294fcfce3a90b09dbff686610802
2014-06-30 16:00:58 -05:00
Nate Jensen
bb71f188a2
Merge "Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory" into omaha_14.4.1
...
Former-commit-id: fff613478c098322ded4fff613478c098322ded4daacd735e7daacd735e7e98a95687b8a274be75fb0daf485ba
2014-06-30 12:04:21 -05:00
Nate Jensen
b44c1dae06
Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
...
Former-commit-id: 5577128de2ef92f03f065577128de2ef92f03f06d6008fc401d6008fc4010bb74e39004f0160d98a58a5daa450
2014-06-30 11:04:55 -05:00
Richard Peter
97e3cc1fa6
Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1
...
Former-commit-id: 88bde6f690363206fea088bde6f690363206fea052210230db52210230dbad1796d08c743f247e165779cda971
2014-06-27 16:01:06 -05:00
Brian Clements
7d47dc8020
Omaha #3319 switched capture to only dump live objects
...
work around for java 1.7 G1 garbage collector jmap problem
Change-Id: I5dd8db5d2d98baacaa03a3b60d1d9c5cb350fc2d
Former-commit-id: 312f74a20092a510fcb8312f74a20092a510fcb8fe6b3ff4b3fe6b3ff4b3deb76698446353125f624c49ba9f65
2014-06-27 12:47:17 -05:00
Slav Korolev
a8e4449248
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
...
Former-commit-id: 6e60afd8cfb72f146d956e60afd8cfb72f146d95f6e8dedfa3f6e8dedfa334d57cd15e03890f03e399fc9b951a
2014-06-27 12:29:25 -04:00
Brian Clements
03b93a13f0
Omaha #3214 excluded total lightning data from text distribution
...
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76
Former-commit-id: 0d8668c6b9f217240f5c0d8668c6b9f217240f5c362e8d543f362e8d543f76464a3f93eb19700c16e66894fc5a
2014-06-27 10:46:48 -05:00
Dave Hladky
963c1e9831
Omaha #2760 Made external JMS route for registry events
...
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6
Former-commit-id: 445ddc86a55556e447e6445ddc86a55556e447e60d1767a3d70d1767a3d7891aba68a8aa507be41e9ca81064df
2014-06-27 10:04:17 -05:00
Matt Nash
695085f892
Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory
...
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a
Former-commit-id: 52f70f50f6983c2c71e052f70f50f6983c2c71e0f31bf67ccaf31bf67ccacd19ad85aed4609b08d91be462cc91
2014-06-26 17:26:06 -05:00
Mike Duff
6163364939
Issue #3321 - Fix ingest switch checks
...
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 1d3aeb881bf17c93bb191d3aeb881bf17c93bb19d62c925baad62c925baa5078011147d2cbeff06a07dda3ecc1
2014-06-26 16:23:02 -05:00
Slav Korolev
81ae177c42
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 41e8e36b8d900d5e8fbe41e8e36b8d900d5e8fbe79f2c0efc679f2c0efc690ad46ac583b9ed35eb00a006483ae
2014-06-26 14:04:34 -04:00
Roger Ferrel
f954d93c5a
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 32ae3ba73fbd2d40faee32ae3ba73fbd2d40faeead6eac6e20ad6eac6e206e37a43757801bdc8fc77fef8ed924
2014-06-26 11:16:09 -05:00
Richard Peter
84531eabe4
Omaha #3277 Update smart init launcher to allow additional threads.
...
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce
Former-commit-id: ae1fd15ab4584b7576afae1fd15ab4584b7576af8eb0b62db88eb0b62db833f9c041c2364c8866597cd25f23df
2014-06-26 10:27:33 -05:00
Dave Hladky
dce9962e54
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: b9c930dd14f2b4bcfef1b9c930dd14f2b4bcfef1dbf301b8c4dbf301b8c4537a57784cbc75b00731f67bd17c03
2014-06-26 09:46:31 -05:00
Nate Jensen
66e045138a
Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
...
Former-commit-id: 3d93d09abbf080f470d33d93d09abbf080f470d317a0af605417a0af60547852f186f12efe126e74b2b2750765
2014-06-26 08:42:44 -05:00
Greg Armendariz
37e6f55621
Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
...
Former-commit-id: 11c275d9e74ca605424b11c275d9e74ca605424bbda30b30fabda30b30fa5d8eeebe9585a69a270acaffbc2a7c
2014-06-25 18:13:49 -05:00
Richard Peter
2150e9c03e
Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
...
Former-commit-id: fcb9c0a103aab371b6abfcb9c0a103aab371b6abbfb242f55cbfb242f55cf85e08ff510bd5a2b347664a93b494
2014-06-25 17:26:24 -05:00
Nate Jensen
62137c0650
Omaha #3165 remove dead code from uengine
...
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08
Former-commit-id: 631c28cd53b1216dd31b631c28cd53b1216dd31b4718ca66144718ca66142324117d9e6bdf7ce79a66fae8e672
2014-06-25 16:59:07 -05:00
Steve Harris
e0abad27a0
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 6c0a7da2a05fd1555ff96c0a7da2a05fd1555ff9436ce72db9436ce72db9548f6ff8e66e2d34ae965e80a12a32
2014-06-25 16:16:03 -05:00
