Steve Harris
|
a19beb1e5d
|
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: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Dave Hladky
|
02a0a1170c
|
Issue #2472 Replacing lost commit
Former-commit-id: a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]]
Former-commit-id: 9c6a430d40
Former-commit-id: aaa709a11d [formerly 2a2b35d62c] [formerly 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea [formerly 47b946fc3b]]
Former-commit-id: ded942728a3b08cb39f24160cce93702bdc3e92e [formerly d5a1042ba3]
Former-commit-id: 5eefed071f
|
2013-11-04 16:24:14 -06:00 |
|
Dave Hladky
|
e9c403615e
|
Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: cfbbc7336f [formerly 6a1a06e3ee] [formerly e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]]
Former-commit-id: 5748dbd8d6839840ad99d4c5bb21eef11054fe88 [formerly 30aa0c93a1]
Former-commit-id: 6e302d35d8
|
2013-08-28 08:24:45 -05:00 |
|
Max Schenkelberg
|
ad32bbd91d
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
|
2013-07-15 14:26:15 -05:00 |
|
Dustin Johnson
|
c9b74d06a1
|
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: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4 [formerly da1ad3c8a0] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad]
Former-commit-id: 9b42432838
|
2013-06-25 08:33:55 -05:00 |
|
Dustin Johnson
|
f002cbc4b3
|
Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e
Former-commit-id: e19ff76a2c [formerly 063e68bc93] [formerly da69d3e630] [formerly e19ff76a2c [formerly 063e68bc93] [formerly da69d3e630] [formerly 1c7d99f53f [formerly da69d3e630 [formerly c213b3b5552a2b11c69965bc6edcfb8acf7fa0a8]]]]
Former-commit-id: 1c7d99f53f
Former-commit-id: c42465efb0 [formerly 2b64936595] [formerly 246a3e209fbb65328702c6de7f86e34cd06fc369 [formerly fef2708ff5]]
Former-commit-id: 62389cfa6373cb32dea356319b4d094a371d7797 [formerly 9220f1a199]
Former-commit-id: 2f75f26b1d
|
2013-06-10 18:47:17 -05:00 |
|
Steve Harris
|
b0fb1f49be
|
13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89 [formerly 0e950655f1] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7]
Former-commit-id: 722e428c74
|
2013-04-24 17:15:55 -05:00 |
|
Dustin Johnson
|
c5464667d5
|
Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 0dcc67bc55 [formerly 53291f7130] [formerly 21a7a7505def7dce020a2a08ac7e2a12253adea8 [formerly 1b1bd69b89]]
Former-commit-id: 696e1ca91ff58627044275c70673d28ff343a7af [formerly e39187c0ce]
Former-commit-id: 0c92ddab72
|
2013-03-22 10:04:21 -05:00 |
|
Dave Hladky
|
6e7e9a653b
|
Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly 38494cec16 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]]
Former-commit-id: 38494cec16
Former-commit-id: 1dcf1cd260 [formerly 69c6fdd887] [formerly e6da29d245a87c028da77d809a837030c9a35209 [formerly 8a46d43216]]
Former-commit-id: 4c1441e90920503c6c0241e46989c32fc0db41cd [formerly 7046f31351]
Former-commit-id: 03219ce56a
|
2013-03-20 12:17:08 -05:00 |
|
Dave Hladky
|
07b8f90014
|
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: e0d90738ad [formerly 618f737fab] [formerly 71c2eba9b6609730384eaad2e834b311fb5eefb6 [formerly f0244f54a4]]
Former-commit-id: 7fb36c3c0bac714c21eadf0ce71c66d6f3e066cc [formerly 64f8c46e64]
Former-commit-id: af0898807b
|
2013-03-19 13:08:14 -05:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
b92dfd1b62
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
|
2013-01-23 11:18:44 -05:00 |
|