Richard Peter
dfa27ccab6
Merge "Issue #189 clean up unneeded references to grib." into development
...
Former-commit-id: b68a8d986f
[formerly b68a8d986f
[formerly 6cb68df37fd22b45abcaee309f9f364456905191]]
Former-commit-id: 48e33e05e7
Former-commit-id: 36ce487edc
2012-11-19 17:16:08 -06:00
Ben Steffensmeier
08df92cccd
Issue #189 clean up unneeded references to grib.
...
Former-commit-id: 7226decbe2
[formerly 7226decbe2
[formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]
Former-commit-id: 7e1463f328
Former-commit-id: 9b1b658f42
2012-11-19 13:33:02 -06:00
Dustin Johnson
f91817813d
Issue #1322 Move router registry to edex.xml
...
Amend:
Add requestRouterRegistry to viz Spring file.
Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864
Former-commit-id: 13b1683458
[formerly 13b1683458
[formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: a9d01486ed
Former-commit-id: 1bb69653af
2012-11-19 13:21:03 -06:00
Richard Peter
0fec5febc9
Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development
...
Former-commit-id: b71c022247
[formerly b71c022247
[formerly d846e934736d3e68f65620640ae2699dfb3c7530]]
Former-commit-id: 657c7a35c5
Former-commit-id: e2f026a6a8
2012-11-19 12:14:16 -06:00
Dustin Johnson
167e11671b
Issue #1322 Fix ingestGrib modes.xml to include router spring file
...
Amend:
Add correct bean name.
Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349
Former-commit-id: ea7e8ac946
[formerly ea7e8ac946
[formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 56ea981db7
2012-11-19 12:03:31 -06:00
Steve Harris
1173d7fd8e
Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development
...
Former-commit-id: 0d16c0c0df
[formerly 0d16c0c0df
[formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]
Former-commit-id: 63cdc32988
Former-commit-id: 91bc36fda3
2012-11-16 15:35:47 -06:00
Dustin Johnson
2afb19d76b
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: 87148a8061
[formerly 87148a8061
[formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 1d5714b994
2012-11-16 14:43:45 -06:00
Max Schenkelberg
755c64bfdc
Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
...
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7
Former-commit-id: 0daa22064b
[formerly 0daa22064b
[formerly a7386c6570455fe6f9175eaeae1225923124cce8]]
Former-commit-id: 71367ef5bb
Former-commit-id: 102c2dbaa1
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
13f8f28c2e
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 1a7560b8a3
[formerly 1a7560b8a3
[formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 2a0769d094
2012-11-16 12:25:00 -06:00
Max Schenkelberg
7ffce5cd45
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: 655f54b098
[formerly 655f54b098
[formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]
Former-commit-id: f540f65fd7
Former-commit-id: f1866b2e49
2012-11-15 16:21:42 -06:00
Benjamin Phillippe
688e19acc1
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 5bf46d468d
[formerly 5bf46d468d
[formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5c31b34e12
Former-commit-id: 6b1b73429b
2012-11-15 13:35:25 -06:00
Max Schenkelberg
429ddc7312
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: dcde9e8951
[formerly dcde9e8951
[formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: 28e61c8285
Former-commit-id: 2e20c3e799
2012-11-14 16:19:37 -06:00
Nate Jensen
25602f0183
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: 49c2079963
[formerly 49c2079963
[formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 31637efbbc
Former-commit-id: 8944e220f6
2012-11-14 16:09:00 -06:00
Dustin Johnson
ff33643234
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: bff32bbe58
[formerly bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
2012-11-14 14:41:57 -06:00
Steve Harris
493f335c0b
12.12.1-4 baseline
...
Former-commit-id: 85130eb611
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
84abe4fa4f
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 2c8f3f09ac
[formerly 2c8f3f09ac
[formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2d864c3b09
Former-commit-id: 91254adfd6
2012-11-14 12:22:53 -06:00
Dustin Johnson
3129d3bd3a
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7d9e7567bd
[formerly 7d9e7567bd
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7c59f9ea41
Former-commit-id: c0c60c2488
2012-11-14 12:19:10 -06:00
Ron Anderson
7a828a608c
Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
...
Former-commit-id: 86c4a247cd
[formerly 86c4a247cd
[formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 652c27918c
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
6093c7cf31
Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
...
Former-commit-id: 5a1a6f2fdb
[formerly 5a1a6f2fdb
[formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 159817f538
2012-11-14 11:05:42 -06:00
Steve Harris
71648c8d59
Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
...
Former-commit-id: f5c87b04d6
[formerly f5c87b04d6
[formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]
Former-commit-id: 956e1a45da
Former-commit-id: a5ca238e96
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
3736a94482
Issue #1331 fix grib-request spring
...
Former-commit-id: b128a3f3c5
[formerly b128a3f3c5
[formerly 3b4dda66b20f04915f406df814ca989350794ae7]]
Former-commit-id: c97223458e
Former-commit-id: 60743ec4b1
2012-11-14 10:07:44 -06:00
Brad Gonzales
dfc125236d
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 4af27e092f
[formerly 4af27e092f
[formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 1617341e2a
Former-commit-id: c024c94050
2012-11-14 09:39:26 -06:00
Steve Harris
59efd9a217
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
314495dc8e
12.12.1-3 baseline
...
Former-commit-id: c999505fba
[formerly c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
2012-11-13 17:27:04 -06:00
Steve Harris
96a4a4f3f5
12.12.1-2 baseline
...
Former-commit-id: a8560580f8
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
7761060a12
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: 69fc030bb4
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Mike Duff
4771bb25ac
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: 0e32ab85db
[formerly 0e32ab85db
[formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: e14b372f42
Former-commit-id: 363aa7bec6
2012-11-13 11:44:02 -06:00
Nate Jensen
61beb174fe
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: c2631b5ba6
[formerly c2631b5ba6
[formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: ff16f82b18
Former-commit-id: 14a139c813
2012-11-13 09:01:43 -06:00
Nate Jensen
d94afa6a55
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: 8a1f3a10a4
[formerly 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: e51d86ce3a
Former-commit-id: cf8fd9f731
2012-11-12 17:16:07 -06:00
Max Schenkelberg
9a13824af2
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: d1099addc6
[formerly d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Nate Jensen
5b837a1b13
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: f255f65b3c
[formerly f255f65b3c
[formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: bf72e29752
Former-commit-id: 78a1185b19
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
94d44ed440
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: 7d3f479031
[formerly 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: b5b472dee1
Former-commit-id: 220f41ec4c
2012-11-12 15:15:49 -06:00
Ben Steffensmeier
e2b7486803
Issue #1108 fix the order of arguments for grib 1 parameter mappings
...
Former-commit-id: adf0fec9a2
[formerly adf0fec9a2
[formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]
Former-commit-id: c4f99aae63
Former-commit-id: 87ec259477
2012-11-09 13:36:49 -06:00
Ben Steffensmeier
74d1381180
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 535c73051d
[formerly 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
2012-11-08 14:45:36 -06:00
Richard Peter
80862cd12e
Merge "Issue #189 add more comments to grib decoder." into development
...
Former-commit-id: db28cc26aa
[formerly db28cc26aa
[formerly 1ad439769c601fe61365f015bc56da0442553be5]]
Former-commit-id: 7077a82458
Former-commit-id: e1852956e2
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
40a07f8998
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: e6b0751f5c
[formerly e6b0751f5c
[formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: fbed67a208
Former-commit-id: 7c9341a3a6
2012-11-08 14:34:55 -06:00
Richard Peter
1ce242e9f0
Merge "Issue #189 fix another Unknown Model" into development
...
Former-commit-id: 7d8dfb9c01
[formerly 7d8dfb9c01
[formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]
Former-commit-id: 675b1666fd
Former-commit-id: ed90d0aa23
2012-11-08 13:43:37 -06:00
Richard Peter
e72818025a
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: 3450ca3cd3
[formerly 3450ca3cd3
[formerly 6fce68b90116d30cf090db64032322916276136b]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 4e0c207306
2012-11-08 13:30:27 -06:00
Dustin Johnson
cd392c40bf
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: ddaa681d8a
[formerly ddaa681d8a
[formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: 9784b563cf
Former-commit-id: 9bb53555a9
2012-11-08 12:00:15 -06:00
Nate Jensen
7430e8dbfe
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: 96cb1ecc7f
[formerly 96cb1ecc7f
[formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 01072652dc
Former-commit-id: 375c864d28
2012-11-08 11:08:48 -06:00
Mike Duff
a4574d22b1
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 1372c08cdc
[formerly 1372c08cdc
[formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]
Former-commit-id: 50f0c4c226
Former-commit-id: 688b7cce30
2012-11-08 10:15:41 -06:00
Max Schenkelberg
d7afa4376e
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: 9aa4221fdf
[formerly 9aa4221fdf
[formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: c80dbffad8
Former-commit-id: 0a410412db
2012-11-08 10:08:38 -06:00
Dustin Johnson
6613c51d3b
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: 064ef82d1e
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Bryan Kowal
1b19c0f3c0
Issue #1318 - fix first dat dependency issue.
...
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 079fdb33a0
[formerly 079fdb33a0
[formerly 0087827da79fedd354a227bad4e02aa76cebc684]]
Former-commit-id: 88a5451ce1
Former-commit-id: 4f36912786
2012-11-08 07:27:39 -06:00
Nate Jensen
01e11761d8
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: b32a9e839e
[formerly b32a9e839e
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
2012-11-07 18:18:06 -06:00
Brad Gonzales
c25fc27e89
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: 577df6943e
[formerly 577df6943e
[formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]
Former-commit-id: 4c49c9116d
Former-commit-id: b17893d7e0
2012-11-07 15:36:44 -06:00
Steve Harris
a5be98d6de
12.12.1-1 baseline
...
Former-commit-id: e4bd20a515
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
2012-11-07 12:41:20 -06:00
Nate Jensen
ed96e701d7
Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
...
Former-commit-id: 2cf2e79f34
[formerly 2cf2e79f34
[formerly bab65855839a69e29d90582e021d13ae439242ce]]
Former-commit-id: 433a79e689
Former-commit-id: b3ecd946ff
2012-11-07 11:04:45 -06:00
Ben Steffensmeier
babdbc9b38
Issue #189 fix another Unknown Model
...
Former-commit-id: eaa7e420df
[formerly eaa7e420df
[formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]
Former-commit-id: 64f59b94e4
Former-commit-id: 89efb7cf22
2012-11-07 10:56:26 -06:00
Max Schenkelberg
50625b0453
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: 2f90120248
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00