Commit graph

80 commits

Author SHA1 Message Date
Ben Steffensmeier
46f252319e Issue #1493 fix grib2 decoder to handle ensembles
Former-commit-id: 02e0433afc [formerly 7d155653bc] [formerly 02e0433afc [formerly 7d155653bc] [formerly 4595797f5f [formerly c694df943bb70f2903fe495400061444a67d3357]]]
Former-commit-id: 4595797f5f
Former-commit-id: e7969ff457 [formerly fb237583e2]
Former-commit-id: e8255e320d
2013-01-15 18:08:19 -06:00
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
2013-01-14 18:07:17 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
2013-01-14 18:42:21 -05:00
Richard Peter
ad6bd4ace8 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 5ec69e843e [formerly 89b08fdd2f] [formerly 5ec69e843e [formerly 89b08fdd2f] [formerly 8192515b06 [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]
Former-commit-id: 8192515b06
Former-commit-id: 9154383e5a [formerly 0b57b16cda]
Former-commit-id: a1517b8daa
2013-01-14 17:34:17 -06:00
Richard Peter
e59ea72456 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 1a1a69d38c [formerly 970216e4c9] [formerly 1a1a69d38c [formerly 970216e4c9] [formerly 19d923f387 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: f1262388ce [formerly 8ccc791566]
Former-commit-id: 2575e4e4ea
2013-01-14 16:53:05 -06:00
Ben Steffensmeier
e65ba73968 Issue #1482 ignore malformed gribModel files
Former-commit-id: fadf4d58cf [formerly 685c09de47] [formerly fadf4d58cf [formerly 685c09de47] [formerly 9cfa09e507 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]
Former-commit-id: 9cfa09e507
Former-commit-id: 80e307c96e [formerly 8fdfc14c29]
Former-commit-id: cc70fe7a41
2013-01-14 15:10:56 -06:00
Ben Steffensmeier
30a076a1b7 Issue #1438 do not log grib ingest
Former-commit-id: b7b5f2e22f [formerly 1c5f61bf33] [formerly b7b5f2e22f [formerly 1c5f61bf33] [formerly 36ce3e2df9 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]]
Former-commit-id: 36ce3e2df9
Former-commit-id: cc9922a697 [formerly 0c675d3deb]
Former-commit-id: 6b8ee10c24
2013-01-08 15:50:47 -06:00
Ben Steffensmeier
a8077ca1c3 Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: 15c7614ffe [formerly 4ca0f320cc] [formerly 15c7614ffe [formerly 4ca0f320cc] [formerly ecbbc823f1 [formerly 77868132755b799810c9a01888fcec06798070fb]]]
Former-commit-id: ecbbc823f1
Former-commit-id: b9980a0f77 [formerly 777a1d93bb]
Former-commit-id: 1a1c6d7efa
2013-01-08 10:32:50 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Ben Steffensmeier
27bd5ba7b8 Issue #1450 apply opposite scanning before flipping in grib decoder
Former-commit-id: 03f9d510fe [formerly 6a8066f3d4] [formerly 03f9d510fe [formerly 6a8066f3d4] [formerly a3bfb8a14e [formerly ce2095697f1f00656bf6b778e565d708ddc6a29c]]]
Former-commit-id: a3bfb8a14e
Former-commit-id: 0102bdc392 [formerly e1bc52b1d8]
Former-commit-id: 1c472994ef
2013-01-03 11:44:13 -06:00
Ben Steffensmeier
f62c7fde9b Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: b312bce5ad [formerly 521924904a] [formerly b312bce5ad [formerly 521924904a] [formerly fe0a8b60c6 [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: ca4e39df79 [formerly c6032b1950]
Former-commit-id: 7d19f5e38f
2012-12-19 11:26:40 -06:00
Richard Peter
9b15f27832 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 3d4fb31161 [formerly 513dd75a23] [formerly 3d4fb31161 [formerly 513dd75a23] [formerly 08919e73c3 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]
Former-commit-id: 08919e73c3
Former-commit-id: e2007e61e1 [formerly f7859723e5]
Former-commit-id: bf19dcd216
2012-12-13 11:02:07 -06:00
Ben Steffensmeier
9c9170d0e4 Issue #1356 add javadoc to subgrid changes.
Former-commit-id: c44dad8a5c [formerly 6da5ac2873] [formerly c44dad8a5c [formerly 6da5ac2873] [formerly 7e6d6fa794 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]]
Former-commit-id: 7e6d6fa794
Former-commit-id: 5d87636fb2 [formerly 47cb87096a]
Former-commit-id: 77e3f5ea79
2012-12-11 17:40:28 -06:00
Ben Steffensmeier
0da60e90b9 Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: dd560f4d15 [formerly c3e1005dc8] [formerly dd560f4d15 [formerly c3e1005dc8] [formerly a7a13d27cd [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]]
Former-commit-id: a7a13d27cd
Former-commit-id: ddcb3e675d [formerly 64922c17c5]
Former-commit-id: 9eba37d4fb
2012-12-11 16:00:03 -06:00
Steve Harris
868acb808b Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a [formerly 113fdcb679]
Former-commit-id: db24093e42
2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4 Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Richard Peter
d3b4ae2fdb Issue #1394: Reduce GFE Grid Database calls
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd

Former-commit-id: ac41861f0b [formerly 3c3c695f24] [formerly ac41861f0b [formerly 3c3c695f24] [formerly 0670ac79fa [formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]]]
Former-commit-id: 0670ac79fa
Former-commit-id: 912b2ec928 [formerly 0cdb86b6ac]
Former-commit-id: 9e837ef99c
2012-12-10 11:59:54 -06:00
Dave Hladky
c8037a5575 Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d

Former-commit-id: 20bbdee95d [formerly e34b9a8862] [formerly 20bbdee95d [formerly e34b9a8862] [formerly 92e8877af4 [formerly 039fdaacc80f5158240de028541ba6688fa1d468]]]
Former-commit-id: 92e8877af4
Former-commit-id: bd878d58d0 [formerly b5689bac66]
Former-commit-id: 1299130f80
2012-12-06 16:06:14 -06:00
David Gillingham
751611bfe8 Issue #1310: Resolve model name conflicts in NCEP grid models XML file.
Change-Id: I7252e7daa2810ad7ffccca9edd2817df79922458

Former-commit-id: 50ca58d08f [formerly dc98529991] [formerly 50ca58d08f [formerly dc98529991] [formerly effbc7cd1a [formerly 32f70ffe880e64bb062016f537a5efd81f814fb7]]]
Former-commit-id: effbc7cd1a
Former-commit-id: 352f8f12e7 [formerly ebb7411ee8]
Former-commit-id: 949a5cbb91
2012-12-06 13:50:52 -06:00
Steve Harris
a10d7d3041 12.12.1-10 baseline
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: 8a41d325d2 [formerly 0c67cb78a3]
Former-commit-id: 8ada406bfe
2012-12-06 09:12:15 -06:00
Steve Harris
0b22b3c014 12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
2012-12-06 09:02:51 -06:00
Ben Steffensmeier
dede328be5 Issue #1331 fix grib-request spring
Former-commit-id: 23190381cd [formerly b128a3f3c5] [formerly 23190381cd [formerly b128a3f3c5] [formerly c97223458e [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]]
Former-commit-id: c97223458e
Former-commit-id: 7590451249 [formerly 60743ec4b1]
Former-commit-id: 3736a94482
2012-11-14 10:07:44 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
7058ebec23 12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
9f2f2591ee 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: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
923731a717 Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: 894998b95f [formerly adf0fec9a2] [formerly 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]]
Former-commit-id: c4f99aae63
Former-commit-id: 5ee5347fc0 [formerly 87ec259477]
Former-commit-id: e2b7486803
2012-11-09 13:36:49 -06:00
Ben Steffensmeier
2223e6ff64 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

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

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
2012-11-08 14:45:36 -06:00
Richard Peter
19a98b3fad Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: 7f49c5fe04 [formerly db28cc26aa] [formerly 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]
Former-commit-id: 7077a82458
Former-commit-id: fa6141c745 [formerly e1852956e2]
Former-commit-id: 80862cd12e
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
35b855635f Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]
Former-commit-id: fbed67a208
Former-commit-id: d75b59622a [formerly 7c9341a3a6]
Former-commit-id: 40a07f8998
2012-11-08 14:34:55 -06:00
Richard Peter
decf129e94 Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 10138f3ae8 [formerly 7d8dfb9c01] [formerly 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]
Former-commit-id: 675b1666fd
Former-commit-id: e7151070ee [formerly ed90d0aa23]
Former-commit-id: 1ce242e9f0
2012-11-08 13:43:37 -06:00
Dustin Johnson
b4a13190ad 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: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
69f07fd7f0 Issue #189 fix another Unknown Model
Former-commit-id: 643212a0ad [formerly eaa7e420df] [formerly 643212a0ad [formerly eaa7e420df] [formerly 64f59b94e4 [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]]
Former-commit-id: 64f59b94e4
Former-commit-id: ac8cd2ef9a [formerly 89efb7cf22]
Former-commit-id: babdbc9b38
2012-11-07 10:56:26 -06:00
Ben Steffensmeier
34be09b488 Issue #189 add more comments to grib decoder.
Former-commit-id: 397ebf02f6 [formerly 67db4ae4e4] [formerly 397ebf02f6 [formerly 67db4ae4e4] [formerly 237a7ea992 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]]
Former-commit-id: 237a7ea992
Former-commit-id: 929df097c0 [formerly d57e097e3d]
Former-commit-id: bc633552fe
2012-11-06 18:30:03 -06:00
Ron Anderson
3bf08b29e5 Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: 5edafa6c86 [formerly 257213e491] [formerly 5edafa6c86 [formerly 257213e491] [formerly 52007a3a00 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]]
Former-commit-id: 52007a3a00
Former-commit-id: 80ef14539e [formerly 1855cb195b]
Former-commit-id: 9614307971
2012-11-05 17:33:06 -06:00
Richard Peter
5d008d4078 Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: 04f3a7ee16 [formerly 9d917020b6] [formerly 04f3a7ee16 [formerly 9d917020b6] [formerly d2e47212c6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]]
Former-commit-id: d2e47212c6
Former-commit-id: 365cd1ad33 [formerly 199fbdac90]
Former-commit-id: 092f0b47e5
2012-11-05 14:03:14 -06:00
David Gillingham
7ee48aad3b Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: 4237143dd0 [formerly 11f109976e] [formerly 4237143dd0 [formerly 11f109976e] [formerly e0c7243c74 [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]]
Former-commit-id: e0c7243c74
Former-commit-id: d6bbcbe863 [formerly 73c592ccdc]
Former-commit-id: 80049b2214
2012-11-05 14:00:15 -06:00
Ben Steffensmeier
6f54171cfb Issue #189 fix several Unknown Models
Former-commit-id: b04bca36d4 [formerly 579d2e5ba6] [formerly b04bca36d4 [formerly 579d2e5ba6] [formerly 365a2274dd [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]]
Former-commit-id: 365a2274dd
Former-commit-id: 19caacc7b6 [formerly fa29bdf8c0]
Former-commit-id: 2dd884765f
2012-11-02 16:19:46 -05:00
Ben Steffensmeier
a097e0f5cd Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated.
Former-commit-id: 9b6833e497 [formerly a6ef4957d6] [formerly 9b6833e497 [formerly a6ef4957d6] [formerly c1c55fa7aa [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]]
Former-commit-id: c1c55fa7aa
Former-commit-id: 11bd701e0a [formerly e4b81a6829]
Former-commit-id: 0e69ab3385
2012-11-02 10:37:42 -05:00
Dustin Johnson
931d94d1de 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: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Richard Peter
7df04375f1 Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 5787d6278d [formerly 275398778f] [formerly 5787d6278d [formerly 275398778f] [formerly 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]]]
Former-commit-id: 886375172b
Former-commit-id: 998278caf7 [formerly bd1d87363a]
Former-commit-id: 940d986f6d
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
1931b503a2 merge branch Unifeid_Grid into developement
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220 [formerly 92fd247ccc]
Former-commit-id: 38b0dafe0b
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
86562637f0 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
2012-10-25 12:22:11 -05:00
Steve Harris
9c597c7060 12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
2012-10-18 15:53:01 -05:00
Steve Harris
13cdd55545 12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70 [formerly e31c1e5bba]
Former-commit-id: dff8d5de9c
2012-10-18 15:46:42 -05:00
Richard Peter
0986063c20 Issue #1257: Revert radar file name changes. Change grib path to just be by master level name.
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26

Former-commit-id: 36c53a2cc8 [formerly 85eb3b7598] [formerly 36c53a2cc8 [formerly 85eb3b7598] [formerly 72acca2422 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]]
Former-commit-id: 72acca2422
Former-commit-id: cfcef0a7b1 [formerly 8cb830c1c6]
Former-commit-id: efdd09b5d6
2012-10-17 13:22:00 -05:00
Steve Harris
35e34308c5 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Richard Peter
fce0aee1b7 Issue #1257: Update grib path keys to include hdf5 layout. Turn on TcpNoDelay
Change-Id: I296d0d4b1c204a325c499b3aeb1f9d7f16de0c9b

Former-commit-id: e32d77c87f [formerly 68ac1abca4] [formerly e32d77c87f [formerly 68ac1abca4] [formerly c5e3b54caa [formerly 29b54f75013685f1bcd9ed3129c9ba3ddf629395]]]
Former-commit-id: c5e3b54caa
Former-commit-id: 19797b9064 [formerly a80db469b2]
Former-commit-id: 3ef8bbab2f
2012-10-15 20:15:39 -05:00
Richard Peter
61892fee88 Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: 12bcfbda80 [formerly ca0c9b7502] [formerly 12bcfbda80 [formerly ca0c9b7502] [formerly bcb0560291 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]
Former-commit-id: bcb0560291
Former-commit-id: 46870808e0 [formerly ce85c8e1a6]
Former-commit-id: 881582885c
2012-10-15 09:52:14 -05:00