Steve Harris
005d453875
Merge branch 'omaha_15.1.1' into omaha_14.4.1
...
Former-commit-id: 5e04680687308246ac7b308246ac7b76d548cdc4
2014-07-16 13:21:53 -05:00
Benjamin Phillippe
c74f855d31
Omaha #3350 Added user/role authentication. Added XACML authorization
...
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: 6cb73e63a1cebfbebea6cebfbebea6d4997f5a90
2014-07-16 10:49:24 -05:00
Brian Clements
a3f91f92cc
Omaha #3373 jaxb manager refactor
...
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: e428f257cbe4c85f7cd5e4c85f7cd533684f3c97
2014-07-16 09:00:59 -05:00
Steve Harris
a46c22c588
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: a43ffbe05205de3fbe5405de3fbe54a893b9b08a
2014-07-14 12:08:09 -05:00
Nate Jensen
a67b7a3005
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
...
Former-commit-id: 9f58d2e08b2531649c552531649c55a55162c74b
2014-07-14 11:15:01 -05:00
Brian Clements
d6e181d301
Omaha #3371 all subprocesses now killed when cave.sh is killed
...
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: ae5fa893a97e70fbda277e70fbda270973e5ac41
2014-07-14 08:05:18 -05:00
Richard Peter
90d2108293
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
...
Former-commit-id: 1c40dc11ef0222a89cd40222a89cd488419fb8f3
2014-07-11 17:46:14 -05:00
Brian Clements
f969720868
Omaha #3333 added grid lightning to cave
...
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: 29fc7e7ec4a50f1e8e70a50f1e8e70555251982b
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
e613cb932e
Omaha #3379 Removing DWR
...
Former-commit-id: 4e1d93abf8d110e8428bd110e8428bcc9e9b427a
2014-07-11 11:56:44 -05:00
Brian Clements
ed03db05ea
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: 0113e109d3871a8655c8871a8655c8987d514fa3
2014-07-10 16:31:11 -05:00
Brian Clements
fc246aa082
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: ac8f861112994226e82b994226e82bdba1fb3fc1
2014-07-09 14:13:47 -05:00
Nate Jensen
93012a8b76
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: 5547ea1c7d0c397d2b7e0c397d2b7ec3bd61a2c0
2014-07-09 09:24:31 -05:00
Brian Clements
392b640b47
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: e4795f6a13572d95e78a572d95e78a91b136c2a0
2014-07-07 15:13:28 -05:00
Brian Clements
c024dd86a1
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: da53d9ccc70d4cd4bab80d4cd4bab8aeb093ad95
2014-07-07 12:29:12 -05:00
Richard Peter
1dca75e12d
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 8c17e9cef2ba1bd20407ba1bd204074219dbeec8
2014-07-07 09:39:28 -05:00
Richard Peter
c2deb63b76
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: 06a1d1555c42ec8874c842ec8874c84312c9c569
2014-07-07 09:30:09 -05:00
Ron Anderson
56389537c2
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: 24faa482338d50f9d15a8d50f9d15afd16321f82
2014-07-07 09:02:14 -05:00
Roger Ferrel
045cd846ec
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: f064f0d1026305bfdcb66305bfdcb61964c7c4f7
2014-07-07 08:52:50 -05:00
Brian Clements
aad63c257d
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: e4c9a13adbbfd9f59de8bfd9f59de8c3a25024ae
2014-07-03 15:11:48 -05:00
Roger Ferrel
b56fe77cbf
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 1869745cce02d960986202d96098622723c92167
2014-07-02 14:27:28 -05:00
Brian Clements
92be869624
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 2773cf8935013292ce9d013292ce9dfdec99abc5
2014-07-02 14:20:10 -05:00
Richard Peter
1c07ac97d1
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 27ba90594759325cf1f159325cf1f19c41b7c23e
2014-07-02 11:51:26 -05:00
Nate Jensen
0031f7adf5
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: 14b514df2c324194117a324194117ae193fe4719
2014-07-02 11:20:26 -05:00
Nate Jensen
a38a776ac6
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 74e2bd1670f6cbccdc5cf6cbccdc5c15d6ff7f79
2014-07-02 11:18:59 -05:00
Brian Clements
6c381d53ed
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: eac871eed78b5ad1ec338b5ad1ec3308724fefd7
2014-07-02 10:02:52 -05:00
Nate Jensen
6f28f24afa
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 765ac1258ba93af621d8a93af621d81373af3e55
2014-07-02 10:01:05 -05:00
Nate Jensen
d873599954
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: f32bf19eb7f10efa300cf10efa300ca16d8689e9
2014-07-01 17:37:08 -05:00
Richard Peter
ed38bf2372
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: 8ecc27f71493bbd98cbc93bbd98cbc6636b301e5
2014-07-01 15:34:39 -05:00
Steve Harris
6a7aeb3557
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: 30cdbff7f81c8dc56d491c8dc56d49f68e051938
2014-07-01 13:38:18 -05:00
Nate Jensen
71025bcc3d
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 1183c0538ec0d36e9a69c0d36e9a6981ca7a9e9f
2014-07-01 10:30:54 -05:00
Nate Jensen
479b22f6a1
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: fbda7c44890a9fc691b90a9fc691b9ac0f0e2298
2014-07-01 10:22:25 -05:00
Steve Harris
741dc31fcb
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: 7acd9ab2ddd4dc1723c1d4dc1723c12f2958df37
2014-07-01 11:08:46 -04:00
Richard Peter
1024035422
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
...
Former-commit-id: e6ac1b2ec86d9db0784a6d9db0784a20eeb493bb
2014-07-01 09:48:20 -05:00
Nate Jensen
0080d97655
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
...
Former-commit-id: fb84c9455263bc6ed37263bc6ed37203efa73bd7
2014-06-30 16:21:09 -05:00
Brian Clements
309900daab
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: fc70dbc86e88ba6b47ad88ba6b47ad0125117d9c
2014-06-30 15:57:58 -05:00
Nate Jensen
e9ffe3f2d6
Omaha #3245 fix detection of correct ini file
...
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: 48249301fcbca39f8b39bca39f8b39d72b56b988
2014-06-30 15:53:41 -05:00
Nate Jensen
b7c6ab2386
Omaha #3165 remove deprecated buildColorMap()
...
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: 128950ec19766d3323d3766d3323d3a393ad429a
2014-06-30 13:22:57 -05:00
Lee Venable
b3f0099029
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 07a7a00256588d3084da588d3084da02037fc2df
2014-06-30 13:15:31 -05:00
Nate Jensen
914683e8a5
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
...
Former-commit-id: fdddf1e0969fddc571429fddc571421137ef84fd
2014-06-30 12:03:21 -05:00
Slav Korolev
64e9564de0
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
...
Former-commit-id: 1956077e1a1b870e21fc1b870e21fccd740de298
2014-06-30 09:40:32 -04:00
Richard Peter
5a74a3cf99
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: f4cdd661fe706409b459706409b459bcffac8875
2014-06-27 16:52:39 -05:00
Richard Peter
90dd05664d
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
...
Former-commit-id: cfb9e6d0ad48aceec34848aceec348cfdb8eebfc
2014-06-27 16:51:36 -05:00
Brian Clements
c2cd991296
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: fe149faffadc7a76197ddc7a76197d023d1bde0b
2014-06-27 16:33:27 -05:00
Brian Clements
9425ad16a3
Omaha #3281 made venue session views non-sticky (except for feed view)
...
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 31a08efb61741afe7d39741afe7d39eb806a6bb3
2014-06-27 15:33:11 -05:00
Slav Korolev
0f048d2c0c
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
...
Former-commit-id: f6e8dedfa3b72f146d95b72f146d956e60afd8cf
2014-06-27 12:29:25 -04:00
Richard Peter
1a472d4b2e
Omaha #3274 Tweak G1 Flags for Cave
...
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 56389ef39546f42687e246f42687e26bc89f2420
2014-06-26 17:46:57 -05:00
Matt Nash
baf64e4a41
Omaha #3303 make FFMPResource interrogatable
...
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: 58a94342542be9c897222be9c897228f71be817f
2014-06-26 17:30:22 -05:00
Nate Jensen
8e716b3d95
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
...
Former-commit-id: 1f6df7f52f024bc29e10024bc29e1059ab35e889
2014-06-26 15:26:21 -05:00
Nate Jensen
6bb1046927
Omaha #3236 thin client pref page supports proxy server as text or combo
...
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 061482b015f4c1691c8df4c1691c8de5c3c32bcb
2014-06-26 15:06:38 -05:00
Slav Korolev
ec134c82d1
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 79f2c0efc6900d5e8fbe900d5e8fbe41e8e36b8d
2014-06-26 14:04:34 -04:00
