Author: dkulp
Date: Fri Jun 15 13:48:45 2012
New Revision: 1350619

URL: http://svn.apache.org/viewvc?rev=1350619&view=rev
Log:
Fix a test that is randomly failing with ActiveMQ 5.6.

Modified:
    cxf/trunk/systests/transport-jms/pom.xml
    cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
    cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml

Modified: cxf/trunk/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1350619&r1=1350618&r2=1350619&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Fri Jun 15 13:48:45 2012
@@ -252,6 +252,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-pool</artifactId>
+            <version>${cxf.activemq.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>${cxf.asm.groupId}</groupId>
             <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>

Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=1350619&r1=1350618&r2=1350619&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java (original)
+++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java Fri Jun 15 13:48:45 2012
@@ -24,6 +24,7 @@ import java.net.URL;
 import javax.jms.ConnectionFactory;
 import javax.xml.namespace.QName;
 
+import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -118,7 +119,7 @@ public class JMSTransactionClientServerT
 
         JMSConfiguration jmsConfig = new JMSConfiguration();
         ConnectionFactory connectionFactory
-            = new org.apache.activemq.ActiveMQConnectionFactory(broker.getBrokerURL());
+            = new PooledConnectionFactory(broker.getBrokerURL());
         jmsConfig.setConnectionFactory(connectionFactory);
         jmsConfig.setTargetDestination("greeter.queue.noaop");
         jmsConfig.setPubSubDomain(false);

Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml?rev=1350619&r1=1350618&r2=1350619&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml (original)
+++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml Fri Jun 15 13:48:45 2012
@@ -46,9 +46,9 @@ http://cxf.apache.org/jaxws http://cxf.a
     </jms:destination>
     
   
-  <bean id="jmsConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
-  	p:brokerURL="${EmbeddedBrokerURL}"
-  />
+  <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+  	<constructor-arg value="${EmbeddedBrokerURL}"/>
+  </bean>
   
   <bean id="singleConnectionFactory"
     class="org.springframework.jms.connection.SingleConnectionFactory" destroy-method="destroy">