You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/01 11:35:23 UTC
svn commit: r959569 - in /camel/trunk/platforms/karaf/features: pom.xml
src/main/resources/features-spring3.xml src/main/resources/features.xml
Author: ningjiang
Date: Thu Jul 1 09:35:23 2010
New Revision: 959569
URL: http://svn.apache.org/viewvc?rev=959569&view=rev
Log:
Update the jetty bundle version of camel-feature, also fix some class not found exceptions of features-spring3.xml
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.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=959569&r1=959568&r2=959569&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Jul 1 09:35:23 2010
@@ -81,7 +81,6 @@
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_2</jdom-bundle-version>
<jettison-bundle-version>1.2</jettison-bundle-version>
- <jetty-bundle-version>7.0.1.v20091125</jetty-bundle-version>
<cometd-java-server-bundle-version>1.0.1_1</cometd-java-server-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=959569&r1=959568&r2=959569&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml Thu Jul 1 09:35:23 2010
@@ -2,11 +2,14 @@
<features>
<feature name='spring' version='${spring3-version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
+ <bundle>mvn:org.springframework/spring-asm/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aspects/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring3-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring3-version}</bundle>
+ <bundle>mvn:org.springframework/spring-expression/${spring3-version}</bundle>
</feature>
<feature name='spring-dm' version='${spring-osgi-version}'>
<feature version='${spring3-version}'>spring</feature>
@@ -139,18 +142,18 @@
</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-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty-bundle-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}'>camel-core</feature>
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
@@ -209,14 +212,14 @@
</feature>
<feature name='camel-cometd' 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-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-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-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.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle>
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=959569&r1=959568&r2=959569&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jul 1 09:35:23 2010
@@ -150,18 +150,18 @@
</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-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty-bundle-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}'>camel-core</feature>
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
@@ -226,14 +226,14 @@
</feature>
<feature name='camel-cometd' 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-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-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-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.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle>