diff --git a/cots/org.apache.camel/.classpath b/cots/org.apache.camel/.classpath index abf53adcea..a2c6e537e6 100644 --- a/cots/org.apache.camel/.classpath +++ b/cots/org.apache.camel/.classpath @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + diff --git a/cots/org.apache.camel/META-INF/MANIFEST.MF b/cots/org.apache.camel/META-INF/MANIFEST.MF index d374d00f55..f0b89a45d6 100644 --- a/cots/org.apache.camel/META-INF/MANIFEST.MF +++ b/cots/org.apache.camel/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Camel Plug-in Bundle-SymbolicName: org.apache.camel -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.11.2 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - camel-core-2.11.0.jar, - camel-http4-2.11.0.jar, - camel-jetty-2.11.0.jar, - camel-jms-2.11.0.jar, - camel-quartz-2.11.0.jar, - camel-spring-2.11.0.jar, - camel-http-2.11.0.jar + camel-core-2.11.2.jar, + camel-http-2.11.2.jar, + camel-http4-2.11.2.jar, + camel-jetty-2.11.2.jar, + camel-jms-2.11.2.jar, + camel-quartz-2.11.2.jar, + camel-spring-2.11.2.jar Require-Bundle: org.springframework;bundle-version="3.1.4", org.apache.commons.management;bundle-version="1.0.0" Export-Package: org.apache.camel, diff --git a/cots/org.apache.camel/apache-camel-2.11.0-src.zip b/cots/org.apache.camel/apache-camel-2.11.2-src.zip similarity index 87% rename from cots/org.apache.camel/apache-camel-2.11.0-src.zip rename to cots/org.apache.camel/apache-camel-2.11.2-src.zip index e2f49b3526..f5d1a7f2e7 100644 Binary files a/cots/org.apache.camel/apache-camel-2.11.0-src.zip and b/cots/org.apache.camel/apache-camel-2.11.2-src.zip differ diff --git a/cots/org.apache.camel/build.properties b/cots/org.apache.camel/build.properties index 640e1187c9..c108e5c805 100644 --- a/cots/org.apache.camel/build.properties +++ b/cots/org.apache.camel/build.properties @@ -1,9 +1,9 @@ bin.includes = META-INF/,\ .,\ - camel-core-2.11.0.jar,\ - camel-http4-2.11.0.jar,\ - camel-jetty-2.11.0.jar,\ - camel-jms-2.11.0.jar,\ - camel-quartz-2.11.0.jar,\ - camel-spring-2.11.0.jar,\ - camel-http-2.11.0.jar + camel-core-2.11.2.jar,\ + camel-http-2.11.2.jar,\ + camel-http4-2.11.2.jar,\ + camel-jetty-2.11.2.jar,\ + camel-jms-2.11.2.jar,\ + camel-quartz-2.11.2.jar,\ + camel-spring-2.11.2.jar diff --git a/cots/org.apache.camel/camel-core-2.11.0.jar b/cots/org.apache.camel/camel-core-2.11.2.jar similarity index 59% rename from cots/org.apache.camel/camel-core-2.11.0.jar rename to cots/org.apache.camel/camel-core-2.11.2.jar index a0507714a6..cde219bb4b 100644 Binary files a/cots/org.apache.camel/camel-core-2.11.0.jar and b/cots/org.apache.camel/camel-core-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-http-2.11.0.jar b/cots/org.apache.camel/camel-http-2.11.0.jar deleted file mode 100644 index 29e2587ea1..0000000000 Binary files a/cots/org.apache.camel/camel-http-2.11.0.jar and /dev/null differ diff --git a/cots/org.apache.camel/camel-http-2.11.2.jar b/cots/org.apache.camel/camel-http-2.11.2.jar new file mode 100644 index 0000000000..dd2557ac92 Binary files /dev/null and b/cots/org.apache.camel/camel-http-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-http4-2.11.0.jar b/cots/org.apache.camel/camel-http4-2.11.0.jar deleted file mode 100644 index aff3bf4072..0000000000 Binary files a/cots/org.apache.camel/camel-http4-2.11.0.jar and /dev/null differ diff --git a/cots/org.apache.camel/camel-http4-2.11.2.jar b/cots/org.apache.camel/camel-http4-2.11.2.jar new file mode 100644 index 0000000000..b0e21ffb74 Binary files /dev/null and b/cots/org.apache.camel/camel-http4-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-jetty-2.11.0.jar b/cots/org.apache.camel/camel-jetty-2.11.0.jar deleted file mode 100644 index 57f9229dfb..0000000000 Binary files a/cots/org.apache.camel/camel-jetty-2.11.0.jar and /dev/null differ diff --git a/cots/org.apache.camel/camel-jetty-2.11.2.jar b/cots/org.apache.camel/camel-jetty-2.11.2.jar new file mode 100644 index 0000000000..b59344826a Binary files /dev/null and b/cots/org.apache.camel/camel-jetty-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-jms-2.11.0.jar b/cots/org.apache.camel/camel-jms-2.11.0.jar deleted file mode 100644 index 388f7a94e2..0000000000 Binary files a/cots/org.apache.camel/camel-jms-2.11.0.jar and /dev/null differ diff --git a/cots/org.apache.camel/camel-jms-2.11.2.jar b/cots/org.apache.camel/camel-jms-2.11.2.jar new file mode 100644 index 0000000000..e65600081a Binary files /dev/null and b/cots/org.apache.camel/camel-jms-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-quartz-2.11.0.jar b/cots/org.apache.camel/camel-quartz-2.11.0.jar deleted file mode 100644 index 574543c8fb..0000000000 Binary files a/cots/org.apache.camel/camel-quartz-2.11.0.jar and /dev/null differ diff --git a/cots/org.apache.camel/camel-quartz-2.11.2.jar b/cots/org.apache.camel/camel-quartz-2.11.2.jar new file mode 100644 index 0000000000..a78f72588c Binary files /dev/null and b/cots/org.apache.camel/camel-quartz-2.11.2.jar differ diff --git a/cots/org.apache.camel/camel-spring-2.11.0.jar b/cots/org.apache.camel/camel-spring-2.11.2.jar similarity index 59% rename from cots/org.apache.camel/camel-spring-2.11.0.jar rename to cots/org.apache.camel/camel-spring-2.11.2.jar index 564f6c1e98..eb30af5441 100644 Binary files a/cots/org.apache.camel/camel-spring-2.11.0.jar and b/cots/org.apache.camel/camel-spring-2.11.2.jar differ diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml index 8e2cef70c7..8f08ea06e1 100644 --- a/edexOsgi/build.edex/esb/conf/spring/edex.xml +++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml @@ -183,25 +183,14 @@ - + + + - - - - - - - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml index bf81c253a1..5e5693c152 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml @@ -76,7 +76,7 @@ java.lang.Throwable - + diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml index 4c6ca44914..76d83f239f 100644 --- a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml @@ -43,7 +43,7 @@ java.lang.Throwable + uri="log:manual?level=ERROR&showBody=true" /> diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml index eab8b24d84..411d4428a0 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml @@ -15,7 +15,7 @@ java.lang.Throwable - +