Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development

Former-commit-id: 44cfe00b5e [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]
Former-commit-id: a6f8174d0c
Former-commit-id: 8c03ad79d6

RadarServer/com.raytheon.rcm.server/META-INF/MANIFEST.MF

@@ -15,7 +15,8 @@ Export-Package: com.raytheon.rcm.coll,
 Require-Bundle: com.raytheon.rcm.lib;bundle-version="1.0.0",
  org.apache.commons.logging;bundle-version="1.0.4",
  org.springframework;bundle-version="2.5.6",
- org.itadaki.bzip2;bundle-version="0.9.1"
+ org.itadaki.bzip2;bundle-version="0.9.1",
+ org.quartz;bundle-version="1.8.6"
 Import-Package: com.raytheon.uf.common.util,
  org.apache.log4j,
  org.junit

cave/com.raytheon.uf.viz.cots.feature/feature.xml

@@ -77,4 +77,10 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.quartz"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>

cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

@@ -479,4 +479,10 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.quartz"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>

cots/org.apache.camel/.classpath

@@ -1,29 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="camel-servlet-2.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="camel-http-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-jms-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-core-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-atom-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-http4-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-bam-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-jetty-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-core-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-jms-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-csv-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-quartz-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-groovy-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-spring-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-http-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-jetty-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-jpa-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-jxpath-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-mina-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-msv-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-ognl-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-quartz-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-rmi-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-saxon-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-script-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-spring-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-stream-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-stringtemplate-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-velocity-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-xmpp-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-xstream-2.4.0.jar" sourcepath="apache-camel-2.4.0-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

cots/org.apache.camel/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,11 @@
-#Mon Nov 17 16:01:48 CST 2008
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

cots/org.apache.camel/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

cots/org.apache.camel/META-INF/MANIFEST.MF

@@ -5,72 +5,51 @@ Bundle-SymbolicName: org.apache.camel
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
- camel-atom-2.4.0.jar,
+ camel-core-2.11.0.jar,
- camel-bam-2.4.0.jar,
+ camel-http4-2.11.0.jar,
- camel-core-2.4.0.jar,
+ camel-jetty-2.11.0.jar,
- camel-csv-2.4.0.jar,
+ camel-jms-2.11.0.jar,
- camel-groovy-2.4.0.jar,
+ camel-quartz-2.11.0.jar,
- camel-http-2.4.0.jar,
+ camel-spring-2.11.0.jar,
- camel-jetty-2.4.0.jar,
+ camel-http-2.11.0.jar
- camel-jms-2.4.0.jarcamel-jpa-2.4.0.jar,
+Require-Bundle: org.springframework;bundle-version="3.1.4",
- camel-jxpath-2.4.0.jar,
+ org.apache.commons.management;bundle-version="1.0.0"
- camel-mina-2.4.0.jar,
- camel-msv-2.4.0.jar,
- camel-ognl-2.4.0.jar,
- camel-quartz-2.4.0.jar,
- camel-rmi-2.4.0.jar,
- camel-saxon-2.4.0.jar,
- camel-script-2.4.0.jar,
- camel-spring-2.4.0.jar,
- camel-stream-2.4.0.jar,
- camel-stringtemplate-2.4.0.jar,
- camel-velocity-2.4.0.jar,
- camel-xmpp-2.4.0.jar,
- camel-xstream-2.4.0.jar,
- camel-servlet-2.4.0.jar
 Export-Package: org.apache.camel,
- org.apache.camel.bam,
+ org.apache.camel.api.management,
- org.apache.camel.bam.model,
+ org.apache.camel.api.management.mbean,
- org.apache.camel.bam.processor,
- org.apache.camel.bam.rules,
  org.apache.camel.builder,
- org.apache.camel.builder.script,
  org.apache.camel.builder.xml,
+ org.apache.camel.com.googlecode.concurrentlinkedhashmap,
  org.apache.camel.component,
- org.apache.camel.component.atom,
  org.apache.camel.component.bean,
+ org.apache.camel.component.binding,
  org.apache.camel.component.browse,
+ org.apache.camel.component.controlbus,
  org.apache.camel.component.dataset,
  org.apache.camel.component.direct,
+ org.apache.camel.component.directvm,
  org.apache.camel.component.event,
