You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/11/04 16:39:16 UTC
svn commit: r1538649 - in /servicemix/smx4/nmr/trunk:
jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/
jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/
parent/
Author: gertv
Date: Mon Nov 4 15:39:16 2013
New Revision: 1538649
URL: http://svn.apache.org/r1538649
Log:
SMX4NMR-319: Upgrade to ActiveMQ 5.9.0
Modified:
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
servicemix/smx4/nmr/trunk/parent/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java?rev=1538649&r1=1538648&r2=1538649&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/test/java/org/apache/servicemix/jbi/cluster/engine/AbstractClusterEndpointTest.java Mon Nov 4 15:39:16 2013
@@ -30,7 +30,7 @@ import javax.transaction.TransactionMana
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.Service;
-import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQXAConnectionFactory;
import org.apache.activemq.pool.XaPooledConnectionFactory;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.api.Endpoint;
@@ -103,7 +103,7 @@ public abstract class AbstractClusterEnd
}
protected ConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:" + port);
+ ActiveMQXAConnectionFactory cf = new ActiveMQXAConnectionFactory("tcp://localhost:" + port);
XaPooledConnectionFactory cnf = new XaPooledConnectionFactory(cf);
cnf.setTransactionManager(transactionManager);
return cnf;
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java?rev=1538649&r1=1538648&r2=1538649&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java Mon Nov 4 15:39:16 2013
@@ -33,7 +33,7 @@ import javax.transaction.xa.XAResource;
import org.apache.activemq.ActiveMQSession;
import org.apache.activemq.MessageAvailableConsumer;
import org.apache.activemq.MessageAvailableListener;
-import org.apache.activemq.pool.PooledSession;
+import org.apache.activemq.jms.pool.PooledSession;
import org.springframework.jms.JmsException;
public class ActiveMQJmsRequestorPool extends AbstractPollingRequestorPool implements ExceptionListener {
Modified: servicemix/smx4/nmr/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/parent/pom.xml?rev=1538649&r1=1538648&r2=1538649&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/parent/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/parent/pom.xml Mon Nov 4 15:39:16 2013
@@ -38,11 +38,11 @@
<!-- Properties -->
<properties>
- <activemq.version>5.8.0</activemq.version>
+ <activemq.version>5.9.0</activemq.version>
<aries.version>0.3</aries.version>
<camel.version>2.12.1</camel.version>
<karaf.version>2.2.11</karaf.version>
- <servicemix.components.version>2013.01</servicemix.components.version>
+ <servicemix.components.version>2013.02-SNAPSHOT</servicemix.components.version>
<servicemix.nmr.version>${project.version}</servicemix.nmr.version>
<servicemix.utils.version>1.6.0</servicemix.utils.version>
<servicemix.specs.version>2.2.0</servicemix.specs.version>