activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [06/20] activemq-6 git commit: ACTIVEMQ6-3 Renaming Exception classes and fixing native compilation
Date Tue, 18 Nov 2014 09:24:08 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java
index 20dc50a..5828bdf 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java
@@ -18,7 +18,7 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.utils.UUID;
 import org.apache.activemq.utils.UUIDGenerator;
@@ -83,7 +83,7 @@ public abstract class NodeManager implements HornetQComponent
       }
    }
 
-   public abstract SimpleString readNodeId() throws HornetQIllegalStateException, IOException;
+   public abstract SimpleString readNodeId() throws ActiveMQIllegalStateException, IOException;
 
    public UUID getUUID()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java
index ed1d004..ccd4805 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java
@@ -14,7 +14,7 @@
 package org.apache.activemq.core.server.cluster;
 
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
@@ -67,9 +67,9 @@ public class ClusterControl implements AutoCloseable
     * authorise this cluster control so it can communicate with the cluster, it will set the cluster channel on a successful
     * authentication.
     *
-    * @throws HornetQException if authorisation wasn't successful.
+    * @throws org.apache.activemq.api.core.ActiveMQException if authorisation wasn't successful.
     */
-   public void authorize() throws HornetQException
+   public void authorize() throws ActiveMQException
    {
       CoreRemotingConnection connection = (CoreRemotingConnection)sessionFactory.getConnection();
 
@@ -90,16 +90,16 @@ public class ClusterControl implements AutoCloseable
     * @param attemptingFailBack if {@code true} then this server wants to trigger a fail-back when
     *                           up-to-date, that is it wants to take over the role of 'live' from the current 'live'
     *                           server.
-    * @throws org.apache.activemq.api.core.HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   public void announceReplicatingBackupToLive(final boolean attemptingFailBack, String replicationClusterName) throws HornetQException
+   public void announceReplicatingBackupToLive(final boolean attemptingFailBack, String replicationClusterName) throws ActiveMQException
    {
 
       ClusterConnectionConfiguration config = ConfigurationUtils.getReplicationClusterConfiguration(server.getConfiguration(), replicationClusterName);
       if (config == null)
       {
          HornetQServerLogger.LOGGER.announceBackupNoClusterConnections();
-         throw new HornetQException("lacking cluster connection");
+         throw new ActiveMQException("lacking cluster connection");
 
       }
       TransportConfiguration connector = server.getConfiguration().getConnectorConfigurations().get(config.getConnectorName());
@@ -107,7 +107,7 @@ public class ClusterControl implements AutoCloseable
       if (connector == null)
       {
          HornetQServerLogger.LOGGER.announceBackupNoConnector(config.getConnectorName());
-         throw new HornetQException("lacking cluster connection");
+         throw new ActiveMQException("lacking cluster connection");
       }
 
       clusterChannel.send(new BackupRegistrationMessage(connector, clusterUser, clusterPassword, attemptingFailBack));
@@ -174,7 +174,7 @@ public class ClusterControl implements AutoCloseable
          replyMessage.decodeRest(voteHandler);
          return replyMessage.getVote();
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          return null;
       }
@@ -193,7 +193,7 @@ public class ClusterControl implements AutoCloseable
       {
          packet = (BackupResponseMessage) clusterChannel.sendBlocking(backupRequestMessage, PacketImpl.BACKUP_REQUEST_RESPONSE);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          return false;
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java
index 39accdc..3836788 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java
@@ -20,8 +20,8 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.HornetQException;
 import org.apache.activemq.api.core.Interceptor;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
@@ -444,7 +444,7 @@ public class ClusterController implements HornetQComponent
                replicationClusterConnectedLatch.countDown();
             }
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             if (!started)
                return;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java
index 150701b..3ecdbaa 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java
@@ -24,10 +24,10 @@ import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.api.core.BroadcastGroupConfiguration;
 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.Interceptor;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -591,13 +591,13 @@ public final class ClusterManager implements HornetQComponent
       }
 
       @Override
