activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r783614 [1/2] - in /activemq/sandbox/activemq-flow: activemq-all/src/test/java/org/apache/activemq/ activemq-all/src/test/java/org/apache/activemq/broker/ activemq-all/src/test/java/org/apache/activemq/bugs/ activemq-all/src/test/java/org/a...
Date Thu, 11 Jun 2009 03:25:39 GMT
Author: chirino
Date: Thu Jun 11 03:25:25 2009
New Revision: 783614

URL: http://svn.apache.org/viewvc?rev=783614&view=rev
Log:
moved all the 5.x style broker stub clases to the legacy packge to keep stuff better organize.  Marked the classes deprecated so it's easier to spot depdenent usage that needs to get ported over to the 6.x apis.


Added:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Broker.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactory.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactoryHandler.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerPlugin.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerRegistry.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerService.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerServiceAware.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Connection.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/ConnectionContext.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/EmptyBroker.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnection.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnector.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/AbstractRegion.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/RegionBroker.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/Subscription.java
      - copied, changed from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/
      - copied from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/
      - copied from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/
      - copied from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/usage/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/
      - copied from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/xbean/
Removed:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/db/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/usage/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/xbean/
Modified:
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ClientTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsBenchmark.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/LoadTestBurnIn.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/RemoveDestinationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/TimeStampTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/Main.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubBroker.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubConnection.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
    activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/TestBrokerConnectionDuplexExcludedDestinations.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyEntry.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyMap.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/RoundRobinDispatchPolicy.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingQueueMessageStoragePolicy.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/PersistenceAdapter.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/DefaultUsageCapacity.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/MemoryUsage.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/StoreUsage.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/SystemUsage.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/Usage.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageCapacity.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageListener.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/XBeanBrokerService.java
    activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
    activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/region/Destination.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java
    activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
    activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
    activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
    activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
    activemq/sandbox/activemq-flow/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTest.java
    activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSslTransportFactory.java
    activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java Thu Jun 11 03:25:25 2009
@@ -27,9 +27,9 @@
 import javax.jms.JMSException;
 import javax.jms.Session;
 
-import org.apache.activemq.broker.BrokerRegistry;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.legacy.broker.BrokerRegistry;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 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/ActiveMQInputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java Thu Jun 11 03:25:25 2009
@@ -23,8 +23,8 @@
 import javax.jms.Session;
 
 import junit.framework.TestCase;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/ActiveMQXAConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java Thu Jun 11 03:25:25 2009
@@ -37,11 +37,11 @@
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.broker.BrokerRegistry;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
 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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ClientTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ClientTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ClientTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ClientTestSupport.java Thu Jun 11 03:25:25 2009
@@ -27,11 +27,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.activemq.broker.Broker;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.StubConnection;
-import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ConnectionId;
 import org.apache.activemq.command.ConnectionInfo;
