activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [10/20] activemq-6 git commit: ACTIVEMQ6-3 Renaming Exception classes and fixing native compilation
Date Tue, 18 Nov 2014 09:24:12 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java
index 35b29d1..f37da08 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQSession.java
@@ -45,10 +45,10 @@ import javax.jms.TopicSubscriber;
 import javax.jms.TransactionInProgressException;
 import javax.transaction.xa.XAResource;
 
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQQueueExistsException;
 import org.apache.activemq.selector.filter.FilterException;
 import org.apache.activemq.selector.SelectorParser;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQQueueExistsException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientProducer;
@@ -219,7 +219,7 @@ public class HornetQSession implements QueueSession, TopicSession
       {
          session.commit();
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -240,7 +240,7 @@ public class HornetQSession implements QueueSession, TopicSession
       {
          session.rollback();
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -263,7 +263,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
             connection.removeSession(this);
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             throw JMSExceptionHelper.convertFromHornetQException(e);
          }
@@ -281,7 +281,7 @@ public class HornetQSession implements QueueSession, TopicSession
       {
          session.rollback(true);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -332,7 +332,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          return new HornetQMessageProducer(connection, producer, jbd, session);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -399,7 +399,7 @@ public class HornetQSession implements QueueSession, TopicSession
             return queue;
          }
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -431,7 +431,7 @@ public class HornetQSession implements QueueSession, TopicSession
             return topic;
          }
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -641,7 +641,7 @@ public class HornetQSession implements QueueSession, TopicSession
             {
                session.createSharedQueue(dest.getSimpleAddress(), queueName, coreFilterString, true);
             }
-            catch (HornetQQueueExistsException ignored)
+            catch (ActiveMQQueueExistsException ignored)
             {
                // We ignore this because querying and then creating the queue wouldn't be idempotent
                // we could also add a parameter to ignore existence what would require a bigger work around to avoid
@@ -666,7 +666,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          return jbc;
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -840,7 +840,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          return jbc;
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -904,7 +904,7 @@ public class HornetQSession implements QueueSession, TopicSession
             throw new InvalidDestinationException(jbq.getAddress() + " does not exist");
          }
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -933,7 +933,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          return queue;
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -964,7 +964,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          return topic;
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -999,7 +999,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          session.deleteQueue(queueName);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -1122,7 +1122,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          connection.removeTemporaryQueue(address);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -1156,7 +1156,7 @@ public class HornetQSession implements QueueSession, TopicSession
 
          connection.removeTemporaryQueue(address);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -1168,7 +1168,7 @@ public class HornetQSession implements QueueSession, TopicSession
       {
          session.start();
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -1180,7 +1180,7 @@ public class HornetQSession implements QueueSession, TopicSession
       {
          session.stop();
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw JMSExceptionHelper.convertFromHornetQException(e);
       }
@@ -1201,7 +1201,7 @@ public class HornetQSession implements QueueSession, TopicSession
          {
             session.deleteQueue(queueName);
          }
-         catch (HornetQException ignore)
+         catch (ActiveMQException ignore)
          {
             // Exception on deleting queue shouldn't prevent close from completing
          }
@@ -1220,7 +1220,7 @@ public class HornetQSession implements QueueSession, TopicSession
       }
    }
 
-   private HornetQQueue lookupQueue(final String queueName, boolean isTemporary) throws HornetQException
+   private HornetQQueue lookupQueue(final String queueName, boolean isTemporary) throws ActiveMQException
    {
       HornetQQueue queue;
 
@@ -1245,7 +1245,7 @@ public class HornetQSession implements QueueSession, TopicSession
       }
    }
 
-   private HornetQTopic lookupTopic(final String topicName, final boolean isTemporary) throws HornetQException
+   private HornetQTopic lookupTopic(final String topicName, final boolean isTemporary) throws ActiveMQException
    {
 
       HornetQTopic topic;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java
index fbef34e..5274557 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQStreamMessage.java
@@ -17,7 +17,7 @@ import javax.jms.MessageEOFException;
 import javax.jms.MessageFormatException;
 import javax.jms.StreamMessage;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -452,7 +452,7 @@ public final class HornetQStreamMessage extends HornetQMessage implements Stream
       reset();
    }
 
