Commit graph

632 commits

Author SHA1 Message Date
Richard Peter
252cdf4ed2 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 809c981306 [formerly 997ab69bf0] [formerly acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b]]
Former-commit-id: b03f2f7ac9211a133637c5710d1b71c02e3b6c48 [formerly bdc637110a]
Former-commit-id: c7f02b18c5
2013-01-14 17:34:31 -06:00
Richard Peter
cccc6f7918 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]]
Former-commit-id: 8192515b06
Former-commit-id: c056fd25cb [formerly 9154383e5a] [formerly e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda]]
Former-commit-id: c079d32f41e54072fc4ab430c0fe1b6e348e1723 [formerly a1517b8daa]
Former-commit-id: ad6bd4ace8
2013-01-14 17:34:17 -06:00
Richard Peter
97c1ff58a1 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: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]]
Former-commit-id: 19d923f387
Former-commit-id: 7af4fc10a8 [formerly f1262388ce] [formerly 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]]
Former-commit-id: 1fd01bf080c7430697622a86c36545061e29af0c [formerly 2575e4e4ea]
Former-commit-id: e59ea72456
2013-01-14 16:53:05 -06:00
Ben Steffensmeier
2d845671d7 Issue #1482 ignore malformed gribModel files
Former-commit-id: beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]]
Former-commit-id: 9cfa09e507
Former-commit-id: b2029cc48a [formerly 80e307c96e] [formerly 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29]]
Former-commit-id: f3128381541f4e049435ad97f2894e64711267b2 [formerly cc70fe7a41]
Former-commit-id: e65ba73968
2013-01-14 15:10:56 -06:00
Dave Hladky
073f3c8bcf Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]]
Former-commit-id: c9160ac945
Former-commit-id: bd45e9af0f [formerly e746688671] [formerly ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a]]
Former-commit-id: 969e08441cecb98cce422486ce46b9039e08656b [formerly 936d0f143d]
Former-commit-id: 64c293c460
2013-01-14 11:38:45 -06:00
Steve Harris
32c48861de 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Richard Peter
33bbd393bd Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: cf8483486b [formerly 74092ae046] [formerly bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020]]
Former-commit-id: 85903a4d7fd36b124d852701aa63c2f9da2782b5 [formerly da60306633]
Former-commit-id: d72901c86c
2013-01-11 12:53:37 -06:00
Dustin Johnson
80af42fd9e Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

