Author: ningjiang
Date: Tue Sep 29 14:10:26 2009
New Revision: 819956
URL: http://svn.apache.org/viewvc?rev=819956&view=rev
Log:
CAMEL-2041 fixed some bundle version issues of the camel features
Modified:
camel/trunk/components/camel-msv/pom.xml
camel/trunk/components/camel-restlet/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-msv/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-msv/pom.xml?rev=819956&r1=819955&r2=819956&view=diff
==============================================================================
--- camel/trunk/components/camel-msv/pom.xml (original)
+++ camel/trunk/components/camel-msv/pom.xml Tue Sep 29 14:10:26 2009
@@ -31,6 +31,7 @@
<description>Camel MSV support</description>
<properties>
+ <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
</properties>
Modified: camel/trunk/components/camel-restlet/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=819956&r1=819955&r2=819956&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Tue Sep 29 14:10:26 2009
@@ -21,7 +21,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Camel :: Restlet</name>
<description>Camel REST (Restlet baesd) Component</description>
@@ -30,6 +30,12 @@
<artifactId>camel-parent</artifactId>
<version>2.1-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.restlet.*
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -45,7 +51,6 @@
<dependency>
<groupId>org.restlet</groupId>
<artifactId>org.restlet</artifactId>
- <version>1.1.4</version>
</dependency>
<!-- test artifacts -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=819956&r1=819955&r2=819956&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Sep 29 14:10:26 2009
@@ -80,6 +80,7 @@
<pax-exam-version>1.0.0</pax-exam-version>
<pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>
<qpid-version>0.5.0</qpid-version>
+ <restlet-version>1.1.5</restlet-version>
<saxon-version>9.1.0.1</saxon-version>
<scala-version>2.7.3</scala-version>
<scala-plugin-version>2.9.1</scala-plugin-version>
@@ -821,6 +822,13 @@
<artifactId>jetty-client</artifactId>
<version>${jetty-version}</version>
</dependency>
+
+ <!-- optional restlet support -->
+ <dependency>
+ <groupId>org.restlet</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
<!-- optional jakarta http core support -->
<dependency>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=819956&r1=819955&r2=819956&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Sep 29 14:10:26 2009
@@ -36,7 +36,7 @@
<properties>
<abdera-bundle-version>0.4.0-incubating_2-SNAPSHOT</abdera-bundle-version>
<ant-bundle-version>1.7.0_2-SNAPSHOT</ant-bundle-version>
- <antlr-bundle-version>3.0.1_2-SNAPSHOT</antlr-bundle-version>
+ <antlr-bundle-version>2.7.7_1-SNAPSHOT</antlr-bundle-version>
<aopalliance-bundle-version>1.0_2-SNAPSHOT</aopalliance-bundle-version>
<asm-bundle-version>2.2.3_2-SNAPSHOT</asm-bundle-version>
<bcel-bundle-version>5.2_1-SNAPSHOT</bcel-bundle-version>
@@ -72,7 +72,7 @@
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jcr-bundle-version>1.0_1</jcr-bundle-version>
<jdom-bundle-version>1.1_1</jdom-bundle-version>
- <jettison-bundle-version>1.0.1_1</jettison-bundle-version>
+ <jettison-bundle-version>1.1</jettison-bundle-version>
<jetty-bundle-version>6.1.14_1</jetty-bundle-version>
<jetty-cometd-bundle-version>6.1.11_2-SNAPSHOT</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-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=819956&r1=819955&r2=819956&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Sep 29 14:10:26 2009
@@ -41,7 +41,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-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.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}</bundle>
+
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
@@ -293,8 +293,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
+ <feature version='${pom.version}'>camel-spring</feature>
</feature>
<feature name='camel-mvel' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -324,6 +324,7 @@
<feature name='camel-restlet' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
+ <bundle>mvn:org.restlet/org.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
@@ -365,6 +366,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle>mvn:org.springframework/org.springframework.test/${spring-version}</bundle>
<bundle>mvn:org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
</feature>
@@ -394,6 +396,10 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
@@ -408,6 +414,9 @@
<feature name='camel-xmlsecurity' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmlsecurity/${pom.version}</bundle>
</feature>
@@ -418,7 +427,7 @@
<bundle>mvn:org.apache.camel/camel-xmpp/${pom.version}</bundle>
</feature>
<feature name='camel-xstream' version='${pom.version}'>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}</bundle>
+
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
