Lee Venable
cf2d07dc47
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
...
Former-commit-id: 9bf95b70f46418906d232401caa24f9bf95b70f46418906d232401caa24fa176a266182401caa24fa176a26618d42483b97bdb11f9af58ab5d8d6204da158b0d7009c582a70a
2014-06-23 15:37:10 -05:00
Richard Peter
00d0ef1a07
Merge "Omaha #3133 remove unnecessary plugins" into omaha_14.4.1
...
Former-commit-id: 5008ab3e6e8c8691738d3771f4713c5008ab3e6e8c8691738d3771f4713cdeb9d6f6f43771f4713cdeb9d6f6f4bf238a8b505b6a02e5f64deef37141972a37613687d11319f2
2014-06-23 14:45:16 -05:00
Nate Jensen
59c87bad1c
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: 457735d2b0f714c75bfce2826c52c0457735d2b0f714c75bfce2826c52c0988e2877e1e2826c52c0988e2877e1b74af812f6f5b68cc357b17e12606ef48422449c284ddc9583
2014-06-23 14:24:14 -05:00
Nate Jensen
266d148803
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 05561468046077794cc99219e1e25405561468046077794cc99219e1e25453633a6ed49219e1e25453633a6ed4325e99b7111117e5b9955062338b2d3239b1956b6d3b2d3119
2014-06-23 14:13:19 -05:00
Nate Jensen
1d8fba796b
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 3e247c3d3c65a42a56891c2b5a5c4e3e247c3d3c65a42a56891c2b5a5c4e6ba15e68b21c2b5a5c4e6ba15e68b2b4bcc4355f92adc389fc14d9616890f0833bdb171d76825805
2014-06-23 14:09:20 -05:00
Nathan Bowler
9f0d47f531
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: b8373c6835705a20e39dd1cde2f291b8373c6835705a20e39dd1cde2f291e2e6724043d1cde2f291e2e6724043f41dfeb999062106864b61b2e5e6f5ef7161188abb83588aae
2014-06-23 15:03:00 -04:00
Dave Hladky
195a81dfe1
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 3d58cd626767d1468c8cc6a1a5592c3d58cd626767d1468c8cc6a1a5592c47cc398e91c6a1a5592c47cc398e916677a75d5c05360ecd9fdf958f67c53c48f43e3768ad68a6f5
2014-06-23 13:03:25 -05:00
Nate Jensen
c6a5e63e8c
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 1cb291c5cdb92a2671f35e30984a411cb291c5cdb92a2671f35e30984a412f85537a555e30984a412f85537a55842078e46f123679b8ec544b0f0dd98bcc2155c6fde6ed28ce
2014-06-23 13:00:44 -05:00
Nate Jensen
4fc569b95a
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: ebc605e2e8718d941c2361640d5c22ebc605e2e8718d941c2361640d5c22172f18a5b161640d5c22172f18a5b12379acd8af4e8d9343dd48995ed5ca217a0999d0b54b30e037
2014-06-23 12:12:03 -05:00
Nate Jensen
764d34448d
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 65eb76ff66e39ecf54734558fe5862845483346fe39ecf54734558fe5862845483346f65eb76ff66845483346fef9e4c2439333f8317bbca27873204ef9e4c2439333f8317bbca2787320465619399a0ca2787320465619399a08bd6177ae83add021413f9fce25836e717dbfeb1e62629413d
2014-06-23 11:59:26 -05:00
Brad Gonzales
5dc085d607
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: 30b7808d64955e37bca757b49b486830b7808d64955e37bca757b49b4868a6138bfc1757b49b4868a6138bfc17fdc5347152e9dca26ebf1d4903be35fc0ed548f059e3eed9f3
2014-06-23 10:49:35 -05:00
Nate Jensen
18e78f42d9
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: cfd3efcfe2c7c0d9cb4b51da67dd3fcfd3efcfe2c7c0d9cb4b51da67dd3f97ef9fc34351da67dd3f97ef9fc3431d50803d20416e6fc85da3c20eb98a9a3a4d5bfdb1ab93a361
2014-06-23 09:54:11 -05:00
Steve Harris
7e7529e482
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: 869235c02a16f5ff0979b84dda5930869235c02a16f5ff0979b84dda5930419c5f4abab84dda5930419c5f4ababab435f286af06c5a89066d30e59a3935542914d196f53e609
2014-06-20 14:01:55 -04:00
Brian Clements
3ef4cf722a
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: c2ac40caecf053e9b0849d626a97e5c2ac40caecf053e9b0849d626a97e593a1ee71c49d626a97e593a1ee71c4a5f70b0e923eb4cd513ca9827ef8e87060fe3fbabb58783ca4
2014-06-20 09:04:15 -05:00
Brian Clements
ad5e56f89a
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 27f7b754a321fca2e6629aa5a87c4b27f7b754a321fca2e6629aa5a87c4bfd95df3bc09aa5a87c4bfd95df3bc01f176ef9b974c62e0bf9795fa49ced5560b12a5aa8e31ffa21
2014-06-20 08:53:54 -05:00
Nate Jensen
933a80d387
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 37d6f292f102372893b6123b22d90a37d6f292f102372893b6123b22d90ad60d2b5caf123b22d90ad60d2b5caf08636a5f5b98e2cb8d62ef20c3192e7af79aca86cc90e21628
2014-06-19 14:44:24 -05:00
Nate Jensen
9814cdfe5c
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 98d3feb47d3971e05c4c644fdf50c798d3feb47d3971e05c4c644fdf50c7caf278ca5c644fdf50c7caf278ca5cea655624cfad63e5b322977a3818f1d67339b3a91d44a9f517
2014-06-19 13:42:06 -05:00
Nate Jensen
8e64be017c
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: 223f082f9576658aa485eff82573df223f082f9576658aa485eff82573dff01e19946ceff82573dff01e19946ce3e2820ece6990acc1a7cb5d6fe18743cdc7fccb255d1859f4
2014-06-19 13:15:40 -05:00
Brian Clements
fe445262e9
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 24e406cbf26345119f9b7dd90e6f8524e406cbf26345119f9b7dd90e6f85a18069809a7dd90e6f85a18069809afa919b9d2dbd2288e0666d5cbf29a574d4ebf071cadb1091fb
2014-06-19 12:50:56 -05:00
Nate Jensen
77d24dabd8
Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1
...
Former-commit-id: a86a4df08e472e6ec591557aa84227a86a4df08e472e6ec591557aa842273f5c895d64557aa842273f5c895d64531aaa945731e4d9573f920ec927366fc60d3edb201d03f319
2014-06-19 12:14:58 -05:00
Benjamin Phillippe
13d625500c
Omaha #3255 Removed security plugin from ebxml common plugin to fix build
...
Former-commit-id: 245703cb9544c5a9efe8df37c55132245703cb9544c5a9efe8df37c551322c646cf054df37c551322c646cf0547c64bf31344b480fa686f1d3019bf0a43a3a94c700e06c15fb
2014-06-19 11:03:04 -05:00
Nate Jensen
9df3186751
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: e81d51e479c19f10ddd466cb3d5f03e81d51e479c19f10ddd466cb3d5f0327df878d8666cb3d5f0327df878d8677bbd44efbd34ee39b1c918e5664bb9c0adc1c15813921a97c
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
74a1fcb570
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: f3d556e3c28428c676d78d2605199ef3d556e3c28428c676d78d2605199efc024e6d4c8d2605199efc024e6d4c1d99894de0d9298ddd4fa90b1891b1fb3ea7760d7dd8c59365
2014-06-19 10:58:11 -05:00
Nate Jensen
5b1db9fc5c
Merge "Omaha #2061 Fix recco." into omaha_14.4.1
...
Former-commit-id: 8326b63fb2d461865ffa95d705424c8326b63fb2d461865ffa95d705424c505cef31a695d705424c505cef31a60c618793e8db7132a68d6779d5c62a5aa5691dc29e888e6848
2014-06-19 10:52:46 -05:00
Nate Jensen
a9bff60102
Merge "Omaha #3242 clean up more graphs" into omaha_14.4.1
...
Former-commit-id: e2ddb7ce2c870b7964b49a459f2da7e2ddb7ce2c870b7964b49a459f2da7a3fe5087119a459f2da7a3fe508711fb6d98a8272586401aa0836fa28a5d70eda084abdae2d1fc39
2014-06-19 10:52:28 -05:00
Ben Steffensmeier
58d1989043
Omaha #2061 Fix recco.
...
Former-commit-id: 16024ca33a6c3a3cc707d953e65ac916024ca33a6c3a3cc707d953e65ac9135452a593d953e65ac9135452a593a6d9c76b84961a8402cc8613e5b11c754c076e94a111506648
2014-06-19 10:46:29 -05:00
Brian Clements
c428d36577
Omaha #3226 fixed lightning decrypt validation, added initialization vector
...
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554
Former-commit-id: 0f2fde3d299064c50f01da6eea7f570f2fde3d299064c50f01da6eea7f5736f8207246da6eea7f5736f8207246a228a4490cb5bc5cf85bbb69af4aef18fd0db6682ad045e4c7
2014-06-19 10:32:05 -05:00
Nate Jensen
44c246c0a8
Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1
...
Former-commit-id: 4df0dc8ff567d6e9ce3b17554ba5c94df0dc8ff567d6e9ce3b17554ba5c95d209448da17554ba5c95d209448daeaee6c2bd544b52b1328413ac17101f8359db42865a65a4b25
2014-06-19 10:12:18 -05:00
Nate Jensen
9cc5ac0325
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: e39ecf54734558fe5862845483346fe39ecf54734558fe5862845483346f65eb76ff66845483346f65eb76ff6664a5a096390ea72ce3edd1766dc9910d1d12158d55aa294dad
2014-06-19 10:02:34 -05:00
Greg Armendariz
198ac126fe
Omaha #3299 - Fix qpid dependency
...
Former-commit-id: 261677faf974500b05fc9d9ba5a78f261677faf974500b05fc9d9ba5a78f9d1630a6179d9ba5a78f9d1630a617c8f98b8bbc4802ac344e58d09cc3ec69f085c08c4e06a55342
2014-06-19 09:56:10 -05:00
Nate Jensen
1de92d63db
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 069075ddd59e317cb9bcaca7b46243069075ddd59e317cb9bcaca7b462437bb2aebd59aca7b462437bb2aebd59c51604ab5188607607d733f36374d0a1467e436189d67fbce7
2014-06-18 18:23:36 -05:00
Nate Jensen
475873c09f
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: c882f1c656a83159ff6a55bd088ce5c882f1c656a83159ff6a55bd088ce5835b65b7b855bd088ce5835b65b7b85d9ae95eef135656f5f519383d86f2c02a5a88ebda89b20f75
2014-06-18 17:17:17 -05:00
Nate Jensen
a2a669ec28
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: 679c3cfc12393718bf41f0e0866155679c3cfc12393718bf41f0e0866155fbd7e64fe2f0e0866155fbd7e64fe23d16b847229e8f46a84c098712e6a0ddae1dc54176f8d24c33
2014-06-18 17:17:04 -05:00
Nate Jensen
cb615b0950
Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1
...
Former-commit-id: 9d943b869c43a6ca22ac0db147238d9d943b869c43a6ca22ac0db147238d9a76fd4db00db147238d9a76fd4db0e347e9e36c2e569fea177867dc1ff6a57ea807ea697c53e6bb
2014-06-18 17:07:19 -05:00
Nate Jensen
ed208045de
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 63adaa42b133f858e9519b98b63bb563adaa42b133f858e9519b98b63bb530e76a1fd59b98b63bb530e76a1fd50c860e471f40ca9ab166a32552846d3a7c95c110d68030a1cc
2014-06-18 17:02:10 -05:00
Nate Jensen
8656172f9d
Omaha #3242 fix errors that can occur if a user zooms or pans while the
...
time series is still loading
Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb
Former-commit-id: 718c6f8901b6ba8c0a3da18fa3f026718c6f8901b6ba8c0a3da18fa3f0263ba4931eeea18fa3f0263ba4931eee2e2924f4fd51e5563415a9904710214e673d8358e46c6a4ed4
2014-06-18 16:48:48 -05:00
Nate Jensen
29ee918f96
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 472b055826aa579b85e71add8fca08472b055826aa579b85e71add8fca0846c843f51a1add8fca0846c843f51afdbcea1bdb18ce2d663532038939b34c44afbf22c65c47c798
2014-06-18 16:37:49 -05:00
Nate Jensen
f943500410
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 9fad6c471273082de4611a8995fc2d9fad6c471273082de4611a8995fc2de10a73c17b1a8995fc2de10a73c17b7f3df290d5d6f84d8281a575c57ecc1d244a4a95bf95e2a827
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
6d22ed8e5b
Omaha #3255 Fix build
...
Former-commit-id: ce6d87cdcbebecdaeb363864eb622ece6d87cdcbebecdaeb363864eb622ebc9e7f1cb33864eb622ebc9e7f1cb376421f9bde22b51148024bb4c753ba953bf4a72f77f29751bb
2014-06-18 14:03:23 -05:00
Benjamin Phillippe
58e89c4c2d
Omaha #3255 Fixing Build
...
Former-commit-id: 2451e01f8fa50a8e79a1621a3f1a5c2451e01f8fa50a8e79a1621a3f1a5c7e7cecceea621a3f1a5c7e7cecceeaffafec5ac0d59ea2591df6dc8523d707c583104555e4811fe8
2014-06-18 13:57:27 -05:00
Nate Jensen
f42ee8c556
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: 45f7c498850167a89312042b69ba9a45f7c498850167a89312042b69ba9a9fd4e4a8d9042b69ba9a9fd4e4a8d9bca37cebb8fdebae41d5806b3b14905d1cf81f992e803f21b3
2014-06-18 12:14:45 -05:00
Ben Steffensmeier
67804f56ba
Omaha #2061 Remove another reference to IDecoderGettable.
...
Former-commit-id: 6f80f2f865a55d42d479cc72f9d9836f80f2f865a55d42d479cc72f9d9837b356e8ce0cc72f9d9837b356e8ce067f6072608b01f99e5f249fc12968f95dceeab133d6aa182fa
2014-06-18 12:12:01 -05:00
Nate Jensen
aeda2c794b
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 0b6265a9b5079828ecceb3e73d78cc0b6265a9b5079828ecceb3e73d78cc32bc3e4056b3e73d78cc32bc3e40567e6663b6eab6c7e0dfd2c59136990b7872e29f1b86a57cc2c5
2014-06-18 11:11:34 -05:00
Nate Jensen
699ab5b707
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 68679fd1a5f958ca8de2465a0fef7168679fd1a5f958ca8de2465a0fef7117dc45e7ca465a0fef7117dc45e7ca01cc17d563fe17c9b8b9a9fc46a6fb4129bd518d787b6d8a60
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
9d5b1f9169
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: 50e9bbd139b41f79658f270caaadde50e9bbd139b41f79658f270caaaddec2ed8a39d1270caaaddec2ed8a39d13f3526805d38abcb36f5447fb0572a5d908f2288a8d99c348d
2014-06-18 09:54:40 -05:00
Steve Harris
fca46f9f01
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts (these go to ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java
Former-commit-id: 3e2eeedc299de49b59eacc7e6bc52a3e2eeedc299de49b59eacc7e6bc52a676948e239cc7e6bc52a676948e23927d4a11026586f56383918b2a1df08545d6da097a6d5652425
2014-06-18 08:52:25 -05:00
Brian.Dyke
71ca3ae180
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: e3dc97e246be589ceb9b399c06820ae3dc97e246be589ceb9b399c06820a8ecdd9a192399c06820a8ecdd9a192f09000ec64e28febcf279031f58d023e10995d87b602d29456
2014-06-18 08:55:49 -04:00
Nate Jensen
4a7f8e9b7b
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 7299d9ccb8344a6b80efa2783be56a7299d9ccb8344a6b80efa2783be56a764f977bf6a2783be56a764f977bf6c20b62489e686f6f67a0bc5cedb1c87011f159293923c96927
2014-06-17 18:09:33 -05:00
Nate Jensen
f1b718d724
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: b0d4a3006bbb60b170e8dcab909b4bb0d4a3006bbb60b170e8dcab909b4b7fc256d076dcab909b4b7fc256d076d6612e027e1f9f0ba7f3a499624f5ff94209e681f21b672114
2014-06-17 17:01:46 -05:00
Brian Clements
d75be4a64c
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: ccac7c3d47b8a0a60df69946f78241ccac7c3d47b8a0a60df69946f782415d03048fff9946f782415d03048fff424e910953dbe778cbe059d92634b048e634b14aed95461c36
2014-06-17 17:01:23 -05:00
