Commit graph

2125 commits

Author SHA1 Message Date
Max Schenkelberg
77c2ae6ad1 Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: db3e7bab99 [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]
Former-commit-id: ff72ce0b0c
Former-commit-id: e5cd1901a5
2013-01-15 14:41:19 -06:00
Max Schenkelberg
f51398595e Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]
Former-commit-id: 02e7c79de9
Former-commit-id: 9aac1d2871
2013-01-15 14:13:36 -06:00
Nate Jensen
744f536415 Issue #1446 Initial python within Jep implementation of data access framework
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8

Former-commit-id: 12e0a100c4 [formerly e5237fceac [formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]
Former-commit-id: e5237fceac
Former-commit-id: e5e7107a56
2013-01-15 13:48:04 -06:00
Richard Peter
cd3fcb5561 Merge "Issue #1452 Clear current filters when creating a new filter configuration." into development
Former-commit-id: b94c90fd51 [formerly 02f597fdb2 [formerly 0fd071aa5ac96a6548ac350f55820837cf20a992]]
Former-commit-id: 02f597fdb2
Former-commit-id: e1ce9b63f1
2013-01-15 13:40:49 -06:00
Richard Peter
d2fbb1af03 Merge "Issue #1475 QPF standalonoe displays appear slow" into development
Former-commit-id: 11e8dae113 [formerly e7305ca187 [formerly 1d1a155a0276dcf02ccc9d66937d0a6d37d51722]]
Former-commit-id: e7305ca187
Former-commit-id: ed6d929dcd
2013-01-15 13:40:13 -06:00
Dave Hladky
e5b4934da1 Issue #1489 Harvester directories not created causing harvester to not start
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

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

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]
Former-commit-id: 3d74a68e94
Former-commit-id: 99f8d40bed
2013-01-15 10:18:14 -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
Brad Gonzales
323f1f44c4 Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 771debed33 [formerly 03c7656f55 [formerly dc3f958011b53ba07ea21648ca1c634bd7b677b7]]
Former-commit-id: 03c7656f55
Former-commit-id: 574ed7c971
2013-01-14 18:06:29 -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
Lee Venable
66aab3680d Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: a3a7dc44c9 [formerly 7009876544 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]
Former-commit-id: 7009876544
Former-commit-id: c3dec53498
2013-01-14 17:47:59 -06:00
Ben Steffensmeier
1926965b6b Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]
Former-commit-id: f49e77f7df
Former-commit-id: da79be73a2
2013-01-14 17:44:46 -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
99414fa1f0 Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 69c6cfd196 [formerly 32d4bc3d9f [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]
Former-commit-id: 32d4bc3d9f
Former-commit-id: 461a503837
2013-01-14 17:33:22 -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
Dave Hladky
a8b5ee21f6 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: 75f62b0856 [formerly 8ac74e6b0d [formerly 2f6bf58b35e6ff8317281c3e62d1c1a61eea14f0]]
Former-commit-id: 8ac74e6b0d
Former-commit-id: 199d88d6a8
2013-01-14 15:50:59 -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
Brad Gonzales
7391e3c0fe Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 72cb336592 [formerly 5bbe5d5dbf [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]
Former-commit-id: 5bbe5d5dbf
Former-commit-id: 1644eee264
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
4547887fe6 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]
Former-commit-id: cf8a9e3f64
Former-commit-id: e00348a124
2013-01-14 14:30:17 -06:00
Richard Peter
16ccbec7fa Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: e180a2ff86 [formerly 65715d4154 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]
Former-commit-id: 65715d4154
Former-commit-id: fe28e371a6
2013-01-14 11:56:33 -06:00
Richard Peter
b731360a84 Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: e176fcbf06 [formerly 0f705ac355 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]
Former-commit-id: 0f705ac355
Former-commit-id: 621a4cd147
2013-01-14 11:55:35 -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
Ben Steffensmeier
e787fdcaf9 Issue #1464 fix saving of spatial subsets.
Former-commit-id: c8ef480815 [formerly bc5233748a [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]
Former-commit-id: bc5233748a
Former-commit-id: 0933461f40
2013-01-14 10:49:14 -06:00
Richard Peter
f1dc664a00 Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]
Former-commit-id: a4f3a2a174
Former-commit-id: 1d61d65a1e
2013-01-14 09:59:28 -06:00
Richard Peter
7e14eb1840 Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development
Former-commit-id: 061fa21537 [formerly d2a1388b0e [formerly 888b839152d86c536b249e795666c596a213da86]]
Former-commit-id: d2a1388b0e
Former-commit-id: 854bd1d4e0
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
d92f2de0c3 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
Former-commit-id: 52f55e6d3a [formerly 5c5b2e3c20 [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]
Former-commit-id: 5c5b2e3c20
Former-commit-id: 83cf6ec05c
2013-01-11 16:26:14 -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
Mike Duff
0eb256fc41 Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]
Former-commit-id: 279729e88e
Former-commit-id: 329a010b07
2013-01-11 14:38:34 -06: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
Richard Peter
7f595074ae Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: f9e39660d4 [formerly a595356025 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]
Former-commit-id: a595356025
Former-commit-id: c309d2dc1e
2013-01-11 12:25:54 -06:00
Richard Peter
3ef137ee36 Merge "Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab. Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a" into development
Former-commit-id: a3429f5ca1 [formerly 130e9151d2 [formerly 3afdc1e33555448ab7863858cc1d6496b545b5c8]]
Former-commit-id: 130e9151d2
Former-commit-id: 31c1c5e71b
2013-01-11 12:25:20 -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
Mike Duff
c12824d7bf Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab.
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: 4cbe807a52 [formerly 35d73f0354 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]
Former-commit-id: 35d73f0354
Former-commit-id: 16a86f47e6
2013-01-11 12:22:47 -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
Richard Peter
d3bb78a262 Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: c5338da7be [formerly dd2f1044c2 [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]
Former-commit-id: dd2f1044c2
Former-commit-id: eaf0cbc118
2013-01-11 11:55:23 -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
Ben Steffensmeier
b210023c96 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]
Former-commit-id: 211a9b6cee
Former-commit-id: 6e7b5a0e3d
2013-01-11 11:46:32 -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
Matt Nash
3f6ffe12e3 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 6bfbf6b0e3 [formerly 90fa08596e [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]
Former-commit-id: 90fa08596e
Former-commit-id: 0a8448cfed
2013-01-11 10:48:06 -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
cea19a313a Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: e91b5bd035 [formerly cffe035019 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]
Former-commit-id: cffe035019
Former-commit-id: 942140cca5
2013-01-10 17:25:09 -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
Mike Duff
7ba0d71d7c Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: 78440f2b5a [formerly 9526199a9c [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]
Former-commit-id: 9526199a9c
Former-commit-id: d2981a8275
2013-01-10 15:35:33 -06:00