Nate Jensen
4ed4ed2e28
Merge "Omaha #3096 fix DataTime to match the Python version" into omaha_14.4.1
...
Former-commit-id: 8ba50134638d4687cc654220e683e916eb0cea4b
2014-06-26 16:47:39 -05:00
Nate Jensen
024bc29e10
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
...
Former-commit-id: 40a9f54b7354de60eaf2b94d10615b2d6ad0720f
2014-06-26 15:26:21 -05:00
Matt Nash
e32adf1ee4
Omaha #3096 fix DataTime to match the Python version
...
Former-commit-id: d7e4329d0d9decf946b463bf40c64f4e968c871f
2014-06-26 15:12:39 -05:00
Nate Jensen
f4c1691c8d
Omaha #3236 thin client pref page supports proxy server as text or combo
...
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 1a9433a524e5b8267fc3303db0763ac4685ec46d
2014-06-26 15:06:38 -05:00
Slav Korolev
900d5e8fbe
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 4dc7f664a3e96a43392eee011bd453310d8e12ab
2014-06-26 14:04:34 -04:00
Richard Peter
ed3b869bab
Merge "Omaha #3230 Add URMA." into omaha_14.4.1
...
Former-commit-id: 63c45abb10f633f5a088e7e4834595f4c6b5e11d
2014-06-26 12:30:15 -05:00
Greg Armendariz
7764f65707
Omaha #3309 - Remove reference to slf4j-log4j library
...
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2
Former-commit-id: 2b2133b9d38453848c6f014704b7625668bcd980
2014-06-26 11:34:47 -05:00
Roger Ferrel
bd2d40faee
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: c6abaff91bc493c9a40e39a66afd2b2262697343
2014-06-26 11:16:09 -05:00
Richard Peter
584b7576af
Omaha #3277 Update smart init launcher to allow additional threads.
...
Change-Id: I118d905823bd8304f0e5ea2087a16d3d8ee075ce
Former-commit-id: 475cb088596a89e3bd2818196e2f2e250930a95c
2014-06-26 10:27:33 -05:00
Dave Hladky
f2b4bcfef1
Omaha #3273 Remove all reference off DD env variables from setup.env
...
Former-commit-id: 0ad525e949fc9cf9390909128b4c590034f00963
2014-06-26 09:46:31 -05:00
Nate Jensen
f080f470d3
Merge "Omaha #3165 remove dead code from uengine" into omaha_14.4.1
...
Former-commit-id: 90641cbc7f84e7c99252870f84f653f853653d2e
2014-06-26 08:42:44 -05:00
Greg Armendariz
4ca605424b
Merge "Omaha #3275 - moving developer tools to separate repository" into omaha_14.4.1
...
Former-commit-id: 08e67f103d58dbc0af31096bc35a3b7ef4e35783
2014-06-25 18:13:49 -05:00
Richard Peter
aab371b6ab
Merge "Omaha #3306 Made DPA SSL comms work Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d" into omaha_14.4.1
...
Former-commit-id: 7ce53f801d18c63d19e8679915fbefd341a3c804
2014-06-25 17:26:24 -05:00
Nate Jensen
b1216dd31b
Omaha #3165 remove dead code from uengine
...
Change-Id: Id47a5c3ef95d606270f235b1c17c1abfa0919b08
Former-commit-id: ba4fed408842df8bf1cbfd46c467cbd58aed49bd
2014-06-25 16:59:07 -05:00
Steve Harris
5fd1555ff9
Omaha #3275 - moving developer tools to separate repository
...
Former-commit-id: da96ff215e03ffdad7e7d157f6f5539663ad47ce
2014-06-25 16:16:03 -05:00
Nate Jensen
589f74f6d8
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
...
Former-commit-id: 3d352136996875ff1e66b9e41244d53e16a1b2c3
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
d7cdfa655d
Omaha #3164 Disable compression on server error 500.
...
Former-commit-id: 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e
2014-06-25 11:13:39 -05:00
Nate Jensen
791ab4913c
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: 3a87ec22c684ea4abab3a6328cc50682c5315cb9
2014-06-25 09:54:38 -05:00
Nate Jensen
3b1c37dc38
Omaha #3236 thin client connectivity dialog remembers past proxy servers
...
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: 353872377cc3f96db4d3a22c6646fccb3edcb865
2014-06-25 08:54:24 -05:00
Nate Jensen
c59ee0663f
Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
...
Former-commit-id: ef2d479ff08fbdbed2e57f72046d8c9fb9baa421
2014-06-25 08:45:09 -05:00
Nate Jensen
eacd31aa9b
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 45ac7ca480ea49dabff490ccc5b29878f0481b90
2014-06-25 08:32:25 -05:00
Steve Harris
d9a3129339
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: 11c37fed7aed29ee42661948db90fab14b49c93c
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
e244664b7d
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 664ae8372cd7df344ae66dfec599646b31dbd27b
2014-06-24 18:16:09 -05:00
Nate Jensen
e8beab36b6
Omaha #3311 fix storing UnlinkedContourVectorPacket
...
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb
Former-commit-id: 15a3026ccf38896b0858187c9e4d0e62a58c0336
2014-06-24 15:53:11 -05:00
Nate Jensen
0447d48232
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: 976a1fff0ca0d531b667b18e63e775d1ccd90bbc
2014-06-24 13:20:10 -05:00
Nate Jensen
5e2f46e892
Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
...
Former-commit-id: 762a5f67f31537f481f38246fba7cf074f1c859f
2014-06-24 12:37:56 -05:00
Nathan Bowler
579f14356a
Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
...
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37
Former-commit-id: b8d9c02463b595ac3adef027cd1f2a03ddc95e4e
2014-06-24 13:27:57 -04:00
Brian Clements
0f25ac3b5b
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: aceeff1e02c896ff27794755eb10fc275718a68c
2014-06-24 11:15:45 -05:00
Steve Harris
89606076ec
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
aaa146b2d0
Issue #2661 Fix grid time series errors when there is no data.
...
Former-commit-id: 2fdb5867131b54f5d74ef3edd8c621c8807d4d99
2014-06-24 10:57:02 -05:00
Nate Jensen
2d98fb83fc
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
...
Former-commit-id: 83cd4ad4af6ac2f90a280fa1367ef88949870dc0
2014-06-23 17:45:11 -05:00
Nate Jensen
2c5dff13e5
Merge "Omaha #3161 - Added SWT dialog trim to the dialogs for thin client." into omaha_14.4.1
...
Former-commit-id: b1bf50e2d89feb66a88a22cb42e1402561b25201
2014-06-23 17:42:28 -05:00
Nate Jensen
b728fac741
Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: e00ce449cd00ded5ba3b84602b03f2cca8c705de
2014-06-23 17:41:45 -05:00
Ben Steffensmeier
ca853f7e93
Omaha #3238 Implement Interrogatable in SatResource.
...
Former-commit-id: 698a2b174606c8425778f5672b613f2d74fb8997
2014-06-23 17:21:43 -05:00
Richard Peter
2bbb6fd90c
Omaha #3225 Reduce default hibernate connections
...
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06
Former-commit-id: fa5b34de9240e02a1ae555d7ccaf65efa2039a9b
2014-06-23 17:20:46 -05:00
Lee Venable
1e561fbc8d
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718
2014-06-23 16:29:24 -05:00
Lee Venable
2401caa24f
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
...
Former-commit-id: 363ddb4af1075686fc5a1d80df884f59d93d7b99
2014-06-23 15:37:10 -05:00
Richard Peter
3771f4713c
Merge "Omaha #3133 remove unnecessary plugins" into omaha_14.4.1
...
Former-commit-id: 20678aae188feb5cc9333d98533708cd03da5fa6
2014-06-23 14:45:16 -05:00
Nate Jensen
e2826c52c0
Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
...
Former-commit-id: c81ee641c5e84cd1c85f31210250ca19d3674d6a
2014-06-23 14:24:14 -05:00
Nate Jensen
9219e1e254
Omaha #3133 remove unnecessary register buddies
...
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4
Former-commit-id: c91a7d4084be3753ad51afd11b46b621af0bc878
2014-06-23 14:13:19 -05:00
Nate Jensen
1c2b5a5c4e
Omaha #3133 remove dead plugin
...
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c
Former-commit-id: 22bcc1db6482f662d79be82e585912ce8c451d7e
2014-06-23 14:09:20 -05:00
Nathan Bowler
d1cde2f291
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: ca5b7fa9d91d085f0684320a4582a974a4356063
2014-06-23 15:03:00 -04:00
Dave Hladky
c6a1a5592c
Omaha #3306 Made DPA SSL comms work
...
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d
Former-commit-id: 9061033cd5f8299435b5aa83410e2d99f477d07e
2014-06-23 13:03:25 -05:00
Nate Jensen
5e30984a41
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 04d26bedbe8d6ccf7a353159f27b133aff42970e
2014-06-23 13:00:44 -05:00
Nate Jensen
61640d5c22
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: 449a40d7981b0814f9cc7feb62f52b2259e83e5f
2014-06-23 12:12:03 -05:00
Nate Jensen
ca27873204
Issue #3248 ensure that a locking file output streams obtains the lock
...
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 845483346f
[formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716])
Former-commit-id: f0ad63d2ccf347e92274701f9890e120b9e70140
2014-06-23 11:59:26 -05:00
Brad Gonzales
57b49b4868
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: 6159b6ec34966762e7dd8ce2f66c24004d11bd95
2014-06-23 10:49:35 -05:00
Nate Jensen
51da67dd3f
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
2014-06-23 09:54:11 -05:00
Steve Harris
b84dda5930
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: ce5767f2bbf5c9627bd43e766c6193c261c48af3
2014-06-20 14:01:55 -04:00
Brian Clements
9d626a97e5
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: a31b7f213081f384bd23d53a431ce53593254c25
2014-06-20 09:04:15 -05:00