Richard Peter
95efb81458
Merge "Issue #189 clean up unneeded references to grib." into development
...
Former-commit-id: 48e33e05e7b68a8d986fb68a8d986f42ce93afa8
2012-11-19 17:16:08 -06:00
Ben Steffensmeier
72792fd1b8
Issue #189 clean up unneeded references to grib.
...
Former-commit-id: 7e1463f3287226decbe27226decbe29dd5c8d545
2012-11-19 13:33:02 -06:00
Dustin Johnson
ea7537804c
Issue #1322 Move router registry to edex.xml
...
Amend:
Add requestRouterRegistry to viz Spring file.
Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864
Former-commit-id: a9d01486ed13b168345813b1683458dd82a472e5
2012-11-19 13:21:03 -06:00
Richard Peter
f95d3c99f8
Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development
...
Former-commit-id: 657c7a35c5b71c022247b71c022247ac10bd4c27
2012-11-19 12:14:16 -06:00
Dustin Johnson
8ec80021c2
Issue #1322 Fix ingestGrib modes.xml to include router spring file
...
Amend:
Add correct bean name.
Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349
Former-commit-id: 63db1ce6f8ea7e8ac946ea7e8ac9469cfb406675
2012-11-19 12:03:31 -06:00
Steve Harris
972bbe5676
Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
...
Former-commit-id: 63cdc329880d16c0c0df0d16c0c0df264dc4bc43
2012-11-16 15:35:47 -06:00
Dustin Johnson
22c930824c
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: 8a6be78eb087148a806187148a8061d1024d091c
2012-11-16 14:43:45 -06:00
Max Schenkelberg
8b497d5900
Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
...
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7
Former-commit-id: 71367ef5bb0daa22064b0daa22064b34c4ec44c3
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
27f6224e91
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 6b0ed3fa501a7560b8a31a7560b8a31082b1b51d
2012-11-16 12:25:00 -06:00
Max Schenkelberg
a40abfda65
Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
...
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737
Former-commit-id: f540f65fd7655f54b098655f54b098a472f5535b
2012-11-15 16:21:42 -06:00
Benjamin Phillippe
1fa596463d
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 5c31b34e125bf46d468d5bf46d468d44519995ee
2012-11-15 13:35:25 -06:00
Max Schenkelberg
61f0c0501b
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: 28e61c8285dcde9e8951dcde9e8951fe11e31bfb
2012-11-14 16:19:37 -06:00
Nate Jensen
c4cc7b638c
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: 31637efbbc49c207996349c20799630398aeaa5b
2012-11-14 16:09:00 -06:00
Dustin Johnson
069c8d4788
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 0d1d663f41bff32bbe58bff32bbe58d27bce13c2
2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135
12.12.1-4 baseline
...
Former-commit-id: 57578da52185130eb61185130eb611b91b7f0fae
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
233398088a
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 2d864c3b092c8f3f09ac2c8f3f09ac3d126b41e1
2012-11-14 12:22:53 -06:00
Dustin Johnson
f1cfa9a60d
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7c59f9ea417d9e7567bd7d9e7567bdafd9a767ea
2012-11-14 12:19:10 -06:00
Ron Anderson
31d37c7a8f
Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
...
Former-commit-id: 0fe91e0d9586c4a247cd86c4a247cd29559e851e
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
af2808c4f4
Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
...
Former-commit-id: 1b4236ccc55a1a6f2fdb5a1a6f2fdb6e6823d62d
2012-11-14 11:05:42 -06:00
Steve Harris
fb70b19b31
Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
...
Former-commit-id: 956e1a45daf5c87b04d6f5c87b04d6ac834c0ebb
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
2ca7447dee
Issue #1331 fix grib-request spring
...
Former-commit-id: c97223458eb128a3f3c5b128a3f3c523190381cd
2012-11-14 10:07:44 -06:00
Brad Gonzales
de29d9feba
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 1617341e2a4af27e092f4af27e092f782ffb92ea
2012-11-14 09:39:26 -06:00
Steve Harris
1ee8938748
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 00f3d51546448dd1c35f448dd1c35f8fc896f7d4
2012-11-13 17:28:50 -06:00
Steve Harris
48fa2a9106
12.12.1-3 baseline
...
Former-commit-id: b3b5e6d28fc999505fbac999505fbaa81c46987b
2012-11-13 17:27:04 -06:00
Steve Harris
7192b19284
12.12.1-2 baseline
...
Former-commit-id: 6868eb9b23a8560580f8a8560580f8ed809a02db
2012-11-13 17:14:24 -06:00
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: e8090e654b69fc030bb469fc030bb4ed4f88aa22
2012-11-13 16:00:19 -06:00
Mike Duff
24aa44a46d
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: e14b372f420e32ab85db0e32ab85db248db814c1
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: ff16f82b18c2631b5ba6c2631b5ba6b43634a58f
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: e51d86ce3a8a1f3a10a48a1f3a10a4254e88a70c
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: 00822a4f39d1099addc6d1099addc630c1802398
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: bf72e29752f255f65b3cf255f65b3cb24c9eb456
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: b5b472dee17d3f4790317d3f47903165441372df
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: c4f99aae63adf0fec9a2adf0fec9a2894998b95f
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: 693090cb36535c73051d535c73051d20e618eb4f
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: 7077a82458db28cc26aadb28cc26aa7f49c5fe04
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: fbed67a208e6b0751f5ce6b0751f5cf62cf2713d
2012-11-08 14:34:55 -06:00
Richard Peter
50ddeed8e6
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 675b1666fd7d8dfb9c017d8dfb9c0110138f3ae8
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: 2e9cdbe43e3450ca3cd33450ca3cd362e5aff255
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: 9784b563cfddaa681d8addaa681d8a1220f5167e
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: 01072652dc96cb1ecc7f96cb1ecc7fe3487942ac
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: 50f0c4c2261372c08cdc1372c08cdce72c2822ad
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: c80dbffad89aa4221fdf9aa4221fdf5f0b4286ba
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: 1dbeb22893064ef82d1e064ef82d1eefd3d3735a
2012-11-08 09:57:16 -06:00
Bryan Kowal
872c104321
Issue #1318 - fix first dat dependency issue.
...
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 88a5451ce1079fdb33a0079fdb33a0a4d6021e5f
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: 6b205399d4b32a9e839eb32a9e839e20a63254e2
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: 4c49c9116d577df6943e577df6943e2a0b6ad151
2012-11-07 15:36:44 -06:00
Steve Harris
8278cac143
12.12.1-1 baseline
...
Former-commit-id: e1498006c7e4bd20a515e4bd20a515c2839cc86d
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: 433a79e6892cf2e79f342cf2e79f34904120bb43
2012-11-07 11:04:45 -06:00
Ben Steffensmeier
690297bb4d
Issue #189 fix another Unknown Model
...
Former-commit-id: 64f59b94e4eaa7e420dfeaa7e420df643212a0ad
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: ca4177dd082f901202482f90120248f069f34a96
2012-11-07 10:44:42 -06:00
