Commit graph

391 commits

Author SHA1 Message Date
Nate Jensen
20a63254e2 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 1902ab64c3ab11c41af906e5d78368689833561f]
Former-commit-id: b32a9e839e
2012-11-07 18:18:06 -06:00
Brad Gonzales
2a0b6ad151 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 3afbeecdaecfb9ab7cea7e59db688639dbdad972]
Former-commit-id: 577df6943e
2012-11-07 15:36:44 -06:00
Nate Jensen
904120bb43 Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
Former-commit-id: 433a79e689 [formerly bab65855839a69e29d90582e021d13ae439242ce]
Former-commit-id: 2cf2e79f34
2012-11-07 11:04:45 -06:00
Max Schenkelberg
f069f34a96 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 a9c7374d162296c170f7c1b80e1fb2978b854cfd]
Former-commit-id: 2f90120248
2012-11-07 10:44:42 -06:00
Richard Peter
ec86e24f71 Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
Former-commit-id: 67471e4453 [formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]
Former-commit-id: 51638344a8
2012-11-07 09:32:25 -06:00
Bryan Kowal
cae04523db Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

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

Former-commit-id: e3da5faf40 [formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]
Former-commit-id: 45b25ead66
2012-11-06 08:47:41 -06:00
Brad Gonzales
cbce70fd0b 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 51802e671ac15d451fec19262dfa7a352f0e4c09]
Former-commit-id: 6ddd1cbdb3
2012-11-06 07:31:19 -06:00
Ron Anderson
5edafa6c86 Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: 52007a3a00 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]
Former-commit-id: 257213e491
2012-11-05 17:33:06 -06:00
Nate Jensen
4ce1b0f752 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 cc63210970aecee47339eb1bb0d774ed1b5b7f2b]
Former-commit-id: 1c1da71b38
2012-11-05 16:32:54 -06:00
Richard Peter
bb475bdbf3 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 3d04fdb509db0a5d46e215bdc2595c07d15575b2]
Former-commit-id: 023bed9bcf
2012-11-05 15:19:04 -06:00
Richard Peter
04f3a7ee16 Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: d2e47212c6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]
Former-commit-id: 9d917020b6
2012-11-05 14:03:14 -06:00
David Gillingham
4237143dd0 Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: e0c7243c74 [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]
Former-commit-id: 11f109976e
2012-11-05 14:00:15 -06:00
Richard Peter
1b753fb500 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 33fea4ad289d7c8b11c01175f3ef2bc820cd26f7]
Former-commit-id: 0f38205cb1
2012-11-05 13:47:14 -06:00
Ben Steffensmeier
b04bca36d4 Issue #189 fix several Unknown Models
Former-commit-id: 365a2274dd [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]
Former-commit-id: 579d2e5ba6
2012-11-02 16:19:46 -05:00
David Gillingham
251f41414a Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

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

Former-commit-id: 5a51e70456 [formerly 51bbb17d43e7e458e75f3229ec1521ecc04517e9]
Former-commit-id: c311b0568e
2012-11-02 14:43:32 -05:00
Ron Anderson
9213fd4b2e 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 f8f82c6124063f4e7a65101fcf7a103297721f33]
Former-commit-id: fac083ce63
2012-11-02 12:14:27 -05:00
David Gillingham
a98e49351d 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 c6df2952d9d4d3a1ff635fcc3b7208193201d33f]
Former-commit-id: 927bae7c59
2012-11-02 11:10:08 -05:00
Richard Peter
8e215f3397 Issue #1257: Fix hdf5 purge
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95

Former-commit-id: 93697faeb1 [formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]
Former-commit-id: da5a8fc3d9
2012-11-02 11:06:27 -05:00
Ben Steffensmeier
9b6833e497 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 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]
Former-commit-id: a6ef4957d6
2012-11-02 10:37:42 -05:00
Ron Anderson
db17dcd548 Merge "Issue #189 fix gfe retrieval of static data" into development
Former-commit-id: df05080714 [formerly a43043963e91e682ff78f370445bbb3e9185456d]
Former-commit-id: a4e12e54a9
2012-11-01 18:33:12 -05:00
Ben Steffensmeier
2cb23de522 Issue #189 fix gfe retrieval of static data
Former-commit-id: 743b2b89e3 [formerly d08a637535547c0b037f3a50d86cc0c16ee0ad62]
Former-commit-id: a663497d5b
2012-11-01 18:30:05 -05:00
Ron Anderson
86aa15c3d6 Merge "Issue #1257: Address peer review comment and cleanup bufrmos." into development
Former-commit-id: 6f4b4624d0 [formerly f11a03f18fa7104b7d920dba8108a582a5f5c967]
Former-commit-id: dfc022c59c
2012-11-01 18:08:47 -05:00
Nate Jensen
18e03a8c57 Merge "Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum." into development
Former-commit-id: ada2d72a9c [formerly 32c1912eef76a513b79e6419ec90c9141dd56479]
Former-commit-id: 4fd1111b7b
2012-11-01 17:29:57 -05:00
Richard Peter
0620aac119 Merge "Issue #1302 Fixes for data delivery merge with development branch." into development
Former-commit-id: 34aeb3015c [formerly 070f9a24c317292b8069848635045364993d66b7]
Former-commit-id: 1b156820b6
2012-11-01 17:00:34 -05:00
Max Schenkelberg
47e684d0e8 Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum.
Change-Id: Iff5460327f799c69800672deb9481e4d65874a62

