activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [32/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:49:07 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java
index 40fc020..b411aa1 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.invm;
+package org.apache.activemq.core.remoting.impl.invm;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,18 +20,18 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.channel.ChannelFutureListener;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.Connection;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq6.spi.core.remoting.ReadyListener;
-import org.apache.activemq6.utils.UUIDGenerator;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.Connection;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.spi.core.remoting.ReadyListener;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
  * A InVMConnection
@@ -283,7 +283,7 @@ public class InVMConnection implements Connection
    {
       Map<String, Object> params = new HashMap<String, Object>();
 
-      params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID);
+      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID);
 
       return new TransportConfiguration(InVMConnectorFactory.class.getName(), params);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java
index c871c10..4c9e243 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.invm;
+package org.apache.activemq.core.remoting.impl.invm;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -19,18 +19,18 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.spi.core.remoting.AbstractConnector;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.ClientProtocolManager;
-import org.apache.activemq6.spi.core.remoting.Connection;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq6.utils.ConfigurationHelper;
-import org.apache.activemq6.utils.OrderedExecutorFactory;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.spi.core.remoting.AbstractConnector;
+import org.apache.activemq.spi.core.remoting.Acceptor;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.ClientProtocolManager;
+import org.apache.activemq.spi.core.remoting.Connection;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.utils.OrderedExecutorFactory;
 
 /**
  * A InVMConnector

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java
index cf4d4c2..f0a55c1 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java
@@ -11,18 +11,18 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.remoting.impl.invm;
+package org.apache.activemq.core.remoting.impl.invm;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.ClientProtocolManager;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq6.spi.core.remoting.Connector;
-import org.apache.activemq6.spi.core.remoting.ConnectorFactory;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.ClientProtocolManager;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.spi.core.remoting.Connector;
+import org.apache.activemq.spi.core.remoting.ConnectorFactory;
 
 /**
  * A InVMConnectorFactory

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java
index 7f3ab5d..4247aad 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.invm;
+package org.apache.activemq.core.remoting.impl.invm;
 
-import org.apache.activemq6.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQMessageBundle;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
index 2fa1600..597597e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.invm;
+package org.apache.activemq.core.remoting.impl.invm;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq6.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 
 /**
  * A TransportConstants
@@ -39,7 +39,7 @@ public final class TransportConstants
    {
       Set<String> allowableAcceptorKeys = new HashSet<String>();
       allowableAcceptorKeys.add(TransportConstants.SERVER_ID_PROP_NAME);
-      allowableAcceptorKeys.add(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
+      allowableAcceptorKeys.add(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
       allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
       allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java
index cd479d3..2db8b64 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java
index d3eed0e..d95e0da 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
index 7349fa8..d8ace2d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
index 7c4c2cb..661d6a7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -48,29 +48,29 @@ import io.netty.util.ResourceLeakDetector;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.GlobalEventExecutor;
 
-import org.apache.activemq6.api.config.HornetQDefaultConfiguration;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.management.CoreNotificationType;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq6.core.protocol.ProtocolHandler;
-import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport;
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.cluster.ClusterConnection;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.core.server.management.NotificationService;
-import org.apache.activemq6.spi.core.protocol.ProtocolManager;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.Connection;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq6.utils.ConfigurationHelper;
-import org.apache.activemq6.utils.HornetQThreadFactory;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.management.CoreNotificationType;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.core.protocol.ProtocolHandler;
+import org.apache.activemq.core.remoting.impl.ssl.SSLSupport;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.cluster.ClusterConnection;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.core.server.management.NotificationService;
+import org.apache.activemq.spi.core.protocol.ProtocolManager;
+import org.apache.activemq.spi.core.remoting.Acceptor;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.Connection;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.utils.HornetQThreadFactory;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A Netty TCP Acceptor that supports SSL

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java
index 9fb3c6f..c803d8c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java
@@ -10,19 +10,19 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.core.server.cluster.ClusterConnection;
-import org.apache.activemq6.spi.core.protocol.ProtocolManager;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
-import org.apache.activemq6.spi.core.remoting.AcceptorFactory;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.core.server.cluster.ClusterConnection;
+import org.apache.activemq.spi.core.protocol.ProtocolManager;
+import org.apache.activemq.spi.core.remoting.Acceptor;
+import org.apache.activemq.spi.core.remoting.AcceptorFactory;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
 
 /**
  * A NettyAcceptorFactory

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java
index 0437263..c49a4da 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java
@@ -10,14 +10,14 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.impl.netty;
+package org.apache.activemq.core.remoting.impl.netty;
 
 import java.util.Map;
 
 import io.netty.channel.Channel;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
 
 /**
  * @author <a href="mailto:nmaurer@redhat.com">Norman Maurer</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java
index e00baeb..cf0b0db 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java
@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.server;
+package org.apache.activemq.core.remoting.server;
 
 import java.util.Set;
 
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.Acceptor;
 
 /**
  * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java
index 4e38d8c..fc1c1b6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.remoting.server.impl;
+package org.apache.activemq.core.remoting.server.impl;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -31,39 +31,39 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.protocol.core.impl.CoreProtocolManagerFactory;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.cluster.ClusterConnection;
-import org.apache.activemq6.core.server.cluster.ClusterManager;
-import org.apache.activemq6.core.server.impl.ServiceRegistry;
-import org.apache.activemq6.core.server.impl.ServerSessionImpl;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.spi.core.protocol.ConnectionEntry;
-import org.apache.activemq6.spi.core.protocol.ProtocolManager;
-import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
-import org.apache.activemq6.spi.core.remoting.AcceptorFactory;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.Connection;
-import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq6.utils.ClassloadingUtil;
-import org.apache.activemq6.utils.ConfigurationHelper;
-import org.apache.activemq6.utils.HornetQThreadFactory;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.protocol.core.impl.CoreProtocolManagerFactory;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.cluster.ClusterConnection;
+import org.apache.activemq.core.server.cluster.ClusterManager;
+import org.apache.activemq.core.server.impl.ServiceRegistry;
+import org.apache.activemq.core.server.impl.ServerSessionImpl;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.spi.core.protocol.ConnectionEntry;
+import org.apache.activemq.spi.core.protocol.ProtocolManager;
+import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.Acceptor;
+import org.apache.activemq.spi.core.remoting.AcceptorFactory;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.Connection;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.utils.ClassloadingUtil;
+import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.utils.HornetQThreadFactory;
 
 /**
  * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
@@ -631,7 +631,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle
 
    private ClusterConnection lookupClusterConnection(TransportConfiguration acceptorConfig)
    {
-      String clusterConnectionName = (String) acceptorConfig.getParams().get(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
+      String clusterConnectionName = (String) acceptorConfig.getParams().get(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
 
       ClusterConnection clusterConnection = null;
       if (clusterConnectionName != null)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java
index af5eef7..eb8e2d5 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java
@@ -10,32 +10,32 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.replication;
+package org.apache.activemq.core.replication;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq6.core.journal.EncodingSupport;
-import org.apache.activemq6.core.journal.IOCompletion;
-import org.apache.activemq6.core.journal.Journal;
-import org.apache.activemq6.core.journal.JournalLoadInformation;
-import org.apache.activemq6.core.journal.LoaderCallback;
-import org.apache.activemq6.core.journal.PreparedTransactionInfo;
-import org.apache.activemq6.core.journal.RecordInfo;
-import org.apache.activemq6.core.journal.SequentialFileFactory;
-import org.apache.activemq6.core.journal.TransactionFailureCallback;
-import org.apache.activemq6.core.journal.impl.JournalFile;
-import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding;
-import org.apache.activemq6.core.persistence.OperationContext;
-import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE;
+import org.apache.activemq.core.journal.EncodingSupport;
+import org.apache.activemq.core.journal.IOCompletion;
+import org.apache.activemq.core.journal.Journal;
+import org.apache.activemq.core.journal.JournalLoadInformation;
+import org.apache.activemq.core.journal.LoaderCallback;
+import org.apache.activemq.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.core.journal.RecordInfo;
+import org.apache.activemq.core.journal.SequentialFileFactory;
+import org.apache.activemq.core.journal.TransactionFailureCallback;
+import org.apache.activemq.core.journal.impl.JournalFile;
+import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding;
+import org.apache.activemq.core.persistence.OperationContext;
+import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE;
 
 /**
- * Used by the {@link org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls.
+ * Used by the {@link org.apache.activemq.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls.
  * <p>
  * This class wraps a {@link ReplicationManager} and the local {@link Journal}. Every call will be
  * relayed to both instances.
  * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- * @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager
+ * @see org.apache.activemq.core.persistence.impl.journal.JournalStorageManager
  */
 public class ReplicatedJournal implements Journal
 {
@@ -68,7 +68,7 @@ public class ReplicatedJournal implements Journal
     * @param record
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean)
     */
    public void appendAddRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
    {
@@ -91,7 +91,7 @@ public class ReplicatedJournal implements Journal
     * @param record
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendAddRecord(long, byte, org.apache.activemq6.core.journal.EncodingSupport, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendAddRecord(long, byte, org.apache.activemq.core.journal.EncodingSupport, boolean)
     */
    public void appendAddRecord(final long id,
                                final byte recordType,
@@ -113,7 +113,7 @@ public class ReplicatedJournal implements Journal
     * @param recordType
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[])
+    * @see org.apache.activemq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[])
     */
    public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception
    {
@@ -126,7 +126,7 @@ public class ReplicatedJournal implements Journal
     * @param recordType
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.apache.activemq6.core.journal.EncodingSupport)
+    * @see org.apache.activemq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.apache.activemq.core.journal.EncodingSupport)
     */
    public void appendAddRecordTransactional(final long txID,
                                             final long id,
@@ -145,7 +145,7 @@ public class ReplicatedJournal implements Journal
     * @param txID
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendCommitRecord(long, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendCommitRecord(long, boolean)
     */
    public void appendCommitRecord(final long txID, final boolean sync) throws Exception
    {
@@ -182,7 +182,7 @@ public class ReplicatedJournal implements Journal
     * @param id
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecord(long, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendDeleteRecord(long, boolean)
     */
    @Override
    public void appendDeleteRecord(final long id, final boolean sync) throws Exception
@@ -211,7 +211,7 @@ public class ReplicatedJournal implements Journal
     * @param id
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[])
+    * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[])
     */
    public void appendDeleteRecordTransactional(final long txID, final long id, final byte[] record) throws Exception
    {
@@ -223,7 +223,7 @@ public class ReplicatedJournal implements Journal
     * @param id
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.apache.activemq6.core.journal.EncodingSupport)
+    * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.apache.activemq.core.journal.EncodingSupport)
     */
    public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
    {
@@ -239,7 +239,7 @@ public class ReplicatedJournal implements Journal
     * @param txID
     * @param id
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendDeleteRecordTransactional(long, long)
+    * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long)
     */
    public void appendDeleteRecordTransactional(final long txID, final long id) throws Exception
    {
@@ -256,7 +256,7 @@ public class ReplicatedJournal implements Journal
     * @param transactionData
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, byte[], boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean)
     */
    public void appendPrepareRecord(final long txID, final byte[] transactionData, final boolean sync) throws Exception
    {
@@ -268,7 +268,7 @@ public class ReplicatedJournal implements Journal
     * @param transactionData
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendPrepareRecord(long, org.apache.activemq6.core.journal.EncodingSupport, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendPrepareRecord(long, org.apache.activemq.core.journal.EncodingSupport, boolean)
     */
    public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception
    {
@@ -298,7 +298,7 @@ public class ReplicatedJournal implements Journal
     * @param txID
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendRollbackRecord(long, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendRollbackRecord(long, boolean)
     */
    public void appendRollbackRecord(final long txID, final boolean sync) throws Exception
    {
@@ -326,7 +326,7 @@ public class ReplicatedJournal implements Journal
     * @param record
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean)
     */
    public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
    {
@@ -339,7 +339,7 @@ public class ReplicatedJournal implements Journal
     * @param record
     * @param sync
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecord(long, byte, org.apache.activemq6.core.journal.EncodingSupport, boolean)
+    * @see org.apache.activemq.core.journal.Journal#appendUpdateRecord(long, byte, org.apache.activemq.core.journal.EncodingSupport, boolean)
     */
    @Override
    public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
@@ -373,7 +373,7 @@ public class ReplicatedJournal implements Journal
     * @param recordType
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[])
+    * @see org.apache.activemq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[])
     */
    public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType,
                                                final byte[] record) throws Exception
@@ -387,7 +387,7 @@ public class ReplicatedJournal implements Journal
     * @param recordType
     * @param record
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.apache.activemq6.core.journal.EncodingSupport)
+    * @see org.apache.activemq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.apache.activemq.core.journal.EncodingSupport)
     */
    public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType,
                                                final EncodingSupport record) throws Exception
