You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/23 16:37:07 UTC
svn commit: r670637 - in /servicemix/smx4/features/trunk: ./ activemq/
activemq/activemq-commands/ activemq/activemq-rm/ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ camel/serv...
Author: gnodet
Date: Mon Jun 23 07:37:06 2008
New Revision: 670637
URL: http://svn.apache.org/viewvc?rev=670637&view=rev
Log:
Clean activemq integration by using the new classes from activemq instead of smx/jencks ones, use non snapshot dependencies of cxf and xbean
Removed:
servicemix/smx4/features/trunk/activemq/activemq-rm/
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
servicemix/smx4/features/trunk/activemq/pom.xml
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml Mon Jun 23 07:37:06 2008
@@ -76,9 +76,9 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.activemq</groupId>
- <artifactId>org.apache.servicemix.activemq.rm</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ <version>${activemq.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/pom.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/pom.xml Mon Jun 23 07:37:06 2008
@@ -34,7 +34,6 @@
<name>Apache ServiceMix Features :: ActiveMQ</name>
<modules>
- <module>activemq-rm</module>
<module>activemq-commands</module>
</modules>
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jun 23 07:37:06 2008
@@ -269,11 +269,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.activemq</groupId>
- <artifactId>org.apache.servicemix.activemq.rm</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.activemq</groupId>
<artifactId>org.apache.servicemix.activemq.commands</artifactId>
<version>${version}</version>
</dependency>
@@ -365,6 +360,11 @@
<version>${activemq.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>${xbean.version}</version>
@@ -434,7 +434,12 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
- <!-- Dependencies not included directly, but repackaged in bundles.
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>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) -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Jun 23 07:37:06 2008
@@ -184,8 +184,9 @@
<include>org.springframework:spring-web</include>
<include>org.apache.activemq:activemq-core</include>
<include>org.apache.activemq:activemq-console</include>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>commons-pool:commons-pool</include>
<include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.rm</include>
<include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
<!-- WEB / WAR -->
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Jun 23 07:37:06 2008
@@ -162,8 +162,9 @@
<include>org.springframework:spring-web</include>
<include>org.apache.activemq:activemq-core</include>
<include>org.apache.activemq:activemq-console</include>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>commons-pool:commons-pool</include>
<include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.rm</include>
<include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
<!-- WEB / WAR -->
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Mon Jun 23 07:37:06 2008
@@ -87,8 +87,9 @@
xbean-spring-${xbean.version}.jar=50
activemq-core-${activemq.version}.jar=50
activemq-console-${activemq.version}.jar=50
+commons-pool-${commons.pool.version}.jar=50
+activemq-pool-${activemq.version}.jar=50
spring-web-${spring.version}.jar=50
-org.apache.servicemix.activemq.rm-${version}.jar=50
org.apache.servicemix.activemq.commands-${version}.jar=50
jetty-${jetty.version}.jar=50
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=670637&r1=670636&r2=670637&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 Mon Jun 23 07:37:06 2008
@@ -38,7 +38,7 @@
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
- <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.rm/${version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
</feature>
<feature name="cxf">
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java Mon Jun 23 07:37:06 2008
@@ -64,10 +64,10 @@
if (e.getPattern() != Pattern.InOnly) {
if (e.getFault().getBody() != null) {
exchange.getFault().setBody(e.getFault().getBody());
- } else
+ } else {
exchange.getOut().setBody(e.getOut().getBody());
}
}
-
+ }
}
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=670637&r1=670636&r2=670637&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Jun 23 07:37:06 2008
@@ -69,7 +69,8 @@
<cglib.version>2.1_3</cglib.version>
<camel.version>1.4-SNAPSHOT</camel.version>
<commons.logging.version>1.1</commons.logging.version>
- <cxf.version>2.1.1-SNAPSHOT</cxf.version>
+ <commons.pool.version>1.4</commons.pool.version>
+ <cxf.version>2.1.1</cxf.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.configadmin.version>1.0.0</felix.configadmin.version>
@@ -120,7 +121,7 @@
<spring.version>2.5.4</spring.version>
<spring.osgi.version>1.1.0-m2</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
- <xbean.version>3.5-SNAPSHOT</xbean.version>
+ <xbean.version>3.4.2</xbean.version>
<commons-io.version>1.3.2</commons-io.version>
<commons-jxpath.version>1.2</commons-jxpath.version>
</properties>