http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
index 75dfa6c..97fc8ab 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
@@ -16,5 +16,5 @@
  * HornetQ can be managed either using JMX or by sending management messages 
to the
  * server's special management address. Please refer to the user manual for 
more information.
  */
-package org.apache.activemq6.api.core.management;
+package org.apache.activemq.api.core.management;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
index 8757bb2..d56fc3c 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
@@ -16,5 +16,5 @@
  * This package defines base classes and interfaces used
  * throughout HornetQ API
  */
-package org.apache.activemq6.api.core;
+package org.apache.activemq.api.core;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
index 396ece6..4f01f74 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.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.buffers.impl;
+package org.apache.activemq.core.buffers.impl;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.message.impl.MessageInternal;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.message.impl.MessageInternal;
 
 /**
  * A ResetLimitWrappedHornetQBuffer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java
index fcba4e1..3e63af8 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.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.client;
+package org.apache.activemq.core.client;
 
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.core.protocol.core.Packet;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.core.protocol.core.Packet;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
@@ -293,7 +293,7 @@ public interface HornetQClientLogger extends BasicLogger
    void packetOutOfOrder(Object obj, @Cause Throwable t);
 
    /**
-    * Warns about usage of {@link 
org.apache.activemq6.api.core.client.SendAcknowledgementHandler} or JMS's 
{@code CompletionWindow} with
+    * Warns about usage of {@link 
org.apache.activemq.api.core.client.SendAcknowledgementHandler} or JMS's {@code 
CompletionWindow} with
     * confirmations disabled (confirmationWindowSize=-1).
     */
    @LogMessage(level = Logger.Level.WARN)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java
index 1d4fc5c..d69b30a 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java
@@ -11,24 +11,24 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.client;
-
-
-import org.apache.activemq6.api.core.HornetQAddressFullException;
-import org.apache.activemq6.api.core.HornetQConnectionTimedOutException;
-import org.apache.activemq6.api.core.HornetQDisconnectedException;
-import org.apache.activemq6.api.core.HornetQIllegalStateException;
-import org.apache.activemq6.api.core.HornetQInterceptorRejectedPacketException;
-import org.apache.activemq6.api.core.HornetQInternalErrorException;
-import org.apache.activemq6.api.core.HornetQLargeMessageException;
-import org.apache.activemq6.api.core.HornetQLargeMessageInterruptedException;
-import org.apache.activemq6.api.core.HornetQNotConnectedException;
-import org.apache.activemq6.api.core.HornetQObjectClosedException;
-import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException;
-import org.apache.activemq6.api.core.HornetQTransactionRolledBackException;
-import org.apache.activemq6.api.core.HornetQUnBlockedException;
-import org.apache.activemq6.core.cluster.DiscoveryGroup;
-import org.apache.activemq6.spi.core.remoting.Connection;
+package org.apache.activemq.core.client;
+
+
+import org.apache.activemq.api.core.HornetQAddressFullException;
+import org.apache.activemq.api.core.HornetQConnectionTimedOutException;
+import org.apache.activemq.api.core.HornetQDisconnectedException;
+import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.HornetQInterceptorRejectedPacketException;
+import org.apache.activemq.api.core.HornetQInternalErrorException;
+import org.apache.activemq.api.core.HornetQLargeMessageException;
+import org.apache.activemq.api.core.HornetQLargeMessageInterruptedException;
+import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.api.core.HornetQObjectClosedException;
+import org.apache.activemq.api.core.HornetQTransactionOutcomeUnknownException;
+import org.apache.activemq.api.core.HornetQTransactionRolledBackException;
+import org.apache.activemq.api.core.HornetQUnBlockedException;
+import org.apache.activemq.core.cluster.DiscoveryGroup;
+import org.apache.activemq.spi.core.remoting.Connection;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java
index 00dd51d..dbe3a2d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java
@@ -11,13 +11,13 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
 
 public class AddressQueryImpl implements ClientSession.AddressQuery, 
