Commit graph

6458 commits

Author SHA1 Message Date
Richard Peter
a50a5b1663 Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
Former-commit-id: 0312ae103ee4dedea47c9ede9bb5651629e5a5b9
2014-07-07 09:21:02 -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
Steve Harris
9886a6aa5f Merge branch 'omaha_14.4.1' into omaha_15.1.1
Former-commit-id: cdc44956b4cd8ee3415ffb83d0d652d7162541d5
2014-07-07 08:35:33 -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
Benjamin Phillippe
ba0472caad Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: b81d5e3de415fb08b83d76aafacfef2ca937115c
2014-07-03 12:53:22 -05:00
Nate Jensen
bd46c43240 Omaha #3165 fix grib logging imports
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: 12665e265f8490101099f96a84240b478e6f5a5f
2014-07-03 11:07:41 -05:00
David Friedman
a45fe1dad0 ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1

Former-commit-id: f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20
2014-07-03 13:58:24 +00:00
Bryan Kowal
38d2431518 Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.


Former-commit-id: 03364fb2cdde0b7d7f5456335c99bae433628711
2014-07-02 15:58:50 -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
Juliya Dynina
244b2f5f3a Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: d6ae0d12f104de38b8fa770e4576b96a32da360c
2014-07-02 14:17:11 -05:00
Steve Harris
136af3f7e2 Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: c88d3136dbadab41df5fbf37b4b7c821dfcd07d9
2014-07-02 13:38:08 -05:00
Brian.Dyke
d56843d0e8 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: 142e61e538fb094633933e5a2e1244441fc0106b
2014-07-02 13:18:10 -04: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
steve.naples
66c3241bc4 ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f

Former-commit-id: b9f868e0ced53987accf675bfe2ce1a1f4f34da1
2014-07-02 15:30:48 +00: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
c003d70168 Issue #3337 disable logback packaging data in cave
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
2014-07-02 09:24:15 -05:00
Steve Harris
483a69c58d 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: f947df2bf87c0df3e461be5c6dd72e13a0743f61
2014-07-01 18:05:43 -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
b8f2fddd95 Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
Former-commit-id: 956c4d9672e8706774d00f58e42b848c9917eb9f
2014-07-01 16:03:36 -05:00
Richard Peter
40c01d05d4 Omaha 3300 Fix merge issue in gfe-spring.xml
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea

Former-commit-id: 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe
2014-07-01 15:43:46 -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
Roger Ferrel
cd3720035d Omaha #3230 Recursive search for model files.
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49

Former-commit-id: c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b
2014-07-01 15:33:30 -05:00
Brian.Dyke
3ed9e07c44 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 625eefb5f53e292d947233c1cd0aa031e61ca9ea
2014-07-01 15:41:10 -04: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
Ron Anderson
2c5f910f90 Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)

Former-commit-id: a0384ccfb30a877f14893c6cfa62d92117c0bb87
2014-07-01 13:56:41 -04:00
Ron Anderson
beee08c32b 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: 49638ba1e9561dea7b318b7adc0f1ab9571170f5
2014-07-01 13:56:05 -04: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
Greg Armendariz
82fe8608e0 Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
Former-commit-id: e6a5ab99510887f28c4a98afaa28f122f814d5a5
2014-07-01 10:17:11 -05:00
Nate Jensen
35e3626527 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: 76fd0a563baa40722ce645d8019c40dbc42405b6
2014-07-01 10:12:14 -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
Juliya Dynina
b5e4bc1fdc Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb
2014-07-01 10:05:57 -05:00
Richard Peter
027fff1de0 Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
Former-commit-id: 33080d565ceb85a0a0945f7c0d6a81caaa715b62
2014-07-01 10:02:57 -05: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
Juliya Dynina
0fe04515ad Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 2260a05df61ec1dc21cc6619fcb48713368e3a46
2014-07-01 09:01:55 -05:00
Nathan Bowler
43f164e682 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: 2d389525e2897237a66eb145002a9ae8970c9993
2014-07-01 09:19:15 -04: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
Benjamin Phillippe
36ef9e7a1a Omaha #3255 Updated Proxy classes to include all java proxy config settings
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79

Former-commit-id: 6cd596e6ed8826365d0faeab766601f98ece4fca
2014-06-30 16:00:58 -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
Sean.Webb
c24c2f1e3e ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03

Former-commit-id: add5d004eca457782f957a95262e880b91dfeeb1
2014-06-30 16:06:25 -04:00
Greg Armendariz
f4063c8162 Omaha #3299 - Remove project file and change build reference
Former-commit-id: c233ad285b9addca8a8be6074b1e2440896d2276
2014-06-30 14:49:24 -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
Qinglu.Lin
1200633cd2 ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81

Former-commit-id: 4d50beaed59d785d923e357f8ce036f6625ce4b4
2014-06-30 13:09:15 -04:00