Steve Harris
439a09df83
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 875e655efd6c0a7da2a05fd1555ff9436ce72db95fd1555ff9436ce72db96e2d34ae96548f6ff8e6
2014-06-25 16:16:03 -05:00
Nate Jensen
78ccc8922c
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
...
Former-commit-id: 42495a55517b44d8ad2d589f74f6d849a592b19f589f74f6d849a592b19f2b3f7f02e5c73138b29e
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
20bc155506
Omaha #3164 Disable compression on server error 500.
...
Former-commit-id: feeef994a97df0be0722d7cdfa655d120e9099e4d7cdfa655d120e9099e48ea38a01a393ecdeeb08
2014-06-25 11:13:39 -05:00
Nate Jensen
05c81f432b
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: af46dfd419c9696dbd3b791ab4913c4bd68c8bd0791ab4913c4bd68c8bd0ce7812983a299c77f875
2014-06-25 09:54:38 -05:00
Nate Jensen
5634845b65
Omaha #3236 thin client connectivity dialog remembers past proxy servers
...
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: f388fc9e22054e8ba9b93b1c37dc38760b0cb5843b1c37dc38760b0cb584a727313c41ad647e2e85
2014-06-25 08:54:24 -05:00
Nate Jensen
a04efaa6da
Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
...
Former-commit-id: 159811c43031804ce5f9c59ee0663fadc60e187dc59ee0663fadc60e187d960b44b9fb3e954acf16
2014-06-25 08:45:09 -05:00
Nate Jensen
cf14ebd812
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 17e4bd97079c058c1e56eacd31aa9b425651652deacd31aa9b425651652d3b288534e47d54b214e1
2014-06-25 08:32:25 -05:00
Steve Harris
4ce15f3642
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)
Former-commit-id: 80d4e29167c6aa4b6cbdd9a312933923d0cf81f8d9a312933923d0cf81f8f6f5c5a3955a5b95e88e
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
216f6615df
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 0a9e0932ce08fe257daae244664b7d5c4f89644ce244664b7d5c4f89644c4d22a3c58ed52b2254f5
2014-06-24 18:16:09 -05:00
Nate Jensen
d779d91c2a
Omaha #3311 fix storing UnlinkedContourVectorPacket
...
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: 16d891abc5af62c5950ce8beab36b6d81fbb83eae8beab36b6d81fbb83eaa4066337ecdb48912fc4
2014-06-24 15:53:11 -05:00
Nate Jensen
18b92cdd9e
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: 619cd3e14fee3d343a640447d482328dc15b71b50447d482328dc15b71b5fd0339464f733d4740f8
2014-06-24 13:20:10 -05:00
Nate Jensen
693418d4a2
Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
...
Former-commit-id: 61fca699d8c10194a6455e2f46e8921ae399d8245e2f46e8921ae399d824dbf37c2bde32573bfa05
2014-06-24 12:37:56 -05:00
Nathan Bowler
7d9aa4a223
Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
...
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37
Former-commit-id: e010108fee3b35b9e54e579f14356a229783d3b0579f14356a229783d3b099c6d288fd2de56a4000
2014-06-24 13:27:57 -04:00
Brian Clements
2b0a3b71be
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: bb9ea8688b27a0d3fb280f25ac3b5b3b71bedd140f25ac3b5b3b71bedd14be3d47e5e991d1378c31
2014-06-24 11:15:45 -05:00
Steve Harris
dd6d6c031d
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: 7f040f069c3f2058a1ab89606076ecddc6f2092a89606076ecddc6f2092a1f033d22e6304d918a7c
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
a638ba05b1
Issue #2661 Fix grid time series errors when there is no data.
...
Former-commit-id: 886e738c6f2c1988017eaaa146b2d046b8688597aaa146b2d046b8688597c1849363409edc1153de
2014-06-24 10:57:02 -05:00
Nate Jensen
453f463f3f
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
...
Former-commit-id: a6f039c7cf26ba9ff2212d98fb83fc476eda35852d98fb83fc476eda3585fdc0dacf688ee8589609
2014-06-23 17:45:11 -05:00
Nate Jensen
1c862c90f9
Merge "Omaha #3161 - Added SWT dialog trim to the dialogs for thin client." into omaha_14.4.1
...
Former-commit-id: 6c794eea9dbfa81210c12c5dff13e5b2de7b23fc2c5dff13e5b2de7b23fc12d03d3a65a887ac9195
2014-06-23 17:42:28 -05:00
Nate Jensen
6837e5f55a
Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: c77b611337b851e4aa94b728fac741a09f079064b728fac741a09f0790647ea4049f2bea738bb20a
2014-06-23 17:41:45 -05:00
Ben Steffensmeier
b92ea37204
Omaha #3238 Implement Interrogatable in SatResource.
...
Former-commit-id: d6e503bddfb1f14f631aca853f7e937fe130b6e2ca853f7e937fe130b6e240041b4f7d4bf1990d8a
2014-06-23 17:21:43 -05:00
Richard Peter
444d61f776
Omaha #3225 Reduce default hibernate connections
...
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06
Former-commit-id: 152930abdeb6092098482bbb6fd90c47081e7ae32bbb6fd90c47081e7ae32502fc954313c116bae5
2014-06-23 17:20:46 -05:00
Lee Venable
e58873288f
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: e841c8d454c4d064369d1e561fbc8d4b9c65f6c41e561fbc8d4b9c65f6c49457dd477470ebd1ea58
2014-06-23 16:29:24 -05:00
Lee Venable
d42483b97b
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
...
Former-commit-id: 9bf95b70f46418906d232401caa24fa176a266182401caa24fa176a26618ab5d8d6204db11f9af58
2014-06-23 15:37:10 -05:00
Richard Peter
bf238a8b50
Merge "Omaha #3133 remove unnecessary plugins" into omaha_14.4.1
...
Former-commit-id: 5008ab3e6e8c8691738d3771f4713cdeb9d6f6f43771f4713cdeb9d6f6f44deef371415b6a02e5f6
2014-06-23 14:45:16 -05:00
Nate Jensen
b74af812f6
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: 457735d2b0f714c75bfce2826c52c0988e2877e1e2826c52c0988e2877e1b17e12606ef5b68cc357
2014-06-23 14:24:14 -05:00
Nate Jensen
325e99b711
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 05561468046077794cc99219e1e25453633a6ed49219e1e25453633a6ed45062338b2d1117e5b995
2014-06-23 14:13:19 -05:00
Nate Jensen
b4bcc4355f
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 3e247c3d3c65a42a56891c2b5a5c4e6ba15e68b21c2b5a5c4e6ba15e68b214d961689092adc389fc
2014-06-23 14:09:20 -05:00
Nathan Bowler
f41dfeb999
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: b8373c6835705a20e39dd1cde2f291e2e6724043d1cde2f291e2e672404361b2e5e6f5062106864b
2014-06-23 15:03:00 -04:00
Dave Hladky
6677a75d5c
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 3d58cd626767d1468c8cc6a1a5592c47cc398e91c6a1a5592c47cc398e91df958f67c505360ecd9f
2014-06-23 13:03:25 -05:00
Nate Jensen
842078e46f
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 1cb291c5cdb92a2671f35e30984a412f85537a555e30984a412f85537a55544b0f0dd9123679b8ec
2014-06-23 13:00:44 -05:00
Nate Jensen
2379acd8af
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: ebc605e2e8718d941c2361640d5c22172f18a5b161640d5c22172f18a5b148995ed5ca4e8d9343dd
2014-06-23 12:12:03 -05:00
Nate Jensen
8bd6177ae8
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 65eb76ff66e39ecf54734558fe5862845483346f65eb76ff66845483346fef9e4c2439333f8317bbca2787320465619399a0ca2787320465619399a0f9fce258363add021413
2014-06-23 11:59:26 -05:00
Brad Gonzales
fdc5347152
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: 30b7808d64955e37bca757b49b4868a6138bfc1757b49b4868a6138bfc171d4903be35e9dca26ebf
2014-06-23 10:49:35 -05:00
Nate Jensen
1d50803d20
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: cfd3efcfe2c7c0d9cb4b51da67dd3f97ef9fc34351da67dd3f97ef9fc343a3c20eb98a416e6fc85d
2014-06-23 09:54:11 -05:00
Steve Harris
bab435f286
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: 869235c02a16f5ff0979b84dda5930419c5f4abab84dda5930419c5f4aba66d30e59a3af06c5a890
2014-06-20 14:01:55 -04:00
Brian Clements
a5f70b0e92
Omaha #3281 peer2peer chat view improvements
...
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: c2ac40caecf053e9b0849d626a97e593a1ee71c49d626a97e593a1ee71c4a9827ef8e83eb4cd513c
2014-06-20 09:04:15 -05:00
Brian Clements
1f176ef9b9
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 27f7b754a321fca2e6629aa5a87c4bfd95df3bc09aa5a87c4bfd95df3bc0795fa49ced74c62e0bf9
2014-06-20 08:53:54 -05:00
Nate Jensen
08636a5f5b
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 37d6f292f102372893b6123b22d90ad60d2b5caf123b22d90ad60d2b5cafef20c3192e98e2cb8d62
2014-06-19 14:44:24 -05:00
Nate Jensen
ea655624cf
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 98d3feb47d3971e05c4c644fdf50c7caf278ca5c644fdf50c7caf278ca5c977a3818f1ad63e5b322
2014-06-19 13:42:06 -05:00
Nate Jensen
e3e2820ece
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: 223f082f9576658aa485eff82573dff01e19946ceff82573dff01e19946ccb5d6fe1876990acc1a7
2014-06-19 13:15:40 -05:00
Brian Clements
fa919b9d2d
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 24e406cbf26345119f9b7dd90e6f85a18069809a7dd90e6f85a18069809a6d5cbf29a5bd2288e066
2014-06-19 12:50:56 -05:00
Nate Jensen
531aaa9457
Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1
...
Former-commit-id: a86a4df08e472e6ec591557aa842273f5c895d64557aa842273f5c895d64920ec9273631e4d9573f
2014-06-19 12:14:58 -05:00
Benjamin Phillippe
7c64bf3134
Omaha #3255 Removed security plugin from ebxml common plugin to fix build
...
Former-commit-id: 245703cb9544c5a9efe8df37c551322c646cf054df37c551322c646cf054f1d3019bf04b480fa686
2014-06-19 11:03:04 -05:00
Nate Jensen
77bbd44efb
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: e81d51e479c19f10ddd466cb3d5f0327df878d8666cb3d5f0327df878d86918e5664bbd34ee39b1c
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
1d99894de0
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: f3d556e3c28428c676d78d2605199efc024e6d4c8d2605199efc024e6d4ca90b1891b1d9298ddd4f
2014-06-19 10:58:11 -05:00
Nate Jensen
0c618793e8
Merge "Omaha #2061 Fix recco." into omaha_14.4.1
...
Former-commit-id: 8326b63fb2d461865ffa95d705424c505cef31a695d705424c505cef31a66779d5c62adb7132a68d
2014-06-19 10:52:46 -05:00
Nate Jensen
fb6d98a827
Merge "Omaha #3242 clean up more graphs" into omaha_14.4.1
...
Former-commit-id: e2ddb7ce2c870b7964b49a459f2da7a3fe5087119a459f2da7a3fe508711836fa28a5d2586401aa0
2014-06-19 10:52:28 -05:00
Ben Steffensmeier
a6d9c76b84
Omaha #2061 Fix recco.
...
Former-commit-id: 16024ca33a6c3a3cc707d953e65ac9135452a593d953e65ac9135452a5938613e5b11c961a8402cc
2014-06-19 10:46:29 -05:00
Brian Clements
a228a4490c
Omaha #3226 fixed lightning decrypt validation, added initialization vector
...
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554
Former-commit-id: 0f2fde3d299064c50f01da6eea7f5736f8207246da6eea7f5736f8207246bb69af4aefb5bc5cf85b
2014-06-19 10:32:05 -05:00
Nate Jensen
eaee6c2bd5
Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1
...
Former-commit-id: 4df0dc8ff567d6e9ce3b17554ba5c95d209448da17554ba5c95d209448da413ac1710144b52b1328
2014-06-19 10:12:18 -05:00
