activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r783614 [2/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
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java Thu Jun 11 03:25:25 2009
@@ -32,11 +32,11 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.JmsTestSupport;
-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.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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java Thu Jun 11 03:25:25 2009
@@ -19,8 +19,8 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.network.NetworkConnector;
-import org.apache.activemq.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/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Thu Jun 11 03:25:25 2009
@@ -20,7 +20,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-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;
 import org.springframework.core.io.ClassPathResource;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Thu Jun 11 03:25:25 2009
@@ -20,7 +20,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-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;
 import org.springframework.core.io.ClassPathResource;

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Thu Jun 11 03:25:25 2009
@@ -32,9 +32,9 @@
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.broker.BrokerService;
+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.test.TestSupport;
 import org.apache.activemq.util.IdGenerator;
 

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java Thu Jun 11 03:25:25 2009
@@ -22,8 +22,8 @@
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
-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;
 
 /**
  * @author Oliver Belikan

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java Thu Jun 11 03:25:25 2009
@@ -25,7 +25,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.activemq.spring.ConsumerBean;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/TestBrokerConnectionDuplexExcludedDestinations.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/TestBrokerConnectionDuplexExcludedDestinations.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/TestBrokerConnectionDuplexExcludedDestinations.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/TestBrokerConnectionDuplexExcludedDestinations.java Thu Jun 11 03:25:25 2009
@@ -32,8 +32,8 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-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;
 
 public class TestBrokerConnectionDuplexExcludedDestinations extends TestCase {
 	

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Broker.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Broker.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Broker.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Broker.java Thu Jun 11 03:25:25 2009
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.util.Set;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public interface Broker {
 
 	public <T> Set<T> getDurableDestinations();

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactory.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactory.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactory.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactory.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactory.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,12 +23,9 @@
 import org.apache.activemq.util.IOExceptionSupport;
 
 /**
- * A helper class to create a fully configured broker service using a URI. The
- * list of currently supported URI syntaxes is described <a
- * href="http://activemq.apache.org/how-do-i-embed-a-broker-inside-a-connection.html">here</a>
- * 
- * @version $Revision$
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public final class BrokerFactory {
 
     private static final FactoryFinder BROKER_FACTORY_HANDLER_FINDER = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactoryHandler.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactoryHandler.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactoryHandler.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerFactoryHandler.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerFactoryHandler.java Thu Jun 11 03:25:25 2009
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.net.URI;
 
 /**
- * Represents the interface used to create a broker from a URI scheme.
- *
- * @version $Revision: 564271 $
-*/
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public interface BrokerFactoryHandler {
     BrokerService createBroker(URI brokerURI) throws Exception;
 }

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerPlugin.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerPlugin.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerPlugin.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerPlugin.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerPlugin.java Thu Jun 11 03:25:25 2009
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 /**
- * Represents a plugin into a Broker
- * 
- * @version $Revision: 564271 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public interface BrokerPlugin {
 
     /**

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerRegistry.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerRegistry.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerRegistry.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerRegistry.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerRegistry.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,8 +24,9 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class BrokerRegistry {
 
     private static final Log LOG = LogFactory.getLog(BrokerRegistry.class);

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerService.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerService.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerService.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerService.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.net.URI;
 import java.util.List;
@@ -24,10 +24,15 @@
 import javax.net.ssl.TrustManager;
 
 import org.apache.activemq.Service;
-import org.apache.activemq.broker.region.RegionBroker;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.broker.SslContext;
+import org.apache.activemq.legacy.broker.region.RegionBroker;
+import org.apache.activemq.legacy.store.PersistenceAdapter;
+import org.apache.activemq.legacy.usage.SystemUsage;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class BrokerService implements Service {
 
     public static final String DEFAULT_PORT = "61616";
@@ -100,7 +105,7 @@
 		
 	}
 
-	public void addConnector(org.apache.activemq.broker.TransportConnector connector) {
+	public void addConnector(org.apache.activemq.legacy.broker.TransportConnector connector) {
 		// TODO Auto-generated method stub
 		
 	}
@@ -109,7 +114,7 @@
 		return null;
 	}
 
-	public void setDestinationPolicy(org.apache.activemq.broker.region.policy.PolicyMap policyMap) {
+	public void setDestinationPolicy(org.apache.activemq.legacy.broker.region.policy.PolicyMap policyMap) {
 		// TODO Auto-generated method stub
 		
 	}

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerServiceAware.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerServiceAware.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerServiceAware.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/BrokerServiceAware.java Thu Jun 11 03:25:25 2009
@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public interface BrokerServiceAware {
 
 }

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Connection.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Connection.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Connection.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/Connection.java Thu Jun 11 03:25:25 2009
@@ -1,6 +1,25 @@
-package org.apache.activemq.broker;
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class Connection {
 
 	public <Response,Command> Response service(Command command) {

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/ConnectionContext.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/ConnectionContext.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/ConnectionContext.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/ConnectionContext.java Thu Jun 11 03:25:25 2009
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 
 /**
- * Used to hold context information needed to process requests sent to a broker.
- * 
- * @version $Revision: 1.5 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class ConnectionContext {
 }

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/EmptyBroker.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/EmptyBroker.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/EmptyBroker.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/EmptyBroker.java Thu Jun 11 03:25:25 2009
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.util.Set;
 
 /**
- * Dumb implementation - used to be overriden by listeners
- * 
- * @version $Revision$
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class EmptyBroker implements Broker {
 
 	public <T> Set<T> getDestinations(T destination) {

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnection.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnection.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnection.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnection.java Thu Jun 11 03:25:25 2009
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import org.apache.activemq.Service;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public interface TransportConnection extends Service {
 
 }

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnector.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnector.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnector.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/TransportConnector.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.legacy.broker;
 
 import java.io.IOException;
 import java.net.URI;
@@ -25,9 +25,9 @@
 
 
 /**
- * @org.apache.xbean.XBean
- * @version $Revision: 1.6 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class TransportConnector implements Service {
 
 	public TransportConnector(TransportServer server) {

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/AbstractRegion.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/AbstractRegion.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/AbstractRegion.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/AbstractRegion.java Thu Jun 11 03:25:25 2009
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.region;
+package org.apache.activemq.legacy.broker.region;
 
 import java.util.Hashtable;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class AbstractRegion {
 
     public Hashtable<Object, Subscription> getSubscriptions() {

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/RegionBroker.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/RegionBroker.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/RegionBroker.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/RegionBroker.java Thu Jun 11 03:25:25 2009
@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.region;
+package org.apache.activemq.legacy.broker.region;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class RegionBroker {
 
     public Object getTopicRegion() {

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/Subscription.java (from r783612, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/Subscription.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/Subscription.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java&r1=783612&r2=783614&rev=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/Subscription.java Thu Jun 11 03:25:25 2009
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.region;
+package org.apache.activemq.legacy.broker.region;
 
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class Subscription {
 
     public <T> T getConsumerInfo() {

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java Thu Jun 11 03:25:25 2009
@@ -1,5 +1,25 @@
-package org.apache.activemq.broker.region.policy;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class FixedCountSubscriptionRecoveryPolicy {
 
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyEntry.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyEntry.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyEntry.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyEntry.java Thu Jun 11 03:25:25 2009
@@ -1,6 +1,26 @@
-package org.apache.activemq.broker.region.policy;
-
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
+
+
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class PolicyEntry {
 
 	public void setMemoryLimit(int i) {

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyMap.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyMap.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyMap.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/PolicyMap.java Thu Jun 11 03:25:25 2009
@@ -1,7 +1,27 @@
-package org.apache.activemq.broker.region.policy;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
 
 import java.util.List;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class PolicyMap {
 
 	public void setDefaultEntry(PolicyEntry policy) {

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/RoundRobinDispatchPolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/RoundRobinDispatchPolicy.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/RoundRobinDispatchPolicy.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/RoundRobinDispatchPolicy.java Thu Jun 11 03:25:25 2009
@@ -1,5 +1,25 @@
-package org.apache.activemq.broker.region.policy;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class RoundRobinDispatchPolicy {
 
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingQueueMessageStoragePolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingQueueMessageStoragePolicy.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingQueueMessageStoragePolicy.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingQueueMessageStoragePolicy.java Thu Jun 11 03:25:25 2009
@@ -1,5 +1,25 @@
-package org.apache.activemq.broker.region.policy;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class VMPendingQueueMessageStoragePolicy {
 
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/broker/region/policy/VMPendingSubscriberMessageStoragePolicy.java Thu Jun 11 03:25:25 2009
@@ -1,5 +1,25 @@
-package org.apache.activemq.broker.region.policy;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.broker.region.policy;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class VMPendingSubscriberMessageStoragePolicy {
 
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/PersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/PersistenceAdapter.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/PersistenceAdapter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/store/PersistenceAdapter.java Thu Jun 11 03:25:25 2009
@@ -1,5 +1,25 @@
-package org.apache.activemq.store;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.store;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class PersistenceAdapter {
 
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/DefaultUsageCapacity.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/DefaultUsageCapacity.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/DefaultUsageCapacity.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/DefaultUsageCapacity.java Thu Jun 11 03:25:25 2009
@@ -14,17 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 
 
 /**
- Identify if a limit has been reached
- * 
- * @org.apache.xbean.XBean
- * 
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class DefaultUsageCapacity implements UsageCapacity{
 
     private long limit;
@@ -32,7 +29,7 @@
     /**
      * @param size
      * @return true if the limit is reached
-     * @see org.apache.activemq.usage.UsageCapacity#isLimit(long)
+     * @see org.apache.activemq.legacy.usage.UsageCapacity#isLimit(long)
      */
     public boolean isLimit(long size) {
         return size >= limit;

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/MemoryUsage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/MemoryUsage.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/MemoryUsage.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/MemoryUsage.java Thu Jun 11 03:25:25 2009
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 /**
- * Used to keep track of how much of something is being used so that a
- * productive working set usage can be controlled. Main use case is manage
- * memory usage.
- * 
- * @org.apache.xbean.XBean
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class MemoryUsage extends Usage<MemoryUsage> {
 
     private long usage;

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/StoreUsage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/StoreUsage.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/StoreUsage.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/StoreUsage.java Thu Jun 11 03:25:25 2009
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 
 /**
- * Used to keep track of how much of something is being used so that a
- * productive working set usage can be controlled. Main use case is manage
- * memory usage.
- * 
- * @org.apache.xbean.XBean
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class StoreUsage extends Usage<StoreUsage> {
 
     

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/SystemUsage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/SystemUsage.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/SystemUsage.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/SystemUsage.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -23,12 +23,9 @@
 //import org.apache.activemq.store.PersistenceAdapter;
 
 /**
- * Holder for Usage instances for memory, store and temp files Main use case is
- * manage memory usage.
- * 
- * @org.apache.xbean.XBean
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public class SystemUsage implements Service {
 
     private SystemUsage parent;

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/Usage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/Usage.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/Usage.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/Usage.java Thu Jun 11 03:25:25 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -33,13 +33,9 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Used to keep track of how much of something is being used so that a
- * productive working set usage can be controlled. Main use case is manage
- * memory usage.
- * 
- * @org.apache.xbean.XBean
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public abstract class Usage<T extends Usage> implements Service {
 
     private static final Log LOG = LogFactory.getLog(Usage.class);

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageCapacity.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageCapacity.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageCapacity.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageCapacity.java Thu Jun 11 03:25:25 2009
@@ -14,17 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
 
 
 /**
- Identify if a limit has been reached
- * 
- * @org.apache.xbean.XBean
- * 
- * @version $Revision: 1.3 $
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
  */
+@Deprecated
 public interface UsageCapacity{
 
     /**

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageListener.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageListener.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageListener.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/usage/UsageListener.java Thu Jun 11 03:25:25 2009
@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usage;
+package org.apache.activemq.legacy.usage;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public interface UsageListener {
     void onUsageChanged(Usage usage, int oldPercentUsage, int newPercentUsage);
 }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/XBeanBrokerService.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/XBeanBrokerService.java?rev=783614&r1=783612&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/XBeanBrokerService.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/legacy/xbean/XBeanBrokerService.java Thu Jun 11 03:25:25 2009
@@ -1,8 +1,28 @@
-package org.apache.activemq.xbean;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy.xbean;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.springframework.context.ApplicationContext;
 
+/**
+ * @deprecated The entire 'org.apache.activemq.legacy' package will hopefully go away soon.
+ */
+@Deprecated
 public class XBeanBrokerService extends BrokerService {
 
     public ApplicationContext getApplicationContext() {

Modified: activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java Thu Jun 11 03:25:25 2009
@@ -30,10 +30,10 @@
 import org.apache.activemq.command.ProducerAck;
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.legacy.usage.MemoryUsage;
 import org.apache.activemq.management.JMSProducerStatsImpl;
 import org.apache.activemq.management.StatsCapable;
 import org.apache.activemq.management.StatsImpl;
-import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.util.IntrospectionSupport;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java Thu Jun 11 03:25:25 2009
@@ -19,12 +19,12 @@
 import org.apache.activemq.blob.BlobTransferPolicy;
 import org.apache.activemq.blob.BlobUploader;
 import org.apache.activemq.command.*;
+import org.apache.activemq.legacy.usage.MemoryUsage;
 import org.apache.activemq.management.JMSSessionStatsImpl;
 import org.apache.activemq.management.StatsCapable;
 import org.apache.activemq.management.StatsImpl;
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.transaction.Synchronization;
-import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.commons.logging.Log;

Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Thu Jun 11 03:25:25 2009
@@ -32,12 +32,6 @@
 
 import org.apache.activemq.Service;
 import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.BrokerServiceAware;
-import org.apache.activemq.broker.TransportConnection;
-import org.apache.activemq.broker.region.AbstractRegion;
-import org.apache.activemq.broker.region.RegionBroker;
-import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQTempDestination;
@@ -65,6 +59,12 @@
 import org.apache.activemq.command.ShutdownInfo;
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.filter.DestinationFilter;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerServiceAware;
+import org.apache.activemq.legacy.broker.TransportConnection;
+import org.apache.activemq.legacy.broker.region.AbstractRegion;
+import org.apache.activemq.legacy.broker.region.RegionBroker;
+import org.apache.activemq.legacy.broker.region.Subscription;
 import org.apache.activemq.transport.DefaultTransportListener;
 import org.apache.activemq.transport.FutureResponse;
 import org.apache.activemq.transport.ResponseCallback;

Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java Thu Jun 11 03:25:25 2009
@@ -30,10 +30,10 @@
 import javax.management.ObjectName;
 
 import org.apache.activemq.Service;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.jmx.NetworkBridgeView;
 import org.apache.activemq.broker.jmx.NetworkBridgeViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;
 import org.apache.activemq.util.JMXSupport;

Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java Thu Jun 11 03:25:25 2009
@@ -29,7 +29,7 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.util.LRUCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/region/Destination.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/region/Destination.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/region/Destination.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/region/Destination.java Thu Jun 11 03:25:25 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.region;
 
-import org.apache.activemq.usage.MemoryUsage;
+import org.apache.activemq.legacy.usage.MemoryUsage;
 
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java Thu Jun 11 03:25:25 2009
@@ -28,7 +28,7 @@
 import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.usage.MemoryUsage;
+import org.apache.activemq.legacy.usage.MemoryUsage;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
 import org.apache.activemq.util.ByteSequence;

Modified: activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java (original)
+++ activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java Thu Jun 11 03:25:25 2009
@@ -19,7 +19,8 @@
 import java.beans.PropertyEditorManager;
 import java.net.URI;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.xbean.XBeanBrokerService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xbean.spring.context.ResourceXmlApplicationContext;

Modified: activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java (original)
+++ activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java Thu Jun 11 03:25:25 2009
@@ -18,7 +18,7 @@
 
 import java.util.HashMap;
 
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;

Modified: activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java (original)
+++ activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java Thu Jun 11 03:25:25 2009
@@ -21,8 +21,8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 
-import org.apache.activemq.broker.BrokerFactoryHandler;
-import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerFactoryHandler;
+import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xbean.spring.context.ResourceXmlApplicationContext;

Modified: activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java (original)
+++ activemq/sandbox/activemq-flow/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java Thu Jun 11 03:25:25 2009
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-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.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;

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

Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSslTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSslTransportFactory.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSslTransportFactory.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSslTransportFactory.java Thu Jun 11 03:25:25 2009
@@ -18,13 +18,13 @@
 
 import java.util.Map;
 
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.BrokerServiceAware;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerServiceAware;
+import org.apache.activemq.legacy.xbean.XBeanBrokerService;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.tcp.SslTransportFactory;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.activemq.xbean.XBeanBrokerService;
 import org.springframework.context.ApplicationContext;
 
 /**

Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java?rev=783614&r1=783613&r2=783614&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java Thu Jun 11 03:25:25 2009
@@ -18,13 +18,13 @@
 
 import java.util.Map;
 
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.BrokerServiceAware;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.apache.activemq.legacy.broker.BrokerServiceAware;
+import org.apache.activemq.legacy.xbean.XBeanBrokerService;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.tcp.TcpTransportFactory;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.activemq.xbean.XBeanBrokerService;
 import org.springframework.context.ApplicationContext;
 
 /**



Mime
View raw message