activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [30/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:49:05 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
index ac3eb9b..1826cd7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.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.server.cluster.impl;
+package org.apache.activemq.core.server.cluster.impl;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.journal.IOAsyncTask;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.Consumer;
-import org.apache.activemq6.core.server.HandleStatus;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.MessageReference;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.RoutingContext;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.transaction.Transaction;
-import org.apache.activemq6.core.transaction.impl.TransactionImpl;
-import org.apache.activemq6.utils.ReusableLatch;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.journal.IOAsyncTask;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.Consumer;
+import org.apache.activemq.core.server.HandleStatus;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.RoutingContext;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.transaction.Transaction;
+import org.apache.activemq.core.transaction.impl.TransactionImpl;
+import org.apache.activemq.utils.ReusableLatch;
 
 /**
  * A Redistributor
@@ -298,7 +298,7 @@ public class Redistributor implements Consumer
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages()
+    * @see org.apache.activemq.core.server.Consumer#getDeliveringMessages()
     */
    @Override
    public List<MessageReference> getDeliveringMessages()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
index 7b2ce78..77032e0 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.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.cluster.impl;
+package org.apache.activemq.core.server.cluster.impl;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -19,17 +19,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.filter.impl.FilterImpl;
-import org.apache.activemq6.core.message.impl.MessageImpl;
-import org.apache.activemq6.core.postoffice.BindingType;
-import org.apache.activemq6.core.server.Bindable;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.RoutingContext;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.cluster.RemoteQueueBinding;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.filter.impl.FilterImpl;
+import org.apache.activemq.core.message.impl.MessageImpl;
+import org.apache.activemq.core.postoffice.BindingType;
+import org.apache.activemq.core.server.Bindable;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.RoutingContext;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.cluster.RemoteQueueBinding;
 
 /**
  * A RemoteQueueBindingImpl

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java
index 73b58c4..f76cfe4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.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.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffer;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java
index e444354..c964ebe 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.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.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.core.client.impl.Topology;
+import org.apache.activemq.core.client.impl.Topology;
 
 /**
  * A quorum can be registered with the {@link QuorumManager} to receive notifications about the state of a cluster.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
index 38cd3a8..1ac2475 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.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.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClusterTopologyListener;
-import org.apache.activemq6.api.core.client.TopologyMember;
-import org.apache.activemq6.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.cluster.ClusterControl;
-import org.apache.activemq6.core.server.cluster.ClusterController;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.api.core.client.TopologyMember;
+import org.apache.activemq.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.cluster.ClusterControl;
+import org.apache.activemq.core.server.cluster.ClusterController;
 
 /**
- * A QourumManager can be used to register a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} to receive notifications
- * about changes to the cluster. A {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} can then issue a vote to the
+ * A QourumManager can be used to register a {@link org.apache.activemq.core.server.cluster.qourum.Quorum} to receive notifications
+ * about changes to the cluster. A {@link org.apache.activemq.core.server.cluster.qourum.Quorum} can then issue a vote to the
  * remaining nodes in a cluster for a specific outcome
  */
 public final class QuorumManager implements ClusterTopologyListener, HornetQComponent
@@ -39,7 +39,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    private final ClusterController clusterController;
 
    /**
-    * all the current registered {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}'s
+    * all the current registered {@link org.apache.activemq.core.server.cluster.qourum.Quorum}'s
     */
    private Map<String, Quorum> quorums = new HashMap<>();
 
@@ -113,7 +113,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    }
 
    /**
-    * registers a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster.
+    * registers a {@link org.apache.activemq.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster.
     * @param quorum
     */
    public void registerQuorum(Quorum quorum)
@@ -123,7 +123,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    }
 
    /**
-    * unregisters a {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}.
+    * unregisters a {@link org.apache.activemq.core.server.cluster.qourum.Quorum}.
     * @param quorum
     */
    public void unRegisterQuorum(Quorum quorum)
