activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r786658 - in /activemq/sandbox/activemq-flow: activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/ activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ a...
Date Fri, 19 Jun 2009 20:43:05 GMT
Author: chirino
Date: Fri Jun 19 20:43:04 2009
New Revision: 786658

URL: http://svn.apache.org/viewvc?rev=786658&view=rev
Log:
moving tests that are passing out of the legacy package.

Added:
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueCompositeSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueTopicCompositeSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsResourceProvider.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicCompositeSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicWildcardSendReceiveTest.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java
      - copied, changed from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java
Removed:
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java
Modified:
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSentMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSessionDeliveryModeTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ReliableReconnectTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TopicRedeliverTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -29,8 +29,8 @@
 import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveTest;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.test3.JmsTopicSendReceiveTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -17,8 +17,8 @@
 package org.apache.activemq.legacy.transport.nio;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 /**
  * @version $Revision$

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSentMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSentMessageTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSentMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSentMessageTest.java Fri Jun 19 20:43:04 2009
@@ -25,7 +25,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 
-import org.apache.activemq.legacy.test3.TestSupport;
+import org.apache.activemq.apollo.test3.TestSupport;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSessionDeliveryModeTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSessionDeliveryModeTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSessionDeliveryModeTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ChangeSessionDeliveryModeTest.java Fri Jun 19 20:43:04 2009
@@ -26,7 +26,7 @@
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import org.apache.activemq.legacy.test3.TestSupport;
+import org.apache.activemq.apollo.test3.TestSupport;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java Fri Jun 19 20:43:04 2009
@@ -19,8 +19,8 @@
 import javax.jms.Destination;
 import javax.jms.Message;
 
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.legacy.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java Fri Jun 19 20:43:04 2009
@@ -27,8 +27,8 @@
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.apollo.test3.JmsSendReceiveTestSupport;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.legacy.test3.JmsSendReceiveTestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java Fri Jun 19 20:43:04 2009
@@ -28,7 +28,7 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.test3.TestSupport;
+import org.apache.activemq.apollo.test3.TestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java Fri Jun 19 20:43:04 2009
@@ -21,7 +21,7 @@
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 
-import org.apache.activemq.legacy.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ReliableReconnectTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ReliableReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ReliableReconnectTest.java Fri Jun 19 20:43:04 2009
@@ -32,10 +32,10 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.apollo.test3.TestSupport;
 import org.apache.activemq.legacy.broker.BrokerFactory;
 import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.legacy.store.PersistenceAdapter;
-import org.apache.activemq.legacy.test3.TestSupport;
 import org.apache.activemq.util.IdGenerator;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java Fri Jun 19 20:43:04 2009
@@ -26,7 +26,7 @@
 import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.test3.TestSupport;
+import org.apache.activemq.apollo.test3.TestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TopicRedeliverTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TopicRedeliverTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TopicRedeliverTest.java Fri Jun 19 20:43:04 2009
@@ -26,7 +26,7 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.legacy.test3.TestSupport;
+import org.apache.activemq.apollo.test3.TestSupport;
 import org.apache.activemq.util.IdGenerator;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java Fri Jun 19 20:43:04 2009
@@ -99,7 +99,7 @@
      * Returns the consumer subject.
      * 
      * @return String - consumer subject
-     * @see org.apache.activemq.apollo.test2.testsupport.test.TestSupport#getConsumerSubject()
+     * @see org.apache.activemq.apollo.test3.testsupport.test.TestSupport#getConsumerSubject()
      */
     protected String getConsumerSubject() {
         return "TEST";
@@ -109,7 +109,7 @@
      * Returns the producer subject.
      * 
      * @return String - producer subject
-     * @see org.apache.activemq.apollo.test2.testsupport.test.TestSupport#getProducerSubject()
+     * @see org.apache.activemq.apollo.test3.testsupport.test.TestSupport#getProducerSubject()
      */
     protected String getProducerSubject() {
         return "TEST";

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.JMSException;
 

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueCompositeSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueCompositeSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueCompositeSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueCompositeSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -23,6 +23,7 @@
 
 
 
+
 /**
  * @version $Revision: 1.3 $
  */
@@ -45,7 +46,7 @@
      * Returns the consumer subject.
      *
      * @return String - consumer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getConsumerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getConsumerSubject()
      */
     protected String getConsumerSubject() {
         return "FOO.BAR.HUMBUG";
@@ -55,7 +56,7 @@
      * Returns the producer subject.
      *
      * @return String - producer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getProducerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getProducerSubject()
      */
     protected String getProducerSubject() {
         return "FOO.BAR.HUMBUG,FOO.BAR.HUMBUG2";

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
+
 
 
 /**

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
+
 
 
 /**

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueTopicCompositeSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueTopicCompositeSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueTopicCompositeSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueTopicCompositeSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -23,6 +23,7 @@
 
 
 
+
 /**
  * @version $Revision: 1.3 $
  */
@@ -56,7 +57,7 @@
      * Returns the consumer subject.
      *
      * @return String - consumer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getConsumerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getConsumerSubject()
      */
     protected String getConsumerSubject() {
         return "FOO.BAR.HUMBUG";
@@ -66,7 +67,7 @@
      * Returns the producer subject.
      *
      * @return String - producer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getProducerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getProducerSubject()
      */
     protected String getProducerSubject() {
         return "queue://FOO.BAR.HUMBUG,topic://FOO.BAR.HUMBUG2";

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsResourceProvider.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsResourceProvider.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsResourceProvider.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsResourceProvider.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionConsumer;
@@ -46,7 +46,7 @@
     /**
      * Creates a connection factory.
      * 
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createConnectionFactory()
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createConnectionFactory()
      */
     public ConnectionFactory createConnectionFactory() throws Exception {
         return new ActiveMQConnectionFactory(serverUri);
@@ -55,7 +55,7 @@
     /**
      * Creates a connection.
      * 
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createConnection(javax.jms.ConnectionFactory)
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createConnection(javax.jms.ConnectionFactory)
      */
     public Connection createConnection(ConnectionFactory cf) throws JMSException {
         Connection connection = cf.createConnection();
@@ -66,14 +66,14 @@
     }
 
     /**
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createSession(javax.jms.Connection)
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createSession(javax.jms.Connection)
      */
     public Session createSession(Connection conn) throws JMSException {
         return conn.createSession(transacted, ackMode);
     }
 
     /**
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createConsumer(javax.jms.Session,
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createConsumer(javax.jms.Session,
      *      javax.jms.Destination)
      */
     public MessageConsumer createConsumer(Session session, Destination destination) throws JMSException {
@@ -96,7 +96,7 @@
     /**
      * Creates a producer.
      * 
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createProducer(javax.jms.Session,
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createProducer(javax.jms.Session,
      *      javax.jms.Destination)
      */
     public MessageProducer createProducer(Session session, Destination destination) throws JMSException {
@@ -108,7 +108,7 @@
     /**
      * Creates a destination, which can either a topic or a queue.
      * 
-     * @see org.apache.activemq.legacy.test3.JmsResourceProvider#createDestination(javax.jms.Session,
+     * @see org.apache.activemq.apollo.test3.JmsResourceProvider#createDestination(javax.jms.Session,
      *      java.lang.String)
      */
     public Destination createDestination(Session session, String name) throws JMSException {

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicCompositeSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicCompositeSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicCompositeSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicCompositeSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -23,6 +23,7 @@
 
 
 
+
 /**
  * @version $Revision: 1.3 $
  */
@@ -56,7 +57,7 @@
      * Returns the consumer subject.
      *
      * @return String - consumer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getConsumerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getConsumerSubject()
      */
     protected String getConsumerSubject() {
         return "FOO.BAR.HUMBUG";
@@ -66,7 +67,7 @@
      * Returns the producer subject.
      *
      * @return String - producer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getProducerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getProducerSubject()
      */
     protected String getProducerSubject() {
         return "FOO.BAR.HUMBUG,FOO.BAR.HUMBUG2";

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java Fri Jun 19 20:43:04 2009
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 
+
 /**
  * @version $Revision$
  */

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java Fri Jun 19 20:43:04 2009
@@ -14,17 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
+
+import java.net.URI;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.broker.BrokerFactory;
+import org.apache.activemq.transport.TransportFactory;
 
 /**
  * @version $Revision: 1.3 $
  */
 public class JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
 
-    protected BrokerService broker;
+    protected Broker broker;
     protected String bindAddress = "tcp://localhost:61616";
 
     /**
@@ -52,15 +56,15 @@
      * 
      * @throws Exception
      */
-    protected BrokerService createBroker() throws Exception {
-        BrokerService answer = new BrokerService();
+    protected Broker createBroker() throws Exception {
+    	Broker answer = BrokerFactory.createBroker("jaxb:classpath:non-persistent-activemq.xml");
         configureBroker(answer);
         answer.start();
         return answer;
     }
 
-    protected void configureBroker(BrokerService answer) throws Exception {
-        answer.addConnector(bindAddress);
+    protected void configureBroker(Broker answer) throws Exception {
+        answer.addTransportServer(TransportFactory.bind(new URI(bindAddress)));
     }
 
     protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -125,7 +125,7 @@
     /**
      * Creates an ActiveMQConnectionFactory.
      * 
-     * @see org.apache.activemq.legacy.test3.TestSupport#createConnectionFactory()
+     * @see org.apache.activemq.apollo.test3.TestSupport#createConnectionFactory()
      */
     protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
         return new ActiveMQConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicWildcardSendReceiveTest.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicWildcardSendReceiveTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicWildcardSendReceiveTest.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicWildcardSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import java.net.URI;
 import java.net.URISyntaxException;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java (from r786650, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java&r1=786650&r2=786658&rev=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java Fri Jun 19 20:43:04 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test3;
+package org.apache.activemq.apollo.test3;
 
 import java.lang.reflect.Array;
 

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java Fri Jun 19 20:43:04 2009
@@ -18,6 +18,9 @@
 
 import javax.jms.DeliveryMode;
 
+import org.apache.activemq.apollo.test3.JmsResourceProvider;
+import org.apache.activemq.apollo.test3.JmsTransactionTestSupport;
+
 
 /**
  * @version $Revision: 1.2 $

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java Fri Jun 19 20:43:04 2009
@@ -16,11 +16,15 @@
  */
 package org.apache.activemq.legacy.test3;
 
+import java.net.URI;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.broker.BrokerFactory;
+import org.apache.activemq.apollo.test3.JmsQueueSendReceiveTwoConnectionsTest;
+import org.apache.activemq.transport.TransportFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -32,7 +36,7 @@
 
     private Queue<Exception> errors = new ConcurrentLinkedQueue<Exception>();
     private int delayBeforeStartingBroker = 1000;
-    private BrokerService broker;
+    private Broker broker;
 
     public void startBroker() {
         // Initialize the broker
@@ -45,9 +49,8 @@
 
         LOG.info("Now starting the broker");
         try {
-            broker = new BrokerService();
-            broker.setPersistent(false);
-            broker.addConnector("tcp://localhost:61616");
+            broker = BrokerFactory.createBroker("jaxb:classpath:non-persistent-activemq.xml");
+            broker.addTransportServer(TransportFactory.bind(new URI("tcp://localhost:61616")));
             broker.start();
         } catch (Exception e) {
             LOG.info("Caught: " + e);

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java Fri Jun 19 20:43:04 2009
@@ -27,6 +27,8 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import org.apache.activemq.apollo.test3.JmsResourceProvider;
+import org.apache.activemq.apollo.test3.JmsTransactionTestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -37,7 +39,7 @@
     private static final Log LOG = LogFactory.getLog(JmsQueueTransactionTest.class);
 
     /**
-     * @see org.apache.activemq.legacy.test3.JmsTransactionTestSupport#getJmsResourceProvider()
+     * @see org.apache.activemq.apollo.test3.JmsTransactionTestSupport#getJmsResourceProvider()
      */
     protected JmsResourceProvider getJmsResourceProvider() {
         JmsResourceProvider p = new JmsResourceProvider();

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java Fri Jun 19 20:43:04 2009
@@ -25,6 +25,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveTest;
 import org.apache.activemq.command.ActiveMQDestination;
 
 /**
@@ -52,7 +53,7 @@
      * Returns the consumer subject.
      * 
      * @return String - consumer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getConsumerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getConsumerSubject()
      */
     protected String getConsumerSubject() {
         return "FOO.>";
@@ -62,7 +63,7 @@
      * Returns the producer subject.
      * 
      * @return String - producer subject
-     * @see org.apache.activemq.legacy.test3.TestSupport#getProducerSubject()
+     * @see org.apache.activemq.apollo.test3.TestSupport#getProducerSubject()
      */
     protected String getProducerSubject() {
         return "FOO.BAR.HUMBUG";

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java Fri Jun 19 20:43:04 2009
@@ -29,6 +29,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import org.apache.activemq.apollo.test3.TestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java Fri Jun 19 20:43:04 2009
@@ -23,7 +23,8 @@
 import javax.jms.Message;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -41,8 +42,9 @@
         return answer;
     }
 
-    protected void configureBroker(BrokerService answer) throws Exception {
-        answer.setPopulateJMSXUserID(true);
+    protected void configureBroker(Broker answer) throws Exception {
+//    	TODO:
+//        answer.setPopulateJMSXUserID(true );
         super.configureBroker(answer);
     }
 

Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java?rev=786658&r1=786657&r2=786658&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java Fri Jun 19 20:43:04 2009
@@ -16,6 +16,9 @@
  */
 package org.apache.activemq.legacy.test3;
 
+import org.apache.activemq.apollo.test3.JmsResourceProvider;
+import org.apache.activemq.apollo.test3.JmsTransactionTestSupport;
+
 
 
 /**
@@ -24,7 +27,7 @@
 public class JmsTopicTransactionTest extends JmsTransactionTestSupport {
 
     /**
-     * @see org.apache.activemq.legacy.test3.JmsTransactionTestSupport#getJmsResourceProvider()
+     * @see org.apache.activemq.apollo.test3.JmsTransactionTestSupport#getJmsResourceProvider()
      */
     protected JmsResourceProvider getJmsResourceProvider() {
         JmsResourceProvider p = new JmsResourceProvider();



Mime
View raw message