- org.apache.camel.component.feed,
  org.apache.camel.component.file,
  org.apache.camel.component.file.strategy,
  org.apache.camel.component.http,
  org.apache.camel.component.http.helper,
+ org.apache.camel.component.http4,
+ org.apache.camel.component.http4.helper,
  org.apache.camel.component.jetty,
  org.apache.camel.component.jms,
- org.apache.camel.component.jms.requestor,
+ org.apache.camel.component.jms.reply,
- org.apache.camel.component.jpa,
+ org.apache.camel.component.language,
  org.apache.camel.component.log,
- org.apache.camel.component.mina,
  org.apache.camel.component.mock,
  org.apache.camel.component.properties,
  org.apache.camel.component.quartz,
  org.apache.camel.component.ref,
- org.apache.camel.component.rmi,
  org.apache.camel.component.seda,
- org.apache.camel.component.servlet,
+ org.apache.camel.component.stub,
- org.apache.camel.component.stream,
- org.apache.camel.component.stringtemplate,
  org.apache.camel.component.test,
  org.apache.camel.component.timer,
  org.apache.camel.component.validator,
- org.apache.camel.component.validator.msv,
- org.apache.camel.component.velocity,
  org.apache.camel.component.vm,
- org.apache.camel.component.xmpp,
- org.apache.camel.component.xquery,
  org.apache.camel.component.xslt,
  org.apache.camel.converter,
  org.apache.camel.converter.jaxp,
@@ -78,9 +57,7 @@ Export-Package: org.apache.camel,
  org.apache.camel.core.osgi,
  org.apache.camel.core.osgi.utils,
  org.apache.camel.core.xml,
- org.apache.camel.core.xml.scan,
+ org.apache.camel.core.xml.util.jsse,
- org.apache.camel.dataformat.csv,
- org.apache.camel.dataformat.xstream,
  org.apache.camel.impl,
  org.apache.camel.impl.converter,
  org.apache.camel.impl.osgi,
@@ -89,14 +66,16 @@ Export-Package: org.apache.camel,
  org.apache.camel.language,
  org.apache.camel.language.bean,
  org.apache.camel.language.constant,
- org.apache.camel.language.groovy,
  org.apache.camel.language.header,
- org.apache.camel.language.jxpath,
- org.apache.camel.language.ognl,
  org.apache.camel.language.property,
+ org.apache.camel.language.ref,
  org.apache.camel.language.simple,
+ org.apache.camel.language.simple.ast,
+ org.apache.camel.language.simple.types,
+ org.apache.camel.language.spel,
  org.apache.camel.language.tokenizer,
  org.apache.camel.language.xpath,
+ org.apache.camel.main,
  org.apache.camel.management,
  org.apache.camel.management.event,
  org.apache.camel.management.mbean,
@@ -108,23 +87,24 @@ Export-Package: org.apache.camel,
  org.apache.camel.osgi,
  org.apache.camel.processor,
  org.apache.camel.processor.aggregate,
+ org.apache.camel.processor.binding,
  org.apache.camel.processor.exceptionpolicy,
  org.apache.camel.processor.idempotent,
- org.apache.camel.processor.idempotent.jpa,
  org.apache.camel.processor.interceptor,
- org.apache.camel.processor.interceptor.jpa,
  org.apache.camel.processor.loadbalancer,
  org.apache.camel.processor.resequencer,
  org.apache.camel.processor.validation,
+ org.apache.camel.routepolicy.quartz,
  org.apache.camel.spi,
  org.apache.camel.spring,
  org.apache.camel.spring.handler,
  org.apache.camel.spring.remoting,
  org.apache.camel.spring.spi,
  org.apache.camel.spring.util,
+ org.apache.camel.support,
  org.apache.camel.util,
  org.apache.camel.util.concurrent,
  org.apache.camel.util.jndi,
+ org.apache.camel.util.jsse,
+ org.apache.camel.util.spring,
  org.apache.camel.view
-Require-Bundle: org.springframework;bundle-version="2.5.6",
- org.apache.commons.management;bundle-version="1.0.0"

cots/org.apache.camel/build.properties

@@ -1,26 +1,9 @@
 bin.includes = META-INF/,\
                .,\
