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
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
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
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
Nate Jensen
124d873714
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: c9696dbd3b791ab4913cc9696dbd3b791ab4913c4bd68c8bd04bd68c8bd0299c77f875ce7812983a374fb4373e
2014-06-25 09:54:38 -05:00
Nate Jensen
775da8ecd4
Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
...
Former-commit-id: 31804ce5f9c59ee0663f31804ce5f9c59ee0663fadc60e187dadc60e187d3e954acf16960b44b9fb5fbe5c1f2e
2014-06-25 08:45:09 -05:00
Nate Jensen
0938ff0ab7
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 9c058c1e56eacd31aa9b9c058c1e56eacd31aa9b425651652d425651652d7d54b214e13b288534e4c811adf70b
2014-06-25 08:32:25 -05:00
Ben Steffensmeier
8dbd523f44
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 08fe257daae244664b7d08fe257daae244664b7d5c4f89644c5c4f89644cd52b2254f54d22a3c58e397f83b2da
2014-06-24 18:16:09 -05:00
Nate Jensen
da51903415
Omaha #3311 fix storing UnlinkedContourVectorPacket
...
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: af62c5950ce8beab36b6af62c5950ce8beab36b6d81fbb83ead81fbb83eadb48912fc4a4066337eca0040bf8cc
2014-06-24 15:53:11 -05:00
Nate Jensen
3ca7ba6f4b
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: ee3d343a640447d48232ee3d343a640447d482328dc15b71b58dc15b71b5733d4740f8fd0339464f9f4f2add10
2014-06-24 13:20:10 -05:00
Nate Jensen
532d98b1bb
Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
...
Former-commit-id: c10194a6455e2f46e892c10194a6455e2f46e8921ae399d8241ae399d82432573bfa05dbf37c2bde482553f0e1
2014-06-24 12:37:56 -05:00
Nathan Bowler
f13bc3f200
Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
...
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37
Former-commit-id: 3b35b9e54e579f14356a3b35b9e54e579f14356a229783d3b0229783d3b02de56a400099c6d288fd91d5e4fcbb
2014-06-24 13:27:57 -04:00
Brian Clements
be85fe241f
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 27a0d3fb280f25ac3b5b27a0d3fb280f25ac3b5b3b71bedd143b71bedd1491d1378c31be3d47e5e9f1a30bf16e
2014-06-24 11:15:45 -05:00
Steve Harris
2841134c60
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: 3f2058a1ab89606076ec3f2058a1ab89606076ecddc6f2092addc6f2092a304d918a7c1f033d22e6323c240f59
2014-06-24 10:57:56 -05:00
Nate Jensen
faba1a57a1
Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: b851e4aa94b728fac741b851e4aa94b728fac741a09f079064a09f079064ea738bb20a7ea4049f2bc8abe9f457
2014-06-23 17:41:45 -05:00
Richard Peter
c30441844d
Omaha #3225 Reduce default hibernate connections
...
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06
Former-commit-id: b6092098482bbb6fd90cb6092098482bbb6fd90c47081e7ae347081e7ae313c116bae52502fc954341650b47f4
2014-06-23 17:20:46 -05:00
Nate Jensen
284ddc9583
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: f714c75bfce2826c52c0f714c75bfce2826c52c0988e2877e1988e2877e1f5b68cc357b17e12606ef48422449c
2014-06-23 14:24:14 -05:00
Nate Jensen
6d3b2d3119
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 6077794cc99219e1e2546077794cc99219e1e25453633a6ed453633a6ed41117e5b9955062338b2d3239b1956b
2014-06-23 14:13:19 -05:00
Nate Jensen
1d76825805
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 65a42a56891c2b5a5c4e65a42a56891c2b5a5c4e6ba15e68b26ba15e68b292adc389fc14d9616890f0833bdb17
2014-06-23 14:09:20 -05:00
Nathan Bowler
bb83588aae
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: 705a20e39dd1cde2f291705a20e39dd1cde2f291e2e6724043e2e6724043062106864b61b2e5e6f5ef7161188a
2014-06-23 15:03:00 -04:00
Dave Hladky
68ad68a6f5
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 67d1468c8cc6a1a5592c67d1468c8cc6a1a5592c47cc398e9147cc398e9105360ecd9fdf958f67c53c48f43e37
2014-06-23 13:03:25 -05:00
Nate Jensen
e62629413d
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 65eb76ff664558fe5862845483346f4558fe5862845483346f65eb76ff66333f8317bbca27873204333f8317bbca2787320465619399a065619399a03add021413f9fce25836e717dbfeb1
2014-06-23 11:59:26 -05:00
Brad Gonzales
59e3eed9f3
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: 955e37bca757b49b4868955e37bca757b49b4868a6138bfc17a6138bfc17e9dca26ebf1d4903be35fc0ed548f0
2014-06-23 10:49:35 -05:00
Steve Harris
196f53e609
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: 16f5ff0979b84dda593016f5ff0979b84dda5930419c5f4aba419c5f4abaaf06c5a89066d30e59a3935542914d
2014-06-20 14:01:55 -04:00
Nate Jensen
1d44a9f517
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 3971e05c4c644fdf50c73971e05c4c644fdf50c7caf278ca5ccaf278ca5cad63e5b322977a3818f1d67339b3a9
2014-06-19 13:42:06 -05:00
Brian Clements
cadb1091fb
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 6345119f9b7dd90e6f856345119f9b7dd90e6f85a18069809aa18069809abd2288e0666d5cbf29a574d4ebf071
2014-06-19 12:50:56 -05:00
Nate Jensen
201d03f319
Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1
...
Former-commit-id: 472e6ec591557aa84227472e6ec591557aa842273f5c895d643f5c895d6431e4d9573f920ec927366fc60d3edb
2014-06-19 12:14:58 -05:00
Benjamin Phillippe
00e06c15fb
Omaha #3255 Removed security plugin from ebxml common plugin to fix build
...
Former-commit-id: 44c5a9efe8df37c5513244c5a9efe8df37c551322c646cf0542c646cf0544b480fa686f1d3019bf0a43a3a94c7
2014-06-19 11:03:04 -05:00
Ben Steffensmeier
a111506648
Omaha #2061 Fix recco.
...
Former-commit-id: 6c3a3cc707d953e65ac96c3a3cc707d953e65ac9135452a593135452a593961a8402cc8613e5b11c754c076e94
2014-06-19 10:46:29 -05:00
Brian Clements
2ad045e4c7
Omaha #3226 fixed lightning decrypt validation, added initialization vector
...
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554
Former-commit-id: 9064c50f01da6eea7f579064c50f01da6eea7f5736f820724636f8207246b5bc5cf85bbb69af4aef18fd0db668
2014-06-19 10:32:05 -05:00
