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/02/25 13:34:06 UTC
svn commit: r916271 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/ examples/camel-nmr/
examples/camel-osgi/ examples/cxf-camel-nmr/ examples/cxf-jaxrs/
examples/itests/tests/ examples/itests/tests/src/test/java...
Author: jbonofre
Date: Thu Feb 25 12:34:05 2010
New Revision: 916271
URL: http://svn.apache.org/viewvc?rev=916271&view=rev
Log:
Fix issue with commons-pool package used by Camel and ActiveMQ. Now, it uses ServiceMix commons-pool wrapped bundles.
Make a cleanup on the commons version property naming.
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/war/deployer/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Feb 25 12:34:05 2010
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-net</artifactId>
- <version>${commons.net.version}</version>
+ <version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -527,9 +527,9 @@
</dependency>
-->
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${activemq.commons.pool.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${activemq.commons-pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -647,9 +647,9 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons.pool.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
</dependency>
<!-- Dependencies not included directly, but repackaged in bundles.
Listed for legal reasons (and LICENSE file generation)
@@ -813,7 +813,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
- <version>${commons.vfs.version}</version>
+ <version>${commons-vfs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -851,11 +851,6 @@
<version>${scriptengines.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons.pool.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
<version>${camel.version}</version>
@@ -895,7 +890,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
- <version>${commons.jexl.version}</version>
+ <version>${commons-jexl.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
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=916271&r1=916270&r2=916271&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 Thu Feb 25 12:34:05 2010
@@ -43,7 +43,7 @@
<feature name="activemq" version="${activemq.version}">
<feature version="${version}">connector</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${activemq.commons.pool.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${activemq.commons-pool.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
@@ -188,15 +188,15 @@
<feature name="servicemix-ftp" version="${servicemix-ftp-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons.net.version}</bundle>
- <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons-net.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp-version}</bundle>
</feature>
<feature name="servicemix-http" version="${servicemix-http-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
<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>
@@ -309,7 +309,7 @@
</feature>
<feature name="servicemix-vfs" version="${servicemix-vfs-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons.vfs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs-version}</bundle>
</feature>
<feature name="servicemix-smpp" version="${servicemix-smpp-version}">
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Thu Feb 25 12:34:05 2010
@@ -37,7 +37,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Thu Feb 25 12:34:05 2010
@@ -37,7 +37,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Thu Feb 25 12:34:05 2010
@@ -47,7 +47,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Thu Feb 25 12:34:05 2010
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
+ <version>${commons-httpclient.version}</version>
</dependency>
</dependencies>
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=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Thu Feb 25 12:34:05 2010
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.fusesource.commonman</groupId>
<artifactId>commons-management</artifactId>
- <version>${commons.management.version}</version>
+ <version>${commons-management.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -299,9 +299,9 @@
<version>${geronimo.jta.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${activemq.commons.pool.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${activemq.commons-pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -439,7 +439,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Thu Feb 25 12:34:05 2010
@@ -93,7 +93,7 @@
getBundle("org.springframework", "spring-tx"),
getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec"),
- getBundle("commons-pool", "commons-pool"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
getBundle("org.apache.xbean", "xbean-spring"),
getBundle("org.apache.activemq", "activemq-core"),
getBundle("org.apache.activemq", "activemq-ra"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Feb 25 12:34:05 2010
@@ -75,22 +75,22 @@
<bnd.version>0.0.384</bnd.version>
<cglib.version>2.1_3_4</cglib.version>
<camel.version>2.2.0</camel.version>
- <commons.management.version>1.0</commons.management.version>
+ <commons-management.version>1.0</commons-management.version>
<commons-beanutils.version>1.7.0_3</commons-beanutils.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-csv.version>1.0-r706899_1</commons-csv.version>
<commons-dbcp.version>1.2.2_5</commons-dbcp.version>
- <commons.httpclient.version>3.1_4</commons.httpclient.version>
+ <commons-httpclient.version>3.1_4</commons-httpclient.version>
<commons-io.version>1.3.2_3</commons-io.version>
<commons-codec.version>1.3_2</commons-codec.version>
<commons-jxpath.version>1.2_3</commons-jxpath.version>
- <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</commons.pool.version>
+ <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-SNAPSHOT</commons-pool.version>
<!-- Required by ActiveMQ -->
- <activemq.commons.pool.version>1.4</activemq.commons.pool.version>
- <commons.vfs.version>1.0_3</commons.vfs.version>
- <commons.jexl.version>1.1_3</commons.jexl.version>
+ <activemq.commons-pool.version>1.4_1-SNAPSHOT</activemq.commons-pool.version>
+ <commons-vfs.version>1.0_3</commons-vfs.version>
+ <commons-jexl.version>1.1_3</commons-jexl.version>
<cxf.version>2.2.6</cxf.version>
<dom4j.version>1.6.1_2</dom4j.version>
<drools.version>4.0.7_4</drools.version>
@@ -145,8 +145,8 @@
<jdt.core.version>3.2.3_2</jdt.core.version>
<jdom.version>1.1_2</jdom.version>
<jencks.version>2.2</jencks.version>
- <jetty.version>6.1.22</jetty.version>
- <jetty.bundle.version>6.1.22_1</jetty.bundle.version>
+ <jetty.version>6.1.19</jetty.version>
+ <jetty.bundle.version>6.1.19_2</jetty.bundle.version>
<jexcelapi.version>2.4.2_2</jexcelapi.version>
<jettison.version>1.2</jettison.version>
<jing.version>20030619_2</jing.version>
@@ -478,7 +478,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/smx4/features/trunk/war/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/deployer/pom.xml?rev=916271&r1=916270&r2=916271&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/deployer/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/deployer/pom.xml Thu Feb 25 12:34:05 2010
@@ -42,7 +42,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>provided</scope>
</dependency>
<dependency>