-      public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+      public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
       {
          if (packet.getType() == PacketImpl.EXCEPTION)
          {
             HornetQExceptionMessage msg = (HornetQExceptionMessage) packet;
-            final HornetQException exception = msg.getException();
-            if (exception.getType() == HornetQExceptionType.CLUSTER_SECURITY_EXCEPTION)
+            final ActiveMQException exception = msg.getException();
+            if (exception.getType() == ActiveMQExceptionType.CLUSTER_SECURITY_EXCEPTION)
             {
                HornetQServerLogger.LOGGER.clusterManagerAuthenticationError(exception.getMessage());
                executor.execute(new Runnable()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java
index b186a7f..dfb6f57 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java
@@ -12,8 +12,8 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.HornetQException;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.HornetQClient;
 import org.apache.activemq.core.client.impl.ServerLocatorInternal;
@@ -110,7 +110,7 @@ public class ScaleDownPolicy
       this.enabled = enabled;
    }
 
-   public static ServerLocatorInternal getScaleDownConnector(ScaleDownPolicy scaleDownPolicy, HornetQServer hornetQServer) throws HornetQException
+   public static ServerLocatorInternal getScaleDownConnector(ScaleDownPolicy scaleDownPolicy, HornetQServer hornetQServer) throws ActiveMQException
    {
       if (!scaleDownPolicy.getConnectors().isEmpty())
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java
index be427be..93af434 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -619,12 +619,12 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
       // no op
    }
 
-   public void connectionFailed(final HornetQException me, boolean failedOver)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver)
    {
       connectionFailed(me, failedOver, null);
    }
 
-   public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
    {
       HornetQServerLogger.LOGGER.bridgeConnectionFailed(me, failedOver);
 
@@ -689,12 +689,12 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
       tryScheduleRetryReconnect(me.getType());
    }
 
-   protected void tryScheduleRetryReconnect(final HornetQExceptionType type)
+   protected void tryScheduleRetryReconnect(final ActiveMQExceptionType type)
    {
       scheduleRetryConnect();
    }
 
-   public void beforeReconnect(final HornetQException exception)
+   public void beforeReconnect(final ActiveMQException exception)
    {
       // log.warn(name + "::Connection failed before reconnect ", exception);
       // fail(false);
@@ -722,7 +722,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
                   queue.deliverAsync();
                }
             }
-            catch (final HornetQException e)
+            catch (final ActiveMQException e)
             {
                unsetLargeMessageDelivery();
                HornetQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
@@ -754,7 +754,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
       {
          producer.send(dest, message);
       }
-      catch (final HornetQException e)
+      catch (final ActiveMQException e)
       {
          HornetQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
 
@@ -996,10 +996,10 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
             keepConnecting = false;
             return;
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             // the session was created while its server was starting, retry it:
-            if (e.getType() == HornetQExceptionType.SESSION_CREATION_REJECTED)
+            if (e.getType() == ActiveMQExceptionType.SESSION_CREATION_REJECTED)
             {
                HornetQServerLogger.LOGGER.errorStartingBridge(name);
 
@@ -1185,7 +1185,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
                   session.close();
                   session = null;
                }
-               catch (HornetQException dontcare)
+               catch (ActiveMQException dontcare)
                {
                }
             }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java
index 639f8b2..33e8fae 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java
@@ -18,10 +18,10 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
 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.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.management.CoreNotificationType;
@@ -197,7 +197,7 @@ public class BroadcastGroupImpl implements BroadcastGroup, Runnable
 
    public synchronized void broadcastConnectors() throws Exception
    {
-      HornetQBuffer buff = HornetQBuffers.dynamicBuffer(4096);
+      ActiveMQBuffer buff = ActiveMQBuffers.dynamicBuffer(4096);
 
       buff.writeString(nodeManager.getNodeId().toString());
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java
index 9dc8503..9d43f58 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -19,8 +19,8 @@ import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientConsumer;
@@ -233,7 +233,7 @@ public class ClusterConnectionBridge extends BridgeImpl
 
                notifConsumer = null;
             }
-            catch (HornetQException e)
+            catch (ActiveMQException e)
             {
                HornetQServerLogger.LOGGER.errorClosingConsumer(e);
             }
@@ -384,7 +384,7 @@ public class ClusterConnectionBridge extends BridgeImpl
    }
 
    @Override
-   protected void tryScheduleRetryReconnect(final HornetQExceptionType type)
+   protected void tryScheduleRetryReconnect(final ActiveMQExceptionType type)
    {
       scheduleRetryConnect();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java
index 4dc8b00..eb13e7e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -25,8 +25,8 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-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;
@@ -526,7 +526,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
                                             false,
                                             localMember.getLive(), localMember.getBackup());
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             HornetQServerLogger.LOGGER.clusterControlAuthfailure();
          }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 f76cfe4..6d6aff0 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
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 
 import java.util.Map;
 
@@ -46,13 +46,13 @@ public final class BooleanVote extends Vote<Boolean>
    }
 
    @Override
-   public void encode(HornetQBuffer buff)
+   public void encode(ActiveMQBuffer buff)
    {
       buff.writeBoolean(vote);
    }
 
    @Override
-   public void decode(HornetQBuffer buff)
+   public void decode(ActiveMQBuffer buff)
    {
       vote = buff.readBoolean();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 9158d63..c10e621 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
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.SimpleString;
 
 /**
@@ -33,5 +33,5 @@ public interface QuorumVoteHandler
     */
    SimpleString getQuorumName();
 
-   Vote decode(HornetQBuffer voteBuffer);
+   Vote decode(ActiveMQBuffer voteBuffer);
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 38fcffd..2285b5a 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
@@ -17,8 +17,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
 import org.apache.activemq.core.client.impl.Topology;
 import org.apache.activemq.core.persistence.StorageManager;
@@ -105,9 +105,9 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
                sessionFactory.connect(RECONNECT_ATTEMPTS, false);
                return;
             }
