Commit graph

538 commits

Author SHA1 Message Date
Richard Peter
8269ba554b Issue #1508: Improve capture to grab screen shots and multiple jstacks to track thread state over time
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd

Former-commit-id: af105bfe0f [formerly a1c58ab36d [formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]
Former-commit-id: a1c58ab36d
Former-commit-id: b83e46a345
2013-01-18 13:55:56 -06:00
Steve Harris
73c5d94310 Issue #1408 - Fix syntax errors in server config
Former-commit-id: a5eac8ec3c [formerly aee6a65e4c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]
Former-commit-id: aee6a65e4c
Former-commit-id: 9a3be4460e
2013-01-15 09:47:25 -06:00
Richard Peter
6e42fa32d3 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: 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 3fb7d96ec1
Former-commit-id: a966546e31
2013-01-14 18:07:17 -06:00
Richard Peter
4c82ddaa12 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]
Former-commit-id: 59368e93e1
Former-commit-id: d2cc93281a
2013-01-14 17:49:29 -06:00
Steve Harris
8dd688c878 13.2.1-1 baseline
Former-commit-id: 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: e62172c8c7
Former-commit-id: 5dfe4d10f1
2013-01-14 18:42:21 -05:00
Richard Peter
4e1f66abb3 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: b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: 1318f53902
Former-commit-id: ae3ea75cbf
2013-01-14 17:38:38 -06:00
Richard Peter
d7beb14c67 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]
Former-commit-id: de7d7b07ef
Former-commit-id: a8495324f7
2013-01-14 17:34:31 -06:00
Richard Peter
85519760d6 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]
Former-commit-id: 89b08fdd2f
Former-commit-id: 5ec69e843e
2013-01-14 17:34:17 -06:00
Richard Peter
9cad9f0c54 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: 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]
Former-commit-id: 970216e4c9
Former-commit-id: 1a1a69d38c
2013-01-14 16:53:05 -06:00
Ben Steffensmeier
beda2be0cb Issue #1482 ignore malformed gribModel files
Former-commit-id: 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]
Former-commit-id: 685c09de47
Former-commit-id: fadf4d58cf
2013-01-14 15:10:56 -06:00
Dave Hladky
e3ec930c36 Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]
Former-commit-id: 30733d3b25
Former-commit-id: 65cfb39ba5
2013-01-14 11:38:45 -06:00
Steve Harris
5aaacf4eec 13.1.2-8 baseline
Former-commit-id: 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: e6217a17de
Former-commit-id: b864fdc303
2013-01-11 16:19:07 -05:00
Steve Harris
0b15dff12b 13.1.2-7 baseline
Former-commit-id: 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 4f86b07eb0
Former-commit-id: a8d90da9c0
2013-01-11 16:12:09 -05:00
Richard Peter
0c51e2e3aa Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]
Former-commit-id: 8df96c2a14
Former-commit-id: 71d8907b6e
2013-01-11 12:53:37 -06:00
Dustin Johnson
32047140e1 Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

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

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

Former-commit-id: 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]
Former-commit-id: 5cf3eee426
Former-commit-id: 440de708df
2013-01-11 11:59:36 -06:00
Dustin Johnson
b128ed3340 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: 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]
Former-commit-id: 4ae1a9645c
Former-commit-id: 8473eb60fb
2013-01-11 11:53:02 -06:00
Richard Peter
169e239175 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

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

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

