svn commit: r1220743 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ apollo-itests/src/test/scala/org/apache/activemq/apollo/

[ch...@apache.org]

Author: chirino
Date: Mon Dec 19 13:45:54 2011
New Revision: 1220743

URL: http://svn.apache.org/viewvc?rev=1220743&view=rev
Log:
Pickup API changes in hawtdispatch and stompjms.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
    activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JMSMessageTest.java
    activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsQueueTransactionTest.java
    activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsTransactionTestSupport.java

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala?rev=1220743&r1=1220742&r2=1220743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala Mon Dec 19 13:45:54 2011
@@ -46,7 +46,7 @@ abstract class Connection() extends Base
     transport.setDispatchQueue(dispatch_queue);
     transport.setTransportListener(new TransportListener(){
       def onTransportFailure(error: IOException) = Connection.this.on_transport_failure(error)
-      def onTransportDisconnected = Connection.this.on_transport_disconnected
+      def onTransportDisconnected(reconnecting:Boolean) = Connection.this.on_transport_disconnected
       def onTransportConnected =  Connection.this.on_transport_connected
       def onTransportCommand(command: AnyRef) =  Connection.this.on_transport_command(command)
       def onRefill =  Connection.this.on_refill

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JMSMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JMSMessageTest.java?rev=1220743&r1=1220742&r2=1220743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JMSMessageTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JMSMessageTest.java Mon Dec 19 13:45:54 2011
@@ -17,7 +17,7 @@
 package org.apache.activemq.apollo;
 
 import junit.framework.Test;
-import org.fusesource.stompjms.StompJmsSession;
+import org.fusesource.stomp.jms.StompJmsSession;
 
 import javax.jms.*;
 import java.net.URISyntaxException;

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsQueueTransactionTest.java?rev=1220743&r1=1220742&r2=1220743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsQueueTransactionTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsQueueTransactionTest.java Mon Dec 19 13:45:54 2011
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo;
 
 import junit.framework.Test;
 import org.apache.activemq.apollo.test.JmsResourceProvider;
-import org.fusesource.stompjms.StompJmsSession;
+import org.fusesource.stomp.jms.StompJmsSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsTransactionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsTransactionTestSupport.java?rev=1220743&r1=1220742&r2=1220743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsTransactionTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/scala/org/apache/activemq/apollo/JmsTransactionTestSupport.java Mon Dec 19 13:45:54 2011
@@ -17,7 +17,7 @@
 package org.apache.activemq.apollo;
 
 import org.apache.activemq.apollo.test.JmsResourceProvider;
-import org.fusesource.stompjms.StompJmsSession;
+import org.fusesource.stomp.jms.StompJmsSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;