You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/18 14:42:29 UTC

svn commit: r786040 [1/6] - in /activemq/sandbox/activemq-flow: activemq-all/src/test/java/org/apache/activemq/legacy/ activemq-all/src/test/java/org/apache/activemq/legacy/broker/ activemq-all/src/test/java/org/apache/activemq/legacy/broker/advisory/ ...

Author: chirino
Date: Thu Jun 18 12:42:23 2009
New Revision: 786040

URL: http://svn.apache.org/viewvc?rev=786040&view=rev
Log:
trying to sort all the test cases.  Initially going to 
 - Group them by the main module testsed
 - The base class of inheritance tree..


Added:
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/Main.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/Main.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/SpringTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/CreateDestinationsOnStartupViaXBeanTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerAndConnectionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ReconnectWithJMXEnabledTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ReconnectWithSameClientIDTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TemporaryDestinationToFromNameTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ZeroPrefetchConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ClientTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LargeMessageTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/ConnectionCleanupTest.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConnectionCleanupTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/JmsConsumerResetActiveListenerTest.java
      - copied unchanged from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsConsumerResetActiveListenerTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRedeliveredTest.java
      - copied unchanged from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsRedeliveredTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java
      - copied unchanged from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/JmsSessionRecoverTest.java
      - copied unchanged from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsSessionRecoverTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/JmsTempDestinationTest.java
      - copied unchanged from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTempDestinationTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSMessageTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/ConsumerReceiveWithTimeoutTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSDurableTopicRedeliverTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSIndividualAckTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JMSQueueRedeliverTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckListenerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsAutoAckTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckListenerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsClientAckTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsConnectionStartStopTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsCreateConsumerInOnMessageTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableQueueWildcardSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSelectorTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicWildcardSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsQueueSelectorTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveTestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsSendReceiveWithMessageExpirationTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicRedeliverTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSelectorTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveSubscriberTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsTopicSendSameMessageTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test2/TestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/CreateConsumerButDontStartConnectionWarningTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsDurableTopicTransactionTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueCompositeSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueRequestReplyTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveUsingTwoSessionsTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTopicCompositeSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueWildcardSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsResourceProvider.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsSendReceiveTestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicCompositeSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicRequestReplyTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicTransactionTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicWildcardSendReceiveTest.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTransactionTestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test3/TestSupport.java   (with props)
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test6/
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test6/JmsMultipleClientsTestSupport.java
      - copied, changed from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsMultipleClientsTestSupport.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/NioQueueSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test6/QueueSubscriptionTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/QueueSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test6/TopicSubscriptionTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/TopicSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/legacy/
    activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/legacy/network/
    activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/legacy/network/BrokerServiceTest.java
      - copied, changed from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/BrokerBenchmark.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerBenchmark.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/BrokerRestartTestSupport.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerRestartTestSupport.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/BrokerTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/BrokerTestSupport.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/ConcurrentConnectSimulationTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ConcurrentConnectSimulationTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/MarshallingBrokerTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/MarshallingBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/MessageExpirationTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/MessageExpirationTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/ProgressPrinter.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ProgressPrinter.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/RecoveryBrokerTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/RecoveryBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/StubBroker.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/StubBroker.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/StubConnection.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/StubConnection.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/XARecoveryBrokerTest.java
      - copied unchanged from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/XARecoveryBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/legacy/broker/advisory/
      - copied from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/advisory/
