Nate Jensen
a5b388edd8
Merge "Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
...
Former-commit-id: d45d793d36
[formerly 36fc48eb53
[formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]
Former-commit-id: 36fc48eb53
Former-commit-id: d725a23922
2013-01-21 11:42:37 -06:00
Steve Harris
bf957a3bd7
Merge branch '13.2.1_delivery' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
Former-commit-id: 407d73a04f
[formerly 2c9c6b7dde
[formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]
Former-commit-id: 2c9c6b7dde
Former-commit-id: 89f3120c0c
2013-01-18 10:52:29 -06:00
Steve Harris
5b617e763b
13.1.2-10 baseline
...
Former-commit-id: 86ea0b666e
[formerly 68dde17de2
[formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 68dde17de2
Former-commit-id: 683193255d
2013-01-18 10:37:25 -05:00
David Gillingham
de3e72065e
Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
...
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc
Former-commit-id: d16760c73e
[formerly c6e64d83a2
[formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]
Former-commit-id: c6e64d83a2
Former-commit-id: 9e3999a427
2013-01-17 17:42:05 -06:00
Nate Jensen
bcd008737b
Issue #1497 ported python fillEditArea to Java to boost speed
...
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36
Former-commit-id: 15e1731ef3
[formerly 278ea6d24e
[formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]
Former-commit-id: 278ea6d24e
Former-commit-id: 449b3735f0
2013-01-17 16:14:56 -06:00
Bryan Kowal
77660c9f5f
Issue #1414 - adding Satellite to the Data Access Framework
...
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions
Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9
Former-commit-id: 789359a779
[formerly 4939e96872
[formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]
Former-commit-id: 4939e96872
Former-commit-id: a315e4461b
2013-01-15 18:08:17 -06:00
Bryan Kowal
1414f0415b
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: 4db9c6c321
[formerly e2a12845d3
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: e2a12845d3
Former-commit-id: fba28ea69b
2013-01-15 14:56:01 -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
Steve Harris
73c5d94310
Issue #1408 - Fix syntax errors in server config
...
Former-commit-id: a5eac8ec3c
[formerly aee6a65e4c
[formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]
Former-commit-id: aee6a65e4c
Former-commit-id: 9a3be4460e
2013-01-15 09:47:25 -06:00
Richard Peter
6e42fa32d3
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1dbb34523b
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 3fb7d96ec1
Former-commit-id: a966546e31
2013-01-14 18:07:17 -06:00
Richard Peter
4c82ddaa12
Merge "Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development" into development
...
Former-commit-id: 4176d078a7
[formerly 59368e93e1
[formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]
Former-commit-id: 59368e93e1
Former-commit-id: d2cc93281a
2013-01-14 17:49:29 -06:00
Steve Harris
8dd688c878
13.2.1-1 baseline
...
Former-commit-id: 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: e62172c8c7
Former-commit-id: 5dfe4d10f1
2013-01-14 18:42:21 -05:00
Richard Peter
4e1f66abb3
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: b8e42dabc0
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: 1318f53902
Former-commit-id: ae3ea75cbf
2013-01-14 17:38:38 -06:00
Richard Peter
d7beb14c67
Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
...
Former-commit-id: 9ef997e3e8
[formerly de7d7b07ef
[formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]
Former-commit-id: de7d7b07ef
Former-commit-id: a8495324f7
2013-01-14 17:34:31 -06:00
Richard Peter
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
e3ec930c36
Issue #1477 Permissions broken for ingestDAT SQL querries.
...
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b
Former-commit-id: c9160ac945
[formerly 30733d3b25
[formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]
Former-commit-id: 30733d3b25
Former-commit-id: 65cfb39ba5
2013-01-14 11:38:45 -06:00
Steve Harris
0b15dff12b
13.1.2-7 baseline
...
Former-commit-id: 42189b5f88
[formerly 4f86b07eb0
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 4f86b07eb0
Former-commit-id: a8d90da9c0
2013-01-11 16:12:09 -05:00
Richard Peter
95f0508c29
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 328be6ac2b
[formerly 029ebaa63a
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 029ebaa63a
Former-commit-id: d0a6ba23e5
2013-01-09 17:55:05 -06:00
Richard Peter
9d5bfa7ae7
Issue #1454 : Update registry log4j
...
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5
Former-commit-id: 7b4d04e828
[formerly c8f79ee0cc
[formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]
Former-commit-id: c8f79ee0cc
Former-commit-id: 08922e14b7
2013-01-07 17:03:15 -06:00
Bryan Kowal
199e202979
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: d6b4cb65f4
[formerly c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: c8a43edd9e
Former-commit-id: ab8b346489
2013-01-07 12:16:01 -06:00
Steve Harris
1d4d25b49b
13.1.2-6 baseline
...
Former-commit-id: 59969775ad
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031
13.1.2-2 baseline
...
Former-commit-id: 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
2013-01-06 14:32:24 -06:00
Richard Peter
f941605942
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: c1765f776c
[formerly 1c560f5013
[formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: 1c560f5013
Former-commit-id: af5b616282
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
474a8dcf65
Issue #1438 move all gfe processing out of the grib plugin.
...
Former-commit-id: fe0a8b60c6
[formerly 521924904a
[formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]
Former-commit-id: 521924904a
Former-commit-id: b312bce5ad
2012-12-19 11:26:40 -06:00
Steve Harris
e0e596120c
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: ce72ebb094
[formerly ab8b1ae64d
[formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ab8b1ae64d
Former-commit-id: d4686333a1
2012-12-11 08:56:54 -06:00
Steve Harris
d27c5237c3
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: f6988eefff
[formerly 43ddfe98c4
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
2012-12-11 08:45:53 -06:00
Brad Gonzales
88a5c6b8ae
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 6ab74bb6ab
[formerly bcff2c134c
[formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]
Former-commit-id: bcff2c134c
Former-commit-id: 4e44770674
2012-12-10 14:08:54 -06:00
Dave Hladky
553610dbb9
Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
...
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d
Former-commit-id: 92e8877af4
[formerly e34b9a8862
[formerly 039fdaacc80f5158240de028541ba6688fa1d468]]
Former-commit-id: e34b9a8862
Former-commit-id: 20bbdee95d
2012-12-06 16:06:14 -06:00
Steve Harris
8790caf84e
12.12.1-8 baseline
...
Former-commit-id: 5093a7c442
[formerly 19962f41ba
[formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 19962f41ba
Former-commit-id: 2d338b4cec
2012-12-06 09:02:51 -06:00
Dustin Johnson
eda8a2208f
Issue #1377 Break registry dependency on data delivery
...
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea
Former-commit-id: 529238d010
[formerly bba092f51e
[formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]
Former-commit-id: bba092f51e
Former-commit-id: 6d1831b002
2012-12-03 12:06:32 -06:00
Ben Steffensmeier
2a653e7223
Issue #1358 add database-common to ingestDat
...
Former-commit-id: 9b0ca8043e
[formerly 5eb58b7ef3
[formerly c23d773e8d03db2c6a4735ea4e91e933b253a058]]
Former-commit-id: 5eb58b7ef3
Former-commit-id: 1eafc87945
2012-11-27 16:58:18 -06:00
Richard Peter
43991f57fd
Merge "Issue #1350 : Track ingestGrib and ingestDat statistics" into development
...
Former-commit-id: 9a90b123e7
[formerly 53426e2e90
[formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]
Former-commit-id: 53426e2e90
Former-commit-id: 5c398cb93f
2012-11-26 18:15:21 -06:00
Richard Peter
797b0bb4e8
Issue #1350 : Track ingestGrib and ingestDat statistics
...
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132
Former-commit-id: 4d5f2fd360
[formerly 8d40a8fea9
[formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]
Former-commit-id: 8d40a8fea9
Former-commit-id: 0db7ec08a2
2012-11-26 18:13:13 -06:00
Bryan Kowal
e0ca63881a
Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
...
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0
Former-commit-id: f645f60a75
[formerly 06241d95e0
[formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]
Former-commit-id: 06241d95e0
Former-commit-id: 95efa5f0e0
2012-11-26 13:06:33 -06:00
Dustin Johnson
ea7537804c
Issue #1322 Move router registry to edex.xml
...
Amend:
Add requestRouterRegistry to viz Spring file.
Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864
Former-commit-id: a9d01486ed
[formerly 13b1683458
[formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: 13b1683458
Former-commit-id: dd82a472e5
2012-11-19 13:21:03 -06:00
Dustin Johnson
8ec80021c2
Issue #1322 Fix ingestGrib modes.xml to include router spring file
...
Amend:
Add correct bean name.
Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349
Former-commit-id: 63db1ce6f8
[formerly ea7e8ac946
[formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]
Former-commit-id: ea7e8ac946
Former-commit-id: 9cfb406675
2012-11-19 12:03:31 -06:00
Dustin Johnson
22c930824c
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: 8a6be78eb0
[formerly 87148a8061
[formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 87148a8061
Former-commit-id: d1024d091c
2012-11-16 14:43:45 -06:00
Ben Steffensmeier
27f6224e91
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 6b0ed3fa50
[formerly 1a7560b8a3
[formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]
Former-commit-id: 1a7560b8a3
Former-commit-id: 1082b1b51d
2012-11-16 12:25:00 -06:00
Benjamin Phillippe
1fa596463d
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 5c31b34e12
[formerly 5bf46d468d
[formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5bf46d468d
Former-commit-id: 44519995ee
2012-11-15 13:35:25 -06:00
Dustin Johnson
069c8d4788
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 0d1d663f41
[formerly bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135
12.12.1-4 baseline
...
Former-commit-id: 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
2012-11-14 14:19:20 -06:00
Dustin Johnson
f1cfa9a60d
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7c59f9ea41
[formerly 7d9e7567bd
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7d9e7567bd
Former-commit-id: afd9a767ea
2012-11-14 12:19:10 -06:00
Brad Gonzales
de29d9feba
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 1617341e2a
[formerly 4af27e092f
[formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 4af27e092f
Former-commit-id: 782ffb92ea
2012-11-14 09:39:26 -06:00
Steve Harris
1ee8938748
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
2012-11-13 17:28:50 -06:00
Steve Harris
48fa2a9106
12.12.1-3 baseline
...
Former-commit-id: b3b5e6d28f
[formerly c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: c999505fba
Former-commit-id: a81c46987b
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
626f398224
Merge branch 'ss_builds'(12.12.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: e8090e654b
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
a0f6c320cb
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 693090cb36
[formerly 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 535c73051d
Former-commit-id: 20e618eb4f
2012-11-08 14:45:36 -06:00
Nate Jensen
b0bb920fde
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
...
Former-commit-id: 6b205399d4
[formerly b32a9e839e
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: b32a9e839e
Former-commit-id: 20a63254e2
2012-11-07 18:18:06 -06:00
Steve Harris
8278cac143
12.12.1-1 baseline
...
Former-commit-id: e1498006c7
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
2012-11-07 12:41:20 -06:00
Max Schenkelberg
94e64c9b0d
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
...
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: ca4177dd08
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
2012-11-07 10:44:42 -06:00