-               camel-atom-2.4.0.jar,\
+               camel-core-2.11.0.jar,\
-               camel-bam-2.4.0.jar,\
+               camel-http4-2.11.0.jar,\
-               camel-core-2.4.0.jar,\
+               camel-jetty-2.11.0.jar,\
-               camel-csv-2.4.0.jar,\
+               camel-jms-2.11.0.jar,\
-               camel-groovy-2.4.0.jar,\
+               camel-quartz-2.11.0.jar,\
-               camel-http-2.4.0.jar,\
+               camel-spring-2.11.0.jar,\
-               camel-jetty-2.4.0.jar,\
+               camel-http-2.11.0.jar
-               camel-jpa-2.4.0.jar,\
-               camel-jxpath-2.4.0.jar,\
-               camel-mina-2.4.0.jar,\
-               camel-msv-2.4.0.jar,\
-               camel-ognl-2.4.0.jar,\
-               camel-quartz-2.4.0.jar,\
-               camel-rmi-2.4.0.jar,\
-               camel-saxon-2.4.0.jar,\
-               camel-script-2.4.0.jar,\
-               camel-spring-2.4.0.jar,\
-               camel-stream-2.4.0.jar,\
-               camel-stringtemplate-2.4.0.jar,\
-               camel-velocity-2.4.0.jar,\
-               camel-xmpp-2.4.0.jar,\
-               camel-xstream-2.4.0.jar,\
-               camel-jms-2.4.0.jar,\
-               camel-servlet-2.4.0.jar

cots/org.apache.commons.logging/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="commons-logging-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="commons-logging-1.1.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

cots/org.apache.commons.logging/META-INF/MANIFEST.MF

@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Commons Logging Plug-in
 Bundle-SymbolicName: org.apache.commons.logging
-Bundle-Version: 1.1.1
+Bundle-Version: 1.1.2
-Bundle-ClassPath: commons-logging-1.1.1.jar
+Bundle-ClassPath: commons-logging-1.1.2.jar
 Bundle-Vendor: Raytheon-bundled OSS
 Export-Package: org.apache.commons.logging,
  org.apache.commons.logging.impl

cots/org.apache.commons.logging/build.properties

@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               commons-logging-1.1.1.jar
+               commons-logging-1.1.2.jar

cots/org.eclipse.jetty/.classpath

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="org.apache.jasper.glassfish_2.1.0.v201007080150.jar"/>
+	<classpathentry exported="true" kind="lib" path="org.apache.jasper.glassfish-2.1.0.v201110031002.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-client-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-client-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-continuation-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-continuation-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-http-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-http-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-io-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-io-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-jmx-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-jmx-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-security-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-security-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-server-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-server-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-servlet-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-servlet-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-servlets-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-servlets-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-util-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-util-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-webapp-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-webapp-7.6.9.v20130131.jar"/>
-	<classpathentry exported="true" kind="lib" path="jetty-xml-7.2.2.v20101205.jar"/>
+	<classpathentry exported="true" kind="lib" path="jetty-xml-7.6.9.v20130131.jar"/>
+	<classpathentry exported="true" kind="lib" path="servlet-api-2.5.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

cots/org.eclipse.jetty/META-INF/MANIFEST.MF

@@ -2,14 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Jetty
 Bundle-SymbolicName: org.eclipse.jetty
-Bundle-Version: 7.1.4.v20100610
+Bundle-Version: 7.6.9.v20130131
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.jetty.client,
+Export-Package: javax.servlet,
+ javax.servlet.http,
+ org.eclipse.jetty.client,
  org.eclipse.jetty.client.security,
  org.eclipse.jetty.client.webdav,
  org.eclipse.jetty.continuation,
  org.eclipse.jetty.http,
- org.eclipse.jetty.http.security,
+ org.eclipse.jetty.http.gzip,
+ org.eclipse.jetty.http.ssl,
  org.eclipse.jetty.io,
  org.eclipse.jetty.io.bio,
  org.eclipse.jetty.io.nio,
@@ -23,31 +26,37 @@ Export-Package: org.eclipse.jetty.client,
  org.eclipse.jetty.server.jmx,
  org.eclipse.jetty.server.nio,
  org.eclipse.jetty.server.session,
+ org.eclipse.jetty.server.session.jmx,
  org.eclipse.jetty.server.ssl,
  org.eclipse.jetty.servlet,
  org.eclipse.jetty.servlet.api,
  org.eclipse.jetty.servlet.jmx,