-            catch (HornetQException e)
+            catch (ActiveMQException e)
             {
-               if (e.getType() != HornetQExceptionType.NOT_CONNECTED)
+               if (e.getType() != ActiveMQExceptionType.NOT_CONNECTED)
                   HornetQServerLogger.LOGGER.errorReConnecting(e);
             }
          }
@@ -157,13 +157,13 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
     * if the connection to our replicated live goes down then decide on an action
     */
    @Override
-   public void connectionFailed(HornetQException exception, boolean failedOver)
+   public void connectionFailed(ActiveMQException exception, boolean failedOver)
    {
       decideOnAction(sessionFactory.getServerLocator().getTopology());
    }
 
    @Override
-   public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
    {
       connectionFailed(me, failedOver);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 f781ec6..a4e847d 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
@@ -13,7 +13,7 @@
 
 package org.apache.activemq.core.server.cluster.qourum;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,9 +31,9 @@ public abstract class Vote<T>
    }
 
 
-   public abstract void encode(final HornetQBuffer buff);
+   public abstract void encode(final ActiveMQBuffer buff);
 
-   public abstract void decode(final HornetQBuffer buff);
+   public abstract void decode(final ActiveMQBuffer buff);
    //whether or note we should ask the target server for an answer or decide ourselves, for instance if we couldn't
    //connect to the node in the first place.
    public abstract boolean isRequestServerVote();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 b69a5ab..4d1e874 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
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.paging.PagingManager;
 import org.apache.activemq.core.persistence.StorageManager;
@@ -96,7 +96,7 @@ public abstract class Activation implements Runnable
    /*
    * create the Journal loader needed for this Activation.
    * */
-   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws HornetQException
+   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws ActiveMQException
    {
       return new PostOfficeJournalLoader(postOffice,
             pagingManager,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 ec38067..1d0bb82 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
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -51,13 +51,13 @@ public class AnyLiveNodeLocatorForReplication extends LiveNodeLocator
    }
 
    @Override
-   public void locateNode() throws HornetQException
+   public void locateNode() throws ActiveMQException
    {
       locateNode(-1L);
    }
 
    @Override
-   public void locateNode(long timeout) throws HornetQException
+   public void locateNode(long timeout) throws ActiveMQException
    {
       //first time
       try

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 c7be0db..d2d463b 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
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -52,13 +52,13 @@ public class AnyLiveNodeLocatorForScaleDown extends LiveNodeLocator
    }
 
    @Override
-   public void locateNode() throws HornetQException
+   public void locateNode() throws ActiveMQException
    {
       locateNode(-1L);
    }
 
    @Override
-   public void locateNode(long timeout) throws HornetQException
+   public void locateNode(long timeout) throws ActiveMQException
    {
       try
       {
@@ -71,7 +71,7 @@ public class AnyLiveNodeLocatorForScaleDown extends LiveNodeLocator
                {
                   if (!condition.await(timeout, TimeUnit.MILLISECONDS))
                   {
-                     throw new HornetQException("Timeout elapsed while waiting for cluster node");
+                     throw new ActiveMQException("Timeout elapsed while waiting for cluster node");
                   }
                }
                else

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 73eebd4..cfc9169 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
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.client.impl.Topology;
@@ -174,7 +174,7 @@ public class ColocatedActivation extends LiveActivation
       }
 
       @Override
-      public Vote decode(HornetQBuffer voteBuffer)
+      public Vote decode(ActiveMQBuffer voteBuffer)
       {
          RequestBackupVote requestBackupVote = new RequestBackupVote();
          requestBackupVote.decode(voteBuffer);
@@ -301,7 +301,7 @@ public class ColocatedActivation extends LiveActivation
       }
 
       @Override
-      public void encode(HornetQBuffer buff)
+      public void encode(ActiveMQBuffer buff)
       {
          buff.writeInt(backupsSize);
          buff.writeNullableString(nodeID);
@@ -309,7 +309,7 @@ public class ColocatedActivation extends LiveActivation
       }
 
       @Override
-      public void decode(HornetQBuffer buff)
+      public void decode(ActiveMQBuffer buff)
       {
          backupsSize = buff.readInt();
          nodeID = buff.readNullableString();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 cfa7f21..0a18b1a 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
@@ -16,7 +16,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileLock;
 
-import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.server.HornetQServerLogger;
 import org.apache.activemq.core.server.NodeManager;
@@ -257,13 +257,13 @@ public class FileLockNodeManager extends NodeManager
    }
 
    @Override
-   public final SimpleString readNodeId() throws HornetQIllegalStateException, IOException
+   public final SimpleString readNodeId() throws ActiveMQIllegalStateException, IOException
    {
       ByteBuffer id = ByteBuffer.allocateDirect(16);
       int read = channel.read(id, 3);
       if (read != 16)
       {
-         throw new HornetQIllegalStateException("live server did not write id to file");
+         throw new ActiveMQIllegalStateException("live server did not write id to file");
       }
       byte[] bytes = new byte[16];
       id.position(0);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 0e7ef7b..a65f1d5 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
@@ -20,7 +20,7 @@ import static org.apache.activemq.core.server.impl.InVMNodeManager.State.PAUSED;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 
-import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.server.NodeManager;
 import org.apache.activemq.utils.UUIDGenerator;
@@ -157,7 +157,7 @@ public final class InVMNodeManager extends NodeManager
    }
 
    @Override
-   public SimpleString readNodeId() throws HornetQIllegalStateException, IOException
+   public SimpleString readNodeId() throws ActiveMQIllegalStateException, IOException
    {
       return getNodeId();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 c79fd31..a352f7c 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
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -168,7 +168,7 @@ public class LiveOnlyActivation extends Activation
          }
          else
          {
-            throw new HornetQException("Unable to connect to server for scale-down");
+            throw new ActiveMQException("Unable to connect to server for scale-down");
          }
       }
       catch (Exception e)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
index 16683d8..67eb291 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
@@ -18,7 +18,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -47,13 +47,13 @@ public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator
    }
 
    @Override
