Commit graph

6231 commits

Author SHA1 Message Date
Benjamin Phillippe
c6c2f9240e Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]
Former-commit-id: ba0472caad
2014-07-03 12:53:22 -05:00
Nate Jensen
e101d99ba2 Omaha #3165 fix grib logging imports
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: 063ccb25e6 [formerly 12665e265f8490101099f96a84240b478e6f5a5f]
Former-commit-id: bd46c43240
2014-07-03 11:07:41 -05:00
Brian Clements
fdec99abc5 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

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

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

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

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

Former-commit-id: f32bf19eb7 [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]
Former-commit-id: f10efa300c
2014-07-01 17:37:08 -05:00
Richard Peter
57ec1df5a5 Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
Former-commit-id: 8dfa9696af [formerly 956c4d9672e8706774d00f58e42b848c9917eb9f]
Former-commit-id: b8f2fddd95
2014-07-01 16:03:36 -05:00
Richard Peter
b38dd722be Omaha 3300 Fix merge issue in gfe-spring.xml
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea

Former-commit-id: eacaf068a7 [formerly 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe]
Former-commit-id: 40c01d05d4
2014-07-01 15:43:46 -05:00
Richard Peter
6636b301e5 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: 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]
Former-commit-id: 93bbd98cbc
2014-07-01 15:34:39 -05:00
Roger Ferrel
69fab4d289 Omaha #3230 Recursive search for model files.
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49

Former-commit-id: a8c93f7783 [formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]
Former-commit-id: cd3720035d
2014-07-01 15:33:30 -05:00
Steve Harris
f68e051938 Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]
Former-commit-id: 1c8dc56d49
2014-07-01 13:38:18 -05:00
Nate Jensen
81ca7a9e9f Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 1183c0538e [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]
Former-commit-id: c0d36e9a69
2014-07-01 10:30:54 -05:00
Nate Jensen
ac0f0e2298 Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: fbda7c4489 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]
Former-commit-id: 0a9fc691b9
2014-07-01 10:22:25 -05:00
Greg Armendariz
134f0e2e8b Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
Former-commit-id: 0688e9db1b [formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]
Former-commit-id: 82fe8608e0
2014-07-01 10:17:11 -05:00
Nate Jensen
3b2dc2915e Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
Former-commit-id: 1d2ae81ff6 [formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]
Former-commit-id: 35e3626527
2014-07-01 10:12:14 -05:00
Steve Harris
2f2958df37 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: 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]
Former-commit-id: d4dc1723c1
2014-07-01 11:08:46 -04:00
Richard Peter
838739ebbb Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
Former-commit-id: e7d0dd1e28 [formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]
Former-commit-id: 027fff1de0
2014-07-01 10:02:57 -05:00
Richard Peter
20eeb493bb Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: e6ac1b2ec8 [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]
Former-commit-id: 6d9db0784a
2014-07-01 09:48:20 -05:00
Nathan Bowler
f3fc00fb32 Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317

Former-commit-id: 6099815272 [formerly 2d389525e2897237a66eb145002a9ae8970c9993]
Former-commit-id: 43f164e682
2014-07-01 09:19:15 -04:00
Nate Jensen
03efa73bd7 Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: fb84c94552 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]
Former-commit-id: 63bc6ed372
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
15b1fb71dd Omaha #3255 Updated Proxy classes to include all java proxy config settings
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79

Former-commit-id: 0dd6262862 [formerly 6cd596e6ed8826365d0faeab766601f98ece4fca]
Former-commit-id: 36ef9e7a1a
2014-06-30 16:00:58 -05:00
Brian Clements
0125117d9c 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: fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]
Former-commit-id: 88ba6b47ad
2014-06-30 15:57:58 -05:00
Nate Jensen
d72b56b988 Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7