@@ -132,8 +132,8 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    }
 
    /**
-    * called by the {@link org.apache.activemq6.core.client.impl.ServerLocatorInternal} when the topology changes. we update the
-    * {@code maxClusterSize} if needed and inform the {@link org.apache.activemq6.core.server.cluster.qourum.Quorum}'s.
+    * called by the {@link org.apache.activemq.core.client.impl.ServerLocatorInternal} when the topology changes. we update the
+    * {@code maxClusterSize} if needed and inform the {@link org.apache.activemq.core.server.cluster.qourum.Quorum}'s.
     *
     * @param topologyMember the topolgy changed
     * @param last if the whole cluster topology is being transmitted (after adding the listener to
@@ -151,7 +151,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    }
 
    /**
-    * notify the {@link org.apache.activemq6.core.server.cluster.qourum.Quorum} of a topology change.
+    * notify the {@link org.apache.activemq.core.server.cluster.qourum.Quorum} of a topology change.
     * @param eventUID
     * @param nodeID the id of the node leaving the cluster
     */
@@ -292,7 +292,7 @@ public final class QuorumManager implements ClusterTopologyListener, HornetQComp
    }
    /**
     * this will connect to a node and then cast a vote. whether or not this vote is asked of the target node is dependant
-    * on {@link org.apache.activemq6.core.server.cluster.qourum.Vote#isRequestServerVote()}
+    * on {@link org.apache.activemq.core.server.cluster.qourum.Vote#isRequestServerVote()}
     */
    private final class VoteRunnable implements Runnable
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java
index 8b616a5..0aba0ad 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.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.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.impl.Topology;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.impl.Topology;
 
 /**
  * the vote itself. the vote can be decided by the enquirer or sent out to each node in the quorum.
@@ -28,7 +28,7 @@ public abstract class QuorumVote<V extends Vote, T>
    }
 
    /**
-    * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is
+    * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is
     * successfully connected to. The QuorumVote can then decide whether or not a decision can be made with just that information.
     *
     * @return the vote to use
@@ -36,7 +36,7 @@ public abstract class QuorumVote<V extends Vote, T>
    public abstract Vote connected();
 
    /**
-    * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum.
+    * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum.
     * The QuorumVote can then decide whether or not a decision can be made with just that information however the node
     * cannot cannot be asked.
     * @return the vote to use
@@ -44,7 +44,7 @@ public abstract class QuorumVote<V extends Vote, T>
    public abstract Vote notConnected();
 
    /**
-    * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the
+    * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the
     * cluster or decided by itself.
     *
     * @param vote the vote to make.
@@ -59,14 +59,14 @@ public abstract class QuorumVote<V extends Vote, T>
    public abstract T getDecision();
 
    /**
-    * called by the {@link org.apache.activemq6.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received.
+    * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received.
     *
     * @param voteTopology the topology of where the votes were sent.
     */
    public abstract void allVotesCast(Topology voteTopology);
 
    /**
-    * the name of this quorum vote, used for identifying the correct {@link org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler}
+    * the name of this quorum vote, used for identifying the correct {@link org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler}
     *
     * @return the name of the wuorum vote
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java
index c59da7c..9158d63 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.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.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * used to handle votes received by a quorum from a particular node

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java
index c717d6d..60dd9f0 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java
@@ -11,11 +11,11 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.impl.Topology;
-import org.apache.activemq6.core.persistence.StorageManager;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.impl.Topology;
+import org.apache.activemq.core.persistence.StorageManager;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
index 47c58e2..38fcffd 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
@@ -11,22 +11,22 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQExceptionType;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq6.core.client.impl.Topology;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.NodeManager;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.core.client.impl.Topology;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.NodeManager;
 
 /**
  * @author Andy Taylor
@@ -56,8 +56,8 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
 
    /**
     * This is a safety net in case the live sends the first {@link ReplicationLiveIsStoppingMessage}
-    * with code {@link org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with
-    * {@link org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}.
+    * with code {@link org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with
+    * {@link org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}.
     * <p/>
     * If the second message does come within this dead line, we fail over anyway.
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java
index a5b33ee..f781ec6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.cluster.qourum;
+package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq6.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffer;
 
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
index 88637a6..6c6540b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.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.embedded;
+package org.apache.activemq.core.server.embedded;
 
 import javax.management.MBeanServer;
 
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.FileConfiguration;
-import org.apache.activemq6.core.server.HornetQServer;
-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.config.impl.FileConfiguration;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl;
 
 /**
  * Helper class to simplify bootstrap of HornetQ server.  Bootstraps from classpath-based config files.
@@ -46,7 +46,7 @@ public class EmbeddedHornetQ
    }
 
    /**
-    * Set the hornetq security manager.  This defaults to org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl
+    * Set the hornetq security manager.  This defaults to org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl
     *
     * @param securityManager
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
index 70105df..d840f72 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.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.server.group;
-
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.group.impl.GroupBinding;
-import org.apache.activemq6.core.server.group.impl.Proposal;
-import org.apache.activemq6.core.server.group.impl.Response;
-import org.apache.activemq6.core.server.management.NotificationListener;
+package org.apache.activemq.core.server.group;
+
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.group.impl.GroupBinding;
+import org.apache.activemq.core.server.group.impl.Proposal;
+import org.apache.activemq.core.server.group.impl.Response;
+import org.apache.activemq.core.server.management.NotificationListener;
 
 /**
  * @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/group/UnproposalListener.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java
index 0922934..5c7d06e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.group;
+package org.apache.activemq.core.server.group;
 
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * @author Clebert Suconic

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java
index 3272405..1d10874 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.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.server.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A group binding

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
index bd12de8..8dd9be9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
@@ -11,23 +11,23 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.Executor;
 
-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.postoffice.BindingType;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.group.GroupingHandler;
-import org.apache.activemq6.core.server.group.UnproposalListener;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.server.management.Notification;
-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.postoffice.BindingType;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.group.GroupingHandler;
+import org.apache.activemq.core.server.group.UnproposalListener;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * @author Clebert Suconic

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
index 1c0aab6..c1aae65 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.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.server.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
 import java.io.Serializable;
 
-import org.apache.activemq6.api.config.HornetQDefaultConfiguration;
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A remote Grouping handler configuration
@@ -26,9 +26,9 @@ public final class GroupingHandlerConfiguration implements Serializable
 {
    public static final long serialVersionUID = -4600283023652477326L;
 
-   public static final String GROUP_TIMEOUT_PROP_NAME = "org.apache.activemq6.GroupingHandlerConfiguration.groupTimeout";
+   public static final String GROUP_TIMEOUT_PROP_NAME = "org.apache.activemq.GroupingHandlerConfiguration.groupTimeout";
 
-   public static final String REAPER_PERIOD_PROP_NAME = "org.apache.activemq6.GroupingHandlerConfiguration.reaperPeriod";
+   public static final String REAPER_PERIOD_PROP_NAME = "org.apache.activemq.GroupingHandlerConfiguration.reaperPeriod";
 
    private SimpleString name = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
index 7c744f8..dcc2944 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.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.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,17 +24,17 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-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.persistence.OperationContext;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.BindingType;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.utils.ExecutorFactory;
-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.persistence.OperationContext;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.BindingType;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A Local Grouping handler. All the Remote handlers will talk with us

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
index ef32733..0b4ab14 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.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.server.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A proposal to select a group id

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
index d5ef299..bcd76a4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.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.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,17 +22,17 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-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.postoffice.BindingType;
-import org.apache.activemq6.core.server.HornetQMessageBundle;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.server.management.Notification;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.ExecutorFactory;
-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.postoffice.BindingType;
+import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.server.management.Notification;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A remote Grouping handler.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
index 5712531..2e77ecc 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.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.server.group.impl;
+package org.apache.activemq.core.server.group.impl;
 
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A response to a proposal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
index c2e8688..1dfebae 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.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.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.channels.FileLock;
 
-import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
 
 /**
  * This is using the HornetQ Libaio Native to perform calls to flock on a Linux system. At the

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
index 712110f..b69a5ab 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
@@ -10,25 +10,25 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.core.config.Configuration;
-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.protocol.core.Channel;
-import org.apache.activemq6.core.protocol.core.ChannelHandler;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.replication.ReplicationManager;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.NodeManager;
-import org.apache.activemq6.core.server.QueueFactory;
-import org.apache.activemq6.core.server.cluster.ha.HAManager;
-import org.apache.activemq6.core.server.cluster.ha.StandaloneHAManager;
-import org.apache.activemq6.core.server.group.GroupingHandler;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.core.config.Configuration;
+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.protocol.core.Channel;
+import org.apache.activemq.core.protocol.core.ChannelHandler;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.replication.ReplicationManager;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.core.server.QueueFactory;
+import org.apache.activemq.core.server.cluster.ha.HAManager;
+import org.apache.activemq.core.server.cluster.ha.StandaloneHAManager;
+import org.apache.activemq.core.server.group.GroupingHandler;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.spi.core.remoting.Acceptor;
 
 /**
 * An activation controls the lifecycle of the server and any components specific to the Activation itself.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
index 5f80eea..ec38067 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -21,12 +21,12 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq6.api.core.HornetQException;
-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.core.server.LiveNodeLocator;
-import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum;
+import org.apache.activemq.api.core.HornetQException;
+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.core.server.LiveNodeLocator;
+import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum;
 
 /**
  * This implementation looks for any available live node, once tried with no success it is marked as

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
index bad0bbf..c7be0db 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -21,12 +21,12 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq6.api.core.HornetQException;
-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.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.LiveNodeLocator;
+import org.apache.activemq.api.core.HornetQException;
+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.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.LiveNodeLocator;
 
 /**
  * This implementation looks for any available live node, once tried with no success it is marked as

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java
index 0b50da2..304ca3f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.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.server.impl;
+package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.journal.Journal;
-import org.apache.activemq6.core.paging.PagingManager;
-import org.apache.activemq6.core.persistence.GroupingInfo;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.NodeManager;
-import org.apache.activemq6.core.server.QueueFactory;
-import org.apache.activemq6.core.server.cluster.ClusterController;
-import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory;
-import org.apache.activemq6.core.server.group.GroupingHandler;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.transaction.ResourceManager;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.journal.Journal;
+import org.apache.activemq.core.paging.PagingManager;
+import org.apache.activemq.core.persistence.GroupingInfo;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.core.server.QueueFactory;
+import org.apache.activemq.core.server.cluster.ClusterController;
+import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory;
+import org.apache.activemq.core.server.group.GroupingHandler;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.transaction.ResourceManager;
 
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java
index 329f3aa..0cf8fa3 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.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.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.core.client.ClusterTopologyListener;
-import org.apache.activemq6.api.core.client.TopologyMember;
+import org.apache.activemq.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.api.core.client.TopologyMember;
 
 final class BackupTopologyListener implements ClusterTopologyListener
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java
index eed7007..73eebd4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.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.server.impl;
-
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.client.impl.Topology;
-import org.apache.activemq6.core.client.impl.TopologyMemberImpl;
-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.BackupRequestMessage;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.replication.ReplicationManager;
-import org.apache.activemq6.core.server.cluster.ha.ColocatedHAManager;
-import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy;
-import org.apache.activemq6.core.server.cluster.ha.HAManager;
-import org.apache.activemq6.core.server.cluster.qourum.QuorumVote;
-import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler;
-import org.apache.activemq6.core.server.cluster.qourum.Vote;
-import org.apache.activemq6.spi.core.remoting.Acceptor;
+package org.apache.activemq.core.server.impl;
+
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.client.impl.Topology;
+import org.apache.activemq.core.client.impl.TopologyMemberImpl;
+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.BackupRequestMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.replication.ReplicationManager;
+import org.apache.activemq.core.server.cluster.ha.ColocatedHAManager;
+import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy;
+import org.apache.activemq.core.server.cluster.ha.HAManager;
+import org.apache.activemq.core.server.cluster.qourum.QuorumVote;
+import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler;
+import org.apache.activemq.core.server.cluster.qourum.Vote;
+import org.apache.activemq.spi.core.remoting.Acceptor;
 
 import java.util.ArrayList;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
index 3e5e047..2119442 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.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.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -18,17 +18,17 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.ConnectorServiceConfiguration;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.ConnectorService;
-import org.apache.activemq6.core.server.ConnectorServiceFactory;
-import org.apache.activemq6.core.server.HornetQComponent;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.utils.ClassloadingUtil;
-import org.apache.activemq6.utils.ConfigurationHelper;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.utils.ClassloadingUtil;
+import org.apache.activemq.utils.ConfigurationHelper;
 
 /**
  * ConnectorsService will pool some resource for updates, e.g. Twitter, then the changes are picked

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
index 8a73273..92ab71f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
@@ -10,17 +10,17 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server.impl;
-
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.Divert;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.RoutingContext;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.cluster.Transformer;
+package org.apache.activemq.core.server.impl;
+
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.Divert;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.RoutingContext;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.cluster.Transformer;
 
 /**
  * A DivertImpl simply diverts a message to a different forwardAddress

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
index 6c8bf9d..cfa7f21 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
@@ -10,17 +10,17 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileLock;
 
-import org.apache.activemq6.api.core.HornetQIllegalStateException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.NodeManager;
-import org.apache.activemq6.utils.UUID;
+import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.utils.UUID;
 
 /**
  * @author <a href="mailto:andy.taylor@jboss.com">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/impl/HornetQServerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
index 51826f6..485bb2e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.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.impl;
+package org.apache.activemq.core.server.impl;
 
 import javax.management.MBeanServer;
 
@@ -37,102 +37,102 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq6.api.config.HornetQDefaultConfiguration;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq6.core.config.BridgeConfiguration;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.ConfigurationUtils;
-import org.apache.activemq6.core.config.CoreQueueConfiguration;
-import org.apache.activemq6.core.config.DivertConfiguration;
-import org.apache.activemq6.core.config.impl.ConfigurationImpl;
-import org.apache.activemq6.core.deployers.Deployer;
-import org.apache.activemq6.core.deployers.DeploymentManager;
-import org.apache.activemq6.core.deployers.impl.AddressSettingsDeployer;
-import org.apache.activemq6.core.deployers.impl.BasicUserCredentialsDeployer;
-import org.apache.activemq6.core.deployers.impl.FileDeploymentManager;
-import org.apache.activemq6.core.deployers.impl.QueueDeployer;
-import org.apache.activemq6.core.deployers.impl.SecurityDeployer;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.filter.impl.FilterImpl;
-import org.apache.activemq6.core.journal.IOCriticalErrorListener;
-import org.apache.activemq6.core.journal.JournalLoadInformation;
-import org.apache.activemq6.core.journal.SequentialFile;
-import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq6.core.journal.impl.SyncSpeedTest;
-import org.apache.activemq6.core.management.impl.HornetQServerControlImpl;
-import org.apache.activemq6.core.paging.PagingManager;
-import org.apache.activemq6.core.paging.cursor.PageSubscription;
-import org.apache.activemq6.core.paging.impl.PagingManagerImpl;
-import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO;
-import org.apache.activemq6.core.persistence.GroupingInfo;
-import org.apache.activemq6.core.persistence.OperationContext;
-import org.apache.activemq6.core.persistence.QueueBindingInfo;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.persistence.config.PersistedAddressSetting;
-import org.apache.activemq6.core.persistence.config.PersistedRoles;
-import org.apache.activemq6.core.persistence.impl.PageCountPending;
-import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq6.core.postoffice.Binding;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.postoffice.QueueBinding;
-import org.apache.activemq6.core.postoffice.impl.DivertBinding;
-import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl;
-import org.apache.activemq6.core.replication.ReplicationManager;
-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.security.impl.SecurityStoreImpl;
-import org.apache.activemq6.core.server.ActivateCallback;
-import org.apache.activemq6.core.server.Bindable;
-import org.apache.activemq6.core.server.Divert;
-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.JournalType;
-import org.apache.activemq6.core.server.LargeServerMessage;
-import org.apache.activemq6.core.server.MemoryManager;
-import org.apache.activemq6.core.server.NodeManager;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.QueueFactory;
-import org.apache.activemq6.core.server.ServerSession;
-import org.apache.activemq6.core.server.ServerSessionFactory;
-import org.apache.activemq6.core.server.cluster.BackupManager;
-import org.apache.activemq6.core.server.cluster.ClusterManager;
-import org.apache.activemq6.core.server.cluster.Transformer;
-import org.apache.activemq6.core.server.cluster.ha.HAPolicy;
-import org.apache.activemq6.core.server.group.GroupingHandler;
-import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq6.core.server.group.impl.LocalGroupingHandler;
-import org.apache.activemq6.core.server.group.impl.RemoteGroupingHandler;
-import org.apache.activemq6.core.server.management.ManagementService;
-import org.apache.activemq6.core.server.management.impl.ManagementServiceImpl;
-import org.apache.activemq6.core.settings.HierarchicalRepository;
-import org.apache.activemq6.core.settings.impl.AddressSettings;
-import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository;
-import org.apache.activemq6.core.transaction.ResourceManager;
-import org.apache.activemq6.core.transaction.impl.ResourceManagerImpl;
-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.ClassloadingUtil;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.ExecutorFactory;
-import org.apache.activemq6.utils.HornetQThreadFactory;
-import org.apache.activemq6.utils.OrderedExecutorFactory;
-import org.apache.activemq6.utils.ReusableLatch;
-import org.apache.activemq6.utils.SecurityFormatter;
-import org.apache.activemq6.utils.VersionLoader;
+import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.core.config.BridgeConfiguration;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.ConfigurationUtils;
+import org.apache.activemq.core.config.CoreQueueConfiguration;
+import org.apache.activemq.core.config.DivertConfiguration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.core.deployers.Deployer;
+import org.apache.activemq.core.deployers.DeploymentManager;
+import org.apache.activemq.core.deployers.impl.AddressSettingsDeployer;
+import org.apache.activemq.core.deployers.impl.BasicUserCredentialsDeployer;
+import org.apache.activemq.core.deployers.impl.FileDeploymentManager;
+import org.apache.activemq.core.deployers.impl.QueueDeployer;
+import org.apache.activemq.core.deployers.impl.SecurityDeployer;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.filter.impl.FilterImpl;
+import org.apache.activemq.core.journal.IOCriticalErrorListener;
+import org.apache.activemq.core.journal.JournalLoadInformation;
+import org.apache.activemq.core.journal.SequentialFile;
+import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.core.journal.impl.SyncSpeedTest;
+import org.apache.activemq.core.management.impl.HornetQServerControlImpl;
+import org.apache.activemq.core.paging.PagingManager;
+import org.apache.activemq.core.paging.cursor.PageSubscription;
+import org.apache.activemq.core.paging.impl.PagingManagerImpl;
+import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO;
+import org.apache.activemq.core.persistence.GroupingInfo;
+import org.apache.activemq.core.persistence.OperationContext;
+import org.apache.activemq.core.persistence.QueueBindingInfo;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.persistence.config.PersistedAddressSetting;
+import org.apache.activemq.core.persistence.config.PersistedRoles;
+import org.apache.activemq.core.persistence.impl.PageCountPending;
+import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.core.postoffice.Binding;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.postoffice.QueueBinding;
+import org.apache.activemq.core.postoffice.impl.DivertBinding;
+import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl;
+import org.apache.activemq.core.replication.ReplicationManager;
+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.security.impl.SecurityStoreImpl;
+import org.apache.activemq.core.server.ActivateCallback;
+import org.apache.activemq.core.server.Bindable;
+import org.apache.activemq.core.server.Divert;
+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.JournalType;
+import org.apache.activemq.core.server.LargeServerMessage;
+import org.apache.activemq.core.server.MemoryManager;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.QueueFactory;
+import org.apache.activemq.core.server.ServerSession;
+import org.apache.activemq.core.server.ServerSessionFactory;
+import org.apache.activemq.core.server.cluster.BackupManager;
+import org.apache.activemq.core.server.cluster.ClusterManager;
+import org.apache.activemq.core.server.cluster.Transformer;
+import org.apache.activemq.core.server.cluster.ha.HAPolicy;
+import org.apache.activemq.core.server.group.GroupingHandler;
+import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.core.server.group.impl.LocalGroupingHandler;
+import org.apache.activemq.core.server.group.impl.RemoteGroupingHandler;
+import org.apache.activemq.core.server.management.ManagementService;
+import org.apache.activemq.core.server.management.impl.ManagementServiceImpl;
+import org.apache.activemq.core.settings.HierarchicalRepository;
+import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository;
+import org.apache.activemq.core.transaction.ResourceManager;
+import org.apache.activemq.core.transaction.impl.ResourceManagerImpl;
+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.ClassloadingUtil;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.utils.HornetQThreadFactory;
+import org.apache.activemq.utils.OrderedExecutorFactory;
+import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.utils.SecurityFormatter;
+import org.apache.activemq.utils.VersionLoader;
 
 /**
  * The HornetQ server implementation

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
index 5c93e53..0e7ef7b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
@@ -10,25 +10,25 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
-import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.LIVE;
-import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.FAILING_BACK;
-import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.NOT_STARTED;
-import static org.apache.activemq6.core.server.impl.InVMNodeManager.State.PAUSED;
+import static org.apache.activemq.core.server.impl.InVMNodeManager.State.LIVE;
+import static org.apache.activemq.core.server.impl.InVMNodeManager.State.FAILING_BACK;
+import static org.apache.activemq.core.server.impl.InVMNodeManager.State.NOT_STARTED;
+import static org.apache.activemq.core.server.impl.InVMNodeManager.State.PAUSED;
 
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 
-import org.apache.activemq6.api.core.HornetQIllegalStateException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.server.NodeManager;
-import org.apache.activemq6.utils.UUIDGenerator;
+import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
  * NodeManager used to run multiple servers in the same VM.
  * <p/>
- * We use the {@link org.apache.activemq6.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq6.core.server.impl.FileLockNodeManager} when
+ * We use the {@link org.apache.activemq.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq.core.server.impl.FileLockNodeManager} when
  * multiple servers are run inside the same VM and File Locks can not be shared in the
  * same VM (it would cause a shared lock violation).
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java
index 39329b4..3276dd5 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.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.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import javax.transaction.xa.Xid;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.journal.Journal;
-import org.apache.activemq6.core.persistence.GroupingInfo;
-import org.apache.activemq6.core.persistence.QueueBindingInfo;
-import org.apache.activemq6.core.persistence.impl.PageCountPending;
-import org.apache.activemq6.core.persistence.impl.journal.AddMessageRecord;
-import org.apache.activemq6.core.server.MessageReference;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.transaction.ResourceManager;
-import org.apache.activemq6.core.transaction.Transaction;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.journal.Journal;
+import org.apache.activemq.core.persistence.GroupingInfo;
+import org.apache.activemq.core.persistence.QueueBindingInfo;
+import org.apache.activemq.core.persistence.impl.PageCountPending;
+import org.apache.activemq.core.persistence.impl.journal.AddMessageRecord;
+import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.transaction.ResourceManager;
+import org.apache.activemq.core.transaction.Transaction;
 
 public interface JournalLoader
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
index 63e875f..86b7737 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
@@ -10,29 +10,29 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.server.impl;
+package org.apache.activemq.core.server.impl;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.filter.Filter;
-import org.apache.activemq6.core.paging.cursor.PageSubscription;
-import org.apache.activemq6.core.persistence.StorageManager;
-import org.apache.activemq6.core.postoffice.PostOffice;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.MessageReference;
-import org.apache.activemq6.core.server.Queue;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.settings.HierarchicalRepository;
-import org.apache.activemq6.core.settings.impl.AddressSettings;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.filter.Filter;
+import org.apache.activemq.core.paging.cursor.PageSubscription;
+import org.apache.activemq.core.persistence.StorageManager;
+import org.apache.activemq.core.postoffice.PostOffice;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.core.server.Queue;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.settings.HierarchicalRepository;
+import org.apache.activemq.core.settings.impl.AddressSettings;
 
 /**
  * A queue that will discard messages if a newer message with the same
- * {@link org.apache.activemq6.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last
+ * {@link org.apache.activemq.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last
  * value
  * <p>
  * This is useful for example, for stock prices, where you're only interested in the latest value
@@ -275,7 +275,7 @@ public class LastValueQueue extends QueueImpl
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq6.core.server.MessageReference#acknowledge(org.apache.activemq6.core.server.MessageReference)
+       * @see org.apache.activemq.core.server.MessageReference#acknowledge(org.apache.activemq.core.server.MessageReference)
        */
       @Override
       public void acknowledge() throws Exception