Former-commit-id: 9a7a8c0f9c [formerly 361a999d368e183513518e87bd350f3ff26ea8c0]
Former-commit-id: cbfdfa4818
2012-11-01 16:38:10 -05:00
Dustin Johnson
8d5c86f31e Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]
Former-commit-id: 2f28e19bf6
2012-11-01 16:31:14 -05:00
Richard Peter
4910120217 Issue #1257: Address peer review comment and cleanup bufrmos.
Change-Id: I37f4714a3b350924fd86c016dea7de8aff023def

Former-commit-id: 12323c1f4e [formerly 2fbcf67a963c3a174a5bd096e3dc11550cdff723]
Former-commit-id: ed20220923
2012-11-01 16:23:41 -05:00
Ben Steffensmeier
93bdc9d407 Issue #189 fix grib purge issues caused by new purge keys
Former-commit-id: 4a3e2f4f49 [formerly 0e7829283db36cb8f2226d626b4e211efa0a3e1f]
Former-commit-id: a64a5ba50e
2012-11-01 15:33:15 -05:00
Dustin Johnson
8e69107b5a Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Brad Gonzales
449e4a2182 Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]
Former-commit-id: 9137f334b5
2012-11-01 11:02:48 -05:00
Richard Peter
01e0819e71 Merge "Issue #1257: Update PurgeRules to not be hard linked to path keys" into development
Former-commit-id: 98a014aedd [formerly 3eb29df71d71820b5e9f62932874e48ac9849f7d]
Former-commit-id: cc8433e76a
2012-10-31 21:26:05 -05:00
Brad Gonzales
75e77feb58 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]
Former-commit-id: 68a3a98547
2012-10-31 21:20:40 -05:00
Richard Peter
5787d6278d Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]
Former-commit-id: 275398778f
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
272e057bf1 merge branch Unifeid_Grid into developement
Former-commit-id: b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]
Former-commit-id: d0a2ed32b5
2012-10-30 12:24:54 -05:00
Bryan Kowal
943b2b0606 Relocating projects due to the dependencies of com.raytheon.uf.edex.esb.camel
Former-commit-id: 10c8013cc3 [formerly e451f4b49d393b595ec0314970ffae8834a67425]
Former-commit-id: 37777f32ea
2012-10-29 17:26:56 -05:00
Steve Harris
340ce53e22 Merge branch 'ss_builds' into development
Former-commit-id: afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]
Former-commit-id: fb46bb053d
2012-10-29 12:17:12 -05:00
Steve Harris
565756567f 12.11.1-12 baseline
Former-commit-id: 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]
Former-commit-id: 8682e4f6ca
2012-10-29 12:15:56 -05:00
Brad Gonzales
d26119c383 Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]
Former-commit-id: b2656df2f8
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
a08b468d48 Issue #189 update grid paths to resemble new grib paths
Former-commit-id: 7b03228e5c [formerly 7347ff2138ecbb3ac28a4f09a3e3a42d86f961d7]
Former-commit-id: 13cfc7c341
2012-10-25 18:03:48 -05:00
Ron Anderson
1767d945fc Issue #1260 Fix data loading from NetCDF databases.
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: ffc8f1567d [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]
Former-commit-id: 3874ac688b
2012-10-25 16:59:25 -05:00
Ben Steffensmeier
7734a983f5 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]
Former-commit-id: b7d61e7543
2012-10-25 16:17:54 -05:00
Richard Peter
936aaae5a4 Merge "Issue #1279 add some comments to the grid wrap chaecking code." into development
Former-commit-id: 6f441fc85e [formerly faf4edee48f169841eb5c1ab3b4ad4dc28f1f338]
Former-commit-id: 0152b058e5
2012-10-25 12:44:10 -05:00
Ben Steffensmeier
4f503d3a1e merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]
Former-commit-id: 6a9ff88b33
2012-10-25 12:22:11 -05:00
Nate Jensen
409da6ad67 Merge "Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run" into development
Former-commit-id: 73bc74d3d5 [formerly e032f584ec1caa3c9c973d554123678f828791a7]
Former-commit-id: c70d361f2d
2012-10-24 15:27:56 -05:00
Steve Harris
af3161539a Merge branch 'ss_builds' (12.11.1-10) into development
Former-commit-id: 1b2cb0db6c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]
Former-commit-id: e8e3ef530c
2012-10-24 15:15:14 -05:00
Steve Harris
63dddc5f5f 12.11.1-10 baseline
Former-commit-id: 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]
Former-commit-id: e845c605e6
2012-10-24 15:13:57 -05:00
Ron Anderson
bd5537e63d Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run
Change-Id: Ie9bfc66b5cba7639155944765701833ffa788660

Former-commit-id: e0b809db9f [formerly f00655f5c5fb53af0682313e5054124a459b9649]
Former-commit-id: e226e41852
2012-10-24 14:11:30 -05:00