@@ -407,7 +407,7 @@ public class ReplicatedJournal implements Journal
     * @param transactionFailure
     *
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#load(java.util.List, java.util.List, org.apache.activemq6.core.journal.TransactionFailureCallback)
+    * @see org.apache.activemq.core.journal.Journal#load(java.util.List, java.util.List, org.apache.activemq.core.journal.TransactionFailureCallback)
     */
    public JournalLoadInformation load(final List<RecordInfo> committedRecords,
                                       final List<PreparedTransactionInfo> preparedTransactions,
@@ -420,7 +420,7 @@ public class ReplicatedJournal implements Journal
     * @param reloadManager
     *
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#load(org.apache.activemq6.core.journal.LoaderCallback)
+    * @see org.apache.activemq.core.journal.Journal#load(org.apache.activemq.core.journal.LoaderCallback)
     */
    public JournalLoadInformation load(final LoaderCallback reloadManager) throws Exception
    {
@@ -430,7 +430,7 @@ public class ReplicatedJournal implements Journal
    /**
     * @param pages
     * @throws Exception
-    * @see org.apache.activemq6.core.journal.Journal#perfBlast(int)
+    * @see org.apache.activemq.core.journal.Journal#perfBlast(int)
     */
    public void perfBlast(final int pages)
    {
@@ -439,7 +439,7 @@ public class ReplicatedJournal implements Journal
 
    /**
     * @throws Exception
-    * @see org.apache.activemq6.core.server.HornetQComponent#start()
+    * @see org.apache.activemq.core.server.HornetQComponent#start()
     */
    public void start() throws Exception
    {
@@ -448,7 +448,7 @@ public class ReplicatedJournal implements Journal
 
    /**
     * @throws Exception
-    * @see org.apache.activemq6.core.server.HornetQComponent#stop()
+    * @see org.apache.activemq.core.server.HornetQComponent#stop()
     */
    public void stop() throws Exception
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java
index f87ceba..b01c3aa 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java
@@ -13,36 +13,36 @@
 /**
  *
  */
-package org.apache.activemq6.core.replication;
+package org.apache.activemq.core.replication;
 
-import org.apache.activemq6.api.core.Message;
+import org.apache.activemq.api.core.Message;
 
 /**
- * {@link org.apache.activemq6.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}.
+ * {@link org.apache.activemq.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}.
  * <p/>
- * In practice a subset of the methods necessary to have a {@link org.apache.activemq6.core.server.LargeServerMessage}
+ * In practice a subset of the methods necessary to have a {@link org.apache.activemq.core.server.LargeServerMessage}
  *
- * @see org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageInSync
+ * @see org.apache.activemq.core.persistence.impl.journal.LargeServerMessageInSync
  */
 public interface ReplicatedLargeMessage
 {
    /**
-    * @see org.apache.activemq6.core.server.LargeServerMessage#setDurable(boolean)
+    * @see org.apache.activemq.core.server.LargeServerMessage#setDurable(boolean)
     */
    Message setDurable(boolean b);
 
    /**
-    * @see org.apache.activemq6.core.server.LargeServerMessage#setMessageID(long)
+    * @see org.apache.activemq.core.server.LargeServerMessage#setMessageID(long)
     */
    Message setMessageID(long id);
 
    /**
-    * @see org.apache.activemq6.core.server.LargeServerMessage#releaseResources()
+    * @see org.apache.activemq.core.server.LargeServerMessage#releaseResources()
     */
    void releaseResources();
 
    /**
-    * @see org.apache.activemq6.core.server.LargeServerMessage#deleteFile()
+    * @see org.apache.activemq.core.server.LargeServerMessage#deleteFile()
     */
    void deleteFile() throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java
index 12954af..c39e05e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.replication;
+package org.apache.activemq.core.replication;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,54 +27,54 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.journal.IOCriticalErrorListener;
-import org.apache.activemq6.core.journal.Journal;
-import org.apache.activemq6.core.journal.Journal.JournalState;
-import org.apache.activemq6.core.journal.JournalLoadInformation;
-import org.apache.activemq6.core.journal.SequentialFile;
-import org.apache.activemq6.core.journal.impl.FileWrapperJournal;
-import org.apache.activemq6.core.journal.impl.JournalFile;
-import org.apache.activemq6.core.paging.PagedMessage;
-import org.apache.activemq6.core.paging.PagingManager;
-import org.apache.activemq6.core.paging.impl.Page;
-import org.apache.activemq6.core.paging.impl.PagingManagerImpl;
-import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent;
-import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageInSync;
-import org.apache.activemq6.core.protocol.core.Channel;
-import org.apache.activemq6.core.protocol.core.ChannelHandler;
-import org.apache.activemq6.core.protocol.core.Packet;
-import org.apache.activemq6.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationResponseMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
-import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum;
-import org.apache.activemq6.core.server.impl.HornetQServerImpl;
-import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.journal.IOCriticalErrorListener;
+import org.apache.activemq.core.journal.Journal;
+import org.apache.activemq.core.journal.Journal.JournalState;
+import org.apache.activemq.core.journal.JournalLoadInformation;
+import org.apache.activemq.core.journal.SequentialFile;
+import org.apache.activemq.core.journal.impl.FileWrapperJournal;
+import org.apache.activemq.core.journal.impl.JournalFile;
+import org.apache.activemq.core.paging.PagedMessage;
+import org.apache.activemq.core.paging.PagingManager;
+import org.apache.activemq.core.paging.impl.Page;
+import org.apache.activemq.core.paging.impl.PagingManagerImpl;
+import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent;
+import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageInSync;
+import org.apache.activemq.core.protocol.core.Channel;
+import org.apache.activemq.core.protocol.core.ChannelHandler;
+import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationResponseMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
+import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum;
+import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
 
 /**
  * Handles all the synchronization necessary for replication on the backup side (that is the

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java
index 626b183..cccde8f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.replication;
+package org.apache.activemq.core.replication;
 
 import java.io.FileInputStream;
 import java.nio.ByteBuffer;
@@ -22,44 +22,44 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.SessionFailureListener;
-import org.apache.activemq6.core.journal.EncodingSupport;
-import org.apache.activemq6.core.journal.SequentialFile;
-import org.apache.activemq6.core.journal.impl.JournalFile;
-import org.apache.activemq6.core.paging.PagedMessage;
-import org.apache.activemq6.core.persistence.OperationContext;
-import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent;
-import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq6.core.protocol.core.Channel;
-import org.apache.activemq6.core.protocol.core.ChannelHandler;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.protocol.core.Packet;
-import org.apache.activemq6.core.protocol.core.impl.ChannelImpl.CHANNEL_ID;
-import org.apache.activemq6.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.utils.ExecutorFactory;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.SessionFailureListener;
+import org.apache.activemq.core.journal.EncodingSupport;
+import org.apache.activemq.core.journal.SequentialFile;
+import org.apache.activemq.core.journal.impl.JournalFile;
+import org.apache.activemq.core.paging.PagedMessage;
+import org.apache.activemq.core.persistence.OperationContext;
+import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent;
+import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.core.protocol.core.Channel;
+import org.apache.activemq.core.protocol.core.ChannelHandler;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID;
+import org.apache.activemq.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.utils.ExecutorFactory;
 import org.omg.CORBA.portable.ResponseHandler;
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java b/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java
index 2d1c2ab..802b0ce 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.security;
+package org.apache.activemq.core.security;
 
 /**
  * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java b/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java
index 95d655b..1aa6b30 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.security;
+package org.apache.activemq.core.security;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.server.ServerSession;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.server.ServerSession;
 
 /**
  * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java
index 9d52656..2fbc96f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java
@@ -10,28 +10,28 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.security.impl;
+package org.apache.activemq.core.security.impl;
 
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.management.CoreNotificationType;
-import org.apache.activemq6.api.core.management.ManagementHelper;
-import org.apache.activemq6.core.security.CheckType;
-import org.apache.activemq6.core.security.Role;
-import org.apache.activemq6.core.security.SecurityStore;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.ServerSession;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.core.server.management.NotificationService;
-import org.apache.activemq6.core.settings.HierarchicalRepository;
-import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener;
-import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.management.CoreNotificationType;
+import org.apache.activemq.api.core.management.ManagementHelper;
+import org.apache.activemq.core.security.CheckType;
+import org.apache.activemq.core.security.Role;
+import org.apache.activemq.core.security.SecurityStore;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ServerSession;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.core.server.management.NotificationService;
+import org.apache.activemq.core.settings.HierarchicalRepository;
+import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener;
+import org.apache.activemq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * The HornetQ SecurityStore implementation

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java
index f3ba55a..b1a07c1 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  * A ActivateCallback

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java
index 1769169..c1efb07 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 public class ActivationParams
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java
index a44c420..4d40606 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  * A Bindable

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java b/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java
index 967701a..83b2912 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 import java.util.List;
 
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java
index 5cefa86..9e76264 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java
index 3f14ec8..7dd8d33 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
 
 import java.util.Map;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java
index 82fcd53..c7637a7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 import java.util.List;
 
-import org.apache.activemq6.core.filter.Filter;
+import org.apache.activemq.core.filter.Filter;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java
index 5a07ce9..4b77c7d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
 
 /**
  * A Divert

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java
index cfdc8bf..ff16a5c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java
index 52993f1..a90e82e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java
@@ -11,29 +11,29 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server;
-
-import org.apache.activemq6.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq6.api.core.HornetQAddressFullException;
-import org.apache.activemq6.api.core.HornetQClusterSecurityException;
-import org.apache.activemq6.api.core.HornetQConnectionTimedOutException;
-import org.apache.activemq6.api.core.HornetQDisconnectedException;
-import org.apache.activemq6.api.core.HornetQDuplicateMetaDataException;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQIOErrorException;
-import org.apache.activemq6.api.core.HornetQIllegalStateException;
-import org.apache.activemq6.api.core.HornetQIncompatibleClientServerException;
-import org.apache.activemq6.api.core.HornetQInternalErrorException;
-import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException;
-import org.apache.activemq6.api.core.HornetQInvalidTransientQueueUseException;
-import org.apache.activemq6.api.core.HornetQNonExistentQueueException;
-import org.apache.activemq6.api.core.HornetQQueueExistsException;
-import org.apache.activemq6.api.core.HornetQSecurityException;
-import org.apache.activemq6.api.core.HornetQSessionCreationException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
-import org.apache.activemq6.core.security.CheckType;
+package org.apache.activemq.core.server;
+
+import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.api.core.HornetQAddressFullException;
+import org.apache.activemq.api.core.HornetQClusterSecurityException;
+import org.apache.activemq.api.core.HornetQConnectionTimedOutException;
+import org.apache.activemq.api.core.HornetQDisconnectedException;
+import org.apache.activemq.api.core.HornetQDuplicateMetaDataException;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQIOErrorException;
+import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.HornetQIncompatibleClientServerException;
+import org.apache.activemq.api.core.HornetQInternalErrorException;
+import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException;
+import org.apache.activemq.api.core.HornetQInvalidTransientQueueUseException;
+import org.apache.activemq.api.core.HornetQNonExistentQueueException;
+import org.apache.activemq.api.core.HornetQQueueExistsException;
+import org.apache.activemq.api.core.HornetQSecurityException;
+import org.apache.activemq.api.core.HornetQSessionCreationException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage;
+import org.apache.activemq.core.security.CheckType;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
@@ -292,25 +292,25 @@ public interface HornetQMessageBundle
    IllegalArgumentException autoConvertError(Class<? extends Object> aClass);
 
    /**
-    * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
+    * Message used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
     */
    @Message(id = 119076, value = "Executing destroyConnection with {0}={1} through management''s request", format = Message.Format.MESSAGE_FORMAT)
    String destroyConnectionWithSessionMetadataHeader(String key, String value);
 
    /**
-    * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
+    * Message used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
     */
    @Message(id = 119077, value = "Closing connection {0}", format = Message.Format.MESSAGE_FORMAT)
    String destroyConnectionWithSessionMetadataClosingConnection(String serverSessionString);
 
    /**
-    * Exception used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
+    * Exception used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
     */
    @Message(id = 119078, value = "Disconnected per admin''s request on {0}={1}", format = Message.Format.MESSAGE_FORMAT)
    HornetQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value);
 
    /**
-    * Message used on on {@link org.apache.activemq6.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
+    * Message used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)}
     */
    @Message(id = 119079, value = "No session found with {0}={1}", format = Message.Format.MESSAGE_FORMAT)
    String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java
index 2fa654c..fa493ae 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServer.java
@@ -10,39 +10,39 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.config.BridgeConfiguration;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.DivertConfiguration;
-import org.apache.activemq6.core.management.impl.HornetQServerControlImpl;
-import org.apache.activemq6.core.paging.PagingManager;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.replication.ReplicationManager;
-import org.apache.activemq6.core.security.Role;
-import org.apache.activemq6.core.security.SecurityStore;
-import org.apache.activemq6.core.server.cluster.ClusterManager;
-import org.apache.activemq6.core.server.cluster.ha.HAPolicy;
-import org.apache.activemq6.core.server.group.GroupingHandler;
-import org.apache.activemq6.core.server.impl.Activation;
-import org.apache.activemq6.core.server.impl.ConnectorsService;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.settings.HierarchicalRepository;
-import org.apache.activemq6.core.settings.impl.AddressSettings;
-import org.apache.activemq6.core.transaction.ResourceManager;
-import org.apache.activemq6.core.version.Version;
-import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.protocol.SessionCallback;
-import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
-import org.apache.activemq6.utils.ExecutorFactory;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.config.BridgeConfiguration;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.DivertConfiguration;
+import org.apache.activemq.core.management.impl.HornetQServerControlImpl;
+import org.apache.activemq.core.paging.PagingManager;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.replication.ReplicationManager;
+import org.apache.activemq.core.security.Role;
+import org.apache.activemq.core.security.SecurityStore;
+import org.apache.activemq.core.server.cluster.ClusterManager;
+import org.apache.activemq.core.server.cluster.ha.HAPolicy;
+import org.apache.activemq.core.server.group.GroupingHandler;
+import org.apache.activemq.core.server.impl.Activation;
+import org.apache.activemq.core.server.impl.ConnectorsService;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.settings.HierarchicalRepository;
+import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.core.transaction.ResourceManager;
+import org.apache.activemq.core.version.Version;
+import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.protocol.SessionCallback;
+import org.apache.activemq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.utils.ExecutorFactory;
 
 /**
  * This interface defines the internal interface of the HornetQ Server exposed to other components

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java
index d7a5661..0399b4b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java
@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
@@ -40,26 +40,26 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 
 import io.netty.channel.Channel;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.journal.IOAsyncTask;
-import org.apache.activemq6.core.journal.SequentialFile;
-import org.apache.activemq6.core.journal.impl.JournalFile;
-import org.apache.activemq6.core.paging.cursor.PagePosition;
-import org.apache.activemq6.core.paging.cursor.PageSubscription;
-import org.apache.activemq6.core.persistence.OperationContext;
-import org.apache.activemq6.core.protocol.core.Packet;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage;
-import org.apache.activemq6.core.server.cluster.Bridge;
-import org.apache.activemq6.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl;
-import org.apache.activemq6.core.server.impl.HornetQServerImpl;
-import org.apache.activemq6.core.server.impl.ServerSessionImpl;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.utils.FutureLatch;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.journal.IOAsyncTask;
+import org.apache.activemq.core.journal.SequentialFile;
+import org.apache.activemq.core.journal.impl.JournalFile;
+import org.apache.activemq.core.paging.cursor.PagePosition;
+import org.apache.activemq.core.paging.cursor.PageSubscription;
+import org.apache.activemq.core.persistence.OperationContext;
+import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage;
+import org.apache.activemq.core.server.cluster.Bridge;
+import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl;
+import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ServerSessionImpl;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.utils.FutureLatch;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java
index bdae34b..54ddda9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServers.java
@@ -10,16 +10,16 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 import java.lang.management.ManagementFactory;
 
 import javax.management.MBeanServer;
 
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.server.impl.HornetQServerImpl;
-import org.apache.activemq6.spi.core.security.HornetQSecurityManager;
-import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl;
 
 /**
  * HornetQServers is a factory class for instantiating HornetQServer instances.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java b/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java
index 8262a45..f7e4a5d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server;
+package org.apache.activemq.core.server;
 
 /**
  *


Mime
View raw message