-   private HornetQBuffer getBuffer()
+   private ActiveMQBuffer getBuffer()
    {
       return message.getBodyBuffer();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java
index 90ffcc1..65bdb82 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQTextMessage.java
@@ -15,7 +15,7 @@ package org.apache.activemq.jms.client;
 import javax.jms.JMSException;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -123,7 +123,7 @@ public class HornetQTextMessage extends HornetQMessage implements TextMessage
    // HornetQRAMessage override -----------------------------------------
 
    @Override
-   public void doBeforeReceive() throws HornetQException
+   public void doBeforeReceive() throws ActiveMQException
    {
       super.doBeforeReceive();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java
index 2833d9e..c61f48a 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java
@@ -17,7 +17,7 @@ import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
 import javax.jms.JMSSecurityException;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 
 /**
  *
@@ -29,7 +29,7 @@ import org.apache.activemq.api.core.HornetQException;
 public final class JMSExceptionHelper
 {
 
-   public static JMSException convertFromHornetQException(final HornetQException me)
+   public static JMSException convertFromHornetQException(final ActiveMQException me)
    {
       JMSException je;
       switch (me.getType())

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
index fa3a1cd..1bbffc5 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
@@ -15,7 +15,7 @@ package org.apache.activemq.jms.client;
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.MessageHandler;
@@ -91,7 +91,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
          {
             message.acknowledge();
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             HornetQJMSClientLogger.LOGGER.errorProcessingMessage(e);
          }
@@ -141,7 +141,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
                message.acknowledge();
             }
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             HornetQJMSClientLogger.LOGGER.errorProcessingMessage(e);
          }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
index dee0db8..f04d59b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
@@ -45,8 +45,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.api.core.client.FailoverEventListener;
 import org.apache.activemq.api.core.client.FailoverEventType;
 import org.apache.activemq.api.jms.HornetQJMSConstants;
@@ -469,7 +469,7 @@ public final class JMSBridgeImpl implements JMSBridge
       }
    }
 
-   private void initPasswords() throws HornetQException
+   private void initPasswords() throws ActiveMQException
    {
       if (useMaskedPassword)
       {
@@ -1932,7 +1932,7 @@ public final class JMSBridgeImpl implements JMSBridge
                      {
                         return;
                      }
-                     throw new HornetQInterruptedException(e);
+                     throw new ActiveMQInterruptedException(e);
                   }
                   continue;
                }
@@ -1973,7 +1973,7 @@ public final class JMSBridgeImpl implements JMSBridge
                      {
                         return;
                      }
-                     throw new HornetQInterruptedException(e);
+                     throw new ActiveMQInterruptedException(e);
                   }
                   continue;
                }
@@ -2197,7 +2197,7 @@ public final class JMSBridgeImpl implements JMSBridge
                      {
                         return;
                      }
-                     throw new HornetQInterruptedException(e);
+                     throw new ActiveMQInterruptedException(e);
                   }
 
                }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
index 5e878e5..36394ed 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
@@ -16,8 +16,8 @@ import javax.management.MBeanInfo;
 import javax.management.StandardMBean;
 import java.util.Map;
 
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.FilterConstants;
-import org.apache.activemq.api.core.HornetQException;
 import org.apache.activemq.api.core.management.MessageCounterInfo;
 import org.apache.activemq.api.core.management.Operation;
 import org.apache.activemq.api.core.management.QueueControl;
@@ -50,7 +50,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
    /**
     * Returns null if the string is null or empty
     */
-   public static String createFilterFromJMSSelector(final String selectorStr) throws HornetQException
+   public static String createFilterFromJMSSelector(final String selectorStr) throws ActiveMQException
    {
       return selectorStr == null || selectorStr.trim().length() == 0 ? null
          : SelectorTranslator.convertToHornetQFilterString(selectorStr);
@@ -205,7 +205,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
          }
          return jmsMessages;
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          throw new IllegalStateException(e.getMessage());
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
index 095b187..298071c 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import javax.management.MBeanInfo;
 import javax.management.StandardMBean;
 
-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.management.AddressControl;
 import org.apache.activemq.api.core.management.HornetQServerControl;
@@ -53,7 +53,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
 
    // Static --------------------------------------------------------
 
-   public static String createFilterFromJMSSelector(final String selectorStr) throws HornetQException
+   public static String createFilterFromJMSSelector(final String selectorStr) throws ActiveMQException
    {
       return selectorStr == null || selectorStr.trim().length() == 0 ? null
                                                                     : SelectorTranslator.convertToHornetQFilterString(selectorStr);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java
index ded50a5..40c357b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.jms.persistence.config;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
@@ -82,14 +82,14 @@ public class PersistedConnectionFactory implements EncodingSupport
    }
 
    @Override
-   public void decode(final HornetQBuffer buffer)
+   public void decode(final ActiveMQBuffer buffer)
    {
       config = new ConnectionFactoryConfigurationImpl();
       config.decode(buffer);
    }
 
    @Override
-   public void encode(final HornetQBuffer buffer)
+   public void encode(final ActiveMQBuffer buffer)
    {
       config.encode(buffer);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java
index 25c728a..a8c9ddf 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.jms.persistence.config;
 
-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.utils.BufferHelper;
@@ -109,7 +109,7 @@ public class PersistedDestination implements EncodingSupport
             DataConstants.SIZE_BOOLEAN;
    }
 
-   public void encode(final HornetQBuffer buffer)
+   public void encode(final ActiveMQBuffer buffer)
    {
       buffer.writeByte(type.getType());
       buffer.writeSimpleString(SimpleString.toSimpleString(name));
@@ -117,7 +117,7 @@ public class PersistedDestination implements EncodingSupport
       buffer.writeBoolean(durable);
    }
 
-   public void decode(final HornetQBuffer buffer)
+   public void decode(final ActiveMQBuffer buffer)
    {
       type = PersistedType.getType(buffer.readByte());
       name = buffer.readSimpleString().toString();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
index fa45e5f..615e642 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
@@ -15,7 +15,7 @@ package org.apache.activemq.jms.persistence.config;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.utils.BufferHelper;
 import org.apache.activemq.utils.DataConstants;
@@ -61,7 +61,7 @@ public class PersistedJNDI implements EncodingSupport
 
    // Public --------------------------------------------------------
    @Override
-   public void decode(HornetQBuffer buffer)
+   public void decode(ActiveMQBuffer buffer)
    {
       type = PersistedType.getType(buffer.readByte());
       name = buffer.readSimpleString().toString();
@@ -75,7 +75,7 @@ public class PersistedJNDI implements EncodingSupport
    }
 
    @Override
-   public void encode(HornetQBuffer buffer)
+   public void encode(ActiveMQBuffer buffer)
    {
       buffer.writeByte(type.getType());
       BufferHelper.writeAsSimpleString(buffer, name);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index d233e39..f3efc5c 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-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.Pair;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.journal.Journal;
@@ -294,7 +294,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
       {
          long id = record.id;
 
-         HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(record.data);
+         ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(record.data);
 
          byte rec = record.getUserRecordType();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
index a812b75..474c990 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
@@ -13,9 +13,9 @@
 package org.apache.activemq.jms.server;
 
 
-import org.apache.activemq.api.core.HornetQAddressExistsException;
-import org.apache.activemq.api.core.HornetQIllegalStateException;
-import org.apache.activemq.api.core.HornetQInternalErrorException;
+import org.apache.activemq.api.core.ActiveMQAddressExistsException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
@@ -37,26 +37,26 @@ public interface HornetQJMSServerBundle
    HornetQJMSServerBundle BUNDLE = Messages.getBundle(HornetQJMSServerBundle.class);
 
    @Message(id = 129000, value =  "Connection Factory {0} does not exist" , format = Message.Format.MESSAGE_FORMAT)
-   HornetQInternalErrorException cfDoesntExist(String name);
+   ActiveMQInternalErrorException cfDoesntExist(String name);
 
    @Message(id = 129001, value =  "Invalid signature {0} parsing Connection Factory" , format = Message.Format.MESSAGE_FORMAT)
-   HornetQInternalErrorException invalidSignatureParsingCF(String sig);
+   ActiveMQInternalErrorException invalidSignatureParsingCF(String sig);
 
    @Message(id = 129002, value = "Invalid node {0} parsing Connection Factory", format = Message.Format.MESSAGE_FORMAT)
-   HornetQInternalErrorException invalidNodeParsingCF(String name);
+   ActiveMQInternalErrorException invalidNodeParsingCF(String name);
 
    @Message(id = 129003, value = "Discovery Group ''{0}'' does not exist on main config", format = Message.Format.MESSAGE_FORMAT)
-   HornetQIllegalStateException discoveryGroupDoesntExist(String name);
+   ActiveMQIllegalStateException discoveryGroupDoesntExist(String name);
 
    @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory", format = Message.Format.MESSAGE_FORMAT)
-   HornetQIllegalStateException noConnectorNameOnCF();
+   ActiveMQIllegalStateException noConnectorNameOnCF();
 
    @Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
-   HornetQIllegalStateException noConnectorNameConfiguredOnCF(String name);
+   ActiveMQIllegalStateException noConnectorNameConfiguredOnCF(String name);
 
    @Message(id = 129006, value =  "JNDI {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
-   HornetQAddressExistsException cfJndiExists(String name);
+   ActiveMQAddressExistsException cfJndiExists(String name);
 
    @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
-   HornetQIllegalStateException errorDecodingPassword(@Cause Exception e);
+   ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index b915817..fcda258 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -15,7 +15,7 @@ package org.apache.activemq.jms.server.config.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-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.api.core.client.HornetQClient;
 import org.apache.activemq.api.jms.JMSFactoryType;
@@ -523,7 +523,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
    // Encoding Support Implementation --------------------------------------------------------------
 
    @Override
-   public void decode(final HornetQBuffer buffer)
+   public void decode(final ActiveMQBuffer buffer)
    {
       persisted = true;
 
@@ -611,7 +611,7 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
    }
 
    @Override
-   public void encode(final HornetQBuffer buffer)
+   public void encode(final ActiveMQBuffer buffer)
    {
       persisted = true;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java
index 554fb1b..b3abd68 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-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.TransportConfiguration;
 import org.apache.activemq.utils.BufferHelper;
@@ -33,7 +33,7 @@ import org.apache.activemq.utils.DataConstants;
  */
 public class TransportConfigurationEncodingSupport
 {
-   public static List<Pair<TransportConfiguration, TransportConfiguration>> decodeConfigs(HornetQBuffer buffer)
+   public static List<Pair<TransportConfiguration, TransportConfiguration>> decodeConfigs(ActiveMQBuffer buffer)
    {
       int size = buffer.readInt();
       List<Pair<TransportConfiguration, TransportConfiguration>> configs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(size);
@@ -53,7 +53,7 @@ public class TransportConfigurationEncodingSupport
       return configs;
    }
 
-   public static TransportConfiguration decode(HornetQBuffer buffer)
+   public static TransportConfiguration decode(ActiveMQBuffer buffer)
    {
       String name = BufferHelper.readNullableSimpleStringAsString(buffer);
       String factoryClassName = buffer.readSimpleString().toString();
@@ -69,7 +69,7 @@ public class TransportConfigurationEncodingSupport
       return config;
    }
 
-   public static void encodeConfigs(HornetQBuffer buffer,
+   public static void encodeConfigs(ActiveMQBuffer buffer,
                                     List<Pair<TransportConfiguration, TransportConfiguration>> configs)
    {
       buffer.writeInt(configs == null ? 0 : configs.size());
@@ -88,7 +88,7 @@ public class TransportConfigurationEncodingSupport
       }
    }
 
-   public static void encode(HornetQBuffer buffer, TransportConfiguration config)
+   public static void encode(ActiveMQBuffer buffer, TransportConfiguration config)
    {
       BufferHelper.writeAsNullableSimpleString(buffer, config.getName());
       BufferHelper.writeAsSimpleString(buffer, config.getFactoryClassName());

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 3a98aa9..6293fe4 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.activemq.api.config.HornetQDefaultConfiguration;
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.client.HornetQClient;
 import org.apache.activemq.api.jms.JMSFactoryType;
 import org.apache.activemq.core.config.impl.Validators;
@@ -422,7 +422,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
       return cfConfig;
    }
 
-   private JMSFactoryType resolveFactoryType(String fact, boolean isXA) throws HornetQException
+   private JMSFactoryType resolveFactoryType(String fact, boolean isXA) throws ActiveMQException
    {
       if ("".equals(fact))
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
index 51d7d75..b8b2d5f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
@@ -31,8 +31,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+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.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.management.AddressControl;
@@ -1398,9 +1398,9 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
    /**
     * @param cfConfig
     * @return
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   protected HornetQConnectionFactory internalCreateCFPOJO(final ConnectionFactoryConfiguration cfConfig) throws HornetQException
+   protected HornetQConnectionFactory internalCreateCFPOJO(final ConnectionFactoryConfiguration cfConfig) throws ActiveMQException
    {
       HornetQConnectionFactory cf;
       if (cfConfig.getDiscoveryGroupName() != null)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java
index fbcc8aa..293137b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java
@@ -18,9 +18,9 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
 import org.apache.activemq.api.core.client.ClientSession;
 import org.apache.activemq.api.core.client.ClientSessionFactory;
 import org.apache.activemq.api.core.client.HornetQClient;
@@ -251,9 +251,9 @@ public class HornetQXAResourceWrapper implements XAResource, SessionFailureListe
       }
    }
 
-   public void connectionFailed(final HornetQException me, boolean failedOver)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver)
    {
-      if (me.getType() == HornetQExceptionType.DISCONNECTED)
+      if (me.getType() == ActiveMQExceptionType.DISCONNECTED)
       {
          if (HornetQJMSServerLogger.LOGGER.isDebugEnabled())
          {
@@ -268,12 +268,12 @@ public class HornetQXAResourceWrapper implements XAResource, SessionFailureListe
    }
 
    @Override
-   public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
    {
       connectionFailed(me, failedOver);
    }
 
-   public void beforeReconnect(final HornetQException me)
+   public void beforeReconnect(final ActiveMQException me)
    {
    }
 
@@ -429,7 +429,7 @@ public class HornetQXAResourceWrapper implements XAResource, SessionFailureListe
          return delegate;
       }
       HornetQJMSServerLogger.LOGGER.recoveryConnectFailed(Arrays.toString(xaRecoveryConfigs));
-      throw new HornetQNotConnectedException();
+      throw new ActiveMQNotConnectedException();
    }
 
    /* (non-Javadoc)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java
index d1cce42..7510361 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java
@@ -14,8 +14,8 @@ package org.apache.activemq.jms.server.recovery;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-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.Pair;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClusterTopologyListener;
@@ -176,9 +176,9 @@ public class RecoveryDiscovery implements SessionFailureListener
 
 
    @Override
-   public void connectionFailed(HornetQException exception, boolean failedOver)
+   public void connectionFailed(ActiveMQException exception, boolean failedOver)
    {
-      if (exception.getType() == HornetQExceptionType.DISCONNECTED)
+      if (exception.getType() == ActiveMQExceptionType.DISCONNECTED)
       {
          HornetQJMSServerLogger.LOGGER.warn("being disconnected for server shutdown", exception);
       }
@@ -192,13 +192,13 @@ public class RecoveryDiscovery implements SessionFailureListener
    }
 
    @Override
-   public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID)
+   public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
    {
       connectionFailed(me, failedOver);
    }
 
    @Override
-   public void beforeReconnect(HornetQException exception)
+   public void beforeReconnect(ActiveMQException exception)
    {
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java
index 8a12a99..43e6b4d 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java
@@ -14,7 +14,7 @@ package org.apache.activemq.core.asyncio;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 
 /**
  *
@@ -23,35 +23,35 @@ import org.apache.activemq.api.core.HornetQException;
  */
 public interface AsynchronousFile
 {
-   void close() throws InterruptedException, HornetQException;
+   void close() throws InterruptedException, ActiveMQException;
 
    /**
     *
     * Note: If you are using a native Linux implementation, maxIO can't be higher than what's defined on /proc/sys/fs/aio-max-nr, or you would get an error
     * @param fileName
     * @param maxIO The number of max concurrent asynchronous IO operations. It has to be balanced between the size of your writes and the capacity of your disk.
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   void open(String fileName, int maxIO) throws HornetQException;
+   void open(String fileName, int maxIO) throws ActiveMQException;
 
    /**
     * Warning: This function will perform a synchronous IO, probably translating to a fstat call
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     * */
-   long size() throws HornetQException;
+   long size() throws ActiveMQException;
 
    /** Any error will be reported on the callback interface */
    void write(long position, long size, ByteBuffer directByteBuffer, AIOCallback aioCallback);
 
    /**
     * Performs an internal direct write.
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   void writeInternal(long positionToWrite, long size, ByteBuffer bytes) throws HornetQException;
+   void writeInternal(long positionToWrite, long size, ByteBuffer bytes) throws ActiveMQException;
 
-   void read(long position, long size, ByteBuffer directByteBuffer, AIOCallback aioCallback) throws HornetQException;
+   void read(long position, long size, ByteBuffer directByteBuffer, AIOCallback aioCallback) throws ActiveMQException;
 
-   void fill(long position, int blocks, long size, byte fillChar) throws HornetQException;
+   void fill(long position, int blocks, long size, byte fillChar) throws ActiveMQException;
 
    void setBufferCallback(BufferCallback callback);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java
index 8e94f1e..f087537 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java
@@ -24,8 +24,8 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-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.asyncio.AIOCallback;
 import org.apache.activemq.core.asyncio.AsynchronousFile;
 import org.apache.activemq.core.asyncio.BufferCallback;
@@ -133,7 +133,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
 
    static
    {
-      String[] libraries = new String[]{"HornetQAIO", "HornetQAIO64", "HornetQAIO32", "HornetQAIO_ia64"};
+      String[] libraries = new String[]{"activemqAIO", "activemqAIO64", "activemqAIO32", "activemqAIO_ia64"};
 
       for (String library : libraries)
       {
@@ -220,7 +220,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
       this(writeExecutor, pollerExecutor, null);
    }
 
-   public void open(final String fileName1, final int maxIOArgument) throws HornetQException
+   public void open(final String fileName1, final int maxIOArgument) throws ActiveMQException
    {
       writeLock.lock();
 
@@ -240,12 +240,12 @@ public class AsynchronousFileImpl implements AsynchronousFile
          {
             handler = Native.init(AsynchronousFileImpl.class, fileName1, this.maxIO, HornetQJournalLogger.LOGGER);
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
-            HornetQException ex = null;
-            if (e.getType() == HornetQExceptionType.NATIVE_ERROR_CANT_INITIALIZE_AIO)
+            ActiveMQException ex = null;
+            if (e.getType() == ActiveMQExceptionType.NATIVE_ERROR_CANT_INITIALIZE_AIO)
             {
-               ex = new HornetQException(e.getType(),
+               ex = new ActiveMQException(e.getType(),
                                          "Can't initialize AIO. Currently AIO in use = " + AsynchronousFileImpl.totalMaxIO.get() +
                                             ", trying to allocate more " +
                                             maxIOArgument,
@@ -268,7 +268,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
       }
    }
 
-   public void close() throws InterruptedException, HornetQException
+   public void close() throws InterruptedException, ActiveMQException
    {
       checkOpened();
 
@@ -308,13 +308,13 @@ public class AsynchronousFileImpl implements AsynchronousFile
    }
 
 
-   public void writeInternal(long positionToWrite, long size, ByteBuffer bytes) throws HornetQException
+   public void writeInternal(long positionToWrite, long size, ByteBuffer bytes) throws ActiveMQException
    {
       try
       {
          Native.writeInternal(handler, positionToWrite, size, bytes);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          fireExceptionListener(e.getType().getCode(), e.getMessage());
          throw e;
@@ -358,7 +358,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
                {
                   Native.write(AsynchronousFileImpl.this, handler, sequence, position, size, directByteBuffer, aioCallback);
                }
-               catch (HornetQException e)
+               catch (ActiveMQException e)
                {
                   callbackError(aioCallback, sequence, directByteBuffer, e.getType().getCode(), e.getMessage());
                }
@@ -367,7 +367,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
                   callbackError(aioCallback,
                                 sequence,
                                 directByteBuffer,
-                                HornetQExceptionType.INTERNAL_ERROR.getCode(),
+                                ActiveMQExceptionType.INTERNAL_ERROR.getCode(),
                                 e.getMessage());
                }
             }
@@ -383,13 +383,13 @@ public class AsynchronousFileImpl implements AsynchronousFile
          {
             Native.write(this, handler, sequence, position, size, directByteBuffer, aioCallback);
          }
-         catch (HornetQException e)
+         catch (ActiveMQException e)
          {
             callbackError(aioCallback, sequence, directByteBuffer, e.getType().getCode(), e.getMessage());
          }
          catch (RuntimeException e)
          {
-            callbackError(aioCallback, sequence, directByteBuffer, HornetQExceptionType.INTERNAL_ERROR.getCode(), e.getMessage());
+            callbackError(aioCallback, sequence, directByteBuffer, ActiveMQExceptionType.INTERNAL_ERROR.getCode(), e.getMessage());
          }
       }
 
@@ -398,7 +398,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
    public void read(final long position,
                     final long size,
                     final ByteBuffer directByteBuffer,
-                    final AIOCallback aioPackage) throws HornetQException
+                    final AIOCallback aioPackage) throws ActiveMQException
    {
       checkOpened();
       if (poller == null)
@@ -411,7 +411,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
       {
          Native.read(this, handler, position, size, directByteBuffer, aioPackage);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          // Release only if an exception happened
          maxIOSemaphore.release();
@@ -427,20 +427,20 @@ public class AsynchronousFileImpl implements AsynchronousFile
       }
    }
 
-   public long size() throws HornetQException
+   public long size() throws ActiveMQException
    {
       checkOpened();
       return Native.size0(handler);
    }
 
-   public void fill(final long position, final int blocks, final long size, final byte fillChar) throws HornetQException
+   public void fill(final long position, final int blocks, final long size, final byte fillChar) throws ActiveMQException
    {
       checkOpened();
       try
       {
          Native.fill(handler, position, blocks, size, fillChar);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          fireExceptionListener(e.getType().getCode(), e.getMessage());
          throw e;
@@ -619,7 +619,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
       HornetQJournalLogger.LOGGER.ioError(errorCode, errorMessage);
       if (ioExceptionListener != null)
       {
-         ioExceptionListener.onIOException(HornetQExceptionType.getType(errorCode).createException(errorMessage), errorMessage);
+         ioExceptionListener.onIOException(ActiveMQExceptionType.getType(errorCode).createException(errorMessage), errorMessage);
       }
    }
 
@@ -668,10 +668,10 @@ public class AsynchronousFileImpl implements AsynchronousFile
    }
 
    /**
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     * @throws InterruptedException
     */
-   private void stopPoller() throws HornetQException, InterruptedException
+   private void stopPoller() throws ActiveMQException, InterruptedException
    {
       Native.stopPoller(handler);
       // We need to make sure we won't call close until Poller is

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java
index a6f8d9b..44ff261 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.journal;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 
 /**
  *
@@ -27,7 +27,7 @@ public interface EncodingSupport
 {
    int getEncodeSize();
 
-   void encode(HornetQBuffer buffer);
+   void encode(ActiveMQBuffer buffer);
 
-   void decode(HornetQBuffer buffer);
+   void decode(ActiveMQBuffer buffer);
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java
index 7c8048d..7eecbfd 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java
@@ -16,8 +16,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.journal.impl.TimedBuffer;
 
 /**
@@ -54,11 +54,11 @@ public interface SequentialFile
 
    void fill(int position, int size, byte fillCharacter) throws Exception;
 
-   void delete() throws IOException, InterruptedException, HornetQException;
+   void delete() throws IOException, InterruptedException, ActiveMQException;
 
-   void write(HornetQBuffer bytes, boolean sync, IOAsyncTask callback) throws Exception;
+   void write(ActiveMQBuffer bytes, boolean sync, IOAsyncTask callback) throws Exception;
 
-   void write(HornetQBuffer bytes, boolean sync) throws Exception;
+   void write(ActiveMQBuffer bytes, boolean sync) throws Exception;
 
    void write(EncodingSupport bytes, boolean sync, IOAsyncTask callback) throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java
index e18b845..6bf0e71 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java
@@ -17,7 +17,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.asyncio.AsynchronousFile;
 import org.apache.activemq.core.asyncio.BufferCallback;
 import org.apache.activemq.core.asyncio.IOExceptionListener;
@@ -97,7 +97,7 @@ public class AIOSequentialFile extends AbstractSequentialFile implements IOExcep
    }
 
    @Override
-   public synchronized void close() throws IOException, InterruptedException, HornetQException
+   public synchronized void close() throws IOException, InterruptedException, ActiveMQException
    {
       if (!opened)
       {
@@ -178,7 +178,7 @@ public class AIOSequentialFile extends AbstractSequentialFile implements IOExcep
       open(maxIO, true);
    }
 
-   public synchronized void open(final int maxIO, final boolean useExecutor) throws HornetQException
+   public synchronized void open(final int maxIO, final boolean useExecutor) throws ActiveMQException
    {
       opened = true;
 
@@ -188,7 +188,7 @@ public class AIOSequentialFile extends AbstractSequentialFile implements IOExcep
       {
          aioFile.open(getFile().getAbsolutePath(), maxIO);
       }
-      catch (HornetQException e)
+      catch (ActiveMQException e)
       {
          factory.onIOError(e, e.getMessage(), this);
          throw e;
@@ -206,7 +206,7 @@ public class AIOSequentialFile extends AbstractSequentialFile implements IOExcep
       aioFile.setBufferCallback(callback);
    }
 
-   public int read(final ByteBuffer bytes, final IOAsyncTask callback) throws HornetQException
+   public int read(final ByteBuffer bytes, final IOAsyncTask callback) throws ActiveMQException
    {
       int bytesToRead = bytes.limit();
 
@@ -292,7 +292,7 @@ public class AIOSequentialFile extends AbstractSequentialFile implements IOExcep
       aioFile.write(positionToWrite, bytesToWrite, bytes, callback);
    }
 
-   public void writeInternal(final ByteBuffer bytes) throws HornetQException
+   public void writeInternal(final ByteBuffer bytes) throws ActiveMQException
    {
       final int bytesToWrite = factory.calculateBlockSize(bytes.limit());
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java
index a2f9e7e..1313546 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.core.asyncio.BufferCallback;
 import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
 import org.apache.activemq.core.journal.IOCriticalErrorListener;
@@ -181,7 +181,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
    {
       super.start();
 
-      pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("HornetQ-AIO-poller-pool" + System.identityHashCode(this),
+      pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("ActiveMQ-AIO-poller-pool" + System.identityHashCode(this),
                                                                               true,
                                                                               AIOSequentialFileFactory.getThisClassLoader()));
 
@@ -205,7 +205,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
          }
          catch (InterruptedException e)
          {
-            throw new HornetQInterruptedException(e);
+            throw new ActiveMQInterruptedException(e);
          }
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java
index 18d7b9b..cbd8999 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-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.Pair;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
@@ -55,7 +55,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
 
    protected long nextOrderingID;
 
-   private HornetQBuffer writingChannel;
+   private ActiveMQBuffer writingChannel;
 
    private final Set<Long> recordsSnapshot = new ConcurrentHashSet<Long>();
 
@@ -95,7 +95,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
 
          JournalImpl.initFileHeader(fileFactory, controlFile, 0, 0);
 
-         HornetQBuffer filesToRename = HornetQBuffers.dynamicBuffer(1);
+         ActiveMQBuffer filesToRename = ActiveMQBuffers.dynamicBuffer(1);
 
          // DataFiles first
 
@@ -150,7 +150,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
                                                                     new ByteArrayEncoding(filesToRename.toByteBuffer()
                                                                                                        .array()));
 
-         HornetQBuffer renameBuffer = HornetQBuffers.dynamicBuffer(filesToRename.writerIndex());
+         ActiveMQBuffer renameBuffer = ActiveMQBuffers.dynamicBuffer(filesToRename.writerIndex());
 
          controlRecord.setFileID(0);
 
@@ -208,7 +208,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
 
       ByteBuffer bufferWrite = fileFactory.newBuffer(journal.getFileSize());
 
-      writingChannel = HornetQBuffers.wrappedBuffer(bufferWrite);
+      writingChannel = ActiveMQBuffers.wrappedBuffer(bufferWrite);
 
       currentFile = filesRepository.takeFile(false, false, false, true);
 
@@ -229,7 +229,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
    /**
     * @return the writingChannel
     */
-   protected HornetQBuffer getWritingChannel()
+   protected ActiveMQBuffer getWritingChannel()
    {
       return writingChannel;
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java
index bbfd626..aebefb7 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java
@@ -21,10 +21,10 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-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.HornetQIOErrorException;
+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.ActiveMQIOErrorException;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.SequentialFile;
@@ -91,7 +91,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
       return file.getName();
    }
 
-   public final void delete() throws IOException, InterruptedException, HornetQException
+   public final void delete() throws IOException, InterruptedException, ActiveMQException
    {
       if (isOpen())
       {
@@ -137,7 +137,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
    }
@@ -157,7 +157,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
    }
 
    public final void renameTo(final String newFileName) throws IOException, InterruptedException,
-      HornetQException
+      ActiveMQException
    {
       try
       {
@@ -165,7 +165,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
 
@@ -183,9 +183,9 @@ public abstract class AbstractSequentialFile implements SequentialFile
 
    /**
     * @throws IOException      we declare throwing IOException because sub-classes need to do it
-    * @throws HornetQException
+    * @throws org.apache.activemq.api.core.ActiveMQException
     */
-   public synchronized void close() throws IOException, InterruptedException, HornetQException
+   public synchronized void close() throws IOException, InterruptedException, ActiveMQException
    {
       final CountDownLatch donelatch = new CountDownLatch(1);
 
@@ -234,7 +234,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
 
    }
 
-   public void write(final HornetQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws IOException
+   public void write(final ActiveMQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws IOException
    {
       if (timedBuffer != null)
       {
@@ -250,8 +250,8 @@ public abstract class AbstractSequentialFile implements SequentialFile
       }
    }
 
-   public void write(final HornetQBuffer bytes, final boolean sync) throws IOException, InterruptedException,
-      HornetQException
+   public void write(final ActiveMQBuffer bytes, final boolean sync) throws IOException, InterruptedException,
+      ActiveMQException
    {
       if (sync)
       {
@@ -281,14 +281,14 @@ public abstract class AbstractSequentialFile implements SequentialFile
          // Because AIO will need a specific Buffer
          // And NIO will also need a whole buffer to perform the write
 
-         HornetQBuffer outBuffer = HornetQBuffers.wrappedBuffer(buffer);
+         ActiveMQBuffer outBuffer = ActiveMQBuffers.wrappedBuffer(buffer);
          bytes.encode(outBuffer);
          buffer.rewind();
          writeDirect(buffer, sync, callback);
       }
    }
 
-   public void write(final EncodingSupport bytes, final boolean sync) throws InterruptedException, HornetQException
+   public void write(final EncodingSupport bytes, final boolean sync) throws InterruptedException, ActiveMQException
    {
       if (sync)
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java
index 312ab31..bec5106 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.core.journal.IOCriticalErrorListener;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
@@ -104,7 +104,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
          }
          catch (InterruptedException e)
          {
-            throw new HornetQInterruptedException(e);
+            throw new ActiveMQInterruptedException(e);
          }
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java
index 21e7241..eb39764 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java
@@ -19,8 +19,8 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQUnsupportedPacketException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQUnsupportedPacketException;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOCompletion;
 import org.apache.activemq.core.journal.Journal;
@@ -189,7 +189,7 @@ public final class FileWrapperJournal extends JournalBase
       writeRecord(prepareRecord, sync, callback);
    }
 
-   private int count(long txID) throws HornetQException
+   private int count(long txID) throws ActiveMQException
    {
       AtomicInteger defaultValue = new AtomicInteger(1);
       AtomicInteger count = transactions.putIfAbsent(Long.valueOf(txID), defaultValue);
@@ -211,19 +211,19 @@ public final class FileWrapperJournal extends JournalBase
    @Override
    public void appendRollbackRecord(long txID, boolean sync, IOCompletion callback) throws Exception
    {
-      throw new HornetQUnsupportedPacketException();
+      throw new ActiveMQUnsupportedPacketException();
    }
 
    @Override
    public JournalLoadInformation load(LoaderCallback reloadManager) throws Exception
    {
-      throw new HornetQUnsupportedPacketException();
+      throw new ActiveMQUnsupportedPacketException();
    }
 
    @Override
    public JournalLoadInformation loadInternalOnly() throws Exception
    {
-      throw new HornetQUnsupportedPacketException();
+      throw new ActiveMQUnsupportedPacketException();
    }
 
    @Override
@@ -236,13 +236,13 @@ public final class FileWrapperJournal extends JournalBase
    public JournalLoadInformation load(List<RecordInfo> committedRecords,
                                       List<PreparedTransactionInfo> preparedTransactions, TransactionFailureCallback transactionFailure) throws Exception
    {
-      throw new HornetQUnsupportedPacketException();
+      throw new ActiveMQUnsupportedPacketException();
    }
 
    @Override
    public int getAlignment() throws Exception
    {
-      throw new HornetQUnsupportedPacketException();
+      throw new ActiveMQUnsupportedPacketException();
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java
index d746719..c48f89f 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.journal.impl;
 
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOCompletion;
 import org.apache.activemq.core.journal.Journal;
@@ -194,12 +194,12 @@ abstract class JournalBase implements Journal
 
       private static NullEncoding instance = new NullEncoding();
 
-      public void decode(final HornetQBuffer buffer)
+      public void decode(final ActiveMQBuffer buffer)
       {
          // no-op
       }
 
-      public void encode(final HornetQBuffer buffer)
+      public void encode(final ActiveMQBuffer buffer)
       {
          // no-op
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java
index 0ff4c14..d582be1 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java
@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-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.Pair;
 import org.apache.activemq.core.journal.RecordInfo;
 import org.apache.activemq.core.journal.SequentialFile;
@@ -90,7 +90,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
          }
          else
          {
-            HornetQBuffer input = HornetQBuffers.wrappedBuffer(records.get(0).data);
+            ActiveMQBuffer input = ActiveMQBuffers.wrappedBuffer(records.get(0).data);
 
             int numberDataFiles = input.readInt();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java
index 46fe900..d5ba1ce 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java
@@ -39,8 +39,8 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantLock;
 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.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOAsyncTask;
@@ -318,11 +318,11 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       class MyRecord implements EncodingSupport
       {
 
-         public void decode(final HornetQBuffer buffer)
+         public void decode(final ActiveMQBuffer buffer)
          {
          }
 
-         public void encode(final HornetQBuffer buffer)
+         public void encode(final ActiveMQBuffer buffer)
          {
             buffer.writeBytes(bytes);
          }
@@ -2723,7 +2723,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       // We don't need to release buffers while writing.
       ByteBuffer bb = fileFactory.newBuffer(JournalImpl.SIZE_HEADER);
 
-      HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bb);
+      ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(bb);
 
       try
       {
@@ -2750,7 +2750,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
     * @param userVersion
     * @param fileID
     */
-   public static void writeHeader(final HornetQBuffer buffer, final int userVersion, final long fileID)
+   public static void writeHeader(final ActiveMQBuffer buffer, final int userVersion, final long fileID)
    {
       buffer.writeInt(JournalImpl.FORMAT_VERSION);
 
@@ -3031,7 +3031,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                   return byteEncoder.getEncodeSize();
                }
 
-               public void encode(final HornetQBuffer buffer)
+               public void encode(final ActiveMQBuffer buffer)
                {
                   byteEncoder.encode(buffer);
                }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java
index c049a43..5c4d73d 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.HornetQExceptionType;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord;
 
 /**
@@ -209,7 +209,7 @@ public class JournalTransaction
 
       if (currentCallback.getErrorMessage() != null)
       {
-         throw HornetQExceptionType.createException(currentCallback.getErrorCode(), currentCallback.getErrorMessage());
+         throw ActiveMQExceptionType.createException(currentCallback.getErrorCode(), currentCallback.getErrorMessage());
       }
 
       currentCallback.countUp();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java
index 4660161..e8db83e 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java
@@ -21,10 +21,10 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Semaphore;
 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.HornetQIOErrorException;
-import org.apache.activemq.api.core.HornetQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
+import org.apache.activemq.api.core.ActiveMQIOErrorException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
@@ -107,7 +107,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
 
@@ -138,7 +138,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
 
@@ -154,7 +154,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
    }
 
    @Override
-   public synchronized void close() throws IOException, InterruptedException, HornetQException
+   public synchronized void close() throws IOException, InterruptedException, ActiveMQException
    {
       super.close();
 
@@ -181,7 +181,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
       channel = null;
@@ -197,13 +197,13 @@ public final class NIOSequentialFile extends AbstractSequentialFile
    }
 
    public synchronized int read(final ByteBuffer bytes, final IOAsyncTask callback) throws IOException,
-      HornetQIllegalStateException
+      ActiveMQIllegalStateException
    {
       try
       {
          if (channel == null)
          {
-            throw new HornetQIllegalStateException("File " + this.getFileName() + " has a null channel");
+            throw new ActiveMQIllegalStateException("File " + this.getFileName() + " has a null channel");
          }
          int bytesRead = channel.read(bytes);
 
@@ -220,10 +220,10 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       {
          if (callback != null)
          {
-            callback.onError(HornetQExceptionType.IO_ERROR.getCode(), e.getLocalizedMessage());
+            callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getLocalizedMessage());
          }
 
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
 
          throw e;
       }
@@ -239,7 +239,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
          }
          catch (IOException e)
          {
-            factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+            factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
             throw e;
          }
       }
@@ -258,7 +258,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
    }
@@ -273,7 +273,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (IOException e)
       {
-         factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+         factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          throw e;
       }
    }
@@ -302,7 +302,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       }
       catch (Exception e)
       {
-         callback.onError(HornetQExceptionType.GENERIC_EXCEPTION.getCode(), e.getMessage());
+         callback.onError(ActiveMQExceptionType.GENERIC_EXCEPTION.getCode(), e.getMessage());
       }
    }
 
@@ -326,13 +326,13 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       return super.newBuffer(size, limit);
    }
 
-   private void internalWrite(final ByteBuffer bytes, final boolean sync, final IOAsyncTask callback) throws IOException, HornetQIOErrorException, InterruptedException
+   private void internalWrite(final ByteBuffer bytes, final boolean sync, final IOAsyncTask callback) throws IOException, ActiveMQIOErrorException, InterruptedException
    {
       if (!isOpen())
       {
          if (callback != null)
          {
-            callback.onError(HornetQExceptionType.IO_ERROR.getCode(), "File not opened");
+            callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), "File not opened");
          }
          else
          {
@@ -352,7 +352,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
          }
          catch (IOException e)
          {
-            factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), this);
+            factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
          }
       }
       else
@@ -373,13 +373,13 @@ public final class NIOSequentialFile extends AbstractSequentialFile
                   catch (IOException e)
                   {
                      HornetQJournalLogger.LOGGER.errorSubmittingWrite(e);
-                     factory.onIOError(new HornetQIOErrorException(e.getMessage(), e), e.getMessage(), NIOSequentialFile.this);
-                     callback.onError(HornetQExceptionType.IO_ERROR.getCode(), e.getMessage());
+                     factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), NIOSequentialFile.this);
+                     callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getMessage());
                   }
                   catch (Throwable e)
                   {
                      HornetQJournalLogger.LOGGER.errorSubmittingWrite(e);
-                     callback.onError(HornetQExceptionType.IO_ERROR.getCode(), e.getMessage());
+                     callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getMessage());
                   }
                }
                finally


Mime
View raw message