+ org.eclipse.jetty.servlet.listener,
  org.eclipse.jetty.servlets,
  org.eclipse.jetty.util,
  org.eclipse.jetty.util.ajax,
  org.eclipse.jetty.util.component,
  org.eclipse.jetty.util.log,
+ org.eclipse.jetty.util.log.jmx,
+ org.eclipse.jetty.util.preventers,
  org.eclipse.jetty.util.resource,
+ org.eclipse.jetty.util.security,
+ org.eclipse.jetty.util.ssl,
  org.eclipse.jetty.util.statistic,
  org.eclipse.jetty.util.thread,
  org.eclipse.jetty.webapp,
- org.eclipse.jetty.webapp.jmx,
  org.eclipse.jetty.xml
-Bundle-ClassPath: jetty-client-7.2.2.v20101205.jar,
+Bundle-ClassPath: jetty-client-7.6.9.v20130131.jar,
- jetty-continuation-7.2.2.v20101205.jar,
+ jetty-continuation-7.6.9.v20130131.jar,
- jetty-http-7.2.2.v20101205.jar,
+ jetty-http-7.6.9.v20130131.jar,
- jetty-io-7.2.2.v20101205.jar,
+ jetty-io-7.6.9.v20130131.jar,
- jetty-jmx-7.2.2.v20101205.jar,
+ jetty-jmx-7.6.9.v20130131.jar,
- jetty-security-7.2.2.v20101205.jar,
+ jetty-security-7.6.9.v20130131.jar,
- jetty-server-7.2.2.v20101205.jar,
+ jetty-server-7.6.9.v20130131.jar,
- jetty-servlet-7.2.2.v20101205.jar,
+ jetty-servlet-7.6.9.v20130131.jar,
- jetty-servlets-7.2.2.v20101205.jar,
+ jetty-servlets-7.6.9.v20130131.jar,
- jetty-util-7.2.2.v20101205.jar,
+ jetty-util-7.6.9.v20130131.jar,
- jetty-webapp-7.2.2.v20101205.jar,
+ jetty-webapp-7.6.9.v20130131.jar,
- jetty-xml-7.2.2.v20101205.jar,
+ jetty-xml-7.6.9.v20130131.jar,
- org.apache.jasper.glassfish_2.1.0.v201007080150.jar
+ servlet-api-2.5.jar,
+ org.apache.jasper.glassfish-2.1.0.v201110031002.jar

cots/org.eclipse.jetty/build.properties

@@ -1,16 +1,16 @@
 bin.includes = META-INF/,\
                .,\
-               jetty-client-7.2.2.v20101205.jar,\
+               jetty-client-7.6.9.v20130131.jar,\
-               jetty-continuation-7.2.2.v20101205.jar,\
+               jetty-continuation-7.6.9.v20130131.jar,\
-               jetty-http-7.2.2.v20101205.jar,\
+               jetty-http-7.6.9.v20130131.jar,\
-               jetty-io-7.2.2.v20101205.jar,\
+               jetty-io-7.6.9.v20130131.jar,\
-               jetty-jmx-7.2.2.v20101205.jar,\
+               jetty-jmx-7.6.9.v20130131.jar,\
-               jetty-security-7.2.2.v20101205.jar,\
+               jetty-security-7.6.9.v20130131.jar,\
-               jetty-server-7.2.2.v20101205.jar,\
+               jetty-server-7.6.9.v20130131.jar,\
-               jetty-servlet-7.2.2.v20101205.jar,\
+               jetty-servlet-7.6.9.v20130131.jar,\
-               jetty-servlets-7.2.2.v20101205.jar,\
+               jetty-servlets-7.6.9.v20130131.jar,\
-               jetty-util-7.2.2.v20101205.jar,\
+               jetty-util-7.6.9.v20130131.jar,\
-               jetty-webapp-7.2.2.v20101205.jar,\
+               jetty-webapp-7.6.9.v20130131.jar,\
-               jetty-xml-7.2.2.v20101205.jar,\
+               jetty-xml-7.6.9.v20130131.jar,\
-               org.apache.jasper.glassfish_2.1.0.v201007080150.jar,\
+               servlet-api-2.5.jar,\
-               jetty-util-6.1.26.jar
+               org.apache.jasper.glassfish-2.1.0.v201110031002.jar

