Steve Harris
52226061e9
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: ffcc34f8d4
[formerly 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
2014-03-06 08:39:43 -06:00
Dave Hladky
1c8f6fb36d
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 39f97723d6
[formerly 6172c83afc
[formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]
Former-commit-id: 6172c83afc
Former-commit-id: 7fb7e10cda
2014-02-05 14:49:26 -06:00
Brad Gonzales
08817277b4
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
...
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: a6540d69ea
[formerly 21acb75f24
[formerly 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8]]
Former-commit-id: 21acb75f24
Former-commit-id: dc45b582e1
2013-10-07 17:06:38 -05:00
Dustin Johnson
fe8c0b47d1
Issue #2106 Fix transactional semantics
...
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: 69c09e530f
[formerly fac7d3a9d9
[formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: fac7d3a9d9
Former-commit-id: 5bfef9bb45
2013-06-25 08:33:55 -05:00
Dustin Johnson
e19ff76a2c
Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
...
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e
Former-commit-id: 1c7d99f53f
[formerly da69d3e630
[formerly c213b3b5552a2b11c69965bc6edcfb8acf7fa0a8]]
Former-commit-id: da69d3e630
Former-commit-id: 063e68bc93
2013-06-10 18:47:17 -05:00