Removed:
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ClientTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConnectionCleanupTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConsumerReceiveWithTimeoutTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/CreateConsumerButDontStartConnectionWarningTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerAndConnectionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSDurableTopicRedeliverTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSExclusiveConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSIndividualAckTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSQueueRedeliverTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JMSUsecaseTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsAutoAckListenerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsAutoAckTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsBenchmark.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsClientAckListenerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsClientAckTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsConnectionStartStopTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsConsumerResetActiveListenerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsCreateConsumerInOnMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsDurableQueueWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsDurableTopicSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsDurableTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsDurableTopicTransactionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsDurableTopicWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsMultipleClientsTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueBrowserTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueRequestReplyTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueSendReceiveTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueSendReceiveUsingTwoSessionsTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueTransactionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsQueueWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsRedeliveredTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsSendReceiveTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsSendReceiveWithMessageExpirationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsSessionRecoverTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTempDestinationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicCompositeSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicRedeliverTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicRequestReplyTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSendReceiveSubscriberTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSendReceiveWithTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicSendSameMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicTransactionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTopicWildcardSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/JmsTransactionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LargeMessageTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LoadTestBurnIn.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/MessageGroupTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ProducerFlowControlSendFailTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ProducerFlowControlTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ReconnectWithSameClientIDTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/RedeliveryPolicyTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/TestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ZeroPrefetchConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerBenchmark.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerRestartTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/BrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ConcurrentConnectSimulationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/CreateDestinationsOnStartupViaXBeanTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/Main.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/MarshallingBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/MessageExpirationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/NioQueueSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ProgressPrinter.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/QueueSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ReconnectWithJMXEnabledTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/RecoveryBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/SpringTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/StubBroker.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/StubConnection.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/TopicSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/XARecoveryBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/advisory/
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsResourceProvider.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsSendReceiveTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsTopicSendReceiveWithTwoConnectionsAndByteSelectorTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TemporaryDestinationToFromNameTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableSubscriptionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupDelayedTest.java
Modified:
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java
    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/test/rollback/CloseRollbackRedeliveryQueueTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/RollbacksWhileConsumingLargeQueueTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.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/transport/tcp/TcpTransportBindTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.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/CreateLotsOfTemporaryQueuesTest.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/NewConsumerCreatesDestinationTest.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

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/Main.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/Main.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/Main.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/Main.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/Main.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/Main.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/Main.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.broker;
+package org.apache.activemq.legacy;
 
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/SpringTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/SpringTest.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/SpringTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java Thu Jun 18 12:42:23 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.legacy.broker;
+package org.apache.activemq.legacy;
 
 import java.util.Iterator;
 import java.util.List;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java Thu Jun 18 12:42:23 2009
@@ -27,8 +27,8 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
 import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 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/bugs/CraigsBugTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java Thu Jun 18 12:42:23 2009
