activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r359567 [3/13] - in /incubator/activemq/trunk/activemq-core: ./ src/gram/java/org/activemq/openwire/tool/ src/gram/script/ src/main/grammar/ src/main/java/org/activemq/ src/main/java/org/activemq/advisory/ src/main/java/org/activemq/broker/...
Date Wed, 28 Dec 2005 17:28:57 GMT
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,41 +23,41 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.activemq.Service;
-import org.activemq.broker.region.ConnectionStatistics;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.Command;
-import org.activemq.command.ConnectionId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.DataArrayResponse;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.ExceptionResponse;
-import org.activemq.command.FlushCommand;
-import org.activemq.command.KeepAliveInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.Response;
-import org.activemq.command.SessionId;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.command.TransactionId;
-import org.activemq.command.TransactionInfo;
-import org.activemq.command.WireFormatInfo;
-import org.activemq.state.CommandVisitor;
-import org.activemq.state.ConsumerState;
-import org.activemq.state.ProducerState;
-import org.activemq.state.SessionState;
-import org.activemq.thread.Task;
-import org.activemq.thread.TaskRunner;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.util.ServiceSupport;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.region.ConnectionStatistics;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DataArrayResponse;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.ExceptionResponse;
+import org.apache.activemq.command.FlushCommand;
+import org.apache.activemq.command.KeepAliveInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.command.TransactionInfo;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.state.CommandVisitor;
+import org.apache.activemq.state.ConsumerState;
+import org.apache.activemq.state.ProducerState;
+import org.apache.activemq.state.SessionState;
+import org.apache.activemq.thread.Task;
+import org.apache.activemq.thread.TaskRunner;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.util.ServiceSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -84,7 +84,7 @@
     protected boolean disposed=false;
 
     