cots/org.quartz/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="quartz-1.8.6.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

cots/org.quartz/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.quartz</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

cots/org.quartz/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

cots/org.quartz/META-INF/MANIFEST.MF

@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Quartz
+Bundle-SymbolicName: org.quartz
+Bundle-Version: 1.8.6
+Bundle-ClassPath: quartz-1.8.6.jar
+Bundle-Vendor: Terracotta
+Export-Package: org.quartz,
+ org.quartz.core,
+ org.quartz.core.jmx,
+ org.quartz.ee.jta,
+ org.quartz.ee.servlet,
+ org.quartz.helpers,
+ org.quartz.impl,
+ org.quartz.impl.calendar,
+ org.quartz.impl.jdbcjobstore,
+ org.quartz.jobs,
+ org.quartz.jobs.ee.ejb,
+ org.quartz.jobs.ee.jms,
+ org.quartz.jobs.ee.jmx,
+ org.quartz.jobs.ee.mail,
+ org.quartz.listeners,
+ org.quartz.plugins,
+ org.quartz.plugins.history,
+ org.quartz.plugins.management,
+ org.quartz.plugins.xml,
+ org.quartz.simpl,
+ org.quartz.spi,
+ org.quartz.utils,
+ org.quartz.utils.counter,
+ org.quartz.utils.counter.sampled,
+ org.quartz.xml
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

cots/org.quartz/build.properties

@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               quartz-1.8.6.jar

cots/org.slf4j/.classpath

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="slf4j-api-1.7.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="slf4j-log4j12-1.7.5.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="slf4j-api-1.6.1.jar"/>
-	<classpathentry kind="lib" path="slf4j-log4j12-1.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

cots/org.slf4j/META-INF/MANIFEST.MF

@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Slf4j Plug-in
 Bundle-SymbolicName: org.slf4j
-Bundle-Version: 1.6.1
+Bundle-Version: 1.7.5
-Bundle-ClassPath: slf4j-api-1.6.1.jar,
+Bundle-ClassPath: slf4j-api-1.7.5.jar,
- slf4j-log4j12-1.6.1.jar
+ slf4j-log4j12-1.7.5.jar
 Export-Package: org.slf4j,
  org.slf4j.helpers,
  org.slf4j.spi

cots/org.slf4j/build.properties

@@ -1,3 +1,3 @@
 bin.includes = META-INF/,\
-               slf4j-api-1.6.1.jar,\
+               slf4j-api-1.7.5.jar,\
-               slf4j-log4j12-1.6.1.jar
+               slf4j-log4j12-1.7.5.jar

cots/org.springframework/.classpath

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="spring-web.jar"/>
+	<classpathentry exported="true" kind="lib" path="antlr-2.7.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="com.springsource.org.aopalliance-1.0.0.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.expression-3.1.4.RELEASE.jar" sourcepath="org.springframework.expression-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="antlr-2.7.6.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="com.springsource.org.aopalliance-1.0.0.jar"/>
-	<classpathentry kind="lib" path="backport-util-concurrent.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.asm-3.1.4.RELEASE.jar" sourcepath="org.springframework.asm-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="quartz-all-1.6.1.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.aop-3.1.4.RELEASE.jar" sourcepath="org.springframework.aop-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-aop.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.beans-3.1.4.RELEASE.jar" sourcepath="org.springframework.beans-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-beans.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.context-3.1.4.RELEASE.jar" sourcepath="org.springframework.context-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-context-support.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.context.support-3.1.4.RELEASE.jar" sourcepath="org.springframework.context.support-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-context.jar" sourcepath="spring-context-2.5.6-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.core-3.1.4.RELEASE.jar" sourcepath="org.springframework.core-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-core.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.jdbc-3.1.4.RELEASE.jar" sourcepath="org.springframework.jdbc-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-jdbc.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.jms-3.1.4.RELEASE.jar" sourcepath="org.springframework.jms-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-jms.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.orm-3.1.4.RELEASE.jar" sourcepath="org.springframework.orm-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-orm.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.test-3.1.4.RELEASE.jar" sourcepath="org.springframework.test-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-tx.jar" sourcepath="spring-framework-2.5.6.zip"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.transaction-3.1.4.RELEASE.jar" sourcepath="org.springframework.transaction-sources-3.1.4.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="spring-test.jar"/>
+	<classpathentry exported="true" kind="lib" path="org.springframework.web-3.1.4.RELEASE.jar" sourcepath="org.springframework.web-sources-3.1.4.RELEASE.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

