Steve Harris
|
2db5dcf6eb
|
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: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
f9587d39d1
|
OB_14.1.1-20 baseline
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
|
2014-02-26 17:39:15 -05:00 |
|
Steve Harris
|
cfb3194426
|
14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
|
2013-11-06 14:16:14 -05:00 |
|
Richard Peter
|
e154f87cf4
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: ff660a78c7 [formerly 592218edb8] [formerly ff660a78c7 [formerly 592218edb8] [formerly 7175e78cf7 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]
Former-commit-id: 7175e78cf7
Former-commit-id: 9aec8b3f88 [formerly ae956e3b4b]
Former-commit-id: beb492620b
|
2013-09-03 11:51:27 -05:00 |
|
Max Schenkelberg
|
5ba50b4476
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 94fa6f0e30 [formerly 63421a4819] [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: d1881ffa51 [formerly 1610826d2e]
Former-commit-id: a47f187f4f
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
c05a6c8b50
|
13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
8091cae89d
|
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: c0f95eb55a [formerly 81fc4fa753] [formerly c0f95eb55a [formerly 81fc4fa753] [formerly c4283b0336 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: afae330d8a [formerly a9c077f0a9]
Former-commit-id: 73c0514c3d
|
2013-06-19 10:16:06 -05:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|
Nate Jensen
|
528ab65a66
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 740237c317 [formerly f3258e77f7] [formerly 740237c317 [formerly f3258e77f7] [formerly fc691cbb2f [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: ab10e0072d [formerly 6214f529a7]
Former-commit-id: 3588ed1899
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
e4bbe70d57
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
eaaf8d1b8a
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: b7cecb931e [formerly 1978133177] [formerly b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: a84a6fe6ae [formerly 49b20e5d20]
Former-commit-id: 9689640192
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
73290b1bb6
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 65b9bafed7 [formerly d74936ef3e] [formerly 65b9bafed7 [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 882296f823 [formerly 91c8b9ac1d]
Former-commit-id: 0f319b9721
|
2013-05-23 10:06:28 -05:00 |
|
Ben Steffensmeier
|
ea3d3660f3
|
Issue #1869 Remove DataURI column from qc.
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
|
2013-05-16 17:48:37 -05:00 |
|
Steve Harris
|
a7b174bfaf
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a [formerly ed8c0487fe]
Former-commit-id: 7eda24c3b0
|
2013-04-04 11:58:50 -05:00 |
|
Steve Harris
|
fc009792e3
|
13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 0edd049e3b [formerly bf6c3b6762]
Former-commit-id: 044912d48b
|
2013-04-03 14:58:29 -05:00 |
|
Bryan Kowal
|
ddf4c04e59
|
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: 820518ffb9 [formerly 0479eb0cc1] [formerly 820518ffb9 [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]
Former-commit-id: 3baebb684b
Former-commit-id: 63f7abc798 [formerly 374bd51fb0]
Former-commit-id: 5eae24b949
|
2013-03-20 16:53:18 -05:00 |
|
Steve Harris
|
961c0b56a7
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]
Former-commit-id: 0379be06d2
Former-commit-id: 8db98c2d71 [formerly 4fc2bb7bba]
Former-commit-id: a91fcf98a2
|
2013-03-20 16:09:26 -05:00 |
|
Steve Harris
|
e6ab10cc26
|
13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
|
2013-03-20 15:53:01 -05:00 |
|
Max Schenkelberg
|
a25ccc8c5c
|
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: 43341e7ad3 [formerly c6db3ce43b] [formerly 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: ec27a16858 [formerly 2e10fd83f6]
Former-commit-id: 924e27f51f
|
2013-03-20 14:10:52 -05:00 |
|
Steve Harris
|
481cee4c74
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
|
2013-03-18 16:52:00 -05:00 |
|
Steve Harris
|
1c2dffd66d
|
13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
|
2013-03-18 15:43:32 -05:00 |
|
Dustin Johnson
|
83034c3f43
|
Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]
Former-commit-id: 43a9f608ef
Former-commit-id: 7adf94e9f6 [formerly 1b82ad0dc4]
Former-commit-id: a08059dd34
|
2013-03-15 11:51:58 -05:00 |
|
Steve Harris
|
c28f3aeb02
|
13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
08bf724a6c
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|