-    static class ConnectionState extends org.activemq.state.ConnectionState {
+    static class ConnectionState extends org.apache.activemq.state.ConnectionState {
         private final ConnectionContext context;
 
         public ConnectionState(ConnectionInfo info, ConnectionContext context) {

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Broker.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Broker.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Broker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java Wed Dec 28 09:24:02 2005
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.Service;
-import org.activemq.broker.region.Region;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.BrokerId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.TransactionId;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.region.Region;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.TransactionId;
 
 /**
  * The Message Broker which routes messages,

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import org.activeio.FactoryFinder;
-import org.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IOExceptionSupport;
 
 import java.io.IOException;
 import java.net.URI;
@@ -29,7 +29,7 @@
  */
 public class BrokerFactory {
 
-    static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/activemq/broker/");    
+    static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");    
 
     public interface BrokerFactoryHandler {
         public BrokerService createBroker(URI brokerURI) throws Exception;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java Wed Dec 28 09:24:02 2005
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.broker.region.Destination;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.BrokerId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.TransactionId;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.TransactionId;
 
 /**
  * Allows you to intercept broker operation so that features such as security can be 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerService.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerService.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/BrokerService.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,35 +30,35 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.activemq.ActiveMQConnectionMetaData;
-import org.activemq.Service;
-import org.activemq.advisory.AdvisoryBroker;
-import org.activemq.broker.jmx.BrokerView;
-import org.activemq.broker.jmx.BrokerViewMBean;
-import org.activemq.broker.jmx.ConnectorView;
-import org.activemq.broker.jmx.ConnectorViewMBean;
-import org.activemq.broker.jmx.ManagedRegionBroker;
-import org.activemq.broker.jmx.ManagedTransportConnector;
-import org.activemq.broker.jmx.ManagementContext;
-import org.activemq.broker.jmx.NetworkConnectorView;
-import org.activemq.broker.jmx.NetworkConnectorViewMBean;
-import org.activemq.broker.jmx.ProxyConnectorView;
-import org.activemq.broker.region.RegionBroker;
-import org.activemq.broker.region.policy.PolicyMap;
-import org.activemq.memory.UsageManager;
-import org.activemq.network.NetworkConnector;
-import org.activemq.network.jms.JmsConnector;
-import org.activemq.proxy.ProxyConnector;
-import org.activemq.store.DefaultPersistenceAdapterFactory;
-import org.activemq.store.PersistenceAdapter;
-import org.activemq.store.memory.MemoryPersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.transport.TransportFactory;
-import org.activemq.transport.TransportServer;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.JMXSupport;
-import org.activemq.util.ServiceStopper;
-import org.activemq.util.URISupport;
+import org.apache.activemq.ActiveMQConnectionMetaData;
+import org.apache.activemq.Service;
+import org.apache.activemq.advisory.AdvisoryBroker;
+import org.apache.activemq.broker.jmx.BrokerView;
+import org.apache.activemq.broker.jmx.BrokerViewMBean;
+import org.apache.activemq.broker.jmx.ConnectorView;
+import org.apache.activemq.broker.jmx.ConnectorViewMBean;
+import org.apache.activemq.broker.jmx.ManagedRegionBroker;
+import org.apache.activemq.broker.jmx.ManagedTransportConnector;
+import org.apache.activemq.broker.jmx.ManagementContext;
+import org.apache.activemq.broker.jmx.NetworkConnectorView;
+import org.apache.activemq.broker.jmx.NetworkConnectorViewMBean;
+import org.apache.activemq.broker.jmx.ProxyConnectorView;
+import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.network.jms.JmsConnector;
+import org.apache.activemq.proxy.ProxyConnector;
+import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.JMXSupport;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.util.URISupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -654,7 +654,7 @@
         map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName()));
         map.put("ConnectorName", JMXSupport.encodeObjectNamePart(connector.getName()));
         try {
-            ObjectName objectName = new ObjectName("org.activemq", map);
+            ObjectName objectName = new ObjectName("org.apache.activemq", map);
             mbeanServer.registerMBean(view, objectName);
             registeredMBeanNames.add(objectName);
         }
@@ -672,7 +672,7 @@
         // map.put("ConnectorName",
         // JMXSupport.encodeObjectNamePart(connector.()));
         try {
-            ObjectName objectName = new ObjectName("org.activemq", map);
+            ObjectName objectName = new ObjectName("org.apache.activemq", map);
             mbeanServer.registerMBean(view, objectName);
             registeredMBeanNames.add(objectName);
         }
@@ -690,7 +690,7 @@
         // map.put("ConnectorName",
         // JMXSupport.encodeObjectNamePart(connector.()));
         try {
-            ObjectName objectName = new ObjectName("org.activemq", map);
+            ObjectName objectName = new ObjectName("org.apache.activemq", map);
             mbeanServer.registerMBean(view, objectName);
             registeredMBeanNames.add(objectName);
         }
@@ -797,7 +797,7 @@
             Hashtable map = new Hashtable();
             map.put("Type", "Broker");
             map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName()));
-            return new ObjectName("org.activemq", map);
+            return new ObjectName("org.apache.activemq", map);
         }
         catch (Throwable e) {
             throw IOExceptionSupport.create("Invalid JMX broker name: " + brokerName, e);

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java Wed Dec 28 09:24:02 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.Message;
-import org.activemq.command.ProducerInfo;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.ProducerInfo;
 
 /**
  * This broker filter handles composite destinations.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connection.java Wed Dec 28 09:24:02 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.Service;
-import org.activemq.broker.region.ConnectionStatistics;
-import org.activemq.command.Command;
-import org.activemq.command.Response;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.region.ConnectionStatistics;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.Response;
 
 /**
  * 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java Wed Dec 28 09:24:02 2005
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 
-import org.activemq.command.ConnectionId;
-import org.activemq.command.WireFormatInfo;
-import org.activemq.filter.MessageEvaluationContext;
-import org.activemq.security.SecurityContext;
-import org.activemq.transaction.Transaction;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.security.SecurityContext;
+import org.apache.activemq.transaction.Transaction;
 
 /**
  * Used to hold context information needed to process requests sent to a broker.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connector.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connector.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Connector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Connector.java Wed Dec 28 09:24:02 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.Service;
-import org.activemq.broker.region.ConnectorStatistics;
-import org.activemq.command.BrokerInfo;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.region.ConnectorStatistics;
+import org.apache.activemq.command.BrokerInfo;
 
 /**
  * A connector creates and manages client connections that talk to the Broker.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java Wed Dec 28 09:24:02 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.broker.BrokerFactory.BrokerFactoryHandler;
-import org.activemq.util.IntrospectionSupport;
-import org.activemq.util.URISupport;
-import org.activemq.util.URISupport.CompositeData;
+import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.URISupport;
+import org.apache.activemq.util.URISupport.CompositeData;
 
 import java.net.URI;
 import java.util.HashMap;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java Wed Dec 28 09:24:02 2005
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.broker.region.Destination;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.BrokerId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.TransactionId;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.TransactionId;
 
 /**
  * Implementation of the broker where all it's methods throw an IllegalStateException.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Main.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Main.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Main.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Main.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Main.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/Main.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Main.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -75,10 +75,10 @@
     public static final int TASK_PRINT_ALL_HELP    = 12;
     public static final int TASK_PRINT_VER         = 13;
 
-    public static final String BROKER_FACTORY_CLASS = "org.activemq.broker.BrokerFactory";
+    public static final String BROKER_FACTORY_CLASS = "org.apache.activemq.broker.BrokerFactory";
     public static final String DEFAULT_CONFIG_URI   = "xbean:activemq.xml";
     public static final String DEFAULT_JMX_URL      = "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxconnector";
-    public static final String DEFAULT_JMX_DOMAIN   = "org.activemq";
+    public static final String DEFAULT_JMX_DOMAIN   = "org.apache.activemq";
 
     private static final String   DEFAULT_KEY_BROKER_NAME    = "BrokerName";
     private static final String   DEFAULT_METHOD_BROKER_STOP = "terminateJVM";
@@ -821,7 +821,7 @@
         ClassLoader cl = getClassLoader();
         // Use reflection to get the version
         try {
-            Class activeMQConnectionMetaData = cl.loadClass("org.activemq.ActiveMQConnectionMetaData");
+            Class activeMQConnectionMetaData = cl.loadClass("org.apache.activemq.ActiveMQConnectionMetaData");
             Field field = activeMQConnectionMetaData.getField("PROVIDER_VERSION");
             return (String)field.get(null);
         } catch (Throwable e) {
@@ -901,7 +901,7 @@
 
             if(activeMQHome==null){
                 // guess from the location of the jar
-                URL url = Main.class.getClassLoader().getResource("org/activemq/broker/Main.class");
+                URL url = Main.class.getClassLoader().getResource("org/apache/activemq/broker/Main.class");
                 if (url != null) {
                     try {
                         JarURLConnection jarConnection = (JarURLConnection) url.openConnection();

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java Wed Dec 28 09:24:02 2005
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.broker.region.Destination;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.BrokerId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.TransactionId;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.TransactionId;
 
 /**
  * Like a BrokerFilter but it allows you to switch the getNext().broker.  This has more 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java Wed Dec 28 09:24:02 2005
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.LocalTransactionId;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.TransactionId;
-import org.activemq.command.XATransactionId;
-import org.activemq.store.TransactionRecoveryListener;
-import org.activemq.store.TransactionStore;
-import org.activemq.transaction.LocalTransaction;
-import org.activemq.transaction.Transaction;
-import org.activemq.transaction.XATransaction;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.WrappedException;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.LocalTransactionId;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.command.XATransactionId;
+import org.apache.activemq.store.TransactionRecoveryListener;
+import org.apache.activemq.store.TransactionStore;
+import org.apache.activemq.transaction.LocalTransaction;
+import org.apache.activemq.transaction.Transaction;
+import org.apache.activemq.transaction.XATransaction;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.WrappedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Wed Dec 28 09:24:02 2005
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import java.io.IOException;
 
-import org.activemq.command.Command;
-import org.activemq.command.Response;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportListener;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportListener;
 
 /**
  * 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,18 +24,18 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.activemq.broker.jmx.ManagedTransportConnector;
-import org.activemq.broker.region.ConnectorStatistics;
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportAcceptListener;
-import org.activemq.transport.TransportFactory;
-import org.activemq.transport.TransportServer;
-import org.activemq.transport.discovery.DiscoveryAgent;
-import org.activemq.transport.discovery.DiscoveryAgentFactory;
-import org.activemq.util.ServiceStopper;
+import org.apache.activemq.broker.jmx.ManagedTransportConnector;
+import org.apache.activemq.broker.region.ConnectorStatistics;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportAcceptListener;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.discovery.DiscoveryAgent;
+import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
+import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java Wed Dec 28 09:24:02 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activemq.Service;
-import org.activemq.ThreadPriorities;
+import org.apache.activemq.Service;
+import org.apache.activemq.ThreadPriorities;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker;
+package org.apache.activemq.broker;
 
-import org.activemq.command.Message;
+import org.apache.activemq.command.Message;
 
 /**
  * This broker filter will append the producer's user ID into the JMSXUserID header

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java Wed Dec 28 09:24:02 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.region.DestinationStatistics;
-import org.activemq.memory.UsageManager;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.memory.UsageManager;
 
 public class BrokerView implements BrokerViewMBean {
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 
 public interface BrokerViewMBean extends Service {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.Connection;
+import org.apache.activemq.broker.Connection;
 
 public class ConnectionView implements ConnectionViewMBean {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 
 public interface ConnectionViewMBean extends Service {
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java Wed Dec 28 09:24:02 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.Connector;
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.RedeliveryPolicy;
+import org.apache.activemq.broker.Connector;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.RedeliveryPolicy;
 
 public class ConnectorView implements ConnectorViewMBean {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 
 public interface ConnectorViewMBean extends Service {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.Destination;
 
 public class DestinationView implements DestinationViewMBean {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
 
 public interface DestinationViewMBean {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java Wed Dec 28 09:24:02 2005
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.broker.region.DestinationStatistics;
-import org.activemq.broker.region.QueueRegion;
-import org.activemq.broker.region.policy.PolicyMap;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.PersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.broker.region.QueueRegion;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
 
 public class ManagedQueueRegion extends QueueRegion {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Wed Dec 28 09:24:02 2005
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.region.Destination;
-import org.activemq.broker.region.Region;
-import org.activemq.broker.region.RegionBroker;
-import org.activemq.broker.region.policy.PolicyMap;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.PersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.util.JMXSupport;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.Region;
+import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.util.JMXSupport;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java Wed Dec 28 09:24:02 2005
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.broker.region.DestinationStatistics;
-import org.activemq.broker.region.TempQueueRegion;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.memory.UsageManager;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.broker.region.TempQueueRegion;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.thread.TaskRunnerFactory;
 
 public class ManagedTempQueueRegion extends TempQueueRegion {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java Wed Dec 28 09:24:02 2005
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.broker.region.DestinationStatistics;
-import org.activemq.broker.region.TempTopicRegion;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.memory.UsageManager;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.broker.region.TempTopicRegion;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.thread.TaskRunnerFactory;
 
 public class ManagedTempTopicRegion extends TempTopicRegion {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java Wed Dec 28 09:24:02 2005
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.broker.region.DestinationStatistics;
-import org.activemq.broker.region.TopicRegion;
-import org.activemq.broker.region.policy.PolicyMap;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.PersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.DestinationStatistics;
+import org.apache.activemq.broker.region.TopicRegion;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
 
 public class ManagedTopicRegion extends TopicRegion {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java Wed Dec 28 09:24:02 2005
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.TransportConnection;
-import org.activemq.broker.TransportConnector;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.Response;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.transport.Transport;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.JMXSupport;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.TransportConnection;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.JMXSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java Wed Dec 28 09:24:02 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.Connection;
-import org.activemq.broker.TransportConnector;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportServer;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.Connection;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportServer;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -31,7 +31,7 @@
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -46,7 +46,7 @@
     /**
      * Default activemq domain
      */
-    public static final String DEFAULT_DOMAIN = "org.activemq";
+    public static final String DEFAULT_DOMAIN = "org.apache.activemq";
 
     private final static Log log = LogFactory.getLog(ManagementContext.class);
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.network.NetworkConnector;
+import org.apache.activemq.network.NetworkConnector;
 
 public class NetworkConnectorView implements NetworkConnectorViewMBean {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 
 public interface NetworkConnectorViewMBean extends Service {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.proxy.ProxyConnector;
+import org.apache.activemq.proxy.ProxyConnector;
 
 public class ProxyConnectorView implements ProxyConnectorViewMBean {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.jmx;
+package org.apache.activemq.broker.jmx;
 
-import org.activemq.Service;
+import org.apache.activemq.Service;
 
 public interface ProxyConnectorViewMBean extends Service {
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Wed Dec 28 09:24:02 2005
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.util.Iterator;
 import java.util.Set;
 
 import javax.jms.JMSException;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.filter.DestinationMap;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.PersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.filter.DestinationMap;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java Wed Dec 28 09:24:02 2005
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.filter.BooleanExpression;
-import org.activemq.filter.DestinationFilter;
-import org.activemq.filter.LogicExpression;
-import org.activemq.filter.MessageEvaluationContext;
-import org.activemq.filter.NoLocalExpression;
-import org.activemq.selector.SelectorParser;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.filter.BooleanExpression;
+import org.apache.activemq.filter.DestinationFilter;
+import org.apache.activemq.filter.LogicExpression;
+import org.apache.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.filter.NoLocalExpression;
+import org.apache.activemq.selector.SelectorParser;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java Wed Dec 28 09:24:02 2005
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
-import org.activemq.command.Command;
-import org.activemq.command.Message;
-import org.activemq.management.CountStatisticImpl;
-import org.activemq.management.StatsImpl;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.management.CountStatisticImpl;
+import org.apache.activemq.management.StatsImpl;
 
 /**
  * The J2EE Statistics for the Connection.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java Wed Dec 28 09:24:02 2005
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.activemq.broker.region;
-import org.activemq.management.CountStatisticImpl;
-import org.activemq.management.PollCountStatisticImpl;
-import org.activemq.management.StatsImpl;
+package org.apache.activemq.broker.region;
+import org.apache.activemq.management.CountStatisticImpl;
+import org.apache.activemq.management.PollCountStatisticImpl;
+import org.apache.activemq.management.StatsImpl;
 
 /**
  * The J2EE Statistics for the a Destination.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/Destination.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/Destination.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/Destination.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 
-import org.activemq.Service;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageId;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.MessageStore;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.MessageStore;
 
 /**
  * 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java Wed Dec 28 09:24:02 2005
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
-import org.activemq.command.Message;
-import org.activemq.management.CountStatisticImpl;
-import org.activemq.management.PollCountStatisticImpl;
-import org.activemq.management.StatsImpl;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.management.CountStatisticImpl;
+import org.apache.activemq.management.PollCountStatisticImpl;
+import org.apache.activemq.management.StatsImpl;
 
 /**
  * The J2EE Statistics for the a Destination.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 import java.util.Iterator;
 
 import javax.jms.InvalidSelectorException;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/IndirectMessageReference.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Wed Dec 28 09:24:02 2005
@@ -16,14 +16,14 @@
 * limitations under the License.
 *
 **/
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.Message;
-import org.activemq.command.MessageId;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageId;
 
 /**
  * Keeps track of a message that is flowing through the Broker.  This 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/MessageReference.java Wed Dec 28 09:24:02 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 
-import org.activemq.command.ConsumerId;
-import org.activemq.command.Message;
-import org.activemq.command.MessageId;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageId;
 
 /**
  * Keeps track of a message that is flowing through the Broker.  This 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.broker.region;
+package org.apache.activemq.broker.region;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -23,15 +23,15 @@
 import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
 
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.MessageId;
-import org.activemq.transaction.Synchronization;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.transaction.Synchronization;
 
 /**
  * A subscription that honors the pre-fetch option of the ConsumerInfo.



Mime
View raw message