@@ -41,6 +37,10 @@
 import org.apache.activemq.command.MessageDispatch;
 import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.legacy.broker.Broker;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.transport.TransportFactory;
 
 public class ClientTestSupport extends TestCase {
@@ -62,7 +62,7 @@
             connector = new TransportConnector(TransportFactory.bind(new URI(this.brokerURL))) {
                 // Hook into the connector so we can assert that the server
                 // accepted a connection.
-                protected org.apache.activemq.broker.Connection createConnection(org.apache.activemq.transport.Transport transport) throws IOException {
+                protected org.apache.activemq.legacy.broker.Connection createConnection(org.apache.activemq.transport.Transport transport) throws IOException {
                     connected.set(true);
                     return super.createConnection(transport);
                 }

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/EmbeddedBrokerTestSupport.java Thu Jun 11 03:25:25 2009
@@ -22,9 +22,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.springframework.jms.core.JmsTemplate;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsBenchmark.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsBenchmark.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsBenchmark.java Thu Jun 11 03:25:25 2009
@@ -38,11 +38,11 @@
 
 import junit.framework.Test;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 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/JmsMultipleClientsTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java Thu Jun 11 03:25:25 2009
@@ -37,11 +37,11 @@
 import javax.jms.TextMessage;
 import javax.jms.TopicSubscriber;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.util.MessageIdList;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java Thu Jun 11 03:25:25 2009
@@ -19,7 +19,7 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/JmsRollbackRedeliveryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java Thu Jun 11 03:25:25 2009
@@ -30,7 +30,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/JmsTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTestSupport.java Thu Jun 11 03:25:25 2009
@@ -33,9 +33,9 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * Test cases used to test the JMS message consumer.

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java Thu Jun 11 03:25:25 2009
@@ -33,8 +33,8 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.test.JmsResourceProvider;
 import org.apache.activemq.test.TestSupport;
 import org.apache.commons.logging.Log;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/LoadTestBurnIn.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/LoadTestBurnIn.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/LoadTestBurnIn.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/LoadTestBurnIn.java Thu Jun 11 03:25:25 2009
@@ -35,10 +35,10 @@
 
 import junit.framework.Test;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 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/ProducerFlowControlSendFailTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java Thu Jun 11 03:25:25 2009
@@ -28,11 +28,11 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
-import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.broker.region.policy.VMPendingQueueMessageStoragePolicy;
+import org.apache.activemq.legacy.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 
 public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/ProducerFlowControlTest.java Thu Jun 11 03:25:25 2009
@@ -29,13 +29,13 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
-import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.broker.region.policy.VMPendingQueueMessageStoragePolicy;
+import org.apache.activemq.legacy.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 import org.apache.activemq.transport.tcp.TcpTransport;
 
 public class ProducerFlowControlTest extends JmsTestSupport {

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/RemoveDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/RemoveDestinationTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/RemoveDestinationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/RemoveDestinationTest.java Thu Jun 11 03:25:25 2009
@@ -30,11 +30,11 @@
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.advisory.DestinationSource;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.jmx.BrokerViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 import junit.framework.TestCase;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/TimeStampTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/TimeStampTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/TimeStampTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/TimeStampTest.java Thu Jun 11 03:25:25 2009
@@ -26,10 +26,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.activemq.broker.BrokerPlugin;
 //import org.apache.activemq.broker.util.UDPTraceBrokerPlugin;
 //import org.apache.activemq.broker.view.ConnectionDotFilePlugin;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerPlugin;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 public class TimeStampTest extends TestCase {
     public void test() throws Exception {

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java Thu Jun 11 03:25:25 2009
@@ -16,7 +16,8 @@
  */
 package org.apache.activemq.broker;
 
-import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.store.PersistenceAdapter;
 
 public class BrokerRestartTestSupport extends BrokerTestSupport {
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java Thu Jun 11 03:25:25 2009
@@ -18,6 +18,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.network.NetworkConnector;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java Thu Jun 11 03:25:25 2009
@@ -29,13 +29,15 @@
 import javax.jms.MessageNotWriteableException;
 
 import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.broker.region.RegionBroker;
-import org.apache.activemq.broker.region.policy.FixedCountSubscriptionRecoveryPolicy;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.region.RegionBroker;
+import org.apache.activemq.legacy.broker.region.policy.FixedCountSubscriptionRecoveryPolicy;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.broker.region.policy.RoundRobinDispatchPolicy;
+import org.apache.activemq.legacy.store.PersistenceAdapter;
+import org.apache.activemq.legacy.usage.SystemUsage;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.ConnectionId;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java Thu Jun 11 03:25:25 2009
@@ -24,6 +24,7 @@
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/Main.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/Main.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/Main.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/Main.java Thu Jun 11 03:25:25 2009
@@ -24,6 +24,7 @@
 import org.apache.activemq.broker.jmx.ManagementContext;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.demo.DefaultQueueSender;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * A helper class which can be handy for running a broker in your IDE from the

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java Thu Jun 11 03:25:25 2009
@@ -20,8 +20,6 @@
 
 import junit.framework.Test;
 
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.ConsumerInfo;
@@ -30,6 +28,9 @@
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 
 public class MessageExpirationTest extends BrokerTestSupport {
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java Thu Jun 11 03:25:25 2009
@@ -32,8 +32,10 @@
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
 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/broker/ReconnectWithJMXEnabledTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java Thu Jun 11 03:25:25 2009
@@ -24,6 +24,7 @@
 import javax.jms.Session;
 
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubBroker.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubBroker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubBroker.java Thu Jun 11 03:25:25 2009
@@ -19,6 +19,8 @@
 
 import java.util.LinkedList;
 import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.legacy.broker.ConnectionContext;
+import org.apache.activemq.legacy.broker.EmptyBroker;
 
 public class StubBroker extends EmptyBroker {
     public LinkedList<AddConnectionData> addConnectionData = new LinkedList<AddConnectionData>();

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubConnection.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubConnection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/StubConnection.java Thu Jun 11 03:25:25 2009
@@ -27,6 +27,8 @@
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.Response;
 import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.Connection;
 import org.apache.activemq.transport.DefaultTransportListener;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java Thu Jun 11 03:25:25 2009
@@ -29,10 +29,10 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
 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/bugs/AMQ1917Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java Thu Jun 11 03:25:25 2009
@@ -19,8 +19,8 @@
 import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 
 public class AMQ1917Test extends TestCase {

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java Thu Jun 11 03:25:25 2009
@@ -17,7 +17,7 @@
 package org.apache.activemq.bugs;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.log4j.Logger;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java Thu Jun 11 03:25:25 2009
@@ -35,9 +35,9 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/AMQ2102Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Thu Jun 11 03:25:25 2009
@@ -42,7 +42,7 @@
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/ConnectionPerMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java Thu Jun 11 03:25:25 2009
@@ -28,7 +28,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/DurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Thu Jun 11 03:25:25 2009
@@ -37,7 +37,7 @@
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/JmsDurableTopicSlowReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java Thu Jun 11 03:25:25 2009
@@ -29,7 +29,7 @@
 import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.test.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/bugs/MissingDataFileTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java Thu Jun 11 03:25:25 2009
@@ -27,8 +27,8 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.usage.SystemUsage;
 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/bugs/QueueWorkerPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java Thu Jun 11 03:25:25 2009
@@ -36,7 +36,7 @@
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQPrefetchPolicy;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/RawRollbackSharedConsumerTests.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackSharedConsumerTests.java Thu Jun 11 03:25:25 2009
@@ -32,8 +32,8 @@
 import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/RawRollbackTests.java Thu Jun 11 03:25:25 2009
@@ -33,8 +33,8 @@
 import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java Thu Jun 11 03:25:25 2009
@@ -31,8 +31,8 @@
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/TransactionNotStartedErrorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java Thu Jun 11 03:25:25 2009
@@ -26,7 +26,7 @@
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/VerifySteadyEnqueueRate.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java Thu Jun 11 03:25:25 2009
@@ -28,7 +28,7 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/bugs/amq1095/ActiveMQTestCase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java Thu Jun 11 03:25:25 2009
@@ -37,9 +37,9 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * <p>

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java Thu Jun 11 03:25:25 2009
@@ -23,7 +23,7 @@
 import javax.jms.Message;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java Thu Jun 11 03:25:25 2009
@@ -17,7 +17,7 @@
 package org.apache.activemq.test;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * @version $Revision: 1.3 $

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Thu Jun 11 03:25:25 2009
@@ -35,11 +35,11 @@
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.util.ServiceStopper;
 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/transport/TransportBrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java Thu Jun 11 03:25:25 2009
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerTest;
 import org.apache.activemq.broker.StubConnection;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 
 public abstract class TransportBrokerTestSupport extends BrokerTest {
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java Thu Jun 11 03:25:25 2009
@@ -35,8 +35,8 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.log4j.Logger;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java Thu Jun 11 03:25:25 2009
@@ -21,7 +21,7 @@
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 public class FailoverRandomTest extends TestCase {
 	

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java Thu Jun 11 03:25:25 2009
@@ -11,7 +11,7 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 public class FailoverTimeoutTest extends TestCase {
 	

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java Thu Jun 11 03:25:25 2009
@@ -34,9 +34,9 @@
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.transport.mock.MockTransport;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.util.ServiceStopper;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsDurableTopicSendReceiveTest.java Thu Jun 11 03:25:25 2009
@@ -18,7 +18,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.JmsDurableTopicSendReceiveTest;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 public class NIOJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
     protected BrokerService broker;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOJmsSendAndReceiveTest.java Thu Jun 11 03:25:25 2009
@@ -17,7 +17,7 @@
 package org.apache.activemq.transport.nio;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/nio/NIOPersistentSendAndReceiveTest.java Thu Jun 11 03:25:25 2009
@@ -18,7 +18,7 @@
 
 import javax.jms.DeliveryMode;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 public class NIOPersistentSendAndReceiveTest extends NIOJmsSendAndReceiveTest {
     protected BrokerService broker;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java Thu Jun 11 03:25:25 2009
@@ -30,7 +30,7 @@
 import junit.framework.Test;
 import junit.textui.TestRunner;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.transport.TransportBrokerTestSupport;
 import org.apache.activemq.transport.TransportFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java Thu Jun 11 03:25:25 2009
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 import junit.textui.TestRunner;
 
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.activemq.transport.TransportBrokerTestSupport;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java Thu Jun 11 03:25:25 2009
@@ -30,8 +30,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java Thu Jun 11 03:25:25 2009
@@ -23,7 +23,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/usecases/AMQStackOverFlowTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java Thu Jun 11 03:25:25 2009
@@ -29,13 +29,13 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.TransportConnector;
+import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
+import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
+import org.apache.activemq.legacy.usage.SystemUsage;
 import org.apache.activemq.network.DiscoveryNetworkConnector;
 import org.apache.activemq.network.NetworkConnector;
-import org.apache.activemq.usage.SystemUsage;
-import org.apache.activemq.broker.BrokerService;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java Thu Jun 11 03:25:25 2009
@@ -30,7 +30,7 @@
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 /**
  * @author Peter Henning

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java Thu Jun 11 03:25:25 2009
@@ -27,8 +27,8 @@
 import javax.jms.Session;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.legacy.broker.BrokerService;
 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/usecases/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java Thu Jun 11 03:25:25 2009
@@ -30,8 +30,8 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.TestSupport;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.store.PersistenceAdapter;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java Thu Jun 11 03:25:25 2009
@@ -28,11 +28,11 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.jmx.DestinationViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.legacy.broker.BrokerService;
 
 
 



Mime
View raw message