@@ -24,7 +24,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 
 /**
  * @version $Revision: $

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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -30,7 +30,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.test.JmsTopicSendReceiveTest;
+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/test/rollback/CloseRollbackRedeliveryQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/CloseRollbackRedeliveryQueueTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/CloseRollbackRedeliveryQueueTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/CloseRollbackRedeliveryQueueTest.java Thu Jun 18 12:42:23 2009
@@ -25,7 +25,7 @@
 import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.jms.core.MessageCreator;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/RollbacksWhileConsumingLargeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/RollbacksWhileConsumingLargeQueueTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/RollbacksWhileConsumingLargeQueueTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/rollback/RollbacksWhileConsumingLargeQueueTest.java Thu Jun 18 12:42:23 2009
@@ -28,7 +28,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.jms.core.MessageCreator;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/CreateDestinationsOnStartupViaXBeanTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/CreateDestinationsOnStartupViaXBeanTest.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/CreateDestinationsOnStartupViaXBeanTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.broker;
+package org.apache.activemq.legacy.test4;
 
 import java.net.URI;
 import java.util.Set;
@@ -23,7 +23,6 @@
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
 import org.apache.activemq.legacy.broker.BrokerService;
 
 /**

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerAndConnectionTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerAndConnectionTestSupport.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerAndConnectionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Connection;
 

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java (from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerTestSupport.java&r1=785745&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/EmbeddedBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ReconnectWithJMXEnabledTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ReconnectWithJMXEnabledTest.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/broker/ReconnectWithJMXEnabledTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.broker;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -23,7 +23,6 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
 import org.apache.activemq.legacy.broker.BrokerService;
 
 /**

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ReconnectWithSameClientIDTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ReconnectWithSameClientIDTest.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ReconnectWithSameClientIDTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Connection;
 import javax.jms.InvalidClientIDException;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java (from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TemporaryDestinationToFromNameTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TemporaryDestinationToFromNameTest.java&r1=785745&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test/TemporaryDestinationToFromNameTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java Thu Jun 18 12:42:23 2009
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy.test;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.legacy.EmbeddedBrokerAndConnectionTestSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ZeroPrefetchConsumerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ZeroPrefetchConsumerTest.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ZeroPrefetchConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test4;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ClientTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ClientTestSupport.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ClientTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test5;
 
 import java.io.File;
 import java.io.IOException;

Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java (from r786032, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LargeMessageTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LargeMessageTestSupport.java&r1=786032&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/LargeMessageTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java Thu Jun 18 12:42:23 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.legacy;
+package org.apache.activemq.legacy.test5;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java Thu Jun 18 12:42:23 2009
@@ -17,8 +17,8 @@
 package org.apache.activemq.legacy.transport.nio;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.JmsDurableTopicSendReceiveTest;
 import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.test2.JmsDurableTopicSendReceiveTest;
 
 public class NIOJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
     protected BrokerService broker;

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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -18,7 +18,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.legacy.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 /**
  * @version $Revision$

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBindTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBindTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBindTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBindTest.java Thu Jun 18 12:42:23 2009
@@ -25,7 +25,7 @@
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 
 public class TcpTransportBindTest extends EmbeddedBrokerTestSupport {
     final String addr = "tcp://localhost:61617";

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java Thu Jun 18 12:42:23 2009
@@ -22,8 +22,8 @@
 import junit.framework.Test;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.EmbeddedBrokerTestSupport;
 import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
 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/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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -25,7 +25,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 
-import org.apache.activemq.legacy.test.TestSupport;
+import org.apache.activemq.legacy.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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -26,7 +26,7 @@
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import org.apache.activemq.legacy.test.TestSupport;
+import org.apache.activemq.legacy.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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -20,7 +20,7 @@
 import javax.jms.Message;
 
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.legacy.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -28,7 +28,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.legacy.test.JmsSendReceiveTestSupport;
+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/CreateLotsOfTemporaryQueuesTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java Thu Jun 18 12:42:23 2009
@@ -23,7 +23,7 @@
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
-import org.apache.activemq.legacy.EmbeddedBrokerAndConnectionTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerAndConnectionTestSupport;
 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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -28,7 +28,7 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.test.TestSupport;
+import org.apache.activemq.legacy.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/NewConsumerCreatesDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java?rev=786040&r1=786039&r2=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java Thu Jun 18 12:42:23 2009
@@ -23,7 +23,7 @@
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.legacy.EmbeddedBrokerAndConnectionTestSupport;
+import org.apache.activemq.legacy.test4.EmbeddedBrokerAndConnectionTestSupport;
 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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -21,7 +21,7 @@
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 
-import org.apache.activemq.legacy.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+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/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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -35,7 +35,7 @@
 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.test.TestSupport;
+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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -26,7 +26,7 @@
 import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.legacy.test.TestSupport;
+import org.apache.activemq.legacy.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=786040&r1=786039&r2=786040&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 Thu Jun 18 12:42:23 2009
@@ -26,7 +26,7 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.legacy.test.TestSupport;
+import org.apache.activemq.legacy.test3.TestSupport;
 import org.apache.activemq.util.IdGenerator;
 
 /**

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/ConnectionCleanupTest.java (from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConnectionCleanupTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/ConnectionCleanupTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/ConnectionCleanupTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConnectionCleanupTest.java&r1=785745&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ConnectionCleanupTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/ConnectionCleanupTest.java Thu Jun 18 12:42:23 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.legacy;
+package org.apache.activemq.apollo;
 
 import javax.jms.JMSException;
 import javax.jms.Session;

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java (from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java&r1=785745&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java Thu Jun 18 12:42:23 2009
@@ -25,7 +25,6 @@
 import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
@@ -41,12 +40,13 @@
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQXAConnectionFactory;
 import org.apache.activemq.apollo.CombinationTestSupport;
+import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.transport.vm.VMTransportFactory;
+import org.apache.activemq.broker.store.memory.MemoryStore;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.legacy.broker.BrokerRegistry;
-import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.activemq.legacy.broker.TransportConnector;
-import org.apache.activemq.transport.stomp.StompTransportFilter;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportServer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -80,23 +80,23 @@
 
     public void testCreateVMConnectionWithEmbdeddBroker() throws URISyntaxException, JMSException {
         ActiveMQXAConnectionFactory cf = new ActiveMQXAConnectionFactory(
-                                                                         "vm://localhost?broker.persistent=false");
+                                                                         "vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         // Make sure the broker is not created until the connection is
         // instantiated.
-        assertNull(BrokerRegistry.getInstance().lookup("localhost"));
+        assertNull(VMTransportFactory.lookup("localhost"));
         Connection connection = cf.createConnection();
         // This should create the connection.
         assertNotNull(connection);
         // Verify the broker was created.
-        assertNotNull(BrokerRegistry.getInstance().lookup("localhost"));
+        assertNotNull(VMTransportFactory.lookup("localhost"));
         connection.close();
         // Verify the broker was destroyed.
-        assertNull(BrokerRegistry.getInstance().lookup("localhost"));
+        assertNull(VMTransportFactory.lookup("localhost"));
     }
 
     public void testGetBrokerName() throws URISyntaxException, JMSException {
         ActiveMQXAConnectionFactory cf = new ActiveMQXAConnectionFactory(
-                                                                         "vm://localhost?broker.persistent=false");
+                                                                         "vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         ActiveMQConnection connection = (ActiveMQConnection)cf.createConnection();
         connection.start();
 
@@ -117,12 +117,12 @@
     
     public void testIsSameRM() throws URISyntaxException, JMSException, XAException {
         
-        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker.persistent=false");
+        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         XAConnection connection1 = (XAConnection)cf1.createConnection();
         XASession session1 = connection1.createXASession();
         XAResource resource1 = session1.getXAResource();
         
-        ActiveMQXAConnectionFactory cf2 = new ActiveMQXAConnectionFactory("vm://localhost?broker.persistent=false");
+        ActiveMQXAConnectionFactory cf2 = new ActiveMQXAConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         XAConnection connection2 = (XAConnection)cf2.createConnection();
         XASession session2 = connection2.createXASession();
         XAResource resource2 = session2.getXAResource();
@@ -135,7 +135,7 @@
 
     public void testVanilaTransactionalProduceReceive() throws Exception {
         
-        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker.persistent=false");
+        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         XAConnection connection1 = (XAConnection)cf1.createConnection();
         connection1.start();
         XASession session = connection1.createXASession();
@@ -167,7 +167,7 @@
     
     public void testConsumerCloseTransactionalSendReceive() throws Exception {
         
-        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker.persistent=false");
+        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         XAConnection connection1 = (XAConnection)cf1.createConnection();
         connection1.start();
         XASession session = connection1.createXASession();
@@ -211,7 +211,7 @@
 
     public void testSessionCloseTransactionalSendReceive() throws Exception {
         
-        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker.persistent=false");
+        ActiveMQXAConnectionFactory cf1 = new ActiveMQXAConnectionFactory("vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml");
         XAConnection connection1 = (XAConnection)cf1.createConnection();
         connection1.start();
         XASession session = connection1.createXASession();
@@ -255,15 +255,17 @@
     
     protected void assertCreateConnection(String uri) throws Exception {
         // Start up a broker with a tcp connector.
-        BrokerService broker = new BrokerService();
-        broker.setPersistent(false);
-        TransportConnector connector = broker.addConnector(uri);
+        Broker broker = new Broker();
+        broker.getDefaultVirtualHost().setStore(new MemoryStore());
+        TransportServer server = TransportFactory.bind(new URI(uri));
+		broker.addTransportServer(server);
         broker.start();
-
+        
+        
         URI temp = new URI(uri);
         // URI connectURI = connector.getServer().getConnectURI();
         // TODO this sometimes fails when using the actual local host name
-        URI currentURI = connector.getServer().getConnectURI();
+        URI currentURI = server.getConnectURI();
 
         // sometimes the actual host name doesn't work in this test case
         // e.g. on OS X so lets use the original details but just use the actual

Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java (from r785745, activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java&p1=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java&r1=785745&r2=786040&rev=786040&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/ExclusiveConsumerTest.java Thu Jun 18 12:42:23 2009
@@ -32,7 +32,7 @@
 
 public class ExclusiveConsumerTest extends TestCase {
 
-    private static final String VM_BROKER_URL = "vm://localhost?broker.persistent=false&broker.useJmx=true";
+    private static final String VM_BROKER_URL = "vm://localhost?broker=jaxb:classpath:non-persistent-activemq.xml";
 
     public ExclusiveConsumerTest(String name) {
         super(name);