Author: ningjiang
Date: Thu Nov 19 06:42:27 2009
New Revision: 882057
URL: http://svn.apache.org/viewvc?rev=882057&view=rev
Log:
CAMEL-2200 also updated the features to use camel-spring-osgi instead of
camel-spring
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=882057&r1=882056&r2=882057&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Nov 19 06:42:27 2009
@@ -99,6 +99,7 @@
<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-integration-version>1.0.1.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<stringtemplate-bundle-version>3.2_3</stringtemplate-bundle-version>
@@ -211,7 +212,14 @@
</goals>
</execution>
</executions>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
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=882057&r1=882056&r2=882057&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 19 06:42:27 2009
@@ -36,7 +36,7 @@
<bundle>mvn:org.apache.camel/camel-osgi/${pom.version}</bundle>
</feature>
<feature name='camel-test' version='${pom.version}'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
</feature>
@@ -77,7 +77,7 @@
<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}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
<feature name='camel-cache' version='${pom.version}'>
@@ -175,13 +175,13 @@
</feature>
<feature name='camel-flatpack' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
<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>
+ <feature version='${pom.version}'>camel-spring-osgi</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>
@@ -220,7 +220,7 @@
<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>
+ <feature version='${pom.version}'>camel-spring-osgi</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>
@@ -245,7 +245,7 @@
<bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle>
</feature>
<feature name='camel-jing' version='${pom.version}'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<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>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
@@ -312,7 +312,7 @@
<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>
<bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
</feature>
<feature name='camel-mvel' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -357,7 +357,7 @@
<bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
</feature>
<feature name='camel-saxon' version='${pom.version}'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
@@ -377,8 +377,8 @@
<bundle>mvn:org.apache.camel/camel-snmp/${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>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/${spring-integration-version}</bundle>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
</feature>
<feature name='camel-spring-javaconfig' version='${pom.version}'>
@@ -386,7 +386,7 @@
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/${spring-version}</bundle>
<bundle>mvn:http://svn.apache.org/repos/asf/camel/m2-repo!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>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
</feature>
<feature name='camel-sql' version='${pom.version}'>
@@ -401,7 +401,7 @@
<bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
</feature>
<feature name='camel-string-template' version='${pom.version}'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-spring-osgi</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>
@@ -421,7 +421,7 @@
<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>
+ <feature version='${pom.version}'>camel-spring-osgi</feature>
<bundle>mvn:org.apache.camel/camel-velocity/${pom.version}</bundle>
</feature>
<feature name='camel-xmlbeans' version='${pom.version}'>
