Commit graph

6498 commits

Author SHA1 Message Date
Brian Clements
92be869624 Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc

Former-commit-id: 2773cf8935 [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]
Former-commit-id: 013292ce9d
Former-commit-id: fdec99abc5
2014-07-02 14:20:10 -05:00
Juliya Dynina
3cb8068313 Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 470d50b4e4 [formerly 244b2f5f3a [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]
Former-commit-id: 244b2f5f3a
Former-commit-id: 67580e73cd
2014-07-02 14:17:11 -05:00
Steve Harris
eaa91efeec Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 0ef8a057f9 [formerly 136af3f7e2 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]
Former-commit-id: 136af3f7e2
Former-commit-id: 9b7f820b06
2014-07-02 13:38:08 -05:00
Brian.Dyke
e68dd70904 Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: 658cf3dd56 [formerly d56843d0e8 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]
Former-commit-id: d56843d0e8
Former-commit-id: 0fc76ff807
2014-07-02 13:18:10 -04:00
Richard Peter
1c07ac97d1 Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 27ba905947 [formerly 59325cf1f1 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]
Former-commit-id: 59325cf1f1
Former-commit-id: 9c41b7c23e
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: 14b514df2c [formerly 324194117a [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]
Former-commit-id: 324194117a
Former-commit-id: e193fe4719
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: 74e2bd1670 [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]
Former-commit-id: f6cbccdc5c
Former-commit-id: 15d6ff7f79
2014-07-02 11:18:59 -05:00
steve.naples
e82b0ae895 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]
Former-commit-id: 66c3241bc4
Former-commit-id: 3d75da3db0
2014-07-02 15:30:48 +00:00
Brian Clements
6c381d53ed Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

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

Former-commit-id: 765ac1258b [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]
Former-commit-id: a93af621d8
Former-commit-id: 1373af3e55
2014-07-02 10:01:05 -05:00
Nate Jensen
2baedbf6b8 Issue #3337 disable logback packaging data in cave
Former-commit-id: 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]
Former-commit-id: c003d70168
Former-commit-id: 56363ffc4a
2014-07-02 09:24:15 -05:00
Steve Harris
070e025fb4 Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]
Former-commit-id: 483a69c58d
Former-commit-id: 4882158177
2014-07-01 18:05:43 -05:00
Nate Jensen
d873599954 Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4

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

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

Former-commit-id: a8c93f7783 [formerly cd3720035d [formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]]
Former-commit-id: cd3720035d
Former-commit-id: 69fab4d289
2014-07-01 15:33:30 -05:00
Brian.Dyke
505d2d7938 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f8759e2317 [formerly 3ed9e07c44 [formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]
Former-commit-id: 3ed9e07c44
Former-commit-id: 7b205d97ca
2014-07-01 15:41:10 -04:00
Steve Harris
6a7aeb3557 Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly 1c8dc56d49 [formerly 382c772c196711d230395f34a04559c188880622]]
Former-commit-id: 1c8dc56d49
Former-commit-id: f68e051938
2014-07-01 13:38:18 -05:00
Ron Anderson
319819d3a7 Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]
Former-commit-id: 2c5f910f90
Former-commit-id: c7a74ab5b1
2014-07-01 13:56:41 -04:00
Ron Anderson
1f056e7ab9 Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)

