Brian Clements
e4c85f7cd5
Omaha #3373 jaxb manager refactor
...
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb
2014-07-16 09:00:59 -05:00
Steve Harris
05de3fbe54
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3
2014-07-14 12:08:09 -05:00
Nate Jensen
2531649c55
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
...
Former-commit-id: 97a0d0d8be7dd87e472dc0422a68df94d43095e1
2014-07-14 11:15:01 -05:00
Brian Clements
7e70fbda27
Omaha #3371 all subprocesses now killed when cave.sh is killed
...
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: e4becce5325aad266fd93548d27e5e122b145011
2014-07-14 08:05:18 -05:00
Richard Peter
0222a89cd4
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
...
Former-commit-id: 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e
2014-07-11 17:46:14 -05:00
Brian Clements
a50f1e8e70
Omaha #3333 added grid lightning to cave
...
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: 33736a713a2c360e70f5a06972a7a21937f2b34c
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
d110e8428b
Omaha #3379 Removing DWR
...
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
2014-07-11 11:56:44 -05:00
Brian Clements
871a8655c8
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: e89daec94625b33f20fc6a9106a63202f4bc7075
2014-07-10 16:31:11 -05:00
Brian Clements
994226e82b
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: 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393
2014-07-09 14:13:47 -05:00
Nate Jensen
0c397d2b7e
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: efa10ca2702ecee4535711be06373e5d079ac117
2014-07-09 09:24:31 -05:00
Brian Clements
572d95e78a
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 2e701ade395cb2ec81d86af714fad825e146dc25
2014-07-07 15:13:28 -05:00
Brian Clements
0d4cd4bab8
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: 5ee2e28b8eb94174c7fce660cccc4a77345617a4
2014-07-07 12:29:12 -05:00
Richard Peter
ba1bd20407
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 3bbe66d8fe2faacc90c695822b61ffad9de0041f
2014-07-07 09:39:28 -05:00
Richard Peter
42ec8874c8
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: 6d960e34632c2f615720c0550296d38feb8c90f6
2014-07-07 09:30:09 -05:00
Ron Anderson
8d50f9d15a
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: 1e9e5abc477785c5b8cda9dd214da7de83532b9f
2014-07-07 09:02:14 -05:00
Roger Ferrel
6305bfdcb6
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 29cc43c5f9b43a51b24b702f04f0a62fab1bd356
2014-07-07 08:52:50 -05:00
Brian Clements
bfd9f59de8
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4
2014-07-03 15:11:48 -05:00
Roger Ferrel
02d9609862
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: a8346a3ffd677f916c14e0ed3589e4e582cb57b5
2014-07-02 14:27:28 -05:00
Brian Clements
013292ce9d
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c
2014-07-02 14:20:10 -05:00
Richard Peter
59325cf1f1
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6
2014-07-02 11:51:26 -05:00
Nate Jensen
324194117a
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: 1a934dbd4fc637cec948f25e3a34a2f874ed0b83
2014-07-02 11:20:26 -05:00
Nate Jensen
f6cbccdc5c
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 5c498bb7c3bf986cba9f150058406238e64d9b65
2014-07-02 11:18:59 -05:00
Brian Clements
8b5ad1ec33
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 87ed36851c390058ab4c92977ecc552cab869d26
2014-07-02 10:02:52 -05:00
Nate Jensen
a93af621d8
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 4f092220cb779c96660ec92509b9720b66c3d4a3
2014-07-02 10:01:05 -05:00
Nate Jensen
f10efa300c
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: 4fedf54b9e2102268c873550da9c567edc2dd255
2014-07-01 17:37:08 -05:00
Richard Peter
93bbd98cbc
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: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
2014-07-01 15:34:39 -05:00
Steve Harris
1c8dc56d49
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: 382c772c196711d230395f34a04559c188880622
2014-07-01 13:38:18 -05:00
Nate Jensen
c0d36e9a69
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 3d0df846090261417f9c9b2e75cf6c439f9b979f
2014-07-01 10:30:54 -05:00
Nate Jensen
0a9fc691b9
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: 221f81f4368a6bbd69255a1a148e055d65a2c957
2014-07-01 10:22:25 -05:00
Steve Harris
d4dc1723c1
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: d25ab509cb53d559edbd520dd1e3c036166f2e29
2014-07-01 11:08:46 -04:00
Richard Peter
6d9db0784a
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
...
Former-commit-id: 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9
2014-07-01 09:48:20 -05:00
Nate Jensen
63bc6ed372
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
...
Former-commit-id: 933384a7ace268be2c267c7dd630dee6d1d42fd0
2014-06-30 16:21:09 -05:00
Brian Clements
88ba6b47ad
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: 4df0a485d285a920a53e812bec204683f5ff29f6
2014-06-30 15:57:58 -05:00
Nate Jensen
bca39f8b39
Omaha #3245 fix detection of correct ini file
...
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453
2014-06-30 15:53:41 -05:00
Nate Jensen
766d3323d3
Omaha #3165 remove deprecated buildColorMap()
...
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c
2014-06-30 13:22:57 -05:00
Lee Venable
588d3084da
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 3d267d269db54c12852b6b6e8c529d826fad1d90
2014-06-30 13:15:31 -05:00
Nate Jensen
9fddc57142
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
...
Former-commit-id: fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd
2014-06-30 12:03:21 -05:00
Slav Korolev
1b870e21fc
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
...
Former-commit-id: 5c5513637b7eb223572cc3425a3c1623cde84d90
2014-06-30 09:40:32 -04:00
Richard Peter
706409b459
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: f81ae068eca41eeae5d785668f4c1d7cf59ae9df
2014-06-27 16:52:39 -05:00
Richard Peter
48aceec348
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
...
Former-commit-id: d7a09b5baa955732e94a0d043fc24e6a9770b7f1
2014-06-27 16:51:36 -05:00
Brian Clements
dc7a76197d
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: e216af49d135ceeff5e6cd251c6742602230553c
2014-06-27 16:33:27 -05:00
Brian Clements
741afe7d39
Omaha #3281 made venue session views non-sticky (except for feed view)
...
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: e7f48359f00b2e91b39b7646da0f9f409f5d3805
2014-06-27 15:33:11 -05:00
Slav Korolev
b72f146d95
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
...
Former-commit-id: 834358236059cbabd11e89b2d43f7f1c621ce2e5
2014-06-27 12:29:25 -04:00
Richard Peter
46f42687e2
Omaha #3274 Tweak G1 Flags for Cave
...
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: e16fd779239a09735d6ea092058a39bc7263b2f1
2014-06-26 17:46:57 -05:00
Matt Nash
2be9c89722
Omaha #3303 make FFMPResource interrogatable
...
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: 848a7c7428a42fe164312363c4eb3e4080d90d66
2014-06-26 17:30:22 -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
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
Roger Ferrel
bd2d40faee
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: c6abaff91bc493c9a40e39a66afd2b2262697343
2014-06-26 11:16:09 -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