@@ -284,7 +284,7 @@ public class LastValueQueue extends QueueImpl
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq6.core.server.MessageReference#getMessageMemoryEstimate()
+       * @see org.apache.activemq.core.server.MessageReference#getMessageMemoryEstimate()
        */
       public int getMessageMemoryEstimate()
       {
@@ -292,7 +292,7 @@ public class LastValueQueue extends QueueImpl
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq6.core.server.MessageReference#setConsumerId(java.lang.Long)
+       * @see org.apache.activemq.core.server.MessageReference#setConsumerId(java.lang.Long)
        */
       @Override
       public void setConsumerId(Long consumerID)
@@ -301,7 +301,7 @@ public class LastValueQueue extends QueueImpl
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq6.core.server.MessageReference#getConsumerId()
+       * @see org.apache.activemq.core.server.MessageReference#getConsumerId()
        */
       @Override
       public Long getConsumerId()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java
index ed9cfb9..80ca44c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.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.impl;
+package org.apache.activemq.core.server.impl;
 
 public abstract class LiveActivation extends Activation
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java
index 1f14b2f..c79fd31 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.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.server.impl;
-
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq6.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq6.core.postoffice.DuplicateIDCache;
-import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq6.core.remoting.server.RemotingService;
-import org.apache.activemq6.core.server.HornetQServerLogger;
-import org.apache.activemq6.core.server.LiveNodeLocator;
-import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory;
-import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy;
-import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy;
+package org.apache.activemq.core.server.impl;
+
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.core.postoffice.DuplicateIDCache;
+import org.apache.activemq.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.core.remoting.server.RemotingService;
+import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.LiveNodeLocator;
+import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory;
+import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy;
+import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy;
 
 import java.util.HashMap;
 import java.util.List;


Mime
View raw message