Author: ningjiang
Date: Sat Mar 13 03:50:55 2010
New Revision: 922478
URL: http://svn.apache.org/viewvc?rev=922478&view=rev
Log:
CAMEL-2332 camel-cxf still need to use Jetty6 bundle
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=922478&r1=922477&r2=922478&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sat Mar 13 03:50:55 2010
@@ -64,6 +64,7 @@
<ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
<jaxb-bundle-version>2.1.12_1</jaxb-bundle-version>
+ <jetty6-bundle-version>6.1.22_1</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<hapi-bundle-version>0.5.1_3</hapi-bundle-version>
<hawtdb-maven-repo-url>http://hawtdb.fusesource.org/repo/snapshot</hawtdb-maven-repo-url>
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=922478&r1=922477&r2=922478&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Mar 13 03:50:55 2010
@@ -33,14 +33,7 @@
<bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
<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.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
