Commit graph

1672 commits

Author SHA1 Message Date
Lee Venable
e5e1841b7e Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]
Former-commit-id: f63da5aba6
Former-commit-id: 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d]
Former-commit-id: c4291fcb2a
2013-01-15 14:47:49 -06:00
Max Schenkelberg
4e507c57f6 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: 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]
Former-commit-id: db3e7bab99
Former-commit-id: 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568]
Former-commit-id: fac8769336
2013-01-15 14:41:19 -06:00
Nate Jensen
65e91312b6 Issue #1446 Initial python within Jep implementation of data access framework
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8

Former-commit-id: 744f536415 [formerly e5e7107a56] [formerly e5237fceac] [formerly 12e0a100c4 [formerly e5237fceac [formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]]
Former-commit-id: 12e0a100c4
Former-commit-id: 7bc5f3faca240fbf62ffec334f821eb98bc580ed [formerly aaa442212a]
Former-commit-id: f726a26b54
2013-01-15 13:48:04 -06:00
Richard Peter
ea1a93d1b9 Merge "Issue #1452 Clear current filters when creating a new filter configuration." into development
Former-commit-id: cd3fcb5561 [formerly e1ce9b63f1] [formerly 02f597fdb2] [formerly b94c90fd51 [formerly 02f597fdb2 [formerly 0fd071aa5ac96a6548ac350f55820837cf20a992]]]
Former-commit-id: b94c90fd51
Former-commit-id: 5710507c6a21951c23fd8e681b010a9da4b49ce8 [formerly 4966d706ae]
Former-commit-id: 99513feec9
2013-01-15 13:40:49 -06:00
Richard Peter
00a4f2f3b7 Merge "Issue #1475 QPF standalonoe displays appear slow" into development
Former-commit-id: d2fbb1af03 [formerly ed6d929dcd] [formerly e7305ca187] [formerly 11e8dae113 [formerly e7305ca187 [formerly 1d1a155a0276dcf02ccc9d66937d0a6d37d51722]]]
Former-commit-id: 11e8dae113
Former-commit-id: a4769661683a42397b8db11e48020d84acc28608 [formerly b3d5faebf3]
Former-commit-id: cf1d3faab2
2013-01-15 13:40:13 -06:00
Steve Harris
eedb2903b1 Issue #1408 - Fix syntax errors in server config
Former-commit-id: 73c5d94310 [formerly 9a3be4460e] [formerly aee6a65e4c] [formerly a5eac8ec3c [formerly aee6a65e4c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: b03470754f36ce50d19e7ef9072478e1b49ef2dd [formerly 31f190865e]
Former-commit-id: e202452ace
2013-01-15 09:47:25 -06:00
Richard Peter
d880361e06 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: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Brad Gonzales
23f6270d4c Issue #1452 Clear current filters when creating a new filter configuration.
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 323f1f44c4 [formerly 574ed7c971] [formerly 03c7656f55] [formerly 771debed33 [formerly 03c7656f55 [formerly dc3f958011b53ba07ea21648ca1c634bd7b677b7]]]
Former-commit-id: 771debed33
Former-commit-id: 3f687442e0ee4193ff1fb6357696a0241823c642 [formerly 10aa12c141]
Former-commit-id: 35a85c2c91
2013-01-14 18:06:29 -06:00
Richard Peter
dd346fa040 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87]
Former-commit-id: ea7d2eaff1
2013-01-14 17:49:29 -06:00
Lee Venable
9d53072b41 Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
Former-commit-id: 66aab3680d [formerly c3dec53498] [formerly 7009876544] [formerly a3a7dc44c9 [formerly 7009876544 [formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: fdd917cd63082600218ba6b454499b49789ae013 [formerly 4e2b009db0]
Former-commit-id: baa5496a72
2013-01-14 17:47:59 -06:00
Ben Steffensmeier
2ebe93dc12 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091]
Former-commit-id: 3d63fa24a1
2013-01-14 17:44:46 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd 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: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Richard Peter
809c981306 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b]
Former-commit-id: 997ab69bf0
2013-01-14 17:34:31 -06:00
Richard Peter
c056fd25cb Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 85519760d6 [formerly 5ec69e843e] [formerly 00047e5aa78cabc9906a5db00d1b104a9d316528 [formerly 89b08fdd2f]] [formerly 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]
Former-commit-id: 8192515b06
Former-commit-id: e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda]
Former-commit-id: 9154383e5a
2013-01-14 17:34:17 -06:00
Richard Peter
715d5bd5f2 Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
Former-commit-id: 99414fa1f0 [formerly 461a503837] [formerly 32d4bc3d9f] [formerly 69c6cfd196 [formerly 32d4bc3d9f [formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]
Former-commit-id: 69c6cfd196
Former-commit-id: 7eb1dd62e445e03b2b2d4d9248f1dfaad042460e [formerly a634690867]
Former-commit-id: ab38a1f89b
2013-01-14 17:33:22 -06:00
Richard Peter
7af4fc10a8 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 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]
Former-commit-id: f1262388ce
2013-01-14 16:53:05 -06:00
Dave Hladky
8abd5b779a Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: a8b5ee21f6 [formerly 199d88d6a8] [formerly 8ac74e6b0d] [formerly 75f62b0856 [formerly 8ac74e6b0d [formerly 2f6bf58b35e6ff8317281c3e62d1c1a61eea14f0]]]
Former-commit-id: 75f62b0856
Former-commit-id: 5680236721f68eccd4069a48b6526291dc525a33 [formerly be17e02b4a]
Former-commit-id: 360d3bfe23
2013-01-14 15:50:59 -06:00
Ben Steffensmeier
b2029cc48a Issue #1482 ignore malformed gribModel files
Former-commit-id: beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]
Former-commit-id: 9cfa09e507
Former-commit-id: 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29]
Former-commit-id: 80e307c96e
2013-01-14 15:10:56 -06:00
Brad Gonzales
eacfe73d3f Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 7391e3c0fe [formerly 1644eee264] [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 5bbe5d5dbf [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bbcec7aca93cd7df0525463803027bc994288c8e [formerly 881cc10e84]
Former-commit-id: bd8eaa6dc8
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
dea702c873 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]
Former-commit-id: c1ae999c81
2013-01-14 14:30:17 -06:00
Richard Peter
8c0a79611e Merge "Issue #1464 fix saving of spatial subsets." into development
Former-commit-id: 16ccbec7fa [formerly fe28e371a6] [formerly 65715d4154] [formerly e180a2ff86 [formerly 65715d4154 [formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]
Former-commit-id: e180a2ff86
Former-commit-id: bb8dc777c2dc2e01f0556a7a8c7253bf8db95622 [formerly 712fb1cb05]
Former-commit-id: 62d3bd6837
2013-01-14 11:56:33 -06:00
Richard Peter
4b57dccb57 Merge "Issue #1473: Fix Alarm Alert NPE" into development
Former-commit-id: b731360a84 [formerly 621a4cd147] [formerly 0f705ac355] [formerly e176fcbf06 [formerly 0f705ac355 [formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]
Former-commit-id: e176fcbf06
Former-commit-id: 668863fe0d8c1e551660ffd2408217fac215e66b [formerly 157e75f7aa]
Former-commit-id: 521e7cf5af
2013-01-14 11:55:35 -06:00
Dave Hladky
bd45e9af0f Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a]
Former-commit-id: e746688671
2013-01-14 11:38:45 -06:00
Ben Steffensmeier
19104e6cbf Issue #1464 fix saving of spatial subsets.
Former-commit-id: e787fdcaf9 [formerly 0933461f40] [formerly bc5233748a] [formerly c8ef480815 [formerly bc5233748a [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: c53d9b72c0b2f445296e31570c1b1f5aa26bb092 [formerly 4fd3d47385]
Former-commit-id: 053b673790
2013-01-14 10:49:14 -06:00
Richard Peter
c9dd98496b Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17]
Former-commit-id: c68dcf4554
2013-01-14 09:59:28 -06:00
Richard Peter
b933bd56c7 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: 7e14eb1840 [formerly 854bd1d4e0] [formerly d2a1388b0e] [formerly 061fa21537 [formerly d2a1388b0e [formerly 888b839152d86c536b249e795666c596a213da86]]]
Former-commit-id: 061fa21537
Former-commit-id: 4731e8fe09be84df4c8258189e64a2405c94b0a5 [formerly 6176588496]
Former-commit-id: fdf83d8623
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
b9baedab39 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
Former-commit-id: d92f2de0c3 [formerly 83cf6ec05c] [formerly 5c5b2e3c20] [formerly 52f55e6d3a [formerly 5c5b2e3c20 [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: 13be1753e7eb83458858e4291537dbb830a7ef05 [formerly c617b3cc70]
Former-commit-id: 0a5da321d6
2013-01-11 16:26:14 -06:00
Steve Harris
13be9f8987 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]
Former-commit-id: f1256f2a9e
2013-01-11 16:12:09 -05:00
Mike Duff
135fd5c13d 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: 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164]
Former-commit-id: d3ed6f6148
2013-01-11 14:38:34 -06:00
Richard Peter
cf8483486b Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020]
Former-commit-id: 74092ae046
2013-01-11 12:53:37 -06:00
Dustin Johnson
bce1b88d26 Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

Former-commit-id: 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly f44a2f6ea9 [formerly 7d10c7fac5 [formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: 1f7651d3448a20469f46b569fcc7d279b6bb1842 [formerly bd8dbc39e7]
Former-commit-id: 5e4a1b7bd9
2013-01-11 12:39:00 -06:00
Richard Peter
dd12b3fe0f Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]
Former-commit-id: cf815a4c72
2013-01-11 12:37:05 -06:00
Richard Peter
b0050959af Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: 7f595074ae [formerly c309d2dc1e] [formerly a595356025] [formerly f9e39660d4 [formerly a595356025 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]
Former-commit-id: f9e39660d4
Former-commit-id: 1c18c0a235839ef85ff98f2d1031b2307daefd8d [formerly b9e409357d]
Former-commit-id: ff1dc7e236
2013-01-11 12:25:54 -06:00
Richard Peter
0be75cba3c Merge "Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab. Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a" into development
Former-commit-id: 3ef137ee36 [formerly 31c1c5e71b] [formerly 130e9151d2] [formerly a3429f5ca1 [formerly 130e9151d2 [formerly 3afdc1e33555448ab7863858cc1d6496b545b5c8]]]
Former-commit-id: a3429f5ca1
Former-commit-id: 26c3d3ceb7c0b959420d9211713244167a32b8e3 [formerly c0655734e7]
Former-commit-id: d01c8c70b4
2013-01-11 12:25:20 -06:00
Dustin Johnson
2a306b4122 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]
Former-commit-id: a4414d409a
2013-01-11 12:23:15 -06:00
Mike Duff
d5f9aefec0 Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab.
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: c12824d7bf [formerly 16a86f47e6] [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 35d73f0354 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]
Former-commit-id: 4cbe807a52
Former-commit-id: 076bb9b030781d1f36bd984fff6daf176073a6f4 [formerly 98ec2a5269]
Former-commit-id: c498087b96
2013-01-11 12:22:47 -06:00
Dave Hladky
59c349ac77 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 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]
Former-commit-id: fe486b4889
2013-01-11 11:59:36 -06:00
Richard Peter
ed2e9c59e1 Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: d3bb78a262 [formerly eaf0cbc118] [formerly dd2f1044c2] [formerly c5338da7be [formerly dd2f1044c2 [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]]
Former-commit-id: c5338da7be
Former-commit-id: 93b5bc836fb851dfa8b1af7af168a935aaef9ded [formerly afbc50da00]
Former-commit-id: 6c5c815c0b
2013-01-11 11:55:23 -06:00
Dustin Johnson
6984791be8 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 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]
Former-commit-id: 7bf029eb7e
2013-01-11 11:53:02 -06:00
Ben Steffensmeier
3f17e60975 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]
Former-commit-id: a1afabe4e3
Former-commit-id: b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]
Former-commit-id: 3b72ea7f19
2013-01-11 11:46:32 -06:00
Richard Peter
c889337379 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]
Former-commit-id: e23ffee8bd
2013-01-11 11:03:42 -06:00
Matt Nash
0e04e3e1d2 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 3f6ffe12e3 [formerly 0a8448cfed] [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 90fa08596e [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: dc95ddec2b8f59c1d1a2eb1f098a077fdf7a1dd2 [formerly addac12b84]
Former-commit-id: 1ab332b654
2013-01-11 10:48:06 -06:00
Dustin Johnson
25a4e68f25 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly f316320b06 [formerly ede32c8d3e [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]
Former-commit-id: f316320b06
Former-commit-id: b6ddfc6f49195136d5d7d440c3e182fdd9538e9b [formerly 35409872a6]
Former-commit-id: f274ce63e9
2013-01-11 08:56:39 -06:00
Richard Peter
60392a7a7c Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: cea19a313a [formerly 942140cca5] [formerly cffe035019] [formerly e91b5bd035 [formerly cffe035019 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: 4a63d9342225528410d684780a44036549f31886 [formerly 6857211fc6]
Former-commit-id: c4c2ae3256
2013-01-10 17:25:09 -06:00
Richard Peter
9d0c8ff714 Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]
Former-commit-id: 4a097586f6
2013-01-10 17:17:58 -06:00
Mike Duff
c21d02d8fb Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: 7ba0d71d7c [formerly d2981a8275] [formerly 9526199a9c] [formerly 78440f2b5a [formerly 9526199a9c [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: c2ca6a0936930afda3caca73c5ca608bee2b795a [formerly bde6be532e]
Former-commit-id: f2da1df6e6
2013-01-10 15:35:33 -06:00
Mike Duff
f167689caf Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 38aae63ee3 [formerly 674ddfedb2] [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 02bfe05a27 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 6d7445bf13f8b180941b8fd9b135ad41b909c4c8 [formerly b42395d6ea]
Former-commit-id: 8b23902cea
2013-01-10 12:26:59 -06:00
Dustin Johnson
2c21da07a8 Merge "Issue #1441 Break net.dods dependency on AWIPS code" into development
Former-commit-id: a40a0fc79b [formerly 5a861267aa] [formerly 7d67bd5949] [formerly d5fcc68163 [formerly 7d67bd5949 [formerly 45b7e01839ef90c8623c3c5b8f2c873997e90111]]]
Former-commit-id: d5fcc68163
Former-commit-id: e3e253eb0720cac3fa541b01c0f9dc5674f3e281 [formerly c6609e8ea8]
Former-commit-id: 048606bae5
2013-01-10 12:25:04 -06:00