Former-commit-id: 48249301fc [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]
Former-commit-id: bca39f8b39
2014-06-30 15:53:41 -05:00
Greg Armendariz
20f5ccf9f0 Omaha #3299 - Remove project file and change build reference
Former-commit-id: 40ad6795df [formerly c233ad285b9addca8a8be6074b1e2440896d2276]
Former-commit-id: f4063c8162
2014-06-30 14:49:24 -05:00
Nate Jensen
a393ad429a Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: 128950ec19 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]
Former-commit-id: 766d3323d3
2014-06-30 13:22:57 -05:00
Lee Venable
02037fc2df Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 07a7a00256 [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]
Former-commit-id: 588d3084da
2014-06-30 13:15:31 -05:00
Nate Jensen
fff613478c Merge "Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory" into omaha_14.4.1
Former-commit-id: daacd735e7 [formerly af116a40bfc5f96ac5be8f638d02ad85ad19e454]
Former-commit-id: 098322ded4
2014-06-30 12:04:21 -05:00
Nate Jensen
1137ef84fd Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: fdddf1e096 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]
Former-commit-id: 9fddc57142
2014-06-30 12:03:21 -05:00
Nate Jensen
5577128de2 Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
Former-commit-id: d6008fc401 [formerly a3364fed45ee7b5872565ba0c5a1c645d416b4c9]
Former-commit-id: ef92f03f06
2014-06-30 11:04:55 -05:00
Slav Korolev
cd740de298 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 1956077e1a [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]
Former-commit-id: 1b870e21fc
2014-06-30 09:40:32 -04:00
Richard Peter
bcffac8875 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]
Former-commit-id: 706409b459
2014-06-27 16:52:39 -05:00
Richard Peter
cfdb8eebfc Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: cfb9e6d0ad [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]
Former-commit-id: 48aceec348
2014-06-27 16:51:36 -05:00
Brian Clements
023d1bde0b Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: fe149faffa [formerly e216af49d135ceeff5e6cd251c6742602230553c]
Former-commit-id: dc7a76197d
2014-06-27 16:33:27 -05:00
Richard Peter
88bde6f690 Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1
Former-commit-id: 52210230db [formerly f75593cb09fe67ca48feb7ac0e67aa2b13221d79]
Former-commit-id: 363206fea0
2014-06-27 16:01:06 -05:00
Brian Clements
eb806a6bb3 Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]
Former-commit-id: 741afe7d39
2014-06-27 15:33:11 -05:00
Brian Clements
312f74a200 Omaha #3319 switched capture to only dump live objects
work around for java 1.7 G1 garbage collector jmap problem

Change-Id: I5dd8db5d2d98baacaa03a3b60d1d9c5cb350fc2d

Former-commit-id: fe6b3ff4b3 [formerly 54157c12af81c4e217d3ade436bc0b3723964cac]
Former-commit-id: 92a510fcb8
2014-06-27 12:47:17 -05:00
Slav Korolev
6e60afd8cf Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: f6e8dedfa3 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]
Former-commit-id: b72f146d95
2014-06-27 12:29:25 -04:00
Brian Clements
0d8668c6b9 Omaha #3214 excluded total lightning data from text distribution
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76

Former-commit-id: 362e8d543f [formerly 360d6b0d35cdc824b7cfa64c4140eb4af55a0696]
Former-commit-id: f217240f5c
2014-06-27 10:46:48 -05:00
Dave Hladky
445ddc86a5 Omaha #2760 Made external JMS route for registry events
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6

Former-commit-id: 0d1767a3d7 [formerly 22e51bc1f882c535c7bafcdfd84428700eb6e547]
Former-commit-id: 5556e447e6
2014-06-27 10:04:17 -05:00
Richard Peter
6bc89f2420 Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6

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

Former-commit-id: 58a9434254 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]
Former-commit-id: 2be9c89722
2014-06-26 17:30:22 -05:00
Matt Nash
52f70f50f6 Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a

Former-commit-id: f31bf67cca [formerly 2f027b86244a3080a62c02cc816dcdca59e4538f]
Former-commit-id: 983c2c71e0
2014-06-26 17:26:06 -05:00
Nate Jensen
b73b65af0e Merge "Omaha #3096 fix DataTime to match the Python version" into omaha_14.4.1
Former-commit-id: 37b42c05cb [formerly 8ba50134638d4687cc654220e683e916eb0cea4b]
Former-commit-id: 4ed4ed2e28
2014-06-26 16:47:39 -05:00
Nate Jensen
59ab35e889 Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 1f6df7f52f [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]
Former-commit-id: 024bc29e10
2014-06-26 15:26:21 -05:00
Matt Nash
91720a1420 Omaha #3096 fix DataTime to match the Python version
Former-commit-id: 407ac96c93 [formerly d7e4329d0d9decf946b463bf40c64f4e968c871f]
Former-commit-id: e32adf1ee4
2014-06-26 15:12:39 -05:00
Nate Jensen
e5c3c32bcb Omaha #3236 thin client pref page supports proxy server as text or combo
field

Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0

Former-commit-id: 061482b015 [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]
Former-commit-id: f4c1691c8d
2014-06-26 15:06:38 -05:00
Slav Korolev
41e8e36b8d Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 79f2c0efc6 [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]
Former-commit-id: 900d5e8fbe
2014-06-26 14:04:34 -04:00