Former-commit-id: 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]
Former-commit-id: beee08c32b
Former-commit-id: 9818d9b485
2014-07-01 13:56:05 -04:00
Nate Jensen
71025bcc3d Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 1183c0538e [formerly c0d36e9a69 [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]
Former-commit-id: c0d36e9a69
Former-commit-id: 81ca7a9e9f
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: fbda7c4489 [formerly 0a9fc691b9 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]
Former-commit-id: 0a9fc691b9
Former-commit-id: ac0f0e2298
2014-07-01 10:22:25 -05:00
Greg Armendariz
80fd17a8c2 Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
Former-commit-id: 0688e9db1b [formerly 82fe8608e0 [formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]]
Former-commit-id: 82fe8608e0
Former-commit-id: 134f0e2e8b
2014-07-01 10:17:11 -05:00
Nate Jensen
049450c5a9 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 35e3626527 [formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]]
Former-commit-id: 35e3626527
Former-commit-id: 3b2dc2915e
2014-07-01 10:12:14 -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: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
2014-07-01 11:08:46 -04:00
Juliya Dynina
9fc999e435 Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]
Former-commit-id: b5e4bc1fdc
Former-commit-id: bf765525b7
2014-07-01 10:05:57 -05:00
Richard Peter
a15a86a911 Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
Former-commit-id: e7d0dd1e28 [formerly 027fff1de0 [formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]]
Former-commit-id: 027fff1de0
Former-commit-id: 838739ebbb
2014-07-01 10:02:57 -05: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: e6ac1b2ec8 [formerly 6d9db0784a [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]
Former-commit-id: 6d9db0784a
Former-commit-id: 20eeb493bb
2014-07-01 09:48:20 -05:00
Juliya Dynina
0959178a06 Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 3aeceabb7a [formerly 0fe04515ad [formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]
Former-commit-id: 0fe04515ad
Former-commit-id: 3ee22b685d
2014-07-01 09:01:55 -05:00
Nathan Bowler
7908a8a361 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 43f164e682 [formerly 2d389525e2897237a66eb145002a9ae8970c9993]]
Former-commit-id: 43f164e682
Former-commit-id: f3fc00fb32
2014-07-01 09:19:15 -04:00
Nate Jensen
0080d97655 Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: fb84c94552 [formerly 63bc6ed372 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]
Former-commit-id: 63bc6ed372
Former-commit-id: 03efa73bd7
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
2075f59d58 Omaha #3255 Updated Proxy classes to include all java proxy config settings
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79

Former-commit-id: 0dd6262862 [formerly 36ef9e7a1a [formerly 6cd596e6ed8826365d0faeab766601f98ece4fca]]
Former-commit-id: 36ef9e7a1a
Former-commit-id: 15b1fb71dd
2014-06-30 16:00:58 -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: fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]
Former-commit-id: 88ba6b47ad
Former-commit-id: 0125117d9c
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: 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]
Former-commit-id: bca39f8b39
Former-commit-id: d72b56b988
2014-06-30 15:53:41 -05:00
Sean.Webb
4aa35df7c7 ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: 0b29e66772 [formerly c24c2f1e3e [formerly add5d004eca457782f957a95262e880b91dfeeb1]]
Former-commit-id: c24c2f1e3e
Former-commit-id: 5288764393
2014-06-30 16:06:25 -04:00
Greg Armendariz
c8dcf22c40 Omaha #3299 - Remove project file and change build reference
Former-commit-id: 40ad6795df [formerly f4063c8162 [formerly c233ad285b9addca8a8be6074b1e2440896d2276]]
Former-commit-id: f4063c8162
Former-commit-id: 20f5ccf9f0
2014-06-30 14:49:24 -05:00
Nate Jensen
b7c6ab2386 Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed

Former-commit-id: 128950ec19 [formerly 766d3323d3 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]
Former-commit-id: 766d3323d3
Former-commit-id: a393ad429a
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: 07a7a00256 [formerly 588d3084da [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]
Former-commit-id: 588d3084da
Former-commit-id: 02037fc2df
2014-06-30 13:15:31 -05:00
Qinglu.Lin
660d1c9ff2 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]
Former-commit-id: 1200633cd2
Former-commit-id: 1180b31875
2014-06-30 13:09:15 -04:00
Nate Jensen
ab51c67540 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 098322ded4 [formerly af116a40bfc5f96ac5be8f638d02ad85ad19e454]]
Former-commit-id: 098322ded4
Former-commit-id: fff613478c
2014-06-30 12:04:21 -05:00
Nate Jensen
914683e8a5 Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: fdddf1e096 [formerly 9fddc57142 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]
Former-commit-id: 9fddc57142
Former-commit-id: 1137ef84fd
2014-06-30 12:03:21 -05:00
Nate Jensen
19a634f97c Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1
Former-commit-id: d6008fc401 [formerly ef92f03f06 [formerly a3364fed45ee7b5872565ba0c5a1c645d416b4c9]]
Former-commit-id: ef92f03f06
Former-commit-id: 5577128de2
2014-06-30 11:04:55 -05:00
Slav Korolev
64e9564de0 Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 1956077e1a [formerly 1b870e21fc [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]
Former-commit-id: 1b870e21fc
Former-commit-id: cd740de298
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: f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]
Former-commit-id: 706409b459
Former-commit-id: bcffac8875
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: cfb9e6d0ad [formerly 48aceec348 [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]
Former-commit-id: 48aceec348
Former-commit-id: cfdb8eebfc
2014-06-27 16:51:36 -05:00
Brian Clements
c2cd991296 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

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

Former-commit-id: 31a08efb61 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]
Former-commit-id: 741afe7d39
Former-commit-id: eb806a6bb3
2014-06-27 15:33:11 -05:00
David Friedman
5c62d368ea ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652

Former-commit-id: dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]
Former-commit-id: 18b3b61afc
Former-commit-id: c4967a96fb
2014-06-27 19:17:55 +00:00