cots/org.springframework/META-INF/MANIFEST.MF

@@ -2,51 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Springframework Plug-in
 Bundle-SymbolicName: org.springframework
-Bundle-Version: 2.5.6
+Bundle-Version: 3.1.4
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: antlr-2.7.6.jar,
+Bundle-ClassPath: .,
- backport-util-concurrent.jar,
+ org.springframework.aop-3.1.4.RELEASE.jar,
+ org.springframework.beans-3.1.4.RELEASE.jar,
+ org.springframework.context-3.1.4.RELEASE.jar,
+ org.springframework.context.support-3.1.4.RELEASE.jar,
+ org.springframework.core-3.1.4.RELEASE.jar,
+ org.springframework.jdbc-3.1.4.RELEASE.jar,
+ org.springframework.jms-3.1.4.RELEASE.jar,
+ org.springframework.orm-3.1.4.RELEASE.jar,
+ org.springframework.test-3.1.4.RELEASE.jar,
+ org.springframework.transaction-3.1.4.RELEASE.jar,
+ org.springframework.web-3.1.4.RELEASE.jar,
+ org.springframework.asm-3.1.4.RELEASE.jar,
  com.springsource.org.aopalliance-1.0.0.jar,
- quartz-all-1.6.1.jar,
+ org.springframework.expression-3.1.4.RELEASE.jar,
- spring-aop.jar,
+ antlr-2.7.7.jar
- spring-beans.jar,
- spring-context-support.jar,
- spring-context.jar,
- spring-core.jar,
- spring-jdbc.jar,
- spring-jms.jar,
- spring-orm.jar,
- spring-tx.jar,
- spring-web.jar,
- .
 Export-Package: org.aopalliance.aop,
- org.aopalliance.intercept,
- org.quartz,
- org.quartz.core,
- org.quartz.ee.jmx.jboss,
- org.quartz.ee.jta,
- org.quartz.ee.servlet,
- org.quartz.helpers,
- org.quartz.impl,
- org.quartz.impl.calendar,
- org.quartz.impl.jdbcjobstore,
- org.quartz.impl.jdbcjobstore.oracle,
- org.quartz.impl.jdbcjobstore.oracle.weblogic,
- org.quartz.jobs,
- org.quartz.jobs.ee.ejb,
- org.quartz.jobs.ee.jms,
- org.quartz.jobs.ee.jmx,
- org.quartz.jobs.ee.mail,
- org.quartz.listeners,
- org.quartz.plugins,
- org.quartz.plugins.history,
- org.quartz.plugins.management,
- org.quartz.plugins.xml,
- org.quartz.simpl,
- org.quartz.spi,
- org.quartz.utils,
- org.quartz.utils.weblogic,
- org.quartz.xml,
  org.springframework.aop,
  org.springframework.aop.aspectj,
  org.springframework.aop.aspectj.annotation,
@@ -72,7 +46,6 @@ Export-Package: org.aopalliance.aop,
  org.springframework.beans.factory.access.el,
  org.springframework.beans.factory.annotation,
  org.springframework.beans.factory.config,
- org.springframework.beans.factory.generic,
  org.springframework.beans.factory.parsing,
  org.springframework.beans.factory.serviceloader,
  org.springframework.beans.factory.support,
@@ -80,20 +53,33 @@ Export-Package: org.aopalliance.aop,
  org.springframework.beans.factory.xml,
  org.springframework.beans.propertyeditors,
  org.springframework.beans.support,
+ org.springframework.cache,
+ org.springframework.cache.annotation,
+ org.springframework.cache.concurrent,
+ org.springframework.cache.config,
  org.springframework.cache.ehcache,
+ org.springframework.cache.interceptor,
+ org.springframework.cache.support,
  org.springframework.context,
  org.springframework.context.access,
  org.springframework.context.annotation,
  org.springframework.context.config,
  org.springframework.context.event,
