You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/03/05 17:28:06 UTC
svn commit: r919471 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/filtered-resources/camel-features.xml
assembly/src/main/filtered-resources/features.xml
examples/itests/tests/pom.xml pom.xml
Author: jbonofre
Date: Fri Mar 5 16:28:06 2010
New Revision: 919471
URL: http://svn.apache.org/viewvc?rev=919471&view=rev
Log:
Make a cleanup to use the overrided camel features.
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=919471&r1=919470&r2=919471&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Mar 5 16:28:06 2010
@@ -138,12 +138,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.camel.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.karaf.bundle.version}</version>
+ <version>${jetty.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -878,19 +873,12 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.camel.version}</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.karaf</groupId>
- <artifactId>apache-camel</artifactId>
- <version>${camel.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1015,7 +1003,7 @@
<descriptors>
<descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+ <descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=919471&r1=919470&r2=919471&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Fri Mar 5 16:28:06 2010
@@ -59,12 +59,12 @@
<bundle>mvn:org.apache.camel/camel-test/${camel.version}</bundle>
</feature>
<feature name='camel-cxf' version='${camel.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/2.2.3_3</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+ <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/1.3_2</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
@@ -132,7 +132,7 @@
<bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
</feature>
<feature name='camel-jetty' version='${camel.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<feature version='${camel.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>
</feature>
@@ -146,7 +146,7 @@
<bundle>mvn:org.springframework/spring-context/2.5.6.SEC01</bundle>
<bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
<feature version='${camel.version}'>camel-core</feature>
@@ -172,8 +172,8 @@
<bundle>mvn:org.springframework/spring-web/2.5.6.SEC01</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
- <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
+ <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
@@ -190,7 +190,7 @@
</feature>
<feature name='camel-cometd' version='${camel.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+ <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.jetty-cometd/6.1.11_3</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${camel.version}</bundle>
@@ -248,9 +248,9 @@
</feature>
<feature name='camel-ibatis' version='${camel.version}'>
<feature version='${camel.version}'>camel-spring-osgi</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
- <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+ <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
@@ -295,8 +295,8 @@
<bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
- <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
+ <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
@@ -370,8 +370,8 @@
</feature>
<feature name='camel-quartz' version='${camel.version}'>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
- <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
+ <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.6.6_1</bundle>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=919471&r1=919470&r2=919471&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Mar 5 16:28:06 2010
@@ -182,7 +182,7 @@
<feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.karaf.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
@@ -207,7 +207,7 @@
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.karaf.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=919471&r1=919470&r2=919471&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri Mar 5 16:28:06 2010
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.karaf.bundle.version}</version>
+ <version>${jetty.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=919471&r1=919470&r2=919471&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Mar 5 16:28:06 2010
@@ -86,9 +86,8 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-net.version>1.4.1_3</commons-net.version>
<commons-pool.version>1.5.4_1</commons-pool.version>
- <commons-pool.camel.version>1.5.4</commons-pool.camel.version>
<commons-pool.activemq.version>1.4_1</commons-pool.activemq.version>
- <commons-dbcp.camel.version>1.3</commons-dbcp.camel.version>
+ <commons-dbcp.version>1.3</commons-dbcp.version>
<commons-vfs.version>1.0_3</commons-vfs.version>
<commons-jexl.version>1.1_3</commons-jexl.version>
<commons-lang-version>2.4</commons-lang-version>
@@ -148,8 +147,7 @@
<jdom.version>1.1_2</jdom.version>
<jencks.version>2.2</jencks.version>
<jetty.version>6.1.22</jetty.version>
- <jetty.karaf.bundle.version>6.1.22_1</jetty.karaf.bundle.version>
- <jetty.camel.bundle.version>6.1.19_2</jetty.camel.bundle.version>
+ <jetty.bundle.version>6.1.22_1</jetty.bundle.version>
<jexcelapi.version>2.4.2_2</jexcelapi.version>
<jettison.version>1.2</jettison.version>
<jing.version>20030619_2</jing.version>