Commit graph

543 commits

Author SHA1 Message Date
Richard Peter
97cc1997ec Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery
Former-commit-id: 312b786d02 [formerly 276fee1b70] [formerly 312b786d02 [formerly 276fee1b70] [formerly b98ed1f8e7 [formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]]
Former-commit-id: b98ed1f8e7
Former-commit-id: e4651df11e [formerly 6d3159ea80]
Former-commit-id: 6f9c3c3074
2013-01-16 12:41:32 -06:00
Dustin Johnson
4ab214c5d7 Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: c12b46027f [formerly b627dfc054] [formerly c12b46027f [formerly b627dfc054] [formerly 19d3a14d4f [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: ecb1d5564a [formerly c750e27389]
Former-commit-id: 19558ae3fa
2013-01-16 12:21:11 -06:00
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
90d7ef6fc3 Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
Former-commit-id: e8a4939150 [formerly 09fb2d0919] [formerly e8a4939150 [formerly 09fb2d0919] [formerly 0e684515c6 [formerly 8388122d8273aca20a9c4292035049957a091a69]]]
Former-commit-id: 0e684515c6
Former-commit-id: cb3f43b17a [formerly 8258395d58]
Former-commit-id: 81bfd386a2
2013-01-15 16:11:35 -06:00
Dave Hladky
50d1017f46 Issue #1489 Harvester directories not created causing harvester to not start
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

Former-commit-id: 34577b50dd [formerly 9b75eaf869] [formerly 34577b50dd [formerly 9b75eaf869] [formerly b6bf73134e [formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]
Former-commit-id: b6bf73134e
Former-commit-id: fa9dc500a3 [formerly ccf832dd38]
Former-commit-id: d1c940cd8e
2013-01-15 12:41:15 -06:00
Dustin Johnson
1070de3f2d Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 99f8d40bed [formerly 3d74a68e94] [formerly 99f8d40bed [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: 94e95f3e07 [formerly aa7acedf0a]
Former-commit-id: 5cd31fc0b7
2013-01-15 10:18:14 -06:00
Steve Harris
846ac28155 Issue #1408 - Fix syntax errors in server config
Former-commit-id: 9a3be4460e [formerly aee6a65e4c] [formerly 9a3be4460e [formerly aee6a65e4c] [formerly a5eac8ec3c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: e202452ace [formerly 31f190865e]
Former-commit-id: 72f3894768
2013-01-15 09:47:25 -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
Richard Peter
ff672cac47 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: d2cc93281a [formerly 59368e93e1] [formerly d2cc93281a [formerly 59368e93e1] [formerly 4176d078a7 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: ea7d2eaff1 [formerly 2049e40d87]
Former-commit-id: 57e68e7872
2013-01-14 17:49:29 -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
ef2dc06b69 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.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
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7 [formerly aa9e16b038]
Former-commit-id: 096134d917
2013-01-14 17:38:38 -06:00
Richard Peter
c7f02b18c5 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: a8495324f7 [formerly de7d7b07ef] [formerly a8495324f7 [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 997ab69bf0 [formerly 94eea3065b]
Former-commit-id: bdc637110a
2013-01-14 17:34:31 -06: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
Dave Hladky
64c293c460 Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: 65cfb39ba5 [formerly 30733d3b25] [formerly 65cfb39ba5 [formerly 30733d3b25] [formerly c9160ac945 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: e746688671 [formerly c5f71be70a]
Former-commit-id: 936d0f143d
2013-01-14 11:38:45 -06:00
Steve Harris
92f1e9416c 13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349 [formerly 3caf592e83]
Former-commit-id: 066c14dcd2
2013-01-11 16:19:07 -05:00
Steve Harris
1ef10eaf2c 13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b]
Former-commit-id: 775a338b90
2013-01-11 16:12:09 -05:00
Richard Peter
d72901c86c Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 71d8907b6e [formerly 8df96c2a14] [formerly 71d8907b6e [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly f65462361c68b9757493f673463c731d0ded9dba]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: 74092ae046 [formerly 90ec121020]
Former-commit-id: da60306633
2013-01-11 12:53:37 -06:00
Dustin Johnson
b462fe0286 Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

Former-commit-id: 08911772bf [formerly 7d10c7fac5] [formerly 08911772bf [formerly 7d10c7fac5] [formerly f44a2f6ea9 [formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: 5e4a1b7bd9 [formerly bd8dbc39e7]
Former-commit-id: 69c42d3e72
2013-01-11 12:39:00 -06:00
Richard Peter
87b4521a69 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: 58242a600c [formerly 32e5d79e7a] [formerly 58242a600c [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: cf815a4c72 [formerly d3df89181f]
Former-commit-id: a9f01d5846
2013-01-11 12:37:05 -06:00
Dustin Johnson
ef31fc45a9 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: 3e1878c5f9 [formerly 7716f1baa9] [formerly 3e1878c5f9 [formerly 7716f1baa9] [formerly c4068d27bf [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: a4414d409a [formerly 0b3f803f6c]
Former-commit-id: 9b3cf3308f
2013-01-11 12:23:15 -06:00
Dave Hladky
b5ea7aaff8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: 440de708df [formerly 5cf3eee426] [formerly 440de708df [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]
Former-commit-id: 002ac2eb41
Former-commit-id: fe486b4889 [formerly 5312e82b4b]
Former-commit-id: a51f8f449b
2013-01-11 11:59:36 -06:00
Dustin Johnson
f269969791 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: 8473eb60fb [formerly 4ae1a9645c] [formerly 8473eb60fb [formerly 4ae1a9645c] [formerly 446f65776e [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 7bf029eb7e [formerly 64ececeda1]
Former-commit-id: 6fb6bc8f87
2013-01-11 11:53:02 -06:00
Richard Peter
8286fb0351 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: f9e89ee518 [formerly d36faee34e] [formerly f9e89ee518 [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: e23ffee8bd [formerly 7e4a0f1377]
Former-commit-id: f7b8b095cc
2013-01-11 11:03:42 -06:00
Dustin Johnson
9f2c0db712 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 6cc28be958 [formerly ede32c8d3e] [formerly 6cc28be958 [formerly ede32c8d3e] [formerly f316320b06 [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]
Former-commit-id: f316320b06
Former-commit-id: f274ce63e9 [formerly 35409872a6]
Former-commit-id: adc46ddeef
2013-01-11 08:56:39 -06:00
Richard Peter
4552b5f71a Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 45e6e286bb [formerly deca70207d] [formerly 45e6e286bb [formerly deca70207d] [formerly 73263e270e [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 4a097586f6 [formerly 69818573a6]
Former-commit-id: 49da28ead4
2013-01-10 17:17:58 -06:00
Richard Peter
c8c4f68603 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 206ffc0e15 [formerly 507a3d641c] [formerly 206ffc0e15 [formerly 507a3d641c] [formerly c0e712f682 [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]
Former-commit-id: c0e712f682
Former-commit-id: 9524f5a52b [formerly 9543d23d23]
Former-commit-id: 6dbbf56c1d
2013-01-10 10:51:28 -06:00
Richard Peter
a9a245dfe2 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: e1547982b0 [formerly ee6513bad3] [formerly e1547982b0 [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: 27a06e14b8 [formerly 46faa0f68d]
Former-commit-id: 58a28b4193
2013-01-10 10:18:39 -06:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Dustin Johnson
d4d1a95461 Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: bad7b754e5 [formerly b7ed75896b] [formerly bad7b754e5 [formerly b7ed75896b] [formerly a354bac4da [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]
Former-commit-id: a354bac4da
Former-commit-id: 424a70dbfe [formerly 0d5bb5ba95]
Former-commit-id: 09a33ab8ac
2013-01-09 15:40:36 -06:00
Mike Duff
660064ea6a Issue #1420 - Rules Peer review comments
Former-commit-id: f41d525fa3 [formerly 4c63333a96] [formerly f41d525fa3 [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: ed95eae2e3 [formerly 67486aa43b]
Former-commit-id: 8313877a3a
2013-01-09 12:02:21 -06:00
Richard Peter
300868ac56 Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: fe14e7eeba [formerly 3386fee25a] [formerly fe14e7eeba [formerly 3386fee25a] [formerly 6e54eea341 [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]]
Former-commit-id: 6e54eea341
Former-commit-id: 54bce1bbd0 [formerly a840a6bed4]
Former-commit-id: ff7d27a295
2013-01-08 16:47:24 -06:00
Richard Peter
d9f19bfc7b Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: dc57c5a282 [formerly fd4d8f2407] [formerly dc57c5a282 [formerly fd4d8f2407] [formerly dcbda78944 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]]
Former-commit-id: dcbda78944
Former-commit-id: fdc4ebb5b5 [formerly 605c8dfe77]
Former-commit-id: 13ff9f1cb1
2013-01-08 16:44: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
01d205d179 Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: d5c6061ffc [formerly 0659a127ff] [formerly d5c6061ffc [formerly 0659a127ff] [formerly 8421469229 [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]]
Former-commit-id: 8421469229
Former-commit-id: b911356a64 [formerly 79474382d2]
Former-commit-id: a99267dd11
2013-01-08 12:56:46 -06:00
Dustin Johnson
b24ddaeb4e Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 1975cd0442 [formerly 6a90779214] [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: 885f315d30 [formerly 492cee4992]
Former-commit-id: b1c159fc7f
2013-01-08 12:44:29 -06:00
Ron Anderson
deeb9ab71b Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: dc156f69c4 [formerly 61700b2f37] [formerly dc156f69c4 [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 0a585a9498 [formerly 5e9f24b527]
Former-commit-id: 693548c7d2
2013-01-08 10:36:19 -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
Nate Jensen
b56796d0ac Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: 42b24aa97f [formerly 27a96cf383] [formerly 42b24aa97f [formerly 27a96cf383] [formerly f77cf10fea [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]]
Former-commit-id: f77cf10fea
Former-commit-id: efb750cc67 [formerly f160900fe5]
Former-commit-id: 4a020340ee
2013-01-08 10:30:21 -06:00
Richard Peter
884d082f9e Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 08922e14b7 [formerly c8f79ee0cc] [formerly 08922e14b7 [formerly c8f79ee0cc] [formerly 7b4d04e828 [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 84c5aa1d29 [formerly b9ae764a04]
Former-commit-id: bf14d0167a
2013-01-07 17:03:15 -06:00
Max Schenkelberg
85e82e4b78 Issue #1329 fixed bug in FileLocker
Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: ebb303ee06 [formerly d779a82c5e] [formerly ebb303ee06 [formerly d779a82c5e] [formerly 91a8e56302 [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]
Former-commit-id: 91a8e56302
Former-commit-id: 06004a0e08 [formerly 66f472ed37]
Former-commit-id: 8745f7acf1
2013-01-07 16:04:14 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -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
Dustin Johnson
3d9c459c10 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: f5f6884b79 [formerly 452729a647] [formerly f5f6884b79 [formerly 452729a647] [formerly 19f1b30437 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]
Former-commit-id: 19f1b30437
Former-commit-id: cdf08ea65a [formerly 818664e557]
Former-commit-id: a29d38f5f9
2013-01-04 12:34:43 -06:00
Richard Peter
e8d1469a70 Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: af5b616282 [formerly 1c560f5013] [formerly af5b616282 [formerly 1c560f5013] [formerly c1765f776c [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: 9f991104dd [formerly 424cb12ef6]
Former-commit-id: 6fd64a20fa
2013-01-03 16:27:32 -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
Richard Peter
be9e052dc3 Merge "Issue #1438 move all gfe processing out of the grib plugin." into development
Former-commit-id: f8f34c268d [formerly cadd463843] [formerly f8f34c268d [formerly cadd463843] [formerly 76ef2ae454 [formerly 87c31ed4792c0270f3166b0b69ce64d0bca1464b]]]
Former-commit-id: 76ef2ae454
Former-commit-id: 9cddcffb4b [formerly d3053692b5]
Former-commit-id: c604ec186f
2012-12-21 14:03:04 -06:00
Max Schenkelberg
d0a39b6c17 Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 08160fff31 [formerly fabb9bbcff] [formerly 08160fff31 [formerly fabb9bbcff] [formerly 7e3273db95 [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]
Former-commit-id: 7e3273db95
Former-commit-id: 3a1106efa0 [formerly 904270b99b]
Former-commit-id: 09f1499af9
2012-12-20 17:14:34 -06:00