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

6258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roger Ferrel
88aa28c46b Omaha #3344 Updated import for GRID_FILL_VALUE. 
Former-commit-id: d490bc82905d37ad284485d30a493c1fd7e3ed6f
 2014-07-14 17:01:32 -05:00
Steve Harris
4df5ae5a60 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: f352b47e1d930bfe2bc46f956c781375881e41f9
 2014-07-14 11:54:53 -05:00
Nate Jensen
9f58d2e08b Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1 
Former-commit-id: 97a0d0d8be7dd87e472dc0422a68df94d43095e1
 2014-07-14 11:15:01 -05:00
Brian Clements
ae5fa893a9 Omaha #3371 all subprocesses now killed when cave.sh is killed 
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: e4becce5325aad266fd93548d27e5e122b145011
 2014-07-14 08:05:18 -05:00
Richard Peter
1c40dc11ef Merge "Omaha #3379 Removing DWR" into omaha_14.4.1 
Former-commit-id: 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e
 2014-07-11 17:46:14 -05:00
Benjamin Phillippe
4e1d93abf8 Omaha #3379 Removing DWR 
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
 2014-07-11 11:56:44 -05:00
Brian Clements
d5506736df Omaha #3364 added jmap -heap to capture script 
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: 65c88529acfb31c408777337f456da5dce879146
 2014-07-11 10:20:48 -05:00
Richard Peter
98d7cbab0d Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1 
Former-commit-id: b5d7d388acb17911b4592182884ac8bfac687c4f
 2014-07-10 17:47:50 -05:00
Nate Jensen
f92d9eb817 Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1 
Former-commit-id: c114f3578804f9eb2fd130428bb327c968f0fbdf
 2014-07-10 17:02:48 -05:00
Nate Jensen
b267109497 Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1 
Former-commit-id: 599f7a6d2eff8723cbf515b14afefc270f42cdd0
 2014-07-10 16:32:02 -05:00
Brian Clements
0113e109d3 Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh 
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: e89daec94625b33f20fc6a9106a63202f4bc7075
 2014-07-10 16:31:11 -05:00
Roger Ferrel
9eaeb01624 Omaha #3318 Delta script for GEFS h5 file updates 
Former-commit-id: 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca
 2014-07-10 16:30:03 -05:00
Everett Kladstrup
febe13a241 Omaha #3165 update manifests for ll.netcdf rename 
Former-commit-id: 434ab5131e44d772d04c029833e2979fc19b6421
 2014-07-10 16:19:42 -05:00
Bryan Kowal
49ffec76ff 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: 146e5ebed335bf25cbae152eef1b0544e833f741
 2014-07-10 11:16:19 -05:00
Nate Jensen
eef97e7ec0 Omaha #3165 fix bad manifests 
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a

Former-commit-id: 4792e114d091b244b46d54b0846b8535583e4068
 2014-07-10 09:20:24 -05:00
Ron Anderson
468668e19b Issue #3146 Added check for duplicate smartInit. 
Added alertViz message for GFE site activation failure

Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004

Former-commit-id: eafc406ec75d5e1a1bbc93bb0b472a053922eb3a
 2014-07-09 16:42:43 -05:00
Brian Clements
ac8f861112 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: 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393
 2014-07-09 14:13:47 -05:00
Nate Jensen
2a18111bdc Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1 
Former-commit-id: 56263f9c5dbc38d838e8da5df252ba5043f846ab
 2014-07-09 09:47:07 -05:00
Nate Jensen
5547ea1c7d Omaha #3361 reduce number of extraneous localization requests at GFE 
startup

Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed

Former-commit-id: efa10ca2702ecee4535711be06373e5d079ac117
 2014-07-09 09:24:31 -05:00
Nate Jensen
b9b26f1b54 Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1 
Former-commit-id: a1a17c4757be0a60d6634384e5de1cbfd611096d
 2014-07-08 13:29:37 -05:00
Dave Hladky
a0d305355b Omaha #3357 Ingest JVM shouldn't pull in DPA beans 
Change-Id: I59d0cf13a7704499093b401328bda5867197c525

Former-commit-id: 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1
 2014-07-08 12:29:04 -05:00
Bryan Kowal
6a197f845d Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments. 
Former-commit-id: e0bb64fc5112a15d9d991eb8f39de42b541f4e54
 2014-07-08 09:31:21 -05:00
Brian Clements
da53d9ccc7 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: 5ee2e28b8eb94174c7fce660cccc4a77345617a4
 2014-07-07 12:29:12 -05:00
Richard Peter
8c17e9cef2 Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1 
Former-commit-id: 3bbe66d8fe2faacc90c695822b61ffad9de0041f
 2014-07-07 09:39:28 -05:00
Richard Peter
98d82de231 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
Brian Clements
e4c9a13adb 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
7960578e2c 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
063ccb25e6 Omaha #3165 fix grib logging imports 
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021

Former-commit-id: 12665e265f8490101099f96a84240b478e6f5a5f
 2014-07-03 11:07:41 -05:00
Roger Ferrel
1869745cce 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
2773cf8935 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
27ba905947 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
14b514df2c 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
74e2bd1670 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
eac871eed7 Omaha #1255 added collaboration specific color presets 
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: 87ed36851c390058ab4c92977ecc552cab869d26
 2014-07-02 10:02:52 -05:00
Nate Jensen
765ac1258b Omaha #3165 attempt to fix build 
Change-Id: I83354442493b532b711fc3febb4163428b89a372

Former-commit-id: 4f092220cb779c96660ec92509b9720b66c3d4a3
 2014-07-02 10:01:05 -05:00
Nate Jensen
f32bf19eb7 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
8dfa9696af 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
eacaf068a7 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
8ecc27f714 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
a8c93f7783 Omaha #3230 Recursive search for model files. 
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49

Former-commit-id: c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b
 2014-07-01 15:33:30 -05:00
Steve Harris
30cdbff7f8 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
1183c0538e 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
fbda7c4489 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
0688e9db1b 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
1d2ae81ff6 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
7acd9ab2dd 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
e7d0dd1e28 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
e6ac1b2ec8 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
6099815272 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
fb84c94552 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