Former-commit-id: 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly f44a2f6ea9 [formerly 7d10c7fac5 [formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: bce1b88d26 [formerly 5e4a1b7bd9] [formerly 1f7651d3448a20469f46b569fcc7d279b6bb1842 [formerly bd8dbc39e7]]
Former-commit-id: f255756970b2d5c0475ee469843208550ee7f07c [formerly 69c42d3e72]
Former-commit-id: b462fe0286
2013-01-11 12:39:00 -06:00
Richard Peter
038b214887 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f [formerly cf815a4c72] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Dustin Johnson
f275418843 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

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

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 59c349ac77 [formerly fe486b4889] [formerly 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]]
Former-commit-id: 57ac28b8518a3193cbd3b4125cd190f547bac07f [formerly a51f8f449b]
Former-commit-id: b5ea7aaff8
2013-01-11 11:59:36 -06:00
Dustin Johnson
2598fc06d8 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: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]
Former-commit-id: 446f65776e
Former-commit-id: 6984791be8 [formerly 7bf029eb7e] [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]]
Former-commit-id: 4b7dc8fbd66d90306e884b8ea9c8af6f53371156 [formerly 6fb6bc8f87]
Former-commit-id: f269969791
2013-01-11 11:53:02 -06:00
Richard Peter
cda4eef641 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: c889337379 [formerly e23ffee8bd] [formerly 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]]
Former-commit-id: 2953ad3d7fd0d19919b0dda10049c53590a3862c [formerly f7b8b095cc]
Former-commit-id: 8286fb0351
2013-01-11 11:03:42 -06:00
Dustin Johnson
4aa6e6fb69 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly f316320b06 [formerly ede32c8d3e [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]]
Former-commit-id: f316320b06
Former-commit-id: 25a4e68f25 [formerly f274ce63e9] [formerly b6ddfc6f49195136d5d7d440c3e182fdd9538e9b [formerly 35409872a6]]
Former-commit-id: 21dac9178560e3afc5725c50138e5a9f1bef619c [formerly adc46ddeef]
Former-commit-id: 9f2c0db712
2013-01-11 08:56:39 -06:00
Richard Peter
d842cfe57e Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]]
Former-commit-id: 73263e270e
Former-commit-id: 9d0c8ff714 [formerly 4a097586f6] [formerly 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]]
Former-commit-id: 033eff671dc64886d6f95f0a1a920fd9a98bc449 [formerly 49da28ead4]
Former-commit-id: 4552b5f71a
2013-01-10 17:17:58 -06:00
Richard Peter
0efa0a7461 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]]
Former-commit-id: c0e712f682
Former-commit-id: d3c6e55c17 [formerly 9524f5a52b] [formerly 97734a3cd0f5afa0b7002ff04016137bde675235 [formerly 9543d23d23]]
Former-commit-id: 87ffeb3ac45703ad2f69f430f100670c9c2a1380 [formerly 6dbbf56c1d]
Former-commit-id: c8c4f68603
2013-01-10 10:51:28 -06:00
Richard Peter
81dfb3f961 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: a4491237e5 [formerly 27a06e14b8] [formerly 6a4957abee715c7f29e3637d9ceac8248e81d07d [formerly 46faa0f68d]]
Former-commit-id: b288c623ea0a30a1e7f08150ba10db89ed72d914 [formerly 58a28b4193]
Former-commit-id: a9a245dfe2
2013-01-10 10:18:39 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Dustin Johnson
834a16e4bc Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly a354bac4da [formerly b7ed75896b [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]]
Former-commit-id: a354bac4da
Former-commit-id: a010315743 [formerly 424a70dbfe] [formerly 53baf13d05630029a4556dcb8562eff91b689c93 [formerly 0d5bb5ba95]]
Former-commit-id: f99fcc7f473dbe7b10a2d765f054c5b16bffbc0b [formerly 09a33ab8ac]
Former-commit-id: d4d1a95461
2013-01-09 15:40:36 -06:00
Mike Duff
9adac72fba Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 65dd6c6f60 [formerly ed95eae2e3] [formerly 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]]
Former-commit-id: 2661145adf236b4fa5c186262fb5752eabdf600d [formerly 8313877a3a]
Former-commit-id: 660064ea6a
2013-01-09 12:02:21 -06:00
Richard Peter
6f17dfc575 Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: b617071350 [formerly fe14e7eeba] [formerly 3386fee25a] [formerly b617071350 [formerly fe14e7eeba] [formerly 3386fee25a] [formerly 6e54eea341 [formerly 3386fee25a [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]]]
Former-commit-id: 6e54eea341
Former-commit-id: c4d34cf9fd [formerly 54bce1bbd0] [formerly bb9fcd548a99b6a6a22f60f2eebab158ed1e3ed6 [formerly a840a6bed4]]
Former-commit-id: 3837d44acf764c4ed5634c7f5a5c570ca2b92b96 [formerly ff7d27a295]
Former-commit-id: 300868ac56
2013-01-08 16:47:24 -06:00
Richard Peter
daeb4e5bf1 Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: f7f6455a5f [formerly dc57c5a282] [formerly fd4d8f2407] [formerly f7f6455a5f [formerly dc57c5a282] [formerly fd4d8f2407] [formerly dcbda78944 [formerly fd4d8f2407 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]]]
Former-commit-id: dcbda78944
Former-commit-id: f8bd67a319 [formerly fdc4ebb5b5] [formerly e91d2bffa583b9662d3ae106dbf61734a2b2712c [formerly 605c8dfe77]]
Former-commit-id: e040a7d0f6d7ece55d794efe2b4b52dae1d9b957 [formerly 13ff9f1cb1]
Former-commit-id: d9f19bfc7b
2013-01-08 16:44:56 -06:00
Ben Steffensmeier
0f88d60923 Issue #1438 do not log grib ingest
Former-commit-id: c0a6c84eca [formerly b7b5f2e22f] [formerly 1c5f61bf33] [formerly c0a6c84eca [formerly b7b5f2e22f] [formerly 1c5f61bf33] [formerly 36ce3e2df9 [formerly 1c5f61bf33 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]]]
Former-commit-id: 36ce3e2df9
Former-commit-id: 37f8b86337 [formerly cc9922a697] [formerly 7d99bb56744c193cb977c56ebe1f2f6513612a2b [formerly 0c675d3deb]]
Former-commit-id: bfad40c416d8a77897756b3c0a490d5109fe3987 [formerly 6b8ee10c24]
Former-commit-id: 30a076a1b7
2013-01-08 15:50:47 -06:00
Ben Steffensmeier
820f10df05 Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: e7c7bfc0ce [formerly d5c6061ffc] [formerly 0659a127ff] [formerly e7c7bfc0ce [formerly d5c6061ffc] [formerly 0659a127ff] [formerly 8421469229 [formerly 0659a127ff [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]]]
Former-commit-id: 8421469229
Former-commit-id: f5bf7a99ca [formerly b911356a64] [formerly f081408de0ecbf94f84671da04ad9b4ca0cf554d [formerly 79474382d2]]
Former-commit-id: b574171513eda4852e7cc07abd331f5db4de82d7 [formerly a99267dd11]
Former-commit-id: 01d205d179
2013-01-08 12:56:46 -06:00
Dustin Johnson
683542813d 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: 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]]
Former-commit-id: 2635e05723
Former-commit-id: 71e085b940 [formerly 885f315d30] [formerly db9b8d2b230d04c2984037f6535517c2201db20b [formerly 492cee4992]]
Former-commit-id: 7294d4c01e6fcf76d993e5993a213ccedb5d6fe1 [formerly b1c159fc7f]
Former-commit-id: b24ddaeb4e
2013-01-08 12:44:29 -06:00
Ron Anderson
c255d85b0e Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: 83d9acb900 [formerly dc156f69c4] [formerly 61700b2f37] [formerly 83d9acb900 [formerly dc156f69c4] [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 61700b2f37 [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 5f11995f9d [formerly 0a585a9498] [formerly d81ed4a74678d47e525c1ce217f742e7d4727a6d [formerly 5e9f24b527]]
Former-commit-id: 02421e4bf111bb1ceb47e5209c0dd6335520139c [formerly 693548c7d2]
Former-commit-id: deeb9ab71b
2013-01-08 10:36:19 -06:00
Ben Steffensmeier
008de3825b Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: 10bc83190e [formerly 15c7614ffe] [formerly 4ca0f320cc] [formerly 10bc83190e [formerly 15c7614ffe] [formerly 4ca0f320cc] [formerly ecbbc823f1 [formerly 4ca0f320cc [formerly 77868132755b799810c9a01888fcec06798070fb]]]]
Former-commit-id: ecbbc823f1
Former-commit-id: 9a084c2371 [formerly b9980a0f77] [formerly efaab21a099bc78c444632abe08315d205bc9e4e [formerly 777a1d93bb]]
Former-commit-id: 01616e2634cae7160ca1d169740c2abef17e4722 [formerly 1a1c6d7efa]
Former-commit-id: a8077ca1c3
2013-01-08 10:32:50 -06:00
Nate Jensen
7288e59494 Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: aa5eb009e0 [formerly 42b24aa97f] [formerly 27a96cf383] [formerly aa5eb009e0 [formerly 42b24aa97f] [formerly 27a96cf383] [formerly f77cf10fea [formerly 27a96cf383 [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]]]
Former-commit-id: f77cf10fea
Former-commit-id: a47ff818b9 [formerly efb750cc67] [formerly b8cdba010ea29e901b536de4b95796dda098c2f3 [formerly f160900fe5]]
Former-commit-id: 3b672f4b17700c719b53173808dc738e90afd78c [formerly 4a020340ee]
Former-commit-id: b56796d0ac
2013-01-08 10:30:21 -06:00
Richard Peter
ec4da3e8fb Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 9d5bfa7ae7 [formerly 08922e14b7] [formerly c8f79ee0cc] [formerly 9d5bfa7ae7 [formerly 08922e14b7] [formerly c8f79ee0cc] [formerly 7b4d04e828 [formerly c8f79ee0cc [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 9fd8d277f7 [formerly 84c5aa1d29] [formerly f0b94833f7347795c6b6916e2dd588c1447a0145 [formerly b9ae764a04]]
Former-commit-id: 11a32c30ccaaceb9b9993adbe4a219bb0381d04f [formerly bf14d0167a]
Former-commit-id: 884d082f9e
2013-01-07 17:03:15 -06:00
Max Schenkelberg
e8fe7541cc Issue #1329 fixed bug in FileLocker
Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: 5f66889a5c [formerly ebb303ee06] [formerly d779a82c5e] [formerly 5f66889a5c [formerly ebb303ee06] [formerly d779a82c5e] [formerly 91a8e56302 [formerly d779a82c5e [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]]
Former-commit-id: 91a8e56302
Former-commit-id: e8445dbd34 [formerly 06004a0e08] [formerly cf7d190ae2b6f26ce5d3b1b3e829d8885e3af0cf [formerly 66f472ed37]]
Former-commit-id: a17dfbf28b6ff9e267571e77b35b50936e317386 [formerly 8745f7acf1]
Former-commit-id: 85e82e4b78
2013-01-07 16:04:14 -06:00
Bryan Kowal
904678e8f4 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 0e985cf0f3 [formerly 6d7f57c62a] [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]]
Former-commit-id: caceba3a84e843b279eb8a807b33e26d81487e49 [formerly 0136f9d5a3]
Former-commit-id: 1996f92f7e
2013-01-07 12:16:01 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Dustin Johnson
ee8e3c1b75 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 19f1b30437 [formerly 452729a647 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]]
Former-commit-id: 19f1b30437
Former-commit-id: 34fea3d53a [formerly cdf08ea65a] [formerly de7f6eddfab0e5e6cb4cd6a0a89817af6d81ac7a [formerly 818664e557]]
Former-commit-id: ed5a671e6262c6d9d859eb31d20e0f2000aeb165 [formerly a29d38f5f9]
Former-commit-id: 3d9c459c10
2013-01-04 12:34:43 -06:00
Richard Peter
7aaec36c1f Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]]
Former-commit-id: c1765f776c
Former-commit-id: 38c6856d3c [formerly 9f991104dd] [formerly b3978f7df010c7a6841e8680eae5b357ababaca4 [formerly 424cb12ef6]]
Former-commit-id: 56d8351962d633cfe957c08f60babdaea17194e8 [formerly 6fd64a20fa]
Former-commit-id: e8d1469a70
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
87965c53d5 Issue #1450 apply opposite scanning before flipping in grib decoder
Former-commit-id: dda3437f46 [formerly 03f9d510fe] [formerly 6a8066f3d4] [formerly dda3437f46 [formerly 03f9d510fe] [formerly 6a8066f3d4] [formerly a3bfb8a14e [formerly 6a8066f3d4 [formerly ce2095697f1f00656bf6b778e565d708ddc6a29c]]]]
Former-commit-id: a3bfb8a14e
Former-commit-id: 53a7483c97 [formerly 0102bdc392] [formerly b41b95e3d236fd69a14b07d92cb84c5a239e754a [formerly e1bc52b1d8]]
Former-commit-id: fb53ca5f08bfff60ba75217fcfc76d75d884e966 [formerly 1c472994ef]
Former-commit-id: 27bd5ba7b8
2013-01-03 11:44:13 -06:00
Richard Peter
ec8a1b4c84 Merge "Issue #1438 move all gfe processing out of the grib plugin." into development
Former-commit-id: 53bbc7e795 [formerly f8f34c268d] [formerly cadd463843] [formerly 53bbc7e795 [formerly f8f34c268d] [formerly cadd463843] [formerly 76ef2ae454 [formerly cadd463843 [formerly 87c31ed4792c0270f3166b0b69ce64d0bca1464b]]]]
Former-commit-id: 76ef2ae454
Former-commit-id: 6837c27118 [formerly 9cddcffb4b] [formerly 716fef37f8ead5f5995db721ad3868a2c866200f [formerly d3053692b5]]
Former-commit-id: 02f5cc88ce4615b9c95b71c5fb805ad6c52cef9e [formerly c604ec186f]
Former-commit-id: be9e052dc3
2012-12-21 14:03:04 -06:00
Max Schenkelberg
5fb550377e 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: 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]]
Former-commit-id: 7e3273db95
Former-commit-id: b912ede4c2 [formerly 3a1106efa0] [formerly 4287aae513311854dca459766b0660713bfe075e [formerly 904270b99b]]
Former-commit-id: 09a73da346014f11fd385751bf9b96d1d8a46914 [formerly 09f1499af9]
Former-commit-id: d0a39b6c17
2012-12-20 17:14:34 -06:00
Ben Steffensmeier
6899085fb5 Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly fe0a8b60c6 [formerly 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: 2a86c290c7 [formerly ca4e39df79] [formerly 4c95d1279cc2d643fa5e3100b8491e31f64b88bb [formerly c6032b1950]]
Former-commit-id: f316ad8c2fe2fba44aa3af884a66b4942b9301ca [formerly 7d19f5e38f]
Former-commit-id: f62c7fde9b
2012-12-19 11:26:40 -06:00
Max Schenkelberg
c257a7f5ed Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]]
Former-commit-id: 373de78320
Former-commit-id: 754fe67e13 [formerly 886c39f5a4] [formerly 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592]]
Former-commit-id: c59b073430cdcff78da21b53fe38f82a966c2e90 [formerly c18d3486eb]
Former-commit-id: 7f708ac427
2012-12-17 17:05:34 -06:00
Richard Peter
8af8fc4503 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]]
Former-commit-id: 08919e73c3
Former-commit-id: bcf2592bf1 [formerly e2007e61e1] [formerly a2ffba67b6efe6ed162228db4c9f67b3e99a3233 [formerly f7859723e5]]
Former-commit-id: de55462bfcfa800aad684c68d8bbf0ac46a8ab9d [formerly bf19dcd216]
Former-commit-id: 9b15f27832
2012-12-13 11:02:07 -06:00
Nate Jensen
25adbd46e2 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: 580d27c4fa [formerly 291bb86680] [formerly d0fe7c860f] [formerly 580d27c4fa [formerly 291bb86680] [formerly d0fe7c860f] [formerly 6debcb5ff4 [formerly d0fe7c860f [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]]]
Former-commit-id: 6debcb5ff4
Former-commit-id: 78380dc03b [formerly 231ddfb978] [formerly b80429cabfa918f11b3de9f281d78d8a535850c9 [formerly 196fdc6110]]
Former-commit-id: f4d9619338c26bb107dc5e782c3f0f86d277ca27 [formerly 3de4dd0821]
Former-commit-id: 0c35a32997
2012-12-12 12:27:30 -06:00
Max Schenkelberg
8f83ab09b5 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: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]]
Former-commit-id: 5db71ca943
Former-commit-id: cf9e6ff3b2 [formerly d43e0c1c25] [formerly e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]]
Former-commit-id: 56e64154314976881dc1506547d9d9b8c9f9f150 [formerly 206116ab66]
Former-commit-id: 2030832669
2012-12-12 11:39:32 -06:00
Nate Jensen
cadd8a8feb Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: dbf9edd0fe [formerly c236b4e1ad] [formerly 817717fe0a] [formerly dbf9edd0fe [formerly c236b4e1ad] [formerly 817717fe0a] [formerly 85658e7e1d [formerly 817717fe0a [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]]]
Former-commit-id: 85658e7e1d
Former-commit-id: 9eb19cc1c2 [formerly 94b9d10c81] [formerly bfc98151a081a65d7cfc11a95d3cd9c422ae9b3f [formerly 3c2865bbd7]]
Former-commit-id: 548d398be98e9d9da135ddf51e23b9bd63991c62 [formerly 13dca3b784]
Former-commit-id: 1aa8d304df
2012-12-12 11:20:42 -06:00
Ben Steffensmeier
16db40f89a Issue #1356 add javadoc to subgrid changes.
Former-commit-id: 24e1b8fed9 [formerly c44dad8a5c] [formerly 6da5ac2873] [formerly 24e1b8fed9 [formerly c44dad8a5c] [formerly 6da5ac2873] [formerly 7e6d6fa794 [formerly 6da5ac2873 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]]]
Former-commit-id: 7e6d6fa794
Former-commit-id: 0e733903aa [formerly 5d87636fb2] [formerly ddd3f1b8e6c6839c8b7da5dd2c5162c696cc8a43 [formerly 47cb87096a]]
Former-commit-id: 2525c99e68b9d452c7e65c184726e952bbf62a6a [formerly 77e3f5ea79]
Former-commit-id: 9c9170d0e4
2012-12-11 17:40:28 -06:00
Richard Peter
7a0909d8f8 Merge "Issue #1356 create subgrid for grib files with extra columns" into development
Former-commit-id: b6674338ed [formerly 559876930b] [formerly 9f9c32fc4e] [formerly b6674338ed [formerly 559876930b] [formerly 9f9c32fc4e] [formerly 4082968b07 [formerly 9f9c32fc4e [formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]]]]
Former-commit-id: 4082968b07
Former-commit-id: 5f4f867295 [formerly f7de6135ca] [formerly 8f43d6e6261035b5da10173c59a560c1e52e1eba [formerly ada54d8e92]]
Former-commit-id: 84e562a6bae12a322ae3acd3f19b22c270427f0f [formerly bd1ae5fdfd]
Former-commit-id: 3986341ee0
2012-12-11 17:05:27 -06:00
Richard Peter
0ff74caf56 Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
Former-commit-id: 5509a226b1 [formerly 6bc665ca3a] [formerly 63465edb95] [formerly 5509a226b1 [formerly 6bc665ca3a] [formerly 63465edb95] [formerly 2a5171c2f3 [formerly 63465edb95 [formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]]]]
Former-commit-id: 2a5171c2f3
Former-commit-id: 0c7ccaebd3 [formerly 6613cbf5ee] [formerly c6aa2d733aa7e5ec3e439c933751c6d5e031900b [formerly 1100c4fa8b]]
Former-commit-id: c2305d9d6dc12e94c978f1f7ac730783e9da236f [formerly 27c261761c]
Former-commit-id: 341868bed7
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
dcb5799262 Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea

Former-commit-id: 97618c7f7a [formerly b32d039c92] [formerly b77f1592a7] [formerly 97618c7f7a [formerly b32d039c92] [formerly b77f1592a7] [formerly 11d3ee3014 [formerly b77f1592a7 [formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]]]]
Former-commit-id: 11d3ee3014
Former-commit-id: a1c18c6ba5 [formerly a693a33f97] [formerly 98abd4aba1a2dca8062b2e5a3c935a37fec9ccdc [formerly 9277840fad]]
Former-commit-id: cf209fee488e6e4733fdb845b69b4121badc267c [formerly 765457b0db]
Former-commit-id: 6334b9ee4e
2012-12-11 16:12:53 -06:00
Ben Steffensmeier
7e3ecb914c Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: 2b2fdedb39 [formerly dd560f4d15] [formerly c3e1005dc8] [formerly 2b2fdedb39 [formerly dd560f4d15] [formerly c3e1005dc8] [formerly a7a13d27cd [formerly c3e1005dc8 [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]]]
Former-commit-id: a7a13d27cd
Former-commit-id: adc94e56a1 [formerly ddcb3e675d] [formerly ee71010c76827c148c8eb57b86279b09db2c3bab [formerly 64922c17c5]]
Former-commit-id: b54b8c788958a872f3ca1992b1745f8df8bdd2b1 [formerly 9eba37d4fb]
Former-commit-id: 0da60e90b9
2012-12-11 16:00:03 -06:00