svn commit: r1349550 - in /cxf/trunk: parent/pom.xml rt/transports/jms/pom.xml rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java

[dkulp]

Author: dkulp
Date: Tue Jun 12 21:36:39 2012
New Revision: 1349550

URL: http://svn.apache.org/viewvc?rev=1349550&view=rev
Log:
Update to activemq 5.6.0 for testing

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/transports/jms/pom.xml
    
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java

Modified: cxf/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1349550&r1=1349549&r2=1349550&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Jun 12 21:36:39 2012
@@ -84,7 +84,7 @@
         <cxf.abdera.version>1.1.2</cxf.abdera.version>
         <!-- Due to AMQ-3276, we need to keep the system tests at 5.4.2, but we
              need the 5.5.0 features.xml. :-(  -->
-        <cxf.activemq.version>5.4.2</cxf.activemq.version>
+        <cxf.activemq.version>5.6.0</cxf.activemq.version>
         <cxf.derby.version>10.2.2.0</cxf.derby.version>
 
         <cxf.jaxb21.version>2.1</cxf.jaxb21.version>
@@ -1248,9 +1248,22 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jms_1.1_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.fusesource.fuse-extra</groupId>
+                        <artifactId>fusemq-leveldb</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.fusesource.mqtt-client</groupId>
+                        <artifactId>mqtt-client</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-pool</artifactId>
+                <version>${cxf.activemq.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>rhino</groupId>
                 <artifactId>js</artifactId>
                 <version>${cxf.rhino.version}</version>

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1349550&r1=1349549&r2=1349550&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Tue Jun 12 21:36:39 2012
@@ -91,6 +91,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>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
             <version>3.5</version>
@@ -126,7 +132,12 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java?rev=1349550&r1=1349549&r2=1349550&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
 (original)
+++ 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
 Tue Jun 12 21:36:39 2012
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 
 
 
-import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.message.Exchange;
@@ -54,14 +54,14 @@ public class MessageIdAsCorrelationIdJMS
     private String requestMessageId;
 
     
-    public void sendAndReceive(String replyDestination) {
+    public void sendAndReceive(String replyDestination) throws Exception {
         BusFactory bf = BusFactory.newInstance();
         Bus bus = bf.createBus();
         BusFactory.setDefaultBus(bus);
         EndpointInfo endpointInfo = new EndpointInfo();
         EndpointReferenceType target = new EndpointReferenceType();
 
-        connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
+        connectionFactory = new PooledConnectionFactory(BROKER_URI);
         
         runReceiver();
 
@@ -79,15 +79,16 @@ public class MessageIdAsCorrelationIdJMS
             .get(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS);
         Assert.assertEquals(requestMessageId, headers.getJMSCorrelationID());
         conduit.close();
+        bus.shutdown(true);
     }
 
     @Test
-    public void testSendReceiveWithTempReplyQueue() {
+    public void testSendReceiveWithTempReplyQueue() throws Exception {
         sendAndReceive(null);
     }
     
     @Test
-    public void testSendReceive() {
+    public void testSendReceive() throws Exception {
         sendAndReceive("queue:testreply");
     }