+ org.springframework.context.expression,
  org.springframework.context.i18n,
  org.springframework.context.support,
  org.springframework.context.weaving,
  org.springframework.core,
  org.springframework.core.annotation,
+ org.springframework.core.convert,
+ org.springframework.core.convert.converter,
+ org.springframework.core.convert.support,
  org.springframework.core.enums,
+ org.springframework.core.env,
  org.springframework.core.io,
  org.springframework.core.io.support,
+ org.springframework.core.serializer,
+ org.springframework.core.serializer.support,
  org.springframework.core.style,
  org.springframework.core.task,
  org.springframework.core.task.support,
@@ -107,10 +93,31 @@ Export-Package: org.aopalliance.aop,
  org.springframework.ejb.config,
  org.springframework.ejb.interceptor,
  org.springframework.ejb.support,
+ org.springframework.expression.common,
+ org.springframework.expression.spel,
+ org.springframework.expression.spel.ast,
+ org.springframework.expression.spel.standard,
+ org.springframework.expression.spel.support,
+ org.springframework.format,
+ org.springframework.format.annotation,
+ org.springframework.format.datetime,
+ org.springframework.format.datetime.joda,
+ org.springframework.format.number,
+ org.springframework.format.support,
+ org.springframework.http,
+ org.springframework.http.client,
+ org.springframework.http.client.support,
+ org.springframework.http.converter,
+ org.springframework.http.converter.feed,
+ org.springframework.http.converter.json,
+ org.springframework.http.converter.xml,
+ org.springframework.http.server,
  org.springframework.instrument.classloading,
  org.springframework.instrument.classloading.glassfish,
+ org.springframework.instrument.classloading.jboss,
  org.springframework.instrument.classloading.oc4j,
  org.springframework.instrument.classloading.weblogic,
+ org.springframework.instrument.classloading.websphere,
  org.springframework.jca.cci,
  org.springframework.jca.cci.connection,
  org.springframework.jca.cci.core,
@@ -123,12 +130,15 @@ Export-Package: org.aopalliance.aop,
  org.springframework.jca.work.glassfish,
  org.springframework.jca.work.jboss,
  org.springframework.jdbc,
+ org.springframework.jdbc.config,
  org.springframework.jdbc.core,
  org.springframework.jdbc.core.metadata,
  org.springframework.jdbc.core.namedparam,
  org.springframework.jdbc.core.simple,
  org.springframework.jdbc.core.support,
  org.springframework.jdbc.datasource,
+ org.springframework.jdbc.datasource.embedded,
+ org.springframework.jdbc.datasource.init,
  org.springframework.jdbc.datasource.lookup,
  org.springframework.jdbc.object,
  org.springframework.jdbc.support,
@@ -145,7 +155,6 @@ Export-Package: org.aopalliance.aop,
  org.springframework.jms.listener,
  org.springframework.jms.listener.adapter,
  org.springframework.jms.listener.endpoint,
- org.springframework.jms.listener.serversession,
  org.springframework.jms.remoting,
  org.springframework.jms.support,
  org.springframework.jms.support.converter,
@@ -163,12 +172,16 @@ Export-Package: org.aopalliance.aop,
  org.springframework.jndi.support,
  org.springframework.mail,
  org.springframework.mail.javamail,
- org.springframework.metadata,
+ org.springframework.mock.env,
- org.springframework.metadata.commons,
+ org.springframework.mock.jndi,
+ org.springframework.mock.web,
+ org.springframework.mock.web.portlet,
  org.springframework.orm,
  org.springframework.orm.hibernate3,
  org.springframework.orm.hibernate3.annotation,
  org.springframework.orm.hibernate3.support,
+ org.springframework.orm.hibernate4,
+ org.springframework.orm.hibernate4.support,
  org.springframework.orm.ibatis,
  org.springframework.orm.ibatis.support,
  org.springframework.orm.jdo,
@@ -177,16 +190,20 @@ Export-Package: org.aopalliance.aop,
  org.springframework.orm.jpa.persistenceunit,
  org.springframework.orm.jpa.support,
  org.springframework.orm.jpa.vendor,
- org.springframework.orm.toplink,
- org.springframework.orm.toplink.support,
  org.springframework.remoting,
