Author: ningjiang
Date: Thu Nov 11 10:56:44 2010
New Revision: 1033879
URL: http://svn.apache.org/viewvc?rev=1033879&view=rev
Log:
CAMEL-3327 update the camel-cxf features for CXF 2.3.0
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1033879&r1=1033878&r2=1033879&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Nov 11 10:56:44 2010
@@ -40,7 +40,7 @@
<aopalliance-bundle-version>1.0_3</aopalliance-bundle-version>
<asm-bundle-version>2.2.3_3</asm-bundle-version>
<bcel-bundle-version>5.2_2</bcel-bundle-version>
- <cglib-version>2.1_3_4</cglib-version>
+ <cglib-version>2.1_3_6</cglib-version>
<cometd-java-server-bundle-version>1.0.1_1</cometd-java-server-bundle-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
@@ -109,7 +109,7 @@
<saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
<scala-bundle-version>2.8.0_1</scala-bundle-version>
<servicemix-specs-version>1.6.0</servicemix-specs-version>
- <jaxws.api.version>2.1</jaxws.api.version>
+ <jaxws.api.version>2.2</jaxws.api.version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
<smack-bundle-version>3.1.0_1</smack-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1033879&r1=1033878&r2=1033879&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Nov 11 10:56:44 2010
@@ -35,7 +35,22 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
- </feature>
+ </feature>
+ <feature name='jetty7' version='${pom.version}'>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty-version}</bundle>
+ </feature>
<feature name='camel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-spring</feature>
@@ -74,7 +89,6 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
@@ -103,11 +117,12 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>jetty7</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
<feature name='camel-cache' version='${pom.version}'>
@@ -146,19 +161,7 @@
<bundle>mvn:org.apache.camel/camel-mina/${pom.version}</bundle>
</feature>
<feature name='camel-jetty' version='${pom.version}'>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty-version}</bundle>
+ <feature version='${pom.version}'>jetty7</feature>
<feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