-   public void locateNode() throws HornetQException
+   public void locateNode() throws ActiveMQException
    {
       locateNode(-1L);
    }
 
    @Override
-   public void locateNode(long timeout) throws HornetQException
+   public void locateNode(long timeout) throws ActiveMQException
    {
       try
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
index 7e67be9..bd963a6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -54,13 +54,13 @@ public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator
    }
 
    @Override
-   public void locateNode() throws HornetQException
+   public void locateNode() throws ActiveMQException
    {
       locateNode(-1L);
    }
 
    @Override
-   public void locateNode(long timeout) throws HornetQException
+   public void locateNode(long timeout) throws ActiveMQException
    {
       try
       {
@@ -73,7 +73,7 @@ public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator
                {
                   if (!condition.await(timeout, TimeUnit.MILLISECONDS))
                   {
-                     throw new HornetQException("Timeout elapsed while waiting for cluster node");
+                     throw new ActiveMQException("Timeout elapsed while waiting for cluster node");
                   }
                }
                else

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java
index efe73ed..c109574 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java
@@ -13,7 +13,7 @@
 package org.apache.activemq.core.server.impl;
 
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -33,13 +33,13 @@ public class NamedNodeIdNodeLocator extends LiveNodeLocator
 
 
    @Override
-   public void locateNode(long timeout) throws HornetQException
+   public void locateNode(long timeout) throws ActiveMQException
    {
       //noop
    }
 
    @Override
-   public void locateNode() throws HornetQException
+   public void locateNode() throws ActiveMQException
    {
       //noop
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java
index ab41397..eedcdf0 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQInternalErrorException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
 import org.apache.activemq.api.core.Interceptor;
 import org.apache.activemq.core.protocol.core.Packet;
 import org.apache.activemq.core.protocol.core.impl.PacketImpl;
@@ -45,7 +45,7 @@ final class ReplicationError implements Interceptor
    }
 
    @Override
-   public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+   public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
    {
       if (packet.getType() != PacketImpl.BACKUP_REGISTRATION_FAILED)
          return true;
@@ -68,7 +68,7 @@ final class ReplicationError implements Interceptor
       return false;
    }
 
-   private void failed() throws HornetQInternalErrorException
+   private void failed() throws ActiveMQInternalErrorException
    {
       HornetQServerLogger.LOGGER.errorRegisteringBackup();
       nodeLocator.notifyRegistrationFailed(false);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
index a68533a..16ba908 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
@@ -23,10 +23,10 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-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.HornetQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.management.CoreNotificationType;
 import org.apache.activemq.api.core.management.ManagementHelper;
@@ -781,7 +781,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener
             tx.commit();
          }
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          if (startedTransaction)
          {
@@ -796,7 +796,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener
       catch (Throwable e)
       {
          HornetQServerLogger.LOGGER.errorAckingMessage((Exception) e);
-         HornetQException hqex = new HornetQIllegalStateException(e.getMessage());
+         ActiveMQException hqex = new ActiveMQIllegalStateException(e.getMessage());
          if (startedTransaction)
          {
             tx.rollback();
@@ -1122,7 +1122,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener
 
                localChunkLen = (int) Math.min(sizePendingLargeMessage - positionPendingLargeMessage, minLargeMessageSize);
 
-               HornetQBuffer bodyBuffer = HornetQBuffers.fixedBuffer(localChunkLen);
+               ActiveMQBuffer bodyBuffer = ActiveMQBuffers.fixedBuffer(localChunkLen);
 
                context.encode(bodyBuffer, localChunkLen);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
index 44871cb..29d1b2d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
@@ -38,8 +38,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQNonExistentQueueException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
@@ -625,7 +625,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
             {
                server.destroyQueue(bindingName, null, false);
             }
-            catch (HornetQException e)
+            catch (ActiveMQException e)
             {
                // that's fine.. it can happen due to queue already been deleted
                HornetQServerLogger.LOGGER.debug(e.getMessage(), e);
@@ -637,13 +637,13 @@ public class ServerSessionImpl implements ServerSession, FailureListener
          }
       }
 
-      public void connectionFailed(HornetQException exception, boolean failedOver)
+      public void connectionFailed(ActiveMQException exception, boolean failedOver)
       {
          run();
       }
 
       @Override
-      public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+      public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
       {
          connectionFailed(me, failedOver);
       }
@@ -667,7 +667,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
 
       if (binding == null || binding.getType() != BindingType.LOCAL_QUEUE)
       {
-         throw new HornetQNonExistentQueueException();
+         throw new ActiveMQNonExistentQueueException();
       }
 
       server.destroyQueue(queueToDelete, this, true);
@@ -1224,7 +1224,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
       {
 
          tx = newTransaction(xid);
-         tx.markAsRollbackOnly(new HornetQException("Can't commit as a Failover happened during the operation"));
+         tx.markAsRollbackOnly(new ActiveMQException("Can't commit as a Failover happened during the operation"));
 
          if (isTrace)
          {
@@ -1682,7 +1682,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
    // --------------------------------------------------------------------
 
    @Override
-   public void connectionFailed(final HornetQException me, boolean failedOver)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver)
    {
       try
       {
@@ -1699,7 +1699,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
    }
 
    @Override
-   public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
    {
       connectionFailed(me, failedOver);
    }
@@ -1738,7 +1738,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
       {
          securityStore.check(message.getAddress(), CheckType.MANAGE, this);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          if (!autoCommitSends)
          {
@@ -1822,7 +1822,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener
       {
          securityStore.check(msg.getAddress(), CheckType.SEND, this);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          if (!autoCommitSends && tx != null)
          {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java
index f84aa61..682d183 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java
@@ -12,8 +12,8 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQInternalErrorException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.TopologyMember;
@@ -331,7 +331,7 @@ public final class SharedNothingBackupActivation extends Activation
    }
 
    @Override
-   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws HornetQException
+   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws ActiveMQException
    {
       if (replicaPolicy.getScaleDownPolicy() != null)
       {
@@ -425,15 +425,15 @@ public final class SharedNothingBackupActivation extends Activation
    }
 
    /**
-    * @throws org.apache.activemq.api.core.HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   public void remoteFailOver(ReplicationLiveIsStoppingMessage.LiveStopping finalMessage) throws HornetQException
+   public void remoteFailOver(ReplicationLiveIsStoppingMessage.LiveStopping finalMessage) throws ActiveMQException
    {
       HornetQServerLogger.LOGGER.trace("Remote fail-over, got message=" + finalMessage + ", backupUpToDate=" +
             backupUpToDate);
       if (!hornetQServer.getHAPolicy().isBackup() || hornetQServer.getHAPolicy().isSharedStore())
       {
-         throw new HornetQInternalErrorException();
+         throw new ActiveMQInternalErrorException();
       }
 
       if (!backupUpToDate)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java
index 8621912..7bad256 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java
@@ -12,10 +12,10 @@
  */
 package org.apache.activemq.core.server.impl;
 
+import org.apache.activemq.api.core.ActiveMQAlreadyReplicatingException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.HornetQAlreadyReplicatingException;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQIllegalStateException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -131,11 +131,11 @@ public class SharedNothingLiveActivation extends LiveActivation
                   startReplication(channel.getConnection(), clusterConnection, getPair(msg.getConnector(), true),
                         msg.isFailBackRequest());
                }
-               catch (HornetQAlreadyReplicatingException are)
+               catch (ActiveMQAlreadyReplicatingException are)
                {
                   channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.ALREADY_REPLICATING));
                }
-               catch (HornetQException e)
+               catch (ActiveMQException e)
                {
                   channel.send(new BackupReplicationStartFailedMessage(BackupReplicationStartFailedMessage.BackupRegistrationProblem.EXCEPTION));
                }
@@ -145,16 +145,16 @@ public class SharedNothingLiveActivation extends LiveActivation
    }
 
    public void startReplication(CoreRemotingConnection rc, final ClusterConnection clusterConnection,
-                                final Pair<TransportConfiguration, TransportConfiguration> pair, final boolean isFailBackRequest) throws HornetQException
+                                final Pair<TransportConfiguration, TransportConfiguration> pair, final boolean isFailBackRequest) throws ActiveMQException
    {
       if (replicationManager != null)
       {
-         throw new HornetQAlreadyReplicatingException();
+         throw new ActiveMQAlreadyReplicatingException();
       }
 
       if (!hornetQServer.isStarted())
       {
-         throw new HornetQIllegalStateException();
+         throw new ActiveMQIllegalStateException();
       }
 
       synchronized (replicationLock)
@@ -162,7 +162,7 @@ public class SharedNothingLiveActivation extends LiveActivation
 
          if (replicationManager != null)
          {
-            throw new HornetQAlreadyReplicatingException();
+            throw new ActiveMQAlreadyReplicatingException();
          }
          ReplicationFailureListener listener = new ReplicationFailureListener();
          rc.addCloseListener(listener);
@@ -256,13 +256,13 @@ public class SharedNothingLiveActivation extends LiveActivation
    {
 
       @Override
-      public void connectionFailed(HornetQException exception, boolean failedOver)
+      public void connectionFailed(ActiveMQException exception, boolean failedOver)
       {
          connectionClosed();
       }
 
       @Override
-      public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+      public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
       {
          connectionFailed(me, failedOver);
       }
@@ -313,7 +313,7 @@ public class SharedNothingLiveActivation extends LiveActivation
       {
          nodeId0 = hornetQServer.getNodeManager().readNodeId();
       }
-      catch (HornetQIllegalStateException e)
+      catch (ActiveMQIllegalStateException e)
       {
          nodeId0 = null;
       }
@@ -405,7 +405,7 @@ public class SharedNothingLiveActivation extends LiveActivation
       }
    }
 
-   private ServerLocatorInternal getLocator(ClusterConnectionConfiguration config) throws HornetQException
+   private ServerLocatorInternal getLocator(ClusterConnectionConfiguration config) throws ActiveMQException
    {
       ServerLocatorInternal locator;
       if (config.getDiscoveryGroupName() != null)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java
index 02b4f68..8c902cd 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.paging.PagingManager;
 import org.apache.activemq.core.persistence.StorageManager;
@@ -186,7 +186,7 @@ public final class SharedStoreBackupActivation extends Activation
    }
 
    @Override
-   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws HornetQException
+   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws ActiveMQException
    {
       if (sharedStoreSlavePolicy.getScaleDownPolicy() != null)
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
index 7c1d7db..3cf3566 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.impl;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.server.HornetQServer;
 import org.apache.activemq.core.server.HornetQServerLogger;
@@ -44,7 +44,7 @@ public class TransientQueueManagerImpl implements TransientQueueManager
             {
                server.destroyQueue(queueName, null, false);
             }
-            catch (HornetQException e)
+            catch (ActiveMQException e)
             {
                HornetQServerLogger.LOGGER.warn("Error on deleting queue " + queueName + ", " + e.getMessage(), e);
             }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
index a88b209..315b116 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
@@ -14,7 +14,7 @@ package org.apache.activemq.core.settings.impl;
 
 import java.io.Serializable;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.settings.Mergeable;
@@ -397,7 +397,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
    }
 
    @Override
-   public void decode(HornetQBuffer buffer)
+   public void decode(ActiveMQBuffer buffer)
    {
       SimpleString policyStr = buffer.readNullableSimpleString();
 
@@ -482,7 +482,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
    }
 
    @Override
-   public void encode(HornetQBuffer buffer)
+   public void encode(ActiveMQBuffer buffer)
    {
       buffer.writeNullableSimpleString(addressFullMessagePolicy != null ? new SimpleString(addressFullMessagePolicy.toString())
                                           : null);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
index 9fd5379..09d3d96 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.server.Queue;
 import org.apache.activemq.core.server.impl.RefsOperation;
 
@@ -53,7 +53,7 @@ public interface Transaction
 
    void setState(State state);
 
-   void markAsRollbackOnly(HornetQException exception);
+   void markAsRollbackOnly(ActiveMQException exception);
 
    long getCreateTime();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
index 4e9fcb6..b6ba3be 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.persistence.StorageManager;
 import org.apache.activemq.core.server.HornetQServerLogger;
@@ -63,7 +63,7 @@ public class TransactionImpl implements Transaction
 
    private volatile State state = State.ACTIVE;
 
-   private HornetQException exception;
+   private ActiveMQException exception;
 
    private final Object timeoutLock = new Object();
 
@@ -385,7 +385,7 @@ public class TransactionImpl implements Transaction
       return xid;
    }
 
-   public void markAsRollbackOnly(final HornetQException exception1)
+   public void markAsRollbackOnly(final ActiveMQException exception1)
    {
       if (HornetQServerLogger.LOGGER.isDebugEnabled())
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
index 5c3d1bc..594257a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
@@ -13,7 +13,7 @@
 package org.apache.activemq.spi.core.protocol;
 
 import io.netty.channel.ChannelPipeline;
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection;
 import org.apache.activemq.spi.core.remoting.Acceptor;
 import org.apache.activemq.spi.core.remoting.Connection;
@@ -29,7 +29,7 @@ public interface ProtocolManager
 
    void removeHandler(final String name);
 
-   void handleBuffer(RemotingConnection connection, HornetQBuffer buffer);
+   void handleBuffer(RemotingConnection connection, ActiveMQBuffer buffer);
 
    void addChannelHandlers(ChannelPipeline pipeline);
 
@@ -42,5 +42,5 @@ public interface ProtocolManager
     */
    MessageConverter getConverter();
 
-   void handshake(NettyServerConnection connection, HornetQBuffer buffer);
+   void handshake(NettyServerConnection connection, ActiveMQBuffer buffer);
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
index 9722a6c..693c016 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
@@ -12,8 +12,8 @@
  */
 package org.apache.activemq.core.filter.impl;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.filter.Filter;
 import org.apache.activemq.core.server.ServerMessage;
@@ -734,11 +734,11 @@ public class FilterTest extends SilentTestCase
          filter = FilterImpl.createFilter(filterString);
          Assert.fail("Should throw exception");
       }
-      catch (HornetQInvalidFilterExpressionException ife)
+      catch (ActiveMQInvalidFilterExpressionException ife)
       {
          //pass
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          fail("Invalid exception type:" + e.getType());
       }
@@ -751,11 +751,11 @@ public class FilterTest extends SilentTestCase
          filter = FilterImpl.createFilter(filterString);
          Assert.fail("Should throw exception");
       }
-      catch (HornetQInvalidFilterExpressionException ife)
+      catch (ActiveMQInvalidFilterExpressionException ife)
       {
          //pass
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          fail("Invalid exception type:" + e.getType());
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
index 109aede..7be2bf1 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -28,9 +28,9 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.filter.Filter;
@@ -461,19 +461,19 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public void encode(HornetQBuffer buffer)
+      public void encode(ActiveMQBuffer buffer)
       {
 
       }
 
       @Override
-      public void decode(HornetQBuffer buffer)
+      public void decode(ActiveMQBuffer buffer)
       {
 
       }
 
       @Override
-      public void decodeFromBuffer(HornetQBuffer buffer)
+      public void decodeFromBuffer(ActiveMQBuffer buffer)
       {
 
       }
@@ -515,7 +515,7 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public HornetQBuffer getEncodedBuffer()
+      public ActiveMQBuffer getEncodedBuffer()
       {
          return null;
       }
@@ -527,25 +527,25 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public HornetQBuffer getWholeBuffer()
+      public ActiveMQBuffer getWholeBuffer()
       {
          return null;
       }
 
       @Override
-      public void encodeHeadersAndProperties(HornetQBuffer buffer)
+      public void encodeHeadersAndProperties(ActiveMQBuffer buffer)
       {
 
       }
 
       @Override
-      public void decodeHeadersAndProperties(HornetQBuffer buffer)
+      public void decodeHeadersAndProperties(ActiveMQBuffer buffer)
       {
 
       }
 
       @Override
-      public BodyEncoder getBodyEncoder() throws HornetQException
+      public BodyEncoder getBodyEncoder() throws ActiveMQException
       {
          return null;
       }
@@ -665,13 +665,13 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public HornetQBuffer getBodyBuffer()
+      public ActiveMQBuffer getBodyBuffer()
       {
          return null;
       }
 
       @Override
-      public HornetQBuffer getBodyBufferCopy()
+      public ActiveMQBuffer getBodyBufferCopy()
       {
          return null;
       }
@@ -797,13 +797,13 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public Message putObjectProperty(SimpleString key, Object value) throws HornetQPropertyConversionException
+      public Message putObjectProperty(SimpleString key, Object value) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Message putObjectProperty(String key, Object value) throws HornetQPropertyConversionException
+      public Message putObjectProperty(String key, Object value) throws ActiveMQPropertyConversionException
       {
          return null;
       }
@@ -833,61 +833,61 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public Boolean getBooleanProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Boolean getBooleanProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Boolean getBooleanProperty(String key) throws HornetQPropertyConversionException
+      public Boolean getBooleanProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Byte getByteProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Byte getByteProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Byte getByteProperty(String key) throws HornetQPropertyConversionException
+      public Byte getByteProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Double getDoubleProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Double getDoubleProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Double getDoubleProperty(String key) throws HornetQPropertyConversionException
+      public Double getDoubleProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Integer getIntProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Integer getIntProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Integer getIntProperty(String key) throws HornetQPropertyConversionException
+      public Integer getIntProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Long getLongProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Long getLongProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Long getLongProperty(String key) throws HornetQPropertyConversionException
+      public Long getLongProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
@@ -905,61 +905,61 @@ public class ScheduledDeliveryHandlerTest extends Assert
       }
 
       @Override
-      public Short getShortProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Short getShortProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Short getShortProperty(String key) throws HornetQPropertyConversionException
+      public Short getShortProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Float getFloatProperty(SimpleString key) throws HornetQPropertyConversionException
+      public Float getFloatProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public Float getFloatProperty(String key) throws HornetQPropertyConversionException
+      public Float getFloatProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public String getStringProperty(SimpleString key) throws HornetQPropertyConversionException
+      public String getStringProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public String getStringProperty(String key) throws HornetQPropertyConversionException
+      public String getStringProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public SimpleString getSimpleStringProperty(SimpleString key) throws HornetQPropertyConversionException
+      public SimpleString getSimpleStringProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public SimpleString getSimpleStringProperty(String key) throws HornetQPropertyConversionException
+      public SimpleString getSimpleStringProperty(String key) throws ActiveMQPropertyConversionException
       {
          return null;
       }
 
       @Override
-      public byte[] getBytesProperty(SimpleString key) throws HornetQPropertyConversionException
+      public byte[] getBytesProperty(SimpleString key) throws ActiveMQPropertyConversionException
       {
          return new byte[0];
       }
 
       @Override
-      public byte[] getBytesProperty(String key) throws HornetQPropertyConversionException
+      public byte[] getBytesProperty(String key) throws ActiveMQPropertyConversionException
       {
          return new byte[0];
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java
index b33ea7c..9452acd 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java
@@ -14,7 +14,7 @@ package org.apache.activemq.tests.util;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.client.ClientSession;
 import org.apache.activemq.api.core.client.SessionFailureListener;
 
@@ -41,13 +41,13 @@ public final class CountDownSessionFailureListener implements SessionFailureList
    }
 
    @Override
-   public void connectionFailed(HornetQException exception, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(ActiveMQException exception, boolean failedOver, String scaleDownTargetNodeID)
    {
       connectionFailed(exception, failedOver);
    }
 
    @Override
-   public void connectionFailed(HornetQException exception, boolean failedOver)
+   public void connectionFailed(ActiveMQException exception, boolean failedOver)
    {
       latch.countDown();
       session.removeFailureListener(this);
@@ -60,7 +60,7 @@ public final class CountDownSessionFailureListener implements SessionFailureList
    }
 
    @Override
-   public void beforeReconnect(HornetQException exception)
+   public void beforeReconnect(ActiveMQException exception)
    {
       // No-op
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
index eec0236..6d277f1 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
@@ -23,7 +23,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -871,7 +871,7 @@ public abstract class ServiceTestBase extends UnitTestCase
     * @throws Exception
     */
    public final void
-   sendMessages(ClientSession session, ClientProducer producer, int numMessages) throws HornetQException
+   sendMessages(ClientSession session, ClientProducer producer, int numMessages) throws ActiveMQException
    {
       for (int i = 0; i < numMessages; i++)
       {
@@ -880,7 +880,7 @@ public abstract class ServiceTestBase extends UnitTestCase
    }
 
    protected final ClientMessage
-   createMessage(ClientSession session, int counter, boolean durable) throws HornetQException
+   createMessage(ClientSession session, int counter, boolean durable) throws ActiveMQException
    {
       ClientMessage message = session.createMessage(durable);
       setBody(counter, message);
@@ -890,7 +890,7 @@ public abstract class ServiceTestBase extends UnitTestCase
    }
 
    protected final void
-   receiveMessages(ClientConsumer consumer, final int start, final int msgCount, final boolean ack) throws HornetQException
+   receiveMessages(ClientConsumer consumer, final int start, final int msgCount, final boolean ack) throws ActiveMQException
    {
       for (int i = start; i < msgCount; i++)
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
index c0edcff..f8deae8 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
@@ -49,9 +49,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -586,7 +586,7 @@ public abstract class UnitTestCase extends CoreUnitTestCase
       }
    }
 
-   public static void assertEqualsBuffers(final int size, final HornetQBuffer expected, final HornetQBuffer actual)
+   public static void assertEqualsBuffers(final int size, final ActiveMQBuffer expected, final ActiveMQBuffer actual)
    {
       // assertEquals(expected.length, actual.length);
       expected.readerIndex(0);
@@ -883,7 +883,7 @@ public abstract class UnitTestCase extends CoreUnitTestCase
       return testDir1 + "/temp";
    }
 
-   protected static void expectHornetQException(final String message, final HornetQExceptionType errorCode, final HornetQAction action)
+   protected static void expectHornetQException(final String message, final ActiveMQExceptionType errorCode, final HornetQAction action)
    {
       try
       {
@@ -892,14 +892,14 @@ public abstract class UnitTestCase extends CoreUnitTestCase
       }
       catch (Exception e)
       {
-         Assert.assertTrue(e instanceof HornetQException);
-         Assert.assertEquals(errorCode, ((HornetQException) e).getType());
+         Assert.assertTrue(e instanceof ActiveMQException);
+         Assert.assertEquals(errorCode, ((ActiveMQException) e).getType());
       }
    }
 
-   protected static void expectHornetQException(final HornetQExceptionType errorCode, final HornetQAction action)
+   protected static void expectHornetQException(final ActiveMQExceptionType errorCode, final HornetQAction action)
    {
-      UnitTestCase.expectHornetQException("must throw a HornetQException with the expected errorCode: " + errorCode,
+      UnitTestCase.expectHornetQException("must throw a ActiveMQException with the expected errorCode: " + errorCode,
                                           errorCode,
                                           action);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java
----------------------------------------------------------------------
diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java
index d05260b..c7f1ce2 100644
--- a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java
+++ b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java
@@ -24,8 +24,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.config.impl.ConfigurationImpl;
 import org.apache.activemq.core.journal.PreparedTransactionInfo;
@@ -257,7 +257,7 @@ public class PrintPages // NO_UCD (unused code)
       {
          byte[] data = record.data;
 
-         HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data);
+         ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data);
 
          if (record.userRecordType == JournalRecordIds.ACKNOWLEDGE_CURSOR)
          {


Mime
View raw message