Steve Harris
7071f50293
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: e7de4b71309886a6aa5f77259e5c1877259e5c18853d803527
2014-07-07 08:35:33 -05:00
Nate Jensen
4cb1e42ddb
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: e101d99ba2bd46c43240063ccb25e6063ccb25e64dc36437fa
2014-07-03 11:07:41 -05:00
Bryan Kowal
712ee6ea96
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: d0d5a0805738d2431518a83301c1e9a83301c1e9fa496a44f6
2014-07-02 15:58:50 -05:00
Richard Peter
93ef55e65e
Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
...
Former-commit-id: 57ec1df5a5b8f2fddd958dfa9696af8dfa9696afd8687baba7
2014-07-01 16:03:36 -05:00
Richard Peter
7961742ee6
Omaha 3300 Fix merge issue in gfe-spring.xml
...
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea
Former-commit-id: b38dd722be40c01d05d4eacaf068a7eacaf068a7a4beeb4d1b
2014-07-01 15:43:46 -05:00
Richard Peter
552ac6d640
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: 6636b301e593bbd98cbc8ecc27f7148ecc27f714fc27824dbc
2014-07-01 15:34:39 -05:00
Roger Ferrel
bb6e08ae2f
Omaha #3230 Recursive search for model files.
...
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49
Former-commit-id: 69fab4d289cd3720035da8c93f7783a8c93f7783f7fe138cc1
2014-07-01 15:33:30 -05:00
Steve Harris
a4d91c59d6
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: f68e0519381c8dc56d4930cdbff7f830cdbff7f86f9129ac78
2014-07-01 13:38:18 -05:00
Nate Jensen
14d368f33b
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: 3b2dc2915e35e36265271d2ae81ff61d2ae81ff68a03a5ecb9
2014-07-01 10:12:14 -05:00
Steve Harris
7fb4663d75
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: 2f2958df37d4dc1723c17acd9ab2dd7acd9ab2dddcbab5621f
2014-07-01 11:08:46 -04:00
Nathan Bowler
f667260f7c
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: f3fc00fb3243f164e68260998152726099815272175f879042
2014-07-01 09:19:15 -04:00
Benjamin Phillippe
2a294fcfce
Omaha #3255 Updated Proxy classes to include all java proxy config settings
...
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79
Former-commit-id: 15b1fb71dd36ef9e7a1a0dd62628620dd62628623a90b09dbf
2014-06-30 16:00:58 -05:00
Nate Jensen
e98a95687b
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: fff613478c098322ded4daacd735e7daacd735e78a274be75f
2014-06-30 12:04:21 -05:00
Nate Jensen
0bb74e3900
Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
...
Former-commit-id: 5577128de2ef92f03f06d6008fc401d6008fc4014f0160d98a
2014-06-30 11:04:55 -05:00
Richard Peter
ad1796d08c
Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1
...
Former-commit-id: 88bde6f690363206fea052210230db52210230db743f247e16
2014-06-27 16:01:06 -05:00
Brian Clements
deb7669844
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: 312f74a20092a510fcb8fe6b3ff4b3fe6b3ff4b36353125f62
2014-06-27 12:47:17 -05:00
Slav Korolev
34d57cd15e
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
...
Former-commit-id: 6e60afd8cfb72f146d95f6e8dedfa3f6e8dedfa303890f03e3
2014-06-27 12:29:25 -04:00
Brian Clements
76464a3f93
Omaha #3214 excluded total lightning data from text distribution
...
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76
Former-commit-id: 0d8668c6b9f217240f5c362e8d543f362e8d543feb19700c16
2014-06-27 10:46:48 -05:00
Dave Hladky
891aba68a8
Omaha #2760 Made external JMS route for registry events
...
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6
Former-commit-id: 445ddc86a55556e447e60d1767a3d70d1767a3d7aa507be41e
2014-06-27 10:04:17 -05:00
Matt Nash
cd19ad85ae
Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory
...
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a
Former-commit-id: 52f70f50f6983c2c71e0f31bf67ccaf31bf67ccad4609b08d9
2014-06-26 17:26:06 -05:00
Slav Korolev
90ad46ac58
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 41e8e36b8d900d5e8fbe79f2c0efc679f2c0efc63b9ed35eb0
2014-06-26 14:04:34 -04:00
Roger Ferrel
6e37a43757
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 32ae3ba73fbd2d40faeead6eac6e20ad6eac6e20801bdc8fc7
2014-06-26 11:16:09 -05:00
Richard Peter
33f9c041c2
Omaha #3277 Update smart init launcher to allow additional threads.
...
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce
Former-commit-id: ae1fd15ab4584b7576af8eb0b62db88eb0b62db8364c886659
2014-06-26 10:27:33 -05:00
Dave Hladky
537a57784c
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: b9c930dd14f2b4bcfef1dbf301b8c4dbf301b8c4bc75b00731
2014-06-26 09:46:31 -05:00
Nate Jensen
7852f186f1
Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
...
Former-commit-id: 3d93d09abbf080f470d317a0af605417a0af60542efe126e74
2014-06-26 08:42:44 -05:00
Greg Armendariz
5d8eeebe95
Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
...
Former-commit-id: 11c275d9e74ca605424bbda30b30fabda30b30fa85a69a270a
2014-06-25 18:13:49 -05:00
Richard Peter
f85e08ff51
Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
...
Former-commit-id: fcb9c0a103aab371b6abbfb242f55cbfb242f55c0bd5a2b347
2014-06-25 17:26:24 -05:00
Nate Jensen
2324117d9e
Omaha #3165 remove dead code from uengine
...
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08
Former-commit-id: 631c28cd53b1216dd31b4718ca66144718ca66146bdf7ce79a
2014-06-25 16:59:07 -05:00
Steve Harris
548f6ff8e6
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 6c0a7da2a05fd1555ff9436ce72db9436ce72db96e2d34ae96
2014-06-25 16:16:03 -05:00
Nate Jensen
299c77f875
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: c9696dbd3b791ab4913c4bd68c8bd04bd68c8bd0ce7812983a
2014-06-25 09:54:38 -05:00
Nate Jensen
3e954acf16
Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
...
Former-commit-id: 31804ce5f9c59ee0663fadc60e187dadc60e187d960b44b9fb
2014-06-25 08:45:09 -05:00
Nate Jensen
7d54b214e1
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 9c058c1e56eacd31aa9b425651652d425651652d3b288534e4
2014-06-25 08:32:25 -05:00
Ben Steffensmeier
d52b2254f5
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 08fe257daae244664b7d5c4f89644c5c4f89644c4d22a3c58e
2014-06-24 18:16:09 -05:00
Nate Jensen
db48912fc4
Omaha #3311 fix storing UnlinkedContourVectorPacket
...
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: af62c5950ce8beab36b6d81fbb83ead81fbb83eaa4066337ec
2014-06-24 15:53:11 -05:00
Nate Jensen
733d4740f8
Merge "Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc." into omaha_14.4.1
...
Former-commit-id: ee3d343a640447d482328dc15b71b58dc15b71b5fd0339464f
2014-06-24 13:20:10 -05:00
Nate Jensen
32573bfa05
Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
...
Former-commit-id: c10194a6455e2f46e8921ae399d8241ae399d824dbf37c2bde
2014-06-24 12:37:56 -05:00
Nathan Bowler
2de56a4000
Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
...
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37
Former-commit-id: 3b35b9e54e579f14356a229783d3b0229783d3b099c6d288fd
2014-06-24 13:27:57 -04:00
Brian Clements
91d1378c31
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 27a0d3fb280f25ac3b5b3b71bedd143b71bedd14be3d47e5e9
2014-06-24 11:15:45 -05:00
Steve Harris
304d918a7c
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: 3f2058a1ab89606076ecddc6f2092addc6f2092a1f033d22e6
2014-06-24 10:57:56 -05:00
Nate Jensen
ea738bb20a
Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: b851e4aa94b728fac741a09f079064a09f0790647ea4049f2b
2014-06-23 17:41:45 -05:00
Richard Peter
13c116bae5
Omaha #3225 Reduce default hibernate connections
...
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06
Former-commit-id: b6092098482bbb6fd90c47081e7ae347081e7ae32502fc9543
2014-06-23 17:20:46 -05:00
Nate Jensen
f5b68cc357
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: f714c75bfce2826c52c0988e2877e1988e2877e1b17e12606e
2014-06-23 14:24:14 -05:00
Nate Jensen
1117e5b995
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 6077794cc99219e1e25453633a6ed453633a6ed45062338b2d
2014-06-23 14:13:19 -05:00
Nate Jensen
92adc389fc
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 65a42a56891c2b5a5c4e6ba15e68b26ba15e68b214d9616890
2014-06-23 14:09:20 -05:00
Nathan Bowler
062106864b
Omaha #3272 Throw UnrecognizedDataException instead of a NPE when records weren't found. Switch to slf4j. Updated Manifest per Code review and removed trailing space.
...
Change-Id: I9a512dcd140e02d092897df4f306c1c25ea84377
Former-commit-id: 705a20e39dd1cde2f291e2e6724043e2e672404361b2e5e6f5
2014-06-23 15:03:00 -04:00
Dave Hladky
05360ecd9f
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 67d1468c8cc6a1a5592c47cc398e9147cc398e91df958f67c5
2014-06-23 13:03:25 -05:00
Nate Jensen
3add021413
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff664558fe5862845483346f65eb76ff66333f8317bbca2787320465619399a065619399a0f9fce25836
2014-06-23 11:59:26 -05:00
Brad Gonzales
e9dca26ebf
Omaha #3197 moved ncep edex plugins that are only needed by the national centers to a separate rpm.
...
Removed the ingest modes excludes since they are not needed (the rpm is only installed where it is needed.)
Amend: Commented out local deploy of National Central Operations EDEX plugins and added a comment.
Updated comment.
Change-Id: I98cfd70ec3d1917404fe7c4b70b380224ef7d14d
Former-commit-id: 955e37bca757b49b4868a6138bfc17a6138bfc171d4903be35
2014-06-23 10:49:35 -05:00
Steve Harris
af06c5a890
CM-MERGE:14.1.3-2,-3 into 14.2.2
...
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979b84dda5930419c5f4aba419c5f4aba66d30e59a3
2014-06-20 14:01:55 -04:00
Nate Jensen
ad63e5b322
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 3971e05c4c644fdf50c7caf278ca5ccaf278ca5c977a3818f1
2014-06-19 13:42:06 -05:00
