Commit graph

413 commits

Author SHA1 Message Date
Ben Steffensmeier
626f398224 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
2012-11-13 16:00:19 -06:00
Mike Duff
24aa44a46d Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: e14b372f42 [formerly 0e32ab85db [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: 0e32ab85db
Former-commit-id: 248db814c1
2012-11-13 11:44:02 -06:00
Nate Jensen
73636a68e9 Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: ff16f82b18 [formerly c2631b5ba6 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: c2631b5ba6
Former-commit-id: b43634a58f
2012-11-13 09:01:43 -06:00
Nate Jensen
35ea1b7773 Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: 8a1f3a10a4
Former-commit-id: 254e88a70c
2012-11-12 17:16:07 -06:00
Max Schenkelberg
1ed5f10230 Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: d1099addc6
Former-commit-id: 30c1802398
2012-11-12 16:46:21 -06:00
Nate Jensen
d7f7152e93 Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: bf72e29752 [formerly f255f65b3c [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: f255f65b3c
Former-commit-id: b24c9eb456
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
dfe697a59c Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: 7d3f479031
Former-commit-id: 65441372df
2012-11-12 15:15:49 -06:00
Ben Steffensmeier
f0add08709 Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: c4f99aae63 [formerly adf0fec9a2 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]
Former-commit-id: adf0fec9a2
Former-commit-id: 894998b95f
2012-11-09 13:36:49 -06:00
Ben Steffensmeier
a0f6c320cb Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 535c73051d
Former-commit-id: 20e618eb4f
2012-11-08 14:45:36 -06:00
Richard Peter
cd8c43078b Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: 7077a82458 [formerly db28cc26aa [formerly 1ad439769c601fe61365f015bc56da0442553be5]]
Former-commit-id: db28cc26aa
Former-commit-id: 7f49c5fe04
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
c17b92afc5 Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: e6b0751f5c
Former-commit-id: f62cf2713d
2012-11-08 14:34:55 -06:00
Richard Peter
50ddeed8e6 Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 675b1666fd [formerly 7d8dfb9c01 [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]
Former-commit-id: 7d8dfb9c01
Former-commit-id: 10138f3ae8
2012-11-08 13:43:37 -06:00
Richard Peter
fbe5195de2 Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: 2e9cdbe43e [formerly 3450ca3cd3 [formerly 6fce68b90116d30cf090db64032322916276136b]]
Former-commit-id: 3450ca3cd3
Former-commit-id: 62e5aff255
2012-11-08 13:30:27 -06:00
Dustin Johnson
67e02347b5 Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 9784b563cf [formerly ddaa681d8a [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: ddaa681d8a
Former-commit-id: 1220f5167e
2012-11-08 12:00:15 -06:00
Nate Jensen
00dcf33480 Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: 01072652dc [formerly 96cb1ecc7f [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 96cb1ecc7f
Former-commit-id: e3487942ac
2012-11-08 11:08:48 -06:00
Mike Duff
7398e4fd68 Issue #1317 - Update the stats config files
Issue #1317 - Peer review comments.

Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f

Former-commit-id: 50f0c4c226 [formerly 1372c08cdc [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]
Former-commit-id: 1372c08cdc
Former-commit-id: e72c2822ad
2012-11-08 10:15:41 -06:00
Max Schenkelberg
001d0710e7 Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b

Former-commit-id: c80dbffad8 [formerly 9aa4221fdf [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: 9aa4221fdf
Former-commit-id: 5f0b4286ba
2012-11-08 10:08:38 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
2012-11-08 09:57:16 -06:00
Bryan Kowal
872c104321 Issue #1318 - fix first dat dependency issue.
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78

Former-commit-id: 88a5451ce1 [formerly 079fdb33a0 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]]
Former-commit-id: 079fdb33a0
Former-commit-id: a4d6021e5f
2012-11-08 07:27:39 -06:00
Nate Jensen
b0bb920fde Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: b32a9e839e
Former-commit-id: 20a63254e2
2012-11-07 18:18:06 -06:00
Brad Gonzales
04d7e36077 Issue #1309 added units to Aggregate.java and AggregateRecord.java
Amend:
   Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
   Removed Unit from AggregateRecord.java.

Change-Id: If4f6fccb65c584055d68129874a398d6391155e7

Former-commit-id: 4c49c9116d [formerly 577df6943e [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]
Former-commit-id: 577df6943e
Former-commit-id: 2a0b6ad151
2012-11-07 15:36:44 -06:00
Steve Harris
8278cac143 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
2012-11-07 12:41:20 -06:00
Nate Jensen
1f4489d2b0 Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
Former-commit-id: 433a79e689 [formerly 2cf2e79f34 [formerly bab65855839a69e29d90582e021d13ae439242ce]]
Former-commit-id: 2cf2e79f34
Former-commit-id: 904120bb43
2012-11-07 11:04:45 -06:00
Ben Steffensmeier
690297bb4d Issue #189 fix another Unknown Model
Former-commit-id: 64f59b94e4 [formerly eaa7e420df [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]
Former-commit-id: eaa7e420df
Former-commit-id: 643212a0ad
2012-11-07 10:56:26 -06:00
Max Schenkelberg
94e64c9b0d Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
2012-11-07 10:44:42 -06:00
Richard Peter
aabb8e044f Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
Former-commit-id: 67471e4453 [formerly 51638344a8 [formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]]
Former-commit-id: 51638344a8
Former-commit-id: ec86e24f71
2012-11-07 09:32:25 -06:00
Ben Steffensmeier
f5dede12c7 Issue #189 add more comments to grib decoder.
Former-commit-id: 237a7ea992 [formerly 67db4ae4e4 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]
Former-commit-id: 67db4ae4e4
Former-commit-id: 397ebf02f6
2012-11-06 18:30:03 -06:00
Bryan Kowal
7ecbbdfdbb Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: 4fd43ee45c [formerly 9263a0ac57 [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]
Former-commit-id: 9263a0ac57
Former-commit-id: cae04523db
2012-11-06 16:13:26 -06:00
Richard Peter
76e97d7ab4 Issue #1257: Fix Tropical Test Tool
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b

Former-commit-id: e3da5faf40 [formerly 45b25ead66 [formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]
Former-commit-id: 45b25ead66
Former-commit-id: 449ad67f82
2012-11-06 08:47:41 -06:00
Brad Gonzales
7acf0f1874 Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
Amend:
   removed groupBy attribute "fileName"
   added LogLevel enum and attribute to Event.java.  Default level is DEBUG.

Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07

Former-commit-id: a4bc175653 [formerly 6ddd1cbdb3 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]
Former-commit-id: 6ddd1cbdb3
Former-commit-id: cbce70fd0b
2012-11-06 07:31:19 -06:00
Ron Anderson
ddc1ac018c Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: 52007a3a00 [formerly 257213e491 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]
Former-commit-id: 257213e491
Former-commit-id: 5edafa6c86
2012-11-05 17:33:06 -06:00
Nate Jensen
fe0e8aed85 Merge "Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"" into development
Former-commit-id: a6d062fb14 [formerly 1c1da71b38 [formerly cc63210970aecee47339eb1bb0d774ed1b5b7f2b]]
Former-commit-id: 1c1da71b38
Former-commit-id: 4ce1b0f752
2012-11-05 16:32:54 -06:00
Richard Peter
e04bb21d8f Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"
Change-Id: I984bb34f88ecda1e57ccac462acbced7240846a0

Former-commit-id: 170e205c88 [formerly 023bed9bcf [formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]
Former-commit-id: 023bed9bcf
Former-commit-id: bb475bdbf3
2012-11-05 15:19:04 -06:00
Richard Peter
80023b6c2e Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: d2e47212c6 [formerly 9d917020b6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]
Former-commit-id: 9d917020b6
Former-commit-id: 04f3a7ee16
2012-11-05 14:03:14 -06:00
David Gillingham
6cd39983d5 Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: e0c7243c74 [formerly 11f109976e [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]
Former-commit-id: 11f109976e
Former-commit-id: 4237143dd0
2012-11-05 14:00:15 -06:00
Richard Peter
ba5ba3bbd8 Merge "Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated." into development
Former-commit-id: bfe5dbf75c [formerly 0f38205cb1 [formerly 33fea4ad289d7c8b11c01175f3ef2bc820cd26f7]]
Former-commit-id: 0f38205cb1
Former-commit-id: 1b753fb500
2012-11-05 13:47:14 -06:00
Ben Steffensmeier
373f7b8d25 Issue #189 fix several Unknown Models
Former-commit-id: 365a2274dd [formerly 579d2e5ba6 [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]
Former-commit-id: 579d2e5ba6
Former-commit-id: b04bca36d4
2012-11-02 16:19:46 -05:00
David Gillingham
31b6703e75 Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

Former-commit-id: ec7a7c1373 [formerly 0f13b5d0b1 [formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]
Former-commit-id: 0f13b5d0b1
Former-commit-id: 251f41414a
2012-11-02 15:21:30 -05:00
Ron Anderson
2d771e6b29 Merge "Issue #1260 Added an extra grid cell around the slab to improve interpolation results." into development
Former-commit-id: aae03ce3f8 [formerly 7a1dc6af0c [formerly e65b1a378d8eff3df100953c800512b5f9c5c90f]]
Former-commit-id: 7a1dc6af0c
Former-commit-id: 2c6bbcafdd
2012-11-02 14:48:06 -05:00
Ron Anderson
479980293b Issue #1260 Added an extra grid cell around the slab to improve interpolation results.
Change-Id: I9ffaa42402aa4527946bcc973577bfc7b2232f57

Former-commit-id: 5a51e70456 [formerly c311b0568e [formerly 51bbb17d43e7e458e75f3229ec1521ecc04517e9]]
Former-commit-id: c311b0568e
Former-commit-id: 76d15a4749
2012-11-02 14:43:32 -05:00
Ron Anderson
3375e90ed4 Merge "Issue #1236: Add a flag to the textdb command that the automated hurricane tools can use that will force reading/writing from the practice textdb." into development
Former-commit-id: b5328a2ee3 [formerly fac083ce63 [formerly f8f82c6124063f4e7a65101fcf7a103297721f33]]
Former-commit-id: fac083ce63
Former-commit-id: 9213fd4b2e
2012-11-02 12:14:27 -05:00
David Gillingham
f79608ba9c Issue #1236: Add a flag to the textdb command that the automated hurricane tools can use that
will force reading/writing from the practice textdb.

Change-Id: I348fba095d203ac4439a611fca948ae52e2f10cc

Former-commit-id: 2dd0c2477f [formerly 927bae7c59 [formerly c6df2952d9d4d3a1ff635fcc3b7208193201d33f]]
Former-commit-id: 927bae7c59
Former-commit-id: a98e49351d
2012-11-02 11:10:08 -05:00
Richard Peter
33a0eb5bba Issue #1257: Fix hdf5 purge
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95

Former-commit-id: 93697faeb1 [formerly da5a8fc3d9 [formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]]
Former-commit-id: da5a8fc3d9
Former-commit-id: 8e215f3397
2012-11-02 11:06:27 -05:00
Ben Steffensmeier
4e728158c6 Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated.
Former-commit-id: c1c55fa7aa [formerly a6ef4957d6 [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]
Former-commit-id: a6ef4957d6
Former-commit-id: 9b6833e497
2012-11-02 10:37:42 -05:00
Ron Anderson
728bd6b64c Merge "Issue #189 fix gfe retrieval of static data" into development
Former-commit-id: df05080714 [formerly a4e12e54a9 [formerly a43043963e91e682ff78f370445bbb3e9185456d]]
Former-commit-id: a4e12e54a9
Former-commit-id: db17dcd548
2012-11-01 18:33:12 -05:00
Ben Steffensmeier
7e5589720a Issue #189 fix gfe retrieval of static data
Former-commit-id: 743b2b89e3 [formerly a663497d5b [formerly d08a637535547c0b037f3a50d86cc0c16ee0ad62]]
Former-commit-id: a663497d5b
Former-commit-id: 2cb23de522
2012-11-01 18:30:05 -05:00
Ron Anderson
4c84138536 Merge "Issue #1257: Address peer review comment and cleanup bufrmos." into development
Former-commit-id: 6f4b4624d0 [formerly dfc022c59c [formerly f11a03f18fa7104b7d920dba8108a582a5f5c967]]
Former-commit-id: dfc022c59c
Former-commit-id: 86aa15c3d6
2012-11-01 18:08:47 -05:00
Nate Jensen
479132da93 Merge "Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum." into development
Former-commit-id: ada2d72a9c [formerly 4fd1111b7b [formerly 32c1912eef76a513b79e6419ec90c9141dd56479]]
Former-commit-id: 4fd1111b7b
Former-commit-id: 18e03a8c57
2012-11-01 17:29:57 -05:00
Richard Peter
7b2d78ad02 Merge "Issue #1302 Fixes for data delivery merge with development branch." into development
Former-commit-id: 34aeb3015c [formerly 1b156820b6 [formerly 070f9a24c317292b8069848635045364993d66b7]]
Former-commit-id: 1b156820b6
Former-commit-id: 0620aac119
2012-11-01 17:00:34 -05:00
Max Schenkelberg
0628637360 Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum.
Change-Id: Iff5460327f799c69800672deb9481e4d65874a62

Former-commit-id: 9a7a8c0f9c [formerly cbfdfa4818 [formerly 361a999d368e183513518e87bd350f3ff26ea8c0]]
Former-commit-id: cbfdfa4818
Former-commit-id: 47e684d0e8
2012-11-01 16:38:10 -05:00