Former-commit-id: 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]
Former-commit-id: deca70207d
Former-commit-id: 45e6e286bb
2013-01-10 17:17:58 -06:00
Richard Peter
48355758a8 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]
Former-commit-id: 507a3d641c
Former-commit-id: 206ffc0e15
2013-01-10 10:51:28 -06:00
Richard Peter
b91a1d35c9 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]
Former-commit-id: ee6513bad3
Former-commit-id: e1547982b0
2013-01-10 10:18:39 -06:00
Richard Peter
95f0508c29 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 029ebaa63a
Former-commit-id: d0a6ba23e5
2013-01-09 17:55:05 -06:00
Dustin Johnson
4ec1b32d09 Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: a354bac4da [formerly b7ed75896b [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]
Former-commit-id: b7ed75896b
Former-commit-id: bad7b754e5
2013-01-09 15:40:36 -06:00
Mike Duff
86e3e4c397 Issue #1420 - Rules Peer review comments
Former-commit-id: 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]
Former-commit-id: 4c63333a96
Former-commit-id: f41d525fa3
2013-01-09 12:02:21 -06:00
Richard Peter
b617071350 Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: 6e54eea341 [formerly 3386fee25a [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]
Former-commit-id: 3386fee25a
Former-commit-id: fe14e7eeba
2013-01-08 16:47:24 -06:00
Richard Peter
f7f6455a5f Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: dcbda78944 [formerly fd4d8f2407 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]
Former-commit-id: fd4d8f2407
Former-commit-id: dc57c5a282
2013-01-08 16:44:56 -06:00
Ben Steffensmeier
c0a6c84eca Issue #1438 do not log grib ingest
Former-commit-id: 36ce3e2df9 [formerly 1c5f61bf33 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]
Former-commit-id: 1c5f61bf33
Former-commit-id: b7b5f2e22f
2013-01-08 15:50:47 -06:00
Ben Steffensmeier
e7c7bfc0ce Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: 8421469229 [formerly 0659a127ff [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]
Former-commit-id: 0659a127ff
Former-commit-id: d5c6061ffc
2013-01-08 12:56:46 -06:00
Dustin Johnson
3fb35985d0 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: 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]
Former-commit-id: 6a90779214
Former-commit-id: 1975cd0442
2013-01-08 12:44:29 -06:00
Ron Anderson
83d9acb900 Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: 19fc9e2bbc [formerly 61700b2f37 [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]
Former-commit-id: 61700b2f37
Former-commit-id: dc156f69c4
2013-01-08 10:36:19 -06:00
Ben Steffensmeier
10bc83190e Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: ecbbc823f1 [formerly 4ca0f320cc [formerly 77868132755b799810c9a01888fcec06798070fb]]
Former-commit-id: 4ca0f320cc
Former-commit-id: 15c7614ffe
2013-01-08 10:32:50 -06:00
Nate Jensen
aa5eb009e0 Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: f77cf10fea [formerly 27a96cf383 [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]
Former-commit-id: 27a96cf383
Former-commit-id: 42b24aa97f
2013-01-08 10:30:21 -06:00
Richard Peter
9d5bfa7ae7 Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

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

Former-commit-id: 91a8e56302 [formerly d779a82c5e [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]
Former-commit-id: d779a82c5e
Former-commit-id: ebb303ee06
2013-01-07 16:04:14 -06:00
Bryan Kowal
199e202979 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: c8a43edd9e
Former-commit-id: ab8b346489
2013-01-07 12:16:01 -06:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
2013-01-06 14:32:24 -06:00
Dustin Johnson
393f51fe1b Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: 19f1b30437 [formerly 452729a647 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]
Former-commit-id: 452729a647
Former-commit-id: f5f6884b79
2013-01-04 12:34:43 -06:00
Richard Peter
f941605942 Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: 1c560f5013
Former-commit-id: af5b616282
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
dda3437f46 Issue #1450 apply opposite scanning before flipping in grib decoder
Former-commit-id: a3bfb8a14e [formerly 6a8066f3d4 [formerly ce2095697f1f00656bf6b778e565d708ddc6a29c]]
Former-commit-id: 6a8066f3d4
Former-commit-id: 03f9d510fe
2013-01-03 11:44:13 -06:00
Richard Peter
53bbc7e795 Merge "Issue #1438 move all gfe processing out of the grib plugin." into development
Former-commit-id: 76ef2ae454 [formerly cadd463843 [formerly 87c31ed4792c0270f3166b0b69ce64d0bca1464b]]
Former-commit-id: cadd463843
Former-commit-id: f8f34c268d
2012-12-21 14:03:04 -06:00
Max Schenkelberg
656a4500eb 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: 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]
Former-commit-id: fabb9bbcff
Former-commit-id: 08160fff31
2012-12-20 17:14:34 -06:00
Ben Steffensmeier
474a8dcf65 Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: fe0a8b60c6 [formerly 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]
Former-commit-id: 521924904a
Former-commit-id: b312bce5ad
2012-12-19 11:26:40 -06:00
Max Schenkelberg
978c200f04 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]
Former-commit-id: b4952b003a
Former-commit-id: 14f102d8ae
2012-12-17 17:05:34 -06:00
Richard Peter
548b521f3f Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]
Former-commit-id: 513dd75a23
Former-commit-id: 3d4fb31161
2012-12-13 11:02:07 -06:00
Nate Jensen
580d27c4fa Merge "Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny" into development
Former-commit-id: 6debcb5ff4 [formerly d0fe7c860f [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]
Former-commit-id: d0fe7c860f
Former-commit-id: 291bb86680
2012-12-12 12:27:30 -06:00
Max Schenkelberg
24938de2d2 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]
Former-commit-id: 3e128b266a
Former-commit-id: be99f6c7ca
2012-12-12 11:39:32 -06:00