+ org.springframework.remoting.caucho,
+ org.springframework.remoting.httpinvoker,
+ org.springframework.remoting.jaxrpc,
+ org.springframework.remoting.jaxws,
  org.springframework.remoting.rmi,
  org.springframework.remoting.soap,
  org.springframework.remoting.support,
  org.springframework.scheduling,
+ org.springframework.scheduling.annotation,
  org.springframework.scheduling.backportconcurrent,
  org.springframework.scheduling.commonj,
  org.springframework.scheduling.concurrent,
+ org.springframework.scheduling.config,
  org.springframework.scheduling.quartz,
  org.springframework.scheduling.support,
  org.springframework.scheduling.timer,
@@ -197,6 +214,19 @@ Export-Package: org.aopalliance.aop,
  org.springframework.scripting.jruby,
  org.springframework.scripting.support,
  org.springframework.stereotype,
+ org.springframework.test,
+ org.springframework.test.annotation,
+ org.springframework.test.context,
+ org.springframework.test.context.junit38,
+ org.springframework.test.context.junit4,
+ org.springframework.test.context.junit4.statements,
+ org.springframework.test.context.support,
+ org.springframework.test.context.testng,
+ org.springframework.test.context.transaction,
+ org.springframework.test.jdbc,
+ org.springframework.test.jpa,
+ org.springframework.test.util,
+ org.springframework.test.web,
  org.springframework.transaction,
  org.springframework.transaction.annotation,
  org.springframework.transaction.config,
@@ -213,13 +243,28 @@ Export-Package: org.aopalliance.aop,
  org.springframework.util.comparator,
  org.springframework.util.xml,
  org.springframework.validation,
+ org.springframework.validation.annotation,
+ org.springframework.validation.beanvalidation,
  org.springframework.validation.support,
  org.springframework.web,
+ org.springframework.web.bind,
+ org.springframework.web.bind.annotation,
+ org.springframework.web.bind.annotation.support,
+ org.springframework.web.bind.support,
+ org.springframework.web.client,
+ org.springframework.web.client.support,
  org.springframework.web.context,
  org.springframework.web.context.request,
  org.springframework.web.context.support,
  org.springframework.web.filter,
  org.springframework.web.jsf,
  org.springframework.web.jsf.el,
+ org.springframework.web.method,
+ org.springframework.web.method.annotation,
+ org.springframework.web.method.support,
+ org.springframework.web.multipart,
+ org.springframework.web.multipart.commons,
+ org.springframework.web.multipart.support,
  org.springframework.web.util
-Require-Bundle: org.apache.commons.logging;bundle-version="1.1.1"
+Require-Bundle: org.apache.commons.logging;bundle-version="1.1.1",
+ org.quartz;bundle-version="1.8.6"

cots/org.springframework/build.properties

@@ -1,16 +1,17 @@
 bin.includes = META-INF/,\
                .,\
-               antlr-2.7.6.jar,\
+               org.springframework.aop-3.1.4.RELEASE.jar,\
-               backport-util-concurrent.jar,\
+               org.springframework.beans-3.1.4.RELEASE.jar,\
-               quartz-all-1.6.1.jar,\
+               org.springframework.context-3.1.4.RELEASE.jar,\
-               spring-aop.jar,\
+               org.springframework.context.support-3.1.4.RELEASE.jar,\
-               spring-beans.jar,\
+               org.springframework.core-3.1.4.RELEASE.jar,\
-               spring-context-support.jar,\
+               org.springframework.jdbc-3.1.4.RELEASE.jar,\
-               spring-context.jar,\
+               org.springframework.jms-3.1.4.RELEASE.jar,\
-               spring-core.jar,\
+               org.springframework.orm-3.1.4.RELEASE.jar,\
-               spring-jdbc.jar,\
+               org.springframework.test-3.1.4.RELEASE.jar,\
-               spring-jms.jar,\
+               org.springframework.transaction-3.1.4.RELEASE.jar,\
-               spring-orm.jar,\
+               org.springframework.web-3.1.4.RELEASE.jar,\
-               spring-tx.jar,\
+               org.springframework.asm-3.1.4.RELEASE.jar,\
                com.springsource.org.aopalliance-1.0.0.jar,\
-               spring-web.jar
+               org.springframework.expression-3.1.4.RELEASE.jar,\
+               antlr-2.7.7.jar