Dustin Johnson
7da688f138
Issue #1441 Create new datadelivery services plugin
...
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.
Amend:
Rebase to HEAD of 13.2.1.
Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa
Former-commit-id: 3ec05a5a9c
[formerly 557de162b0
] [formerly 3ec05a5a9c
[formerly 557de162b0
] [formerly 15c2c55ff9
[formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e
[formerly a3c99f86bb
]
Former-commit-id: 2168713505
2013-01-22 11:45:18 -06:00
Nate Jensen
41f4599ba8
Issue #1497 ported python fillEditArea to Java to boost speed
...
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36
Former-commit-id: 449b3735f0
[formerly 278ea6d24e
] [formerly 449b3735f0
[formerly 278ea6d24e
] [formerly 15e1731ef3
[formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]]
Former-commit-id: 15e1731ef3
Former-commit-id: 492634b6f5
[formerly f70f8d1f4f
]
Former-commit-id: ec5806fb58
2013-01-17 16:14:56 -06:00
Steve Harris
846ac28155
Issue #1408 - Fix syntax errors in server config
...
Former-commit-id: 9a3be4460e
[formerly aee6a65e4c
] [formerly 9a3be4460e
[formerly aee6a65e4c
] [formerly a5eac8ec3c
[formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: e202452ace
[formerly 31f190865e
]
Former-commit-id: 72f3894768
2013-01-15 09:47:25 -06:00
Richard Peter
e838f2db25
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: a966546e31
[formerly 3fb7d96ec1
] [formerly a966546e31
[formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838
[formerly 345dfd2ca9
]
Former-commit-id: cd2014bf8d
2013-01-14 18:07:17 -06:00
Richard Peter
ff672cac47
Merge "Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development" into development
...
Former-commit-id: d2cc93281a
[formerly 59368e93e1
] [formerly d2cc93281a
[formerly 59368e93e1
] [formerly 4176d078a7
[formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]
Former-commit-id: 4176d078a7
Former-commit-id: ea7d2eaff1
[formerly 2049e40d87
]
Former-commit-id: 57e68e7872
2013-01-14 17:49:29 -06:00
Steve Harris
b4556ea28f
13.2.1-1 baseline
...
Former-commit-id: 5dfe4d10f1
[formerly e62172c8c7
] [formerly 5dfe4d10f1
[formerly e62172c8c7
] [formerly 81849e3cbb
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d
[formerly 8713dfc5ca
]
Former-commit-id: ebff2a6275
2013-01-14 18:42:21 -05:00
Richard Peter
ef2dc06b69
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: ae3ea75cbf
[formerly 1318f53902
] [formerly ae3ea75cbf
[formerly 1318f53902
] [formerly b8e42dabc0
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7
[formerly aa9e16b038
]
Former-commit-id: 096134d917
2013-01-14 17:38:38 -06:00
Richard Peter
c7f02b18c5
Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
...
Former-commit-id: a8495324f7
[formerly de7d7b07ef
] [formerly a8495324f7
[formerly de7d7b07ef
] [formerly 9ef997e3e8
[formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 997ab69bf0
[formerly 94eea3065b
]
Former-commit-id: bdc637110a
2013-01-14 17:34:31 -06:00
Richard Peter
e59ea72456
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: 1a1a69d38c
[formerly 970216e4c9
] [formerly 1a1a69d38c
[formerly 970216e4c9
] [formerly 19d923f387
[formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]
Former-commit-id: 19d923f387
Former-commit-id: f1262388ce
[formerly 8ccc791566
]
Former-commit-id: 2575e4e4ea
2013-01-14 16:53:05 -06:00
Dave Hladky
64c293c460
Issue #1477 Permissions broken for ingestDAT SQL querries.
...
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b
Former-commit-id: 65cfb39ba5
[formerly 30733d3b25
] [formerly 65cfb39ba5
[formerly 30733d3b25
] [formerly c9160ac945
[formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]
Former-commit-id: c9160ac945
Former-commit-id: e746688671
[formerly c5f71be70a
]
Former-commit-id: 936d0f143d
2013-01-14 11:38:45 -06:00
Steve Harris
1ef10eaf2c
13.1.2-7 baseline
...
Former-commit-id: a8d90da9c0
[formerly 4f86b07eb0
] [formerly a8d90da9c0
[formerly 4f86b07eb0
] [formerly 42189b5f88
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e
[formerly b7f1dbe72b
]
Former-commit-id: 775a338b90
2013-01-11 16:12:09 -05:00
Richard Peter
398b47967d
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: d0a6ba23e5
[formerly 029ebaa63a
] [formerly d0a6ba23e5
[formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28
[formerly 6a5a0d7d09
]
Former-commit-id: 709af3b25e
2013-01-09 17:55:05 -06:00
Richard Peter
884d082f9e
Issue #1454 : Update registry log4j
...
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5
Former-commit-id: 08922e14b7
[formerly c8f79ee0cc
] [formerly 08922e14b7
[formerly c8f79ee0cc
] [formerly 7b4d04e828
[formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 84c5aa1d29
[formerly b9ae764a04
]
Former-commit-id: bf14d0167a
2013-01-07 17:03:15 -06:00
Bryan Kowal
1996f92f7e
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: ab8b346489
[formerly c8a43edd9e
] [formerly ab8b346489
[formerly c8a43edd9e
] [formerly d6b4cb65f4
[formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a
[formerly 146c43a606
]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4
[formerly dbcae57f57
]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c
[formerly 941337c553
]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Richard Peter
e8d1469a70
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: af5b616282
[formerly 1c560f5013
] [formerly af5b616282
[formerly 1c560f5013
] [formerly c1765f776c
[formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: 9f991104dd
[formerly 424cb12ef6
]
Former-commit-id: 6fd64a20fa
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
f62c7fde9b
Issue #1438 move all gfe processing out of the grib plugin.
...
Former-commit-id: b312bce5ad
[formerly 521924904a
] [formerly b312bce5ad
[formerly 521924904a
] [formerly fe0a8b60c6
[formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: ca4e39df79
[formerly c6032b1950
]
Former-commit-id: 7d19f5e38f
2012-12-19 11:26:40 -06:00
Steve Harris
868acb808b
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: d4686333a1
[formerly ab8b1ae64d
] [formerly d4686333a1
[formerly ab8b1ae64d
] [formerly ce72ebb094
[formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a
[formerly 113fdcb679
]
Former-commit-id: db24093e42
2012-12-11 08:56:54 -06:00
Steve Harris
b0a60923c4
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: 4d4771ee3a
[formerly 43ddfe98c4
] [formerly 4d4771ee3a
[formerly 43ddfe98c4
] [formerly f6988eefff
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d
[formerly 6287b32e7d
]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Brad Gonzales
5959f06dbd
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 4e44770674
[formerly bcff2c134c
] [formerly 4e44770674
[formerly bcff2c134c
] [formerly 6ab74bb6ab
[formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 15b3a61287
[formerly 065ddf4d4a
]
Former-commit-id: cb35e0f5e8
2012-12-10 14:08:54 -06:00
Dave Hladky
c8037a5575
Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler
...
Change-Id: I38294e99102b77936f95b97eef28ef3eca126d6d
Former-commit-id: 20bbdee95d
[formerly e34b9a8862
] [formerly 20bbdee95d
[formerly e34b9a8862
] [formerly 92e8877af4
[formerly 039fdaacc80f5158240de028541ba6688fa1d468]]]
Former-commit-id: 92e8877af4
Former-commit-id: bd878d58d0
[formerly b5689bac66
]
Former-commit-id: 1299130f80
2012-12-06 16:06:14 -06:00
Steve Harris
0b22b3c014
12.12.1-8 baseline
...
Former-commit-id: 2d338b4cec
[formerly 19962f41ba
] [formerly 2d338b4cec
[formerly 19962f41ba
] [formerly 5093a7c442
[formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee
[formerly ee06a94735
]
Former-commit-id: ec2cdc1593
2012-12-06 09:02:51 -06:00
Dustin Johnson
5f51b0b3f8
Issue #1377 Break registry dependency on data delivery
...
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea
Former-commit-id: 6d1831b002
[formerly bba092f51e
] [formerly 6d1831b002
[formerly bba092f51e
] [formerly 529238d010
[formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]
Former-commit-id: 529238d010
Former-commit-id: 5953c5372f
[formerly 1b165c8e73
]
Former-commit-id: 5731299558
2012-12-03 12:06:32 -06:00
Ben Steffensmeier
81bf8f2ce1
Issue #1358 add database-common to ingestDat
...
Former-commit-id: 1eafc87945
[formerly 5eb58b7ef3
] [formerly 1eafc87945
[formerly 5eb58b7ef3
] [formerly 9b0ca8043e
[formerly c23d773e8d03db2c6a4735ea4e91e933b253a058]]]
Former-commit-id: 9b0ca8043e
Former-commit-id: f0732b0944
[formerly 2fa293fc9d
]
Former-commit-id: ca2a22f236
2012-11-27 16:58:18 -06:00
Richard Peter
a67465cf41
Merge "Issue #1350 : Track ingestGrib and ingestDat statistics" into development
...
Former-commit-id: 5c398cb93f
[formerly 53426e2e90
] [formerly 5c398cb93f
[formerly 53426e2e90
] [formerly 9a90b123e7
[formerly 08b5d690e71afd7424fc00e0d4c06b497447d93a]]]
Former-commit-id: 9a90b123e7
Former-commit-id: 88602c16f4
[formerly a7d31535da
]
Former-commit-id: 3e12efe275
2012-11-26 18:15:21 -06:00
Richard Peter
688cc569f5
Issue #1350 : Track ingestGrib and ingestDat statistics
...
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132
Former-commit-id: 0db7ec08a2
[formerly 8d40a8fea9
] [formerly 0db7ec08a2
[formerly 8d40a8fea9
] [formerly 4d5f2fd360
[formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: d1d28437ad
[formerly b891bb63e1
]
Former-commit-id: 17189b1862
2012-11-26 18:13:13 -06:00
Bryan Kowal
da6b3656bd
Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature
...
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0
Former-commit-id: 95efa5f0e0
[formerly 06241d95e0
] [formerly 95efa5f0e0
[formerly 06241d95e0
] [formerly f645f60a75
[formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]]
Former-commit-id: f645f60a75
Former-commit-id: 87e0c08179
[formerly f68c9873b7
]
Former-commit-id: 55ac52ff6e
2012-11-26 13:06:33 -06:00
Dustin Johnson
5b64ddb7ba
Issue #1322 Move router registry to edex.xml
...
Amend:
Add requestRouterRegistry to viz Spring file.
Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864
Former-commit-id: dd82a472e5
[formerly 13b1683458
] [formerly dd82a472e5
[formerly 13b1683458
] [formerly a9d01486ed
[formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: dd03bf9bd5
[formerly 1bb69653af
]
Former-commit-id: f91817813d
2012-11-19 13:21:03 -06:00
Dustin Johnson
80622f912d
Issue #1322 Fix ingestGrib modes.xml to include router spring file
...
Amend:
Add correct bean name.
Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349
Former-commit-id: 9cfb406675
[formerly ea7e8ac946
] [formerly 9cfb406675
[formerly ea7e8ac946
] [formerly 63db1ce6f8
[formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 75feca3cd0
[formerly 56ea981db7
]
Former-commit-id: 167e11671b
2012-11-19 12:03:31 -06:00
Dustin Johnson
08f3910ece
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: d1024d091c
[formerly 87148a8061
] [formerly d1024d091c
[formerly 87148a8061
] [formerly 8a6be78eb0
[formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: a448369b44
[formerly 1d5714b994
]
Former-commit-id: 2afb19d76b
2012-11-16 14:43:45 -06:00
Ben Steffensmeier
268f7cb64d
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 1082b1b51d
[formerly 1a7560b8a3
] [formerly 1082b1b51d
[formerly 1a7560b8a3
] [formerly 6b0ed3fa50
[formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 5126024a6b
[formerly 2a0769d094
]
Former-commit-id: 13f8f28c2e
2012-11-16 12:25:00 -06:00
Benjamin Phillippe
debdd584fd
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 44519995ee
[formerly 5bf46d468d
] [formerly 44519995ee
[formerly 5bf46d468d
] [formerly 5c31b34e12
[formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 43b94988c8
[formerly 6b1b73429b
]
Former-commit-id: 688e19acc1
2012-11-15 13:35:25 -06:00
Dustin Johnson
6d21c445c2
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: d27bce13c2
[formerly bff32bbe58
] [formerly d27bce13c2
[formerly bff32bbe58
] [formerly 0d1d663f41
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 5d5dbe27e1
[formerly e25b7c312b
]
Former-commit-id: ff33643234
2012-11-14 14:41:57 -06:00
Steve Harris
2c2bfc949d
12.12.1-4 baseline
...
Former-commit-id: b91b7f0fae
[formerly 85130eb611
] [formerly b91b7f0fae
[formerly 85130eb611
] [formerly 57578da521
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: e35a321a8c
[formerly 628ca9e5c6
]
Former-commit-id: 493f335c0b
2012-11-14 14:19:20 -06:00
Dustin Johnson
0c5a52f3b1
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: afd9a767ea
[formerly 7d9e7567bd
] [formerly afd9a767ea
[formerly 7d9e7567bd
] [formerly 7c59f9ea41
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 5d410ff934
[formerly c0c60c2488
]
Former-commit-id: 3129d3bd3a
2012-11-14 12:19:10 -06:00
Brad Gonzales
ec0fc6417a
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: 782ffb92ea
[formerly 4af27e092f
] [formerly 782ffb92ea
[formerly 4af27e092f
] [formerly 1617341e2a
[formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: cc8ed35821
[formerly c024c94050
]
Former-commit-id: dfc125236d
2012-11-14 09:39:26 -06:00
Steve Harris
ae9d9985cd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 8fc896f7d4
[formerly 448dd1c35f
] [formerly 8fc896f7d4
[formerly 448dd1c35f
] [formerly 00f3d51546
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719
[formerly c8cac52915
]
Former-commit-id: 59efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
7058ebec23
12.12.1-3 baseline
...
Former-commit-id: a81c46987b
[formerly c999505fba
] [formerly a81c46987b
[formerly c999505fba
] [formerly b3b5e6d28f
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f
[formerly 2797cbcdd0
]
Former-commit-id: 314495dc8e
2012-11-13 17:27:04 -06:00
Ben Steffensmeier
9f2f2591ee
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: ed4f88aa22
[formerly 69fc030bb4
] [formerly ed4f88aa22
[formerly 69fc030bb4
] [formerly e8090e654b
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778
[formerly 60f78c22e3
]
Former-commit-id: 7761060a12
2012-11-13 16:00:19 -06:00
Ben Steffensmeier
2223e6ff64
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 20e618eb4f
[formerly 535c73051d
] [formerly 20e618eb4f
[formerly 535c73051d
] [formerly 693090cb36
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c
[formerly 884c82c4fe
]
Former-commit-id: 74d1381180
2012-11-08 14:45:36 -06:00
Nate Jensen
04c843cb1b
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: 20a63254e2
[formerly b32a9e839e
] [formerly 20a63254e2
[formerly b32a9e839e
] [formerly 6b205399d4
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 2fe69a5871
[formerly e3208d48a0
]
Former-commit-id: 01e11761d8
2012-11-07 18:18:06 -06:00
Steve Harris
af59663a99
12.12.1-1 baseline
...
Former-commit-id: c2839cc86d
[formerly e4bd20a515
] [formerly c2839cc86d
[formerly e4bd20a515
] [formerly e1498006c7
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928
[formerly 214fcd3b63
]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Max Schenkelberg
2345861756
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: f069f34a96
[formerly 2f90120248
] [formerly f069f34a96
[formerly 2f90120248
] [formerly ca4177dd08
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1
[formerly 747ab974e9
]
Former-commit-id: 50625b0453
2012-11-07 10:44:42 -06:00
Bryan Kowal
cf7ae375b9
Issue #1276 - v1.0 of multiple WA deployment support
...
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5
Former-commit-id: cae04523db
[formerly 9263a0ac57
] [formerly cae04523db
[formerly 9263a0ac57
] [formerly 4fd43ee45c
[formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: d928e2f257
[formerly 2c14ea1bb7
]
Former-commit-id: 2cd64bd5cc
2012-11-06 16:13:26 -06:00
Dustin Johnson
7843e33544
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: 8d5c86f31e
[formerly 2f28e19bf6
] [formerly 8d5c86f31e
[formerly 2f28e19bf6
] [formerly a8f9c4f90a
[formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7b4967b5bb
[formerly 7f994472ae
]
Former-commit-id: e0c68bde6d
2012-11-01 16:31:14 -05:00
Dustin Johnson
931d94d1de
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 8e69107b5a
[formerly 98d7beae50
] [formerly 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a
[formerly bcf575966b
]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Brad Gonzales
69e4af9ce2
Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
...
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41
Former-commit-id: 449e4a2182
[formerly 9137f334b5
] [formerly 449e4a2182
[formerly 9137f334b5
] [formerly 20a5fe3577
[formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]]
Former-commit-id: 20a5fe3577
Former-commit-id: 4ffe05d37e
[formerly 2ffcd5d684
]
Former-commit-id: 49343a7e3c
2012-11-01 11:02:48 -05:00
Brad Gonzales
78fbf32245
Issue #1274 Added Token control for java code and scripts started by RFC Crons.
...
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.
Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().
Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc
Former-commit-id: 75e77feb58
[formerly 68a3a98547
] [formerly 75e77feb58
[formerly 68a3a98547
] [formerly 44e9238fa9
[formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 7807eca270
[formerly 253c19ae05
]
Former-commit-id: 6fae286ad2
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
1931b503a2
merge branch Unifeid_Grid into developement
...
Former-commit-id: 272e057bf1
[formerly d0a2ed32b5
] [formerly 272e057bf1
[formerly d0a2ed32b5
] [formerly b6a1563bb2
[formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220
[formerly 92fd247ccc
]
Former-commit-id: 38b0dafe0b
2012-10-30 12:24:54 -05:00