ClientSession.BindingQuery
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java
index d1ca8dd..10d7fd0 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 /**
  * To be called right after the ConnectionFactory created a connection.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
index ed89a21..e7ef46d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.File;
 import java.security.AccessController;
@@ -20,25 +20,25 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 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.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.MessageHandler;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.spi.core.remoting.ConsumerContext;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
-import org.apache.activemq6.utils.FutureLatch;
-import org.apache.activemq6.utils.PriorityLinkedList;
-import org.apache.activemq6.utils.PriorityLinkedListImpl;
-import org.apache.activemq6.utils.ReusableLatch;
-import org.apache.activemq6.utils.TokenBucketLimiter;
+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.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.MessageHandler;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.spi.core.remoting.SessionContext;
+import org.apache.activemq.utils.FutureLatch;
+import org.apache.activemq.utils.PriorityLinkedList;
+import org.apache.activemq.utils.PriorityLinkedListImpl;
+import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.utils.TokenBucketLimiter;
 
 /**
  * @author <a href="mailto:[email protected]";>Tim Fox</a>
@@ -1003,7 +1003,7 @@ public final class ClientConsumerImpl implements 
ClientConsumerInternal
          return;
       }
 
-      org.apache.activemq6.utils.FutureLatch future = new FutureLatch();
+      org.apache.activemq.utils.FutureLatch future = new FutureLatch();
 
       sessionExecutor.execute(future);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java
index a4f1551..57f0ab0 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.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.client.impl;
-
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.utils.FutureLatch;
+package org.apache.activemq.core.client.impl;
+
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.utils.FutureLatch;
 
 /**
  * A ClientConsumerInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java
index 49f4d89..389a9fd 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
-import org.apache.activemq6.utils.DataConstants;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
+import org.apache.activemq.utils.DataConstants;
 
 /**
  * ClientLargeMessageImpl is only created when receiving large messages.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java
index 61fdd67..8e4d72a 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java
index 58d29b6..8ef0cb6 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java
@@ -10,23 +10,23 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQPropertyConversionException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.message.BodyEncoder;
-import org.apache.activemq6.core.message.impl.MessageImpl;
-import org.apache.activemq6.reader.MessageUtil;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.message.BodyEncoder;
+import org.apache.activemq.core.message.impl.MessageImpl;
+import org.apache.activemq.reader.MessageUtil;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java
index ab55b88..efcb892 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java
@@ -11,11 +11,11 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A ClientMessageInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java
index 83360b7..b53452e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.spi.core.remoting.SessionContext;
 
 /**
  * A ClientProducerCreditManager

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java
index c0fd364..6305506 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.spi.core.remoting.SessionContext;
 
 /**
  * A ProducerCreditManager

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java
index 7ef4916..c57a50d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.spi.core.remoting.SessionContext;
 
 /**
  * A ClientProducerCredits

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java
index 2b420d5..c943b3e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.spi.core.remoting.SessionContext;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java
index 12dc322..48c63a3 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.message.BodyEncoder;
-import org.apache.activemq6.core.message.impl.MessageInternal;
-import 
org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
-import org.apache.activemq6.utils.DeflaterReader;
-import org.apache.activemq6.utils.HornetQBufferInputStream;
-import org.apache.activemq6.utils.TokenBucketLimiter;
-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.HornetQException;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.message.BodyEncoder;
+import org.apache.activemq.core.message.impl.MessageInternal;
+import 
org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
+import org.apache.activemq.spi.core.remoting.SessionContext;
+import org.apache.activemq.utils.DeflaterReader;
+import org.apache.activemq.utils.HornetQBufferInputStream;
+import org.apache.activemq.utils.TokenBucketLimiter;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
  * The client-side Producer.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java
index 056c20c..874752e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientProducer;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java
index eebc044..7f67773 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java
@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
@@ -28,40 +28,40 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-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.HornetQNotConnectedException;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.FailoverEventListener;
-import org.apache.activemq6.api.core.client.FailoverEventType;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.api.core.client.SessionFailureListener;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-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.spi.core.remoting.Connector;
-import org.apache.activemq6.spi.core.remoting.ConnectorFactory;
-import org.apache.activemq6.spi.core.remoting.TopologyResponseHandler;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
-import org.apache.activemq6.utils.ClassloadingUtil;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.ConfigurationHelper;
-import org.apache.activemq6.utils.ConfirmationWindowWarning;
-import org.apache.activemq6.utils.ExecutorFactory;
-import org.apache.activemq6.utils.OrderedExecutorFactory;
-import org.apache.activemq6.utils.UUIDGenerator;
+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.HornetQNotConnectedException;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.FailoverEventListener;
+import org.apache.activemq.api.core.client.FailoverEventType;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.api.core.client.SessionFailureListener;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+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.spi.core.remoting.Connector;
+import org.apache.activemq.spi.core.remoting.ConnectorFactory;
+import org.apache.activemq.spi.core.remoting.TopologyResponseHandler;
+import org.apache.activemq.spi.core.remoting.SessionContext;
+import org.apache.activemq.utils.ClassloadingUtil;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.utils.ConfirmationWindowWarning;
+import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.utils.OrderedExecutorFactory;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
  * @author Tim Fox

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java
index 3ddfde5..64b4194 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.util.concurrent.locks.Lock;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.SessionFailureListener;
-import org.apache.activemq6.utils.ConfirmationWindowWarning;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.SessionFailureListener;
+import org.apache.activemq.utils.ConfirmationWindowWarning;
 
 /**
  * A ClientSessionFactoryInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java
index e912369..173df2d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -23,28 +23,28 @@ import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.FailoverEventListener;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.api.core.client.SessionFailureListener;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.ConsumerContext;
-import org.apache.activemq6.spi.core.remoting.SessionContext;
-import org.apache.activemq6.utils.ConfirmationWindowWarning;
-import org.apache.activemq6.utils.TokenBucketLimiterImpl;
-import org.apache.activemq6.utils.XidCodecSupport;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.FailoverEventListener;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.api.core.client.SessionFailureListener;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.spi.core.remoting.SessionContext;
+import org.apache.activemq.utils.ConfirmationWindowWarning;
+import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.utils.XidCodecSupport;
 
 /**
  * @author <a href="mailto:[email protected]";>Tim Fox</a>
@@ -359,7 +359,7 @@ public final class ClientSessionImpl implements 
ClientSessionInternal, FailureLi
    }
 
    /**
-    * Use {@link #addressQuery(org.apache.activemq6.api.core.SimpleString)} 
instead
+    * Use {@link #addressQuery(org.apache.activemq.api.core.SimpleString)} 
instead
     *
     * @param address
     * @return

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java
index 2fa6609..952afd9 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.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.client.impl;
-
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.ConsumerContext;
+package org.apache.activemq.core.client.impl;
+
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.ConsumerContext;
 
 /**
  * A ClientSessionInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java
index 63d9a7b..3f6a319 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
@@ -18,16 +18,16 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
 import io.netty.buffer.ByteBuf;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.utils.DataConstants;
-import org.apache.activemq6.utils.HornetQBufferInputStream;
-import org.apache.activemq6.utils.InflaterReader;
-import org.apache.activemq6.utils.InflaterWriter;
-import org.apache.activemq6.utils.UTF8Util;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.utils.HornetQBufferInputStream;
+import org.apache.activemq.utils.InflaterReader;
+import org.apache.activemq.utils.InflaterWriter;
+import org.apache.activemq.utils.UTF8Util;
 
 /**
  * @author <a href="mailto:[email protected]";>Clebert Suconic</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java
index 9d6f2d0..f328aa4 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java
@@ -10,27 +10,27 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.Set;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.FailoverEventListener;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.api.core.client.SessionFailureListener;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.spi.core.remoting.ConsumerContext;
-import org.apache.activemq6.utils.ConcurrentHashSet;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.FailoverEventListener;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.api.core.client.SessionFailureListener;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.utils.ConcurrentHashSet;
 
 /**
  * A DelegatingSession

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java
index 40c0a7e..31ff43d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import javax.transaction.xa.XAResource;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java
index d75ab8a..b7aba81 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.OutputStream;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
 
 /**
  * A LargeMessageBufferInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java
index e15edc4..7c37524 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -26,19 +26,19 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.buffer.ByteBuf;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.utils.DataConstants;
-import org.apache.activemq6.utils.UTF8Util;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.utils.UTF8Util;
 
 /**
- * This class aggregates several {@link 
org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage}
+ * This class aggregates several {@link 
org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage}
  * as it was being handled
  * by a single buffer. This buffer can be consumed as messages are arriving, 
and it will hold the
  * packets until they are read using the ChannelBuffer interface, or the 
setOutputStream or

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java
index 8ced2c1..affe94b 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java
@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
 
 public class QueueQueryImpl implements ClientSession.QueueQuery
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java
index c37036a..bd02f4d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -35,35 +35,35 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.api.core.HornetQIllegalStateException;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.ClusterTopologyListener;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.TopologyMember;
-import 
org.apache.activemq6.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.cluster.DiscoveryEntry;
-import org.apache.activemq6.core.cluster.DiscoveryGroup;
-import org.apache.activemq6.core.cluster.DiscoveryListener;
-import 
org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManagerFactory;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.spi.core.remoting.ClientProtocolManager;
-import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory;
-import org.apache.activemq6.spi.core.remoting.Connector;
-import org.apache.activemq6.utils.ClassloadingUtil;
-import org.apache.activemq6.utils.HornetQThreadFactory;
-import org.apache.activemq6.utils.UUIDGenerator;
+import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.TopologyMember;
+import 
org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.cluster.DiscoveryEntry;
+import org.apache.activemq.core.cluster.DiscoveryGroup;
+import org.apache.activemq.core.cluster.DiscoveryListener;
+import 
org.apache.activemq.core.protocol.core.impl.HornetQClientProtocolManagerFactory;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.spi.core.remoting.ClientProtocolManager;
+import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory;
+import org.apache.activemq.spi.core.remoting.Connector;
+import org.apache.activemq.utils.ClassloadingUtil;
+import org.apache.activemq.utils.HornetQThreadFactory;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
- * This is the implementation of {@link 
org.apache.activemq6.api.core.client.ServerLocator} and all
+ * This is the implementation of {@link 
org.apache.activemq.api.core.client.ServerLocator} and all
  * the proper javadoc is located on that interface.
  *
  * @author Tim Fox

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java
index 4ae2497..dcdca02 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.util.concurrent.Executor;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.spi.core.remoting.ClientProtocolManager;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.spi.core.remoting.ClientProtocolManager;
 
 /**
  * A ServerLocatorInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java
index deb1b36..89973e2 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.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.client.impl;
+package org.apache.activemq.core.client.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -23,10 +23,10 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClusterTopologyListener;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.spi.core.remoting.Connector;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.spi.core.remoting.Connector;
 
 /**
  * @author <a href="mailto:[email protected]";>Andy Taylor</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java
index a63f787..466b9d5 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.client.impl;
+package org.apache.activemq.core.client.impl;
 
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.TopologyMember;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.TopologyMember;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
 
 /**
  * @author <a href="mailto:[email protected]";>Andy Taylor</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java
index e5bfae4..dac2c8d 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.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.cluster;
+package org.apache.activemq.core.cluster;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.TransportConfiguration;
 
 /**
  * A DiscoveryEntry

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java
index fd2ae35..30bed33 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.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.cluster;
+package org.apache.activemq.core.cluster;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,19 +19,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq6.api.core.BroadcastEndpoint;
-import org.apache.activemq6.api.core.BroadcastEndpointFactory;
-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.SimpleString;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.management.CoreNotificationType;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.core.server.management.NotificationService;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.BroadcastEndpoint;
+import org.apache.activemq.api.core.BroadcastEndpointFactory;
+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.SimpleString;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.management.CoreNotificationType;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.core.server.management.NotificationService;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * This class is used to search for members on the cluster through the opaque 
interface {@link BroadcastEndpoint}.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java
index 032ba68..0f7a3c8 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.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.cluster;
+package org.apache.activemq.core.cluster;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java
index f72f2b2..e721d3e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/exception/HornetQXAException.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.exception;
+package org.apache.activemq.core.exception;
 
 import javax.transaction.xa.XAException;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java
index 923beb1..c3f4402 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.message;
+package org.apache.activemq.core.message;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
 
 /**
  * Class used to encode message body into buffers.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java
index b797f38..1c76af9 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java
@@ -10,26 +10,26 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.message.impl;
+package org.apache.activemq.core.message.impl;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQPropertyConversionException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
-import org.apache.activemq6.core.message.BodyEncoder;
-import org.apache.activemq6.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq6.utils.ByteUtil;
-import org.apache.activemq6.utils.DataConstants;
-import org.apache.activemq6.utils.TypedProperties;
-import org.apache.activemq6.utils.UUID;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
+import org.apache.activemq.core.message.BodyEncoder;
+import org.apache.activemq.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.utils.ByteUtil;
+import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.utils.TypedProperties;
+import org.apache.activemq.utils.UUID;
 
 /**
  * A concrete implementation of a message

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java
index b341c25..9210173 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.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.message.impl;
+package org.apache.activemq.core.message.impl;
 
 import java.io.InputStream;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.message.BodyEncoder;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.message.BodyEncoder;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A MessageInternal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java
index 0f2f1e7..2029246 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java
@@ -11,18 +11,18 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.protocol;
+package org.apache.activemq.core.protocol;
 
-import static 
org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG;
-import static 
org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG;
+import static 
org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG;
+import static 
org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.core.client.impl.ClientLargeMessageImpl;
-import org.apache.activemq6.core.client.impl.ClientMessageImpl;
-import org.apache.activemq6.core.protocol.core.Packet;
-import org.apache.activemq6.core.protocol.core.impl.PacketDecoder;
-import 
org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage;
-import 
org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.core.client.impl.ClientLargeMessageImpl;
+import org.apache.activemq.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.core.protocol.core.impl.PacketDecoder;
+import 
org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage;
+import 
org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage;
 /**
  * @author <a href="mailto:[email protected]";>Andy Taylor</a>
  *         10/12/12

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java
index 96c8073..b5a310f 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.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.protocol.core;
+package org.apache.activemq.core.protocol.core;
 
 import java.util.concurrent.locks.Lock;
 
-import org.apache.activemq6.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQException;
 
 /**
- * A channel is a way of interleaving data meant for different endpoints over 
the same {@link org.apache.activemq6.core.protocol.core.CoreRemotingConnection}.
+ * A channel is a way of interleaving data meant for different endpoints over 
the same {@link org.apache.activemq.core.protocol.core.CoreRemotingConnection}.
  * <p>
  * Any packet sent will have its channel id set to the specific channel 
sending so it can be routed to its correct channel
- * when received by the {@link 
org.apache.activemq6.core.protocol.core.CoreRemotingConnection}. see {@link 
org.apache.activemq6.core.protocol.core.Packet#setChannelID(long)}.
+ * when received by the {@link 
org.apache.activemq.core.protocol.core.CoreRemotingConnection}. see {@link 
org.apache.activemq.core.protocol.core.Packet#setChannelID(long)}.
  * <p>
- * Each Channel should will forward any packets received to its {@link 
org.apache.activemq6.core.protocol.core.ChannelHandler}.
+ * Each Channel should will forward any packets received to its {@link 
org.apache.activemq.core.protocol.core.ChannelHandler}.
  * <p>
  * A Channel *does not* support concurrent access by more than one thread!
  *
@@ -74,14 +74,14 @@ public interface Channel
    Packet sendBlocking(Packet packet, byte expectedPacket) throws 
HornetQException;
 
    /**
-    * Sets the {@link org.apache.activemq6.core.protocol.core.ChannelHandler} 
that this channel should
+    * Sets the {@link org.apache.activemq.core.protocol.core.ChannelHandler} 
that this channel should
     * forward received packets to.
     * @param handler the handler
     */
    void setHandler(ChannelHandler handler);
 
    /**
-    * Gets the {@link org.apache.activemq6.core.protocol.core.ChannelHandler} 
that this channel should
+    * Gets the {@link org.apache.activemq.core.protocol.core.ChannelHandler} 
that this channel should
     * forward received packets to.
     * @return the current channel handler
     */
@@ -131,12 +131,12 @@ public interface Channel
    void unlock();
 
    /**
-    * forces any {@link 
org.apache.activemq6.core.protocol.core.Channel#sendBlocking(Packet, byte)} 
request to return with an exception.
+    * forces any {@link 
org.apache.activemq.core.protocol.core.Channel#sendBlocking(Packet, byte)} 
request to return with an exception.
     */
    void returnBlocking();
 
    /**
-    * forces any {@link 
org.apache.activemq6.core.protocol.core.Channel#sendBlocking(Packet, byte)} 
request to return with an exception.
+    * forces any {@link 
org.apache.activemq.core.protocol.core.Channel#sendBlocking(Packet, byte)} 
request to return with an exception.
     */
    void returnBlocking(Throwable cause);
 
@@ -172,9 +172,9 @@ public interface Channel
    void flushConfirmations();
 
    /**
-    * Called by {@link 
org.apache.activemq6.core.protocol.core.CoreRemotingConnection} when a packet 
is received.
+    * Called by {@link 
org.apache.activemq.core.protocol.core.CoreRemotingConnection} when a packet is 
received.
     * <p>
-    * This method should then call its {@link 
org.apache.activemq6.core.protocol.core.ChannelHandler} after appropriate 
processing of
+    * This method should then call its {@link 
org.apache.activemq.core.protocol.core.ChannelHandler} after appropriate 
processing of
     * the packet
     *
     * @param packet the packet to process.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java
index 0fce6da..5f9cde3 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.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.protocol.core;
+package org.apache.activemq.core.protocol.core;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java
index fe7fda9..34bfd78 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.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.protocol.core;
+package org.apache.activemq.core.protocol.core;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java
index 513aa70..07fd491 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.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.protocol.core;
+package org.apache.activemq.core.protocol.core;
 
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java
index 6fb6359..e4cb414 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.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.protocol.core;
+package org.apache.activemq.core.protocol.core;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
 
 /**
  * A Packet represents a packet of data transmitted over a connection.
@@ -54,7 +54,7 @@ public interface Packet
    byte getType();
 
    /**
-    * Encodes the packet and returns a {@link 
org.apache.activemq6.api.core.HornetQBuffer} containing the data
+    * Encodes the packet and returns a {@link 
org.apache.activemq.api.core.HornetQBuffer} containing the data
     *
     * @param connection the connection
     * @return the buffer to encode to

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java
index b186fe9..7021acd 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.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.protocol.core.impl;
+package org.apache.activemq.core.protocol.core.impl;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -21,20 +21,20 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-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.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.protocol.core.Channel;
-import org.apache.activemq6.core.protocol.core.ChannelHandler;
-import org.apache.activemq6.core.protocol.core.CommandConfirmationHandler;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.protocol.core.Packet;
-import 
org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
-import 
org.apache.activemq6.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+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.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.protocol.core.Channel;
+import org.apache.activemq.core.protocol.core.ChannelHandler;
+import org.apache.activemq.core.protocol.core.CommandConfirmationHandler;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.protocol.core.Packet;
+import 
org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
+import 
org.apache.activemq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
 
 /**
  * A ChannelImpl

Reply via email to