Author: ningjiang
Date: Thu Nov 12 08:18:08 2009
New Revision: 835296
URL: http://svn.apache.org/viewvc?rev=835296&view=rev
Log:
Revert the change on camel-features
Modified:
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=835296&r1=835295&r2=835296&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Thu Nov 12
08:18:08 2009
@@ -33,91 +33,115 @@
<name>Camel :: Platforms :: Apache Karaf :: Features</name>
<properties>
- <abdera-bundle-version>0.4.0-incubating_1</abdera-bundle-version>
- <ant-bundle-version>1.7.0_1</ant-bundle-version>
- <antlr-bundle-version>3.0.1_1</antlr-bundle-version>
- <aopalliance-bundle-version>1.0_1</aopalliance-bundle-version>
- <asm-bundle-version>2.2.3_1</asm-bundle-version>
+ <abdera-bundle-version>0.4.0-incubating_3</abdera-bundle-version>
+ <ant-bundle-version>1.7.0_3</ant-bundle-version>
+ <antlr-bundle-version>2.7.7_2</antlr-bundle-version>
+ <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>
- <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
- <cglib-version>2.1_3_2</cglib-version>
-
<commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
- <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
- <commons-csv-version>1.0-r706899_1</commons-csv-version>
+ <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
+ <cglib-version>2.1_3_4</cglib-version>
+
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
+ <commons-dbcp-bundle-version>1.2.2_5</commons-dbcp-bundle-version>
+ <commons-csv-version>1.0-r706899_3</commons-csv-version>
<commons-codec-bundle-version>1.3_2</commons-codec-bundle-version>
-
<commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
- <commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
+
<commons-httpclient-bundle-version>3.1_4</commons-httpclient-bundle-version>
+ <commons-io-bundle-version>1.3.2_3</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.4</commons-lang-version>
<commons-net-version>2.0</commons-net-version>
- <flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
- <freemarker-bundle-version>2.3.15_1</freemarker-bundle-version>
+ <el-api-1.0-version>1.0.1</el-api-1.0-version>
+ <freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
<flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-jaxws-spec-version>1.0</geronimo-jaxws-spec-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
- <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
<geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
<hamcrest-bundle-version>1.2-dev1_3</hamcrest-bundle-version>
<hapi-bundle-version>0.5.1_1</hapi-bundle-version>
- <ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
+ <ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
- <javax-mail-version>1.4.1_2</javax-mail-version>
- <jaxb-bundle-version>2.1.6_1</jaxb-bundle-version>
- <jexcelapi-bundle-version>2.4.2_1</jexcelapi-bundle-version>
- <jsr311-api-1.0-spec-version>1.3.0</jsr311-api-1.0-spec-version>
- <hapi-bundle-version>0.5.1_1</hapi-bundle-version>
+ <jaxb-bundle-version>2.1.12_1</jaxb-bundle-version>
+ <jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version>
- <irclib-bundle-version>1.10_1</irclib-bundle-version>
+ <irclib-bundle-version>1.10_2</irclib-bundle-version>
<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>
+ <jcr-bundle-version>1.0_2</jcr-bundle-version>
+ <jdom-bundle-version>1.1_2</jdom-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_1</jetty-cometd-bundle-version>
+ <jetty-bundle-version>6.1.14_2</jetty-bundle-version>
+ <jetty-cometd-bundle-version>6.1.11_3</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
- <jodatime-bundle-version>1.5.2_1</jodatime-bundle-version>
+ <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>
- <jsch-bundle-version>0.1.31_1</jsch-bundle-version>
- <juel-bundle-version>2.1.0_1</juel-bundle-version>
- <junit-bundle-version>4.4_1</junit-bundle-version>
- <mvel-bundle-version>2.0.9_1</mvel-bundle-version>
- <mina-bundle-version>1.1.7_1</mina-bundle-version>
+ <jsch-bundle-version>0.1.31_3</jsch-bundle-version>
+ <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
+ <juel-bundle-version>2.1.0_2</juel-bundle-version>
+ <junit-bundle-version>4.7_1</junit-bundle-version>
+ <mina-bundle-version>1.1.7_3</mina-bundle-version>
<neethi-bundle-version>2.0.4_1</neethi-bundle-version>
- <ognl-bundle-version>2.7.3_1</ognl-bundle-version>
- <oro-bundle-version>2.0.8_1</oro-bundle-version>
+ <ognl-bundle-version>2.7.3_3</ognl-bundle-version>
+ <oro-bundle-version>2.0.8_3</oro-bundle-version>
<openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
- <oscache-bundle-version>2.4_1</oscache-bundle-version>
- <quartz-bundle-version>1.6.1_1</quartz-bundle-version>
- <qpid-bundle-version>1.0-incubating-M2.1_1</qpid-bundle-version>
- <saxon-bundle-version>9.1.0.1_1</saxon-bundle-version>
- <servicemix-specs-version>1.3.0</servicemix-specs-version>
+ <oscache-bundle-version>2.4_3</oscache-bundle-version>
+ <quartz-bundle-version>1.6.1_3</quartz-bundle-version>
+ <qpid-bundle-version>0.5.0_2</qpid-bundle-version>
+ <saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
+ <servicemix-specs-version>1.4-SNAPSHOT</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
- <snmp4j-bundle-version>1.8.1_2</snmp4j-bundle-version>
- <smack-bundle-version>3.0.4_1</smack-bundle-version>
-
<spring-commons-collections-version>3.2.1</spring-commons-collections-version>
+ <smack-bundle-version>3.0.4_2</smack-bundle-version>
<spring-version>2.5.6.SEC01</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<spring-commons-collections-version>3.2.1</spring-commons-collections-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
- <tagsoup-bundle-version>1.2_1</tagsoup-bundle-version>
- <velocity-bundle-version>1.6.2_1</velocity-bundle-version>
- <xalan-bundle-version>2.7.1_1</xalan-bundle-version>
- <xerces-bundle-version>2.9.1_1</xerces-bundle-version>
+ <stringtemplate-bundle-version>3.2_3</stringtemplate-bundle-version>
+ <tagsoup-bundle-version>1.2_3</tagsoup-bundle-version>
+ <velocity-bundle-version>1.6.2_3</velocity-bundle-version>
+ <xalan-bundle-version>2.7.1_2</xalan-bundle-version>
+ <xerces-bundle-version>2.9.1_3</xerces-bundle-version>
<xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
<xmlschema-version>1.4.5</xmlschema-version>
- <xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
- <xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
+ <xmlsec-bundle-version>1.4.3_2</xmlsec-bundle-version>
+ <xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
<xstream-bundle-version>1.3_3</xstream-bundle-version>
- <werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
- <woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
- <wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
+ <werken-xpath-bundle-version>0.9.4_3</werken-xpath-bundle-version>
+ <woodstox-bundle-version>3.2.8_1</woodstox-bundle-version>
+ <wsdl4j-bundle-version>1.6.2_2</wsdl4j-bundle-version>
</properties>
+
+ <repositories>
+ <!-- ServiceMix repo (for org.osgi:org.osgi.impl.bundle.jmx) -->
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<resources>
@@ -162,8 +186,30 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
+ <!--profiles>
+ <profile>
+ <id>validate</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles-->
</project>
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=835296&r1=835295&r2=835296&view=diff
==============================================================================
---
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Thu Nov 12 08:18:08 2009
@@ -5,7 +5,6 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle>
</feature>
<feature name='camel-spring' version='${pom.version}'>
@@ -39,6 +38,9 @@
<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>
<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>
+
<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.xmlbeans/${xmlbeans-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.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -48,7 +50,6 @@
<bundle>mvn:commons-collections/commons-collections/${commons-collections-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.oro/${oro-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.velocity/${velocity-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
@@ -75,11 +76,6 @@
</feature>
<feature name='camel-mina' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
-
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mina/${pom.version}</bundle>
</feature>
@@ -100,36 +96,36 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jms/${pom.version}</bundle>
</feature>
-
<feature name='camel-amqp' version='${pom.version}'>
+ <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.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid-bundle-version}</bundle>
<feature version='${pom.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle>
</feature>
-
<feature name='camel-atom' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<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.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
-
<feature name='camel-bam' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-bam/${pom.version}</bundle>
</feature>
-
<feature name='camel-csv' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -142,13 +138,11 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle>
</feature>
-
<feature name='camel-freemarker' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle>
</feature>
-
<feature name='camel-ftp' version='${pom.version}'>
<bundle>mvn:commons-net/commons-net/${commons-net-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -168,10 +162,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hamcrest/${pom.version}</bundle>
</feature>
-
<feature name='camel-hl7' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-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.xerces/${xerces-bundle-version}</bundle>
@@ -181,17 +175,16 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
-
-
<feature name='camel-ibatis' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-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.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${pom.version}</bundle>
</feature>
-
<feature name='camel-irc' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -229,7 +222,7 @@
<bundle>mvn:org.apache.camel/camel-josql/${pom.version}</bundle>
</feature>
<feature name='camel-jpa' version='${pom.version}'>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_3.0_spec/${geronimo-jpa-spec-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -241,17 +234,22 @@
<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.serp/${serp-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa-bundle-version}</bundle>
<bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle>
</feature>
-
<feature name='camel-jxpath' version='${pom.version}'>
+ <!-- All those bundles should be optional I think, but the commons-jxpath
osgi metadata is not really good -->
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${el-api-1.0-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${jsp-api-2.1-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jxpath/${pom.version}</bundle>
</feature>
-
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
@@ -279,7 +277,7 @@
</feature>
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-quartz' version='${pom.version}'>
@@ -291,14 +289,12 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
</feature>
-
<feature name='camel-restlet' version='${pom.version}'>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
<bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
<bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
-
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-rmi/${pom.version}</bundle>
@@ -313,13 +309,12 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
-
<feature name='camel-script' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle>
</feature>
-
<feature name='camel-spring-integration' version='${pom.version}'>
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
<feature version='${pom.version}'>camel-spring</feature>
@@ -336,14 +331,12 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
</feature>
-
- <feature name='camel-stringtemplate' version='${pom.version}'>
+ <feature name='camel-string-template' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<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.stringtemplate/${stringtemplate-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
</feature>
-
<feature name='camel-tagsoup' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
