Steve Harris
36a0533f19
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: 069093884f069093884fffcc34f8d496658d8ce0
2014-03-06 08:39:43 -06:00
Dave Hladky
d5a1042ba3
Issue #2472 Replacing lost commit
...
Former-commit-id: 1f1469fe821f1469fe829c6a430d4047b946fc3b
2013-11-04 16:24:14 -06:00
Dave Hladky
30aa0c93a1
Issue #2097 Initial update for OGC services
...
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: 83dba7b65583dba7b655bef4b3cdbd37062aac21
2013-08-28 08:24:45 -05:00
Max Schenkelberg
a47f187f4f
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 63421a481963421a481950825200a11610826d2e
2013-07-15 14:26:15 -05:00
Dustin Johnson
c2ed1495ad
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: fac7d3a9d9fac7d3a9d969c09e530ff67d02a394
2013-06-25 08:33:55 -05:00
Dustin Johnson
9220f1a199
Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
...
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e
Former-commit-id: da69d3e630da69d3e6301c7d99f53ffef2708ff5
2013-06-10 18:47:17 -05:00
Steve Harris
4001e050e7
13.4.1-1 baseline
...
Former-commit-id: 2f517b77132f517b771300332e63054accbb80db
2013-04-24 17:15:55 -05:00
Dustin Johnson
e39187c0ce
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 8956d1ac178956d1ac1704cbd3a24e1b1bd69b89
2013-03-22 10:04:21 -05:00
Dave Hladky
7046f31351
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: 5362771743536277174338494cec168a46d43216
2013-03-20 12:17:08 -05:00
Dave Hladky
64f8c46e64
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59fddb23ae59f81ad1ce2edf0244f54a4
2013-03-19 13:08:14 -05:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e899002171e8990021d2a654625f46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
547c1dedd1
13.2.1-2 baseline
...
Former-commit-id: 83e9157df783e9157df7328c6dccad47cc08ac79
2013-01-23 11:18:44 -05:00
