Richard Peter
f0cb9ef34a
Merge "Omaha #3230 Add URMA." into omaha_14.4.1
...
Former-commit-id: f1823e07a2
[formerly 63c45abb10f633f5a088e7e4834595f4c6b5e11d]
Former-commit-id: ed3b869bab
2014-06-26 12:30:15 -05:00
Greg Armendariz
58f93a0ecf
Omaha #3309 - Remove reference to slf4j-log4j library
...
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2
Former-commit-id: 58158a9e73
[formerly 2b2133b9d38453848c6f014704b7625668bcd980]
Former-commit-id: 7764f65707
2014-06-26 11:34:47 -05:00
Roger Ferrel
32ae3ba73f
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: ad6eac6e20
[formerly c6abaff91bc493c9a40e39a66afd2b2262697343]
Former-commit-id: bd2d40faee
2014-06-26 11:16:09 -05:00
Richard Peter
ae1fd15ab4
Omaha #3277 Update smart init launcher to allow additional threads.
...
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce
Former-commit-id: 8eb0b62db8
[formerly 475cb088596a89e3bd2818196e2f2e250930a95c]
Former-commit-id: 584b7576af
2014-06-26 10:27:33 -05:00
Dave Hladky
b9c930dd14
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: dbf301b8c4
[formerly 0ad525e949fc9cf9390909128b4c590034f00963]
Former-commit-id: f2b4bcfef1
2014-06-26 09:46:31 -05:00
Nate Jensen
3d93d09abb
Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
...
Former-commit-id: 17a0af6054
[formerly 90641cbc7f84e7c99252870f84f653f853653d2e]
Former-commit-id: f080f470d3
2014-06-26 08:42:44 -05:00
Greg Armendariz
11c275d9e7
Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
...
Former-commit-id: bda30b30fa
[formerly 08e67f103d58dbc0af31096bc35a3b7ef4e35783]
Former-commit-id: 4ca605424b
2014-06-25 18:13:49 -05:00
Richard Peter
fcb9c0a103
Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
...
Former-commit-id: bfb242f55c
[formerly 7ce53f801d18c63d19e8679915fbefd341a3c804]
Former-commit-id: aab371b6ab
2014-06-25 17:26:24 -05:00
Nate Jensen
631c28cd53
Omaha #3165 remove dead code from uengine
...
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08
Former-commit-id: 4718ca6614
[formerly ba4fed408842df8bf1cbfd46c467cbd58aed49bd]
Former-commit-id: b1216dd31b
2014-06-25 16:59:07 -05:00
Steve Harris
6c0a7da2a0
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: 436ce72db9
[formerly da96ff215e03ffdad7e7d157f6f5539663ad47ce]
Former-commit-id: 5fd1555ff9
2014-06-25 16:16:03 -05:00
Nate Jensen
7b44d8ad2d
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
...
Former-commit-id: 49a592b19f
[formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]
Former-commit-id: 589f74f6d8
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
7df0be0722
Omaha #3164 Disable compression on server error 500.
...
Former-commit-id: 120e9099e4
[formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]
Former-commit-id: d7cdfa655d
2014-06-25 11:13:39 -05:00
Nate Jensen
c9696dbd3b
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: 4bd68c8bd0
[formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]
Former-commit-id: 791ab4913c
2014-06-25 09:54:38 -05:00
Nate Jensen
054e8ba9b9
Omaha #3236 thin client connectivity dialog remembers past proxy servers
...
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: 760b0cb584
[formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]
Former-commit-id: 3b1c37dc38
2014-06-25 08:54:24 -05:00
Nate Jensen
31804ce5f9
Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
...
Former-commit-id: adc60e187d
[formerly ef2d479ff08fbdbed2e57f72046d8c9fb9baa421]
Former-commit-id: c59ee0663f
2014-06-25 08:45:09 -05:00
Nate Jensen
9c058c1e56
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 425651652d
[formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]
Former-commit-id: eacd31aa9b
2014-06-25 08:32:25 -05:00
Steve Harris
c6aa4b6cbd
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: 23d0cf81f8
[formerly 11c37fed7aed29ee42661948db90fab14b49c93c]
Former-commit-id: d9a3129339
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
08fe257daa
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 5c4f89644c
[formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]
Former-commit-id: e244664b7d
2014-06-24 18:16:09 -05:00
Nate Jensen
af62c5950c
Omaha #3311 fix storing UnlinkedContourVectorPacket
...
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: d81fbb83ea
[formerly 15a3026ccf38896b0858187c9e4d0e62a58c0336]
Former-commit-id: e8beab36b6
2014-06-24 15:53:11 -05:00
Nate Jensen
ee3d343a64
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: 8dc15b71b5
[formerly 976a1fff0ca0d531b667b18e63e775d1ccd90bbc]
Former-commit-id: 0447d48232
2014-06-24 13:20:10 -05:00
Nate Jensen
c10194a645
Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
...
Former-commit-id: 1ae399d824
[formerly 762a5f67f31537f481f38246fba7cf074f1c859f]
Former-commit-id: 5e2f46e892
2014-06-24 12:37:56 -05:00
Nathan Bowler
3b35b9e54e
Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
...
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37
Former-commit-id: 229783d3b0
[formerly b8d9c02463b595ac3adef027cd1f2a03ddc95e4e]
Former-commit-id: 579f14356a
2014-06-24 13:27:57 -04:00
Brian Clements
27a0d3fb28
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 3b71bedd14
[formerly aceeff1e02c896ff27794755eb10fc275718a68c]
Former-commit-id: 0f25ac3b5b
2014-06-24 11:15:45 -05:00
Steve Harris
3f2058a1ab
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: ddc6f2092a
[formerly 174fe6d66525229f328846a1f4564300d7603c10]
Former-commit-id: 89606076ec
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
2c1988017e
Issue #2661 Fix grid time series errors when there is no data.
...
Former-commit-id: 46b8688597
[formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]
Former-commit-id: aaa146b2d0
2014-06-24 10:57:02 -05:00
Nate Jensen
26ba9ff221
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
...
Former-commit-id: 476eda3585
[formerly 83cd4ad4af6ac2f90a280fa1367ef88949870dc0]
Former-commit-id: 2d98fb83fc
2014-06-23 17:45:11 -05:00
Nate Jensen
bfa81210c1
Merge "Omaha #3161 - Added SWT dialog trim to the dialogs for thin client." into omaha_14.4.1
...
Former-commit-id: b2de7b23fc
[formerly b1bf50e2d89feb66a88a22cb42e1402561b25201]
Former-commit-id: 2c5dff13e5
2014-06-23 17:42:28 -05:00
Nate Jensen
b851e4aa94
Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: a09f079064
[formerly e00ce449cd00ded5ba3b84602b03f2cca8c705de]
Former-commit-id: b728fac741
2014-06-23 17:41:45 -05:00
Ben Steffensmeier
b1f14f631a
Omaha #3238 Implement Interrogatable in SatResource.
...
Former-commit-id: 7fe130b6e2
[formerly 698a2b174606c8425778f5672b613f2d74fb8997]
Former-commit-id: ca853f7e93
2014-06-23 17:21:43 -05:00
Richard Peter
b609209848
Omaha #3225 Reduce default hibernate connections
...
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06
Former-commit-id: 47081e7ae3
[formerly fa5b34de9240e02a1ae555d7ccaf65efa2039a9b]
Former-commit-id: 2bbb6fd90c
2014-06-23 17:20:46 -05:00
Lee Venable
c4d064369d
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 4b9c65f6c4
[formerly 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718]
Former-commit-id: 1e561fbc8d
2014-06-23 16:29:24 -05:00
Lee Venable
6418906d23
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
...
Former-commit-id: a176a26618
[formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]
Former-commit-id: 2401caa24f
2014-06-23 15:37:10 -05:00
Richard Peter
8c8691738d
Merge "Omaha #3133 remove unnecessary plugins" into omaha_14.4.1
...
Former-commit-id: deb9d6f6f4
[formerly 20678aae188feb5cc9333d98533708cd03da5fa6]
Former-commit-id: 3771f4713c
2014-06-23 14:45:16 -05:00
Nate Jensen
f714c75bfc
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: 988e2877e1
[formerly c81ee641c5e84cd1c85f31210250ca19d3674d6a]
Former-commit-id: e2826c52c0
2014-06-23 14:24:14 -05:00
Nate Jensen
6077794cc9
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: 53633a6ed4
[formerly c91a7d4084be3753ad51afd11b46b621af0bc878]
Former-commit-id: 9219e1e254
2014-06-23 14:13:19 -05:00
Nate Jensen
65a42a5689
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 6ba15e68b2
[formerly 22bcc1db6482f662d79be82e585912ce8c451d7e]
Former-commit-id: 1c2b5a5c4e
2014-06-23 14:09:20 -05:00
Nathan Bowler
705a20e39d
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: e2e6724043
[formerly ca5b7fa9d91d085f0684320a4582a974a4356063]
Former-commit-id: d1cde2f291
2014-06-23 15:03:00 -04:00
Dave Hladky
67d1468c8c
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 47cc398e91
[formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]
Former-commit-id: c6a1a5592c
2014-06-23 13:03:25 -05:00
Nate Jensen
b92a2671f3
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 2f85537a55
[formerly 04d26bedbe8d6ccf7a353159f27b133aff42970e]
Former-commit-id: 5e30984a41
2014-06-23 13:00:44 -05:00
Nate Jensen
718d941c23
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: 172f18a5b1
[formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]
Former-commit-id: 61640d5c22
2014-06-23 12:12:03 -05:00
Nate Jensen
333f8317bb
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 4558fe5862
[formerly 845483346f
] [formerly 65eb76ff66
[formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]])
Former-commit-id: 65619399a0
[formerly f0ad63d2ccf347e92274701f9890e120b9e70140]
Former-commit-id: ca27873204
2014-06-23 11:59:26 -05:00
Brad Gonzales
955e37bca7
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: a6138bfc17
[formerly 6159b6ec34966762e7dd8ce2f66c24004d11bd95]
Former-commit-id: 57b49b4868
2014-06-23 10:49:35 -05:00
Nate Jensen
c7c0d9cb4b
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: 97ef9fc343
[formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]
Former-commit-id: 51da67dd3f
2014-06-23 09:54:11 -05:00
Steve Harris
16f5ff0979
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: 419c5f4aba
[formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
2014-06-20 14:01:55 -04:00
Brian Clements
f053e9b084
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: 93a1ee71c4
[formerly a31b7f213081f384bd23d53a431ce53593254c25]
Former-commit-id: 9d626a97e5
2014-06-20 09:04:15 -05:00
Brian Clements
21fca2e662
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: fd95df3bc0
[formerly b84f7571415871f2983b913cf816ed227b24bbac]
Former-commit-id: 9aa5a87c4b
2014-06-20 08:53:54 -05:00
Nate Jensen
02372893b6
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: d60d2b5caf
[formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]
Former-commit-id: 123b22d90a
2014-06-19 14:44:24 -05:00
Nate Jensen
3971e05c4c
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: caf278ca5c
[formerly 741f2710372a713c53e70602395bf7c54fd17cdf]
Former-commit-id: 644fdf50c7
2014-06-19 13:42:06 -05:00
Nate Jensen
76658aa485
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: f01e19946c
[formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]
Former-commit-id: eff82573df
2014-06-19 13:15:40 -05:00
Brian Clements
6345119f9b
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: a18069809a
[formerly 136bb5feca753f83f53d9d1e9381061853edc402]
Former-commit-id: 7dd90e6f85
2014-06-19 12:50:56 -05:00