xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6236 commits 31 branches 40 tags 3.8 GiB
Commit graph

6236 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nate Jensen
bd46c43240 Omaha #3165 fix grib logging imports 
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: 12665e265f8490101099f96a84240b478e6f5a5f
 2014-07-03 11:07:41 -05: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
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
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
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
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
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
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
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
Nate Jensen
098322ded4 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: af116a40bfc5f96ac5be8f638d02ad85ad19e454
 2014-06-30 12:04:21 -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
Nate Jensen
ef92f03f06 Merge "Omaha #2760 Made external JMS route for registry events Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6" into omaha_14.4.1 
Former-commit-id: a3364fed45ee7b5872565ba0c5a1c645d416b4c9
 2014-06-30 11:04:55 -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
Richard Peter
363206fea0 Merge "Omaha #3319 switched capture to only dump live objects" into omaha_14.4.1 
Former-commit-id: f75593cb09fe67ca48feb7ac0e67aa2b13221d79
 2014-06-27 16:01:06 -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
Brian Clements
92a510fcb8 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: 54157c12af81c4e217d3ade436bc0b3723964cac
 2014-06-27 12:47:17 -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
Brian Clements
f217240f5c Omaha #3214 excluded total lightning data from text distribution 
Change-Id: I9ab3676be7dfae30c60f43eaec58baae32b37d76

Former-commit-id: 360d6b0d35cdc824b7cfa64c4140eb4af55a0696
 2014-06-27 10:46:48 -05:00
Dave Hladky
5556e447e6 Omaha #2760 Made external JMS route for registry events 
Change-Id: I8ff1af48468896dadd41bdcf8a6e6e7bc24c9eb6

Former-commit-id: 22e51bc1f882c535c7bafcdfd84428700eb6e547
 2014-06-27 10:04:17 -05: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
Matt Nash
983c2c71e0 Omaha #3170 get accum value from multiple times if they are requested in FFMP geometry factory 
Change-Id: Ia7759a942ec078ec5ce72b6c0007629e263d8a4a

Former-commit-id: 2f027b86244a3080a62c02cc816dcdca59e4538f
 2014-06-26 17:26:06 -05:00