Commit graph

3396 commits

Author SHA1 Message Date
Brian Clements
94f5989af7 Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: 871a8655c8 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]
Former-commit-id: 0113e109d3
Former-commit-id: c32592fd1c
2014-07-10 16:31:11 -05:00
Brian Clements
97451515b6 Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache

Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486

Former-commit-id: 994226e82b [formerly 994226e82b [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]
Former-commit-id: ac8f861112
Former-commit-id: e74fcfbce1
2014-07-09 14:13:47 -05:00
Nate Jensen
9931cfdf84 Omaha #3361 reduce number of extraneous localization requests at GFE
startup

Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed

Former-commit-id: 0c397d2b7e [formerly 0c397d2b7e [formerly efa10ca2702ecee4535711be06373e5d079ac117]]
Former-commit-id: 5547ea1c7d
Former-commit-id: af08cc189f
2014-07-09 09:24:31 -05:00
Brian Clements
9a1bc8c521 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: 0d4cd4bab8 [formerly 0d4cd4bab8 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]
Former-commit-id: da53d9ccc7
Former-commit-id: e6e84d2c71
2014-07-07 12:29:12 -05:00
Richard Peter
b4e4629d24 Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: ba1bd20407 [formerly ba1bd20407 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 741fc59f34
2014-07-07 09:39:28 -05:00
Brian Clements
276dd801f2 Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e

Former-commit-id: bfd9f59de8 [formerly bfd9f59de8 [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]
Former-commit-id: e4c9a13adb
Former-commit-id: bd9520f4fe
2014-07-03 15:11:48 -05:00
Roger Ferrel
a7daeebc77 Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e

Former-commit-id: 02d9609862 [formerly 02d9609862 [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]
Former-commit-id: 1869745cce
Former-commit-id: 7f50b8fb93
2014-07-02 14:27:28 -05:00
Brian Clements
6dea5ec026 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

Former-commit-id: 013292ce9d [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]
Former-commit-id: 2773cf8935
Former-commit-id: 648ffac146
2014-07-02 14:20:10 -05:00
Richard Peter
a357fc835b Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 59325cf1f1 [formerly 59325cf1f1 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]
Former-commit-id: 27ba905947
Former-commit-id: 127ce13eb8
2014-07-02 11:51:26 -05:00
Nate Jensen
760adb2b77 Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: 324194117a [formerly 324194117a [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]
Former-commit-id: 14b514df2c
Former-commit-id: f39f6858e2
2014-07-02 11:20:26 -05:00
Nate Jensen
db9550e367 Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49

Former-commit-id: f6cbccdc5c [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]
Former-commit-id: 74e2bd1670
Former-commit-id: e9b31a4429
2014-07-02 11:18:59 -05:00
Brian Clements
d066846c3f Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: 8b5ad1ec33 [formerly 8b5ad1ec33 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]
Former-commit-id: eac871eed7
Former-commit-id: cd282ef018
2014-07-02 10:02:52 -05:00
Nate Jensen
d1d3aa94a6 Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372

Former-commit-id: a93af621d8 [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]
Former-commit-id: 765ac1258b
Former-commit-id: 264ac4d8a3
2014-07-02 10:01:05 -05:00
Nate Jensen
e659a0702d Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4

Former-commit-id: f10efa300c [formerly f10efa300c [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]
Former-commit-id: f32bf19eb7
Former-commit-id: 55dcecc7a7
2014-07-01 17:37:08 -05:00
Richard Peter
0fefdc7cd6 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: 93bbd98cbc [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 8ecc27f714
Former-commit-id: fc27824dbc
2014-07-01 15:34:39 -05:00
Steve Harris
d600ed9acf Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 1c8dc56d49 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]
Former-commit-id: 30cdbff7f8
Former-commit-id: 6f9129ac78
2014-07-01 13:38:18 -05:00
Nate Jensen
10dee29029 Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: c0d36e9a69 [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]
Former-commit-id: 1183c0538e
Former-commit-id: cb9e715aec
2014-07-01 10:30:54 -05:00
Nate Jensen
6f0d007112 Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: 0a9fc691b9 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]
Former-commit-id: fbda7c4489
Former-commit-id: 9e6433f44b
2014-07-01 10:22:25 -05:00
Steve Harris
71357da9d2 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: d4dc1723c1 [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: dcbab5621f
2014-07-01 11:08:46 -04:00
Richard Peter
e659b5a694 Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 6d9db0784a [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 3de8492ff3
2014-07-01 09:48:20 -05:00
Nate Jensen
a2ab4f6c76 Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 63bc6ed372 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]
Former-commit-id: fb84c94552
Former-commit-id: 01115d0ad0
2014-06-30 16:21:09 -05:00
Brian Clements
0be4260b4c Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 88ba6b47ad [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]
Former-commit-id: fc70dbc86e
Former-commit-id: 44f8b3dce1
2014-06-30 15:57:58 -05:00
Nate Jensen
635e902b80 Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: bca39f8b39 [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]
Former-commit-id: 48249301fc
Former-commit-id: 1d6912b4dd
2014-06-30 15:53:41 -05:00
Nate Jensen
345de597a6 Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: 766d3323d3 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]
Former-commit-id: 128950ec19
Former-commit-id: 2bf3449e00
2014-06-30 13:22:57 -05:00
Lee Venable
6046a2cbe1 Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 588d3084da [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]
Former-commit-id: 07a7a00256
Former-commit-id: c6e53f6a9b
2014-06-30 13:15:31 -05:00
Nate Jensen
c6c921279a Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 9fddc57142 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]
Former-commit-id: fdddf1e096
Former-commit-id: 1ac5c54ee3
2014-06-30 12:03:21 -05:00
Slav Korolev
a78f0ea765 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 1b870e21fc [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]
Former-commit-id: 1956077e1a
Former-commit-id: 0f5a2c0233
2014-06-30 09:40:32 -04:00
Richard Peter
25dd598b55 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 706409b459 [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]
Former-commit-id: f4cdd661fe
Former-commit-id: e3c3d55883
2014-06-27 16:52:39 -05:00
Richard Peter
8b8f6ff0fe Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: 48aceec348 [formerly 48aceec348 [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: b1810026c8
2014-06-27 16:51:36 -05:00
Brian Clements
0800ea7cb7 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: dc7a76197d [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]
Former-commit-id: fe149faffa
Former-commit-id: cb108f12b8
2014-06-27 16:33:27 -05:00
Brian Clements
c1bfab0914 Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: 741afe7d39 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]
Former-commit-id: 31a08efb61
Former-commit-id: ed2823daef
2014-06-27 15:33:11 -05:00
Slav Korolev
99fc9b951a Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: b72f146d95 [formerly b72f146d95 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 03890f03e3
2014-06-27 12:29:25 -04:00
Richard Peter
c5003ff6c4 Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6

Former-commit-id: 46f42687e2 [formerly 46f42687e2 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]
Former-commit-id: 56389ef395
Former-commit-id: 5112bbb8d5
2014-06-26 17:46:57 -05:00
Matt Nash
0bfa8347a4 Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540

Former-commit-id: 2be9c89722 [formerly 2be9c89722 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]
Former-commit-id: 58a9434254
Former-commit-id: a82e71702a
2014-06-26 17:30:22 -05:00
Nate Jensen
58791a046a Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 024bc29e10 [formerly 024bc29e10 [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]
Former-commit-id: 1f6df7f52f
Former-commit-id: 96a065399e
2014-06-26 15:26:21 -05:00
Nate Jensen
392ddd5ce0 Omaha #3236 thin client pref page supports proxy server as text or combo
field

Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0

Former-commit-id: f4c1691c8d [formerly f4c1691c8d [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]
Former-commit-id: 061482b015
Former-commit-id: 40a3c0a372
2014-06-26 15:06:38 -05:00
Slav Korolev
0a006483ae Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 900d5e8fbe [formerly 900d5e8fbe [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]
Former-commit-id: 79f2c0efc6
Former-commit-id: 3b9ed35eb0
2014-06-26 14:04:34 -04:00
Roger Ferrel
7fef8ed924 Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: bd2d40faee [formerly bd2d40faee [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]
Former-commit-id: ad6eac6e20
Former-commit-id: 801bdc8fc7
2014-06-26 11:16:09 -05:00
Nate Jensen
e5c63a67ac Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 589f74f6d8 [formerly 589f74f6d8 [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]
Former-commit-id: 49a592b19f
Former-commit-id: 2b3f7f02e5
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
05ad65e8a0 Omaha #3164 Disable compression on server error 500.
Former-commit-id: d7cdfa655d [formerly d7cdfa655d [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]
Former-commit-id: 120e9099e4
Former-commit-id: 8ea38a01a3
2014-06-25 11:13:39 -05:00
Nate Jensen
374fb4373e Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: 791ab4913c [formerly 791ab4913c [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: ce7812983a
2014-06-25 09:54:38 -05:00
Nate Jensen
5854347d2b Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a

Former-commit-id: 3b1c37dc38 [formerly 3b1c37dc38 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]]
Former-commit-id: 760b0cb584
Former-commit-id: a727313c41
2014-06-25 08:54:24 -05:00
Nate Jensen
c811adf70b Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: eacd31aa9b [formerly eacd31aa9b [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]
Former-commit-id: 425651652d
Former-commit-id: 3b288534e4
2014-06-25 08:32:25 -05:00
Steve Harris
766c6ca296 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: d9a3129339 [formerly d9a3129339 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]
Former-commit-id: 23d0cf81f8
Former-commit-id: f6f5c5a395
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
397f83b2da Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: e244664b7d [formerly e244664b7d [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]
Former-commit-id: 5c4f89644c
Former-commit-id: 4d22a3c58e
2014-06-24 18:16:09 -05:00
Brian Clements
f1a30bf16e Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd

Former-commit-id: 0f25ac3b5b [formerly 0f25ac3b5b [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]
Former-commit-id: 3b71bedd14
Former-commit-id: be3d47e5e9
2014-06-24 11:15:45 -05:00
Steve Harris
323c240f59 Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 89606076ec [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]
Former-commit-id: ddc6f2092a
Former-commit-id: 1f033d22e6
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
17e92d31bd Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: aaa146b2d0 [formerly aaa146b2d0 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]
Former-commit-id: 46b8688597
Former-commit-id: c184936340
2014-06-24 10:57:02 -05:00
Nate Jensen
4b343962dd Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
Former-commit-id: 2d98fb83fc [formerly 2d98fb83fc [formerly 83cd4ad4af6ac2f90a280fa1367ef88949870dc0]]
Former-commit-id: 476eda3585
Former-commit-id: fdc0dacf68
2014-06-23 17:45:11 -05:00
Ben Steffensmeier
a2119ef3a0 Omaha #3238 Implement Interrogatable in SatResource.
Former-commit-id: ca853f7e93 [formerly ca853f7e93 [formerly 698a2b174606c8425778f5672b613f2d74fb8997]]
Former-commit-id: 7fe130b6e2
Former-commit-id: 40041b4f7d
2014-06-23 17:21:43 -05:00