activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [31/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Date Tue, 18 Nov 2014 23:38:24 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java
index 31809a2..49f61d4 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java
@@ -19,12 +19,12 @@ import javax.transaction.xa.Xid;
 import org.apache.activemq.core.server.ServerMessage;
 import org.apache.activemq.core.transaction.Transaction;
 import org.apache.activemq.core.transaction.TransactionDetail;
-import org.apache.activemq.jms.client.HornetQBytesMessage;
-import org.apache.activemq.jms.client.HornetQMapMessage;
-import org.apache.activemq.jms.client.HornetQMessage;
-import org.apache.activemq.jms.client.HornetQObjectMessage;
-import org.apache.activemq.jms.client.HornetQStreamMessage;
-import org.apache.activemq.jms.client.HornetQTextMessage;
+import org.apache.activemq.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.jms.client.ActiveMQMapMessage;
+import org.apache.activemq.jms.client.ActiveMQMessage;
+import org.apache.activemq.jms.client.ActiveMQObjectMessage;
+import org.apache.activemq.jms.client.ActiveMQStreamMessage;
+import org.apache.activemq.jms.client.ActiveMQTextMessage;
 
 /**
  * A JMSTransactionDetail
@@ -46,17 +46,17 @@ public class JMSTransactionDetail extends TransactionDetail
       int type = msg.getType();
       switch (type)
       {
-         case HornetQMessage.TYPE: // 0
+         case ActiveMQMessage.TYPE: // 0
             return "Default";
-         case HornetQObjectMessage.TYPE: // 2
+         case ActiveMQObjectMessage.TYPE: // 2
             return "ObjectMessage";
-         case HornetQTextMessage.TYPE: // 3
+         case ActiveMQTextMessage.TYPE: // 3
             return "TextMessage";
-         case HornetQBytesMessage.TYPE: // 4
+         case ActiveMQBytesMessage.TYPE: // 4
             return "ByteMessage";
-         case HornetQMapMessage.TYPE: // 5
+         case ActiveMQMapMessage.TYPE: // 5
             return "MapMessage";
-         case HornetQStreamMessage.TYPE: // 6
+         case ActiveMQStreamMessage.TYPE: // 6
             return "StreamMessage";
          default:
             return "(Unknown Type)";
@@ -68,7 +68,7 @@ public class JMSTransactionDetail extends TransactionDetail
    {
       try
       {
-         return HornetQMessage.coreMaptoJMSMap(msg.toMap());
+         return ActiveMQMessage.coreMaptoJMSMap(msg.toMap());
       }
       catch (Throwable t)
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java
new file mode 100644
index 0000000..5fcd3e3
--- /dev/null
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.core.asyncio.impl;
+
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+
+import org.apache.activemq.core.libaio.Native;
+
+/**
+ * A ActiveMQFileLock
+ * @author clebertsuconic
+ */
+public class ActiveMQFileLock extends FileLock
+{
+
+   private final int handle;
+
+   protected ActiveMQFileLock(final int handle)
+   {
+      super((FileChannel)null, 0, 0, false);
+      this.handle = handle;
+   }
+
+   @Override
+   public boolean isValid()
+   {
+      return true;
+   }
+
+   @Override
+   public void release() throws IOException
+   {
+      Native.closeFile(handle);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 f087537..c497356 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
@@ -31,7 +31,7 @@ import org.apache.activemq.core.asyncio.AsynchronousFile;
 import org.apache.activemq.core.asyncio.BufferCallback;
 import org.apache.activemq.core.asyncio.IOExceptionListener;
 import org.apache.activemq.core.libaio.Native;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 import org.apache.activemq.utils.ReusableLatch;
 
 /**
@@ -111,11 +111,11 @@ public class AsynchronousFileImpl implements AsynchronousFile
    {
       try
       {
-         HornetQJournalLogger.LOGGER.trace(name + " being loaded");
+         ActiveMQJournalLogger.LOGGER.trace(name + " being loaded");
          System.loadLibrary(name);
          if (Native.getNativeVersion() != AsynchronousFileImpl.EXPECTED_NATIVE_VERSION)
          {
-            HornetQJournalLogger.LOGGER.incompatibleNativeLibrary();
+            ActiveMQJournalLogger.LOGGER.incompatibleNativeLibrary();
             return false;
          }
          else
@@ -125,7 +125,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
       }
       catch (Throwable e)
       {
-         HornetQJournalLogger.LOGGER.debug(name + " -> error loading the native library", e);
+         ActiveMQJournalLogger.LOGGER.debug(name + " -> error loading the native library", e);
          return false;
       }
 
@@ -144,13 +144,13 @@ public class AsynchronousFileImpl implements AsynchronousFile
          }
          else
          {
-            HornetQJournalLogger.LOGGER.debug("Library " + library + " not found!");
+            ActiveMQJournalLogger.LOGGER.debug("Library " + library + " not found!");
          }
       }
 
       if (!AsynchronousFileImpl.loaded)
       {
-         HornetQJournalLogger.LOGGER.debug("Couldn't locate LibAIO Wrapper");
+         ActiveMQJournalLogger.LOGGER.debug("Couldn't locate LibAIO Wrapper");
       }
    }
 
@@ -238,7 +238,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
 
          try
          {
-            handler = Native.init(AsynchronousFileImpl.class, fileName1, this.maxIO, HornetQJournalLogger.LOGGER);
+            handler = Native.init(AsynchronousFileImpl.class, fileName1, this.maxIO, ActiveMQJournalLogger.LOGGER);
          }
          catch (ActiveMQException e)
          {
@@ -279,12 +279,12 @@ public class AsynchronousFileImpl implements AsynchronousFile
 
          while (!pendingWrites.await(60000))
          {
-            HornetQJournalLogger.LOGGER.couldNotGetLock(fileName);
+            ActiveMQJournalLogger.LOGGER.couldNotGetLock(fileName);
          }
 
          while (!maxIOSemaphore.tryAcquire(maxIO, 60, TimeUnit.SECONDS))
          {
-            HornetQJournalLogger.LOGGER.couldNotGetLock(fileName);
+            ActiveMQJournalLogger.LOGGER.couldNotGetLock(fileName);
          }
 
          maxIOSemaphore = null;
@@ -493,7 +493,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
    {
       if (opened)
       {
-         HornetQJournalLogger.LOGGER.fileFinalizedWhileOpen(fileName);
+         ActiveMQJournalLogger.LOGGER.fileFinalizedWhileOpen(fileName);
       }
    }
 
@@ -566,7 +566,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
                               final int errorCode,
                               final String errorMessage)
    {
-      HornetQJournalLogger.LOGGER.callbackError(errorMessage);
+      ActiveMQJournalLogger.LOGGER.callbackError(errorMessage);
 
       fireExceptionListener(errorCode, errorMessage);
 
@@ -616,7 +616,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
     */
    private void fireExceptionListener(final int errorCode, final String errorMessage)
    {
-      HornetQJournalLogger.LOGGER.ioError(errorCode, errorMessage);
+      ActiveMQJournalLogger.LOGGER.ioError(errorCode, errorMessage);
       if (ioExceptionListener != null)
       {
          ioExceptionListener.onIOException(ActiveMQExceptionType.getType(errorCode).createException(errorMessage), errorMessage);
@@ -649,7 +649,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
             }
             catch (Exception ex)
             {
-               HornetQJournalLogger.LOGGER.errorStartingPoller(ex);
+               ActiveMQJournalLogger.LOGGER.errorStartingPoller(ex);
             }
          }
       }
@@ -683,7 +683,7 @@ public class AsynchronousFileImpl implements AsynchronousFile
    {
       if (Native.flock(handle))
       {
-         return new HornetQFileLock(handle);
+         return new ActiveMQFileLock(handle);
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java
deleted file mode 100644
index 94546ce..0000000
--- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.core.asyncio.impl;
-
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-
-import org.apache.activemq.core.libaio.Native;
-
-/**
- * A HornetQFileLock
- * @author clebertsuconic
- */
-public class HornetQFileLock extends FileLock
-{
-
-   private final int handle;
-
-   protected HornetQFileLock(final int handle)
-   {
-      super((FileChannel)null, 0, 0, false);
-      this.handle = handle;
-   }
-
-   @Override
-   public boolean isValid()
-   {
-      return true;
-   }
-
-   @Override
-   public void release() throws IOException
-   {
-      Native.closeFile(handle);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java
index c311f70..a174aae 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.activemq.core.journal.impl.JournalFile;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 
 /**
  * Most methods on the journal provide a blocking version where you select the sync mode and a non
@@ -28,7 +28,7 @@ import org.apache.activemq.core.server.HornetQComponent;
  * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
  * @see org.apache.activemq.utils.IDGenerator
  */
-public interface Journal extends HornetQComponent
+public interface Journal extends ActiveMQComponent
 {
    enum JournalState
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 1313546..8002155 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
@@ -26,8 +26,8 @@ import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
 import org.apache.activemq.core.journal.IOCriticalErrorListener;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.libaio.Native;
-import org.apache.activemq.journal.HornetQJournalLogger;
-import org.apache.activemq.utils.HornetQThreadFactory;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
+import org.apache.activemq.utils.ActiveMQThreadFactory;
 
 /**
  * A AIOSequentialFileFactory
@@ -36,7 +36,7 @@ import org.apache.activemq.utils.HornetQThreadFactory;
  */
 public final class AIOSequentialFileFactory extends AbstractSequentialFileFactory
 {
-   private static final boolean trace = HornetQJournalLogger.LOGGER.isTraceEnabled();
+   private static final boolean trace = ActiveMQJournalLogger.LOGGER.isTraceEnabled();
 
    private final ReuseBuffersController buffersControl = new ReuseBuffersController();
 
@@ -47,7 +47,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
    // Journal
    private static void trace(final String message)
    {
-      HornetQJournalLogger.LOGGER.trace(message);
+      ActiveMQJournalLogger.LOGGER.trace(message);
    }
 
    public AIOSequentialFileFactory(final String journalDir)
@@ -181,7 +181,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
    {
       super.start();
 
-      pollerExecutor = Executors.newCachedThreadPool(new HornetQThreadFactory("ActiveMQ-AIO-poller-pool" + System.identityHashCode(this),
+      pollerExecutor = Executors.newCachedThreadPool(new ActiveMQThreadFactory("ActiveMQ-AIO-poller-pool" + System.identityHashCode(this),
                                                                               true,
                                                                               AIOSequentialFileFactory.getThisClassLoader()));
 
@@ -200,7 +200,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor
          {
             if (!pollerExecutor.awaitTermination(AbstractSequentialFileFactory.EXECUTOR_TIMEOUT, TimeUnit.SECONDS))
             {
-               HornetQJournalLogger.LOGGER.timeoutOnPollerShutdown(new Exception("trace"));
+               ActiveMQJournalLogger.LOGGER.timeoutOnPollerShutdown(new Exception("trace"));
             }
          }
          catch (InterruptedException e)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 aebefb7..ecf5e87 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
@@ -29,8 +29,8 @@ import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.journal.HornetQJournalBundle;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalBundle;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A AbstractSequentialFile
@@ -100,7 +100,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
 
       if (file.exists() && !file.delete())
       {
-         HornetQJournalLogger.LOGGER.errorDeletingFile(this);
+         ActiveMQJournalLogger.LOGGER.errorDeletingFile(this);
       }
    }
 
@@ -108,7 +108,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
    {
       try
       {
-         HornetQJournalLogger.LOGGER.debug("Copying " + this + " as " + newFileName);
+         ActiveMQJournalLogger.LOGGER.debug("Copying " + this + " as " + newFileName);
          if (!newFileName.isOpen())
          {
             newFileName.open();
@@ -175,7 +175,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
       {
          if (!file.renameTo(newFile))
          {
-            throw HornetQJournalBundle.BUNDLE.ioRenameFileError(file.getName(), newFileName);
+            throw ActiveMQJournalBundle.BUNDLE.ioRenameFileError(file.getName(), newFileName);
          }
          file = newFile;
       }
@@ -201,7 +201,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
 
          while (!donelatch.await(60, TimeUnit.SECONDS))
          {
-            HornetQJournalLogger.LOGGER.couldNotCompleteTask(new Exception("trace"), file.getName());
+            ActiveMQJournalLogger.LOGGER.couldNotCompleteTask(new Exception("trace"), file.getName());
          }
       }
    }
@@ -328,7 +328,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
             }
             catch (Throwable e)
             {
-               HornetQJournalLogger.LOGGER.errorCompletingCallback(e);
+               ActiveMQJournalLogger.LOGGER.errorCompletingCallback(e);
             }
          }
       }
@@ -343,7 +343,7 @@ public abstract class AbstractSequentialFile implements SequentialFile
             }
             catch (Throwable e)
             {
-               HornetQJournalLogger.LOGGER.errorCallingErrorCallback(e);
+               ActiveMQJournalLogger.LOGGER.errorCallingErrorCallback(e);
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 bec5106..024b160 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
@@ -28,8 +28,8 @@ 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;
-import org.apache.activemq.journal.HornetQJournalLogger;
-import org.apache.activemq.utils.HornetQThreadFactory;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
+import org.apache.activemq.utils.ActiveMQThreadFactory;
 
 /**
  *
@@ -99,7 +99,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
          {
             if (!writeExecutor.awaitTermination(AbstractSequentialFileFactory.EXECUTOR_TIMEOUT, TimeUnit.SECONDS))
             {
-               HornetQJournalLogger.LOGGER.timeoutOnWriterShutdown(new Exception("trace"));
+               ActiveMQJournalLogger.LOGGER.timeoutOnWriterShutdown(new Exception("trace"));
             }
          }
          catch (InterruptedException e)
@@ -123,7 +123,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
 
       if (isSupportsCallbacks())
       {
-         writeExecutor = Executors.newSingleThreadExecutor(new HornetQThreadFactory("HornetQ-Asynchronous-Persistent-Writes" + System.identityHashCode(this),
+         writeExecutor = Executors.newSingleThreadExecutor(new ActiveMQThreadFactory("ActiveMQ-Asynchronous-Persistent-Writes" + System.identityHashCode(this),
                                                                                     true,
                                                                                     AbstractSequentialFileFactory.getThisClassLoader()));
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java
index c2d68ab..5ffe75d 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java
@@ -29,7 +29,7 @@ public final class CompactJournal // NO_UCD
    {
       if (arg.length != 4)
       {
-         System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.CompactJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>");
+         System.err.println("Use: java -cp activemq-core.jar org.apache.activemq.core.journal.impl.CompactJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>");
          return;
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java
index d0e3fb5..4150008 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.journal.impl;
 
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A DummyCallback
@@ -36,7 +36,7 @@ class DummyCallback extends SyncIOCompletion
 
    public void onError(final int errorCode, final String errorMessage)
    {
-      HornetQJournalLogger.LOGGER.errorWritingData(new Exception(errorMessage), errorMessage, errorCode);
+      ActiveMQJournalLogger.LOGGER.errorWritingData(new Exception(errorMessage), errorMessage, errorCode);
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java
index 87ff658..ee55d6b 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java
@@ -27,7 +27,7 @@ import org.apache.activemq.utils.Base64;
  *
  * If you use the main method, use it as  <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput>
  *
- * Example: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat
+ * Example: java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir activemq-data amq 2 10485760 /tmp/export.dat
  *
  * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
  *
@@ -50,7 +50,7 @@ public class ExportJournal
    {
       if (arg.length != 5)
       {
-         System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>");
+         System.err.println("Use: java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>");
          return;
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java
index d845e47..047efde 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java
@@ -40,7 +40,7 @@ import org.apache.activemq.utils.Base64;
  * Example:
  *
  * <pre>
- * java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat
+ * java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir activemq-data amq 2 10485760 /tmp/export.dat
  * </pre>
  * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
  */
@@ -61,7 +61,7 @@ public class ImportJournal
    {
       if (arg.length != 5)
       {
-         System.err.println("Use: java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>");
+         System.err.println("Use: java -cp activemq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>");
          return;
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 d582be1..5cbc654 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
@@ -34,7 +34,7 @@ import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.
 import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX;
 import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord;
 import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A JournalCompactor
@@ -284,7 +284,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
          }
          catch (Exception e)
          {
-            HornetQJournalLogger.LOGGER.errorReplayingCommands(e);
+            ActiveMQJournalLogger.LOGGER.errorReplayingCommands(e);
          }
       }
 
@@ -339,7 +339,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
       if (pendingTransactions.get(transactionID) != null)
       {
          // Sanity check, this should never happen
-         HornetQJournalLogger.LOGGER.inconsistencyDuringCompacting(transactionID);
+         ActiveMQJournalLogger.LOGGER.inconsistencyDuringCompacting(transactionID);
       }
       else
       {
@@ -363,7 +363,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
       if (newRecords.get(recordID) != null)
       {
          // Sanity check, it should never happen
-         HornetQJournalLogger.LOGGER.inconsistencyDuringCompactingDelete(recordID);
+         ActiveMQJournalLogger.LOGGER.inconsistencyDuringCompactingDelete(recordID);
       }
 
    }
@@ -454,7 +454,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
 
          if (newRecord == null)
          {
-            HornetQJournalLogger.LOGGER.compactingWithNoAddRecord(info.id);
+            ActiveMQJournalLogger.LOGGER.compactingWithNoAddRecord(info.id);
          }
          else
          {
@@ -529,7 +529,7 @@ public class JournalCompactor extends AbstractJournalUpdateTask implements Journ
          JournalRecord deleteRecord = journal.getRecords().remove(id);
          if (deleteRecord == null)
          {
-            HornetQJournalLogger.LOGGER.noRecordDuringCompactReplay(id);
+            ActiveMQJournalLogger.LOGGER.noRecordDuringCompactReplay(id);
          }
          else
          {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java
index 81b31eb..9c7600b 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * This is a helper class for the Journal, which will control access to dataFiles, openedFiles and freeFiles
@@ -39,7 +39,7 @@ import org.apache.activemq.journal.HornetQJournalLogger;
  */
 public class JournalFilesRepository
 {
-   private static final boolean trace = HornetQJournalLogger.LOGGER.isTraceEnabled();
+   private static final boolean trace = ActiveMQJournalLogger.LOGGER.isTraceEnabled();
 
    /**
     * Used to debug the consistency of the journal ordering.
@@ -53,7 +53,7 @@ public class JournalFilesRepository
    // Journal
    private static void trace(final String message)
    {
-      HornetQJournalLogger.LOGGER.trace(message);
+      ActiveMQJournalLogger.LOGGER.trace(message);
    }
 
    private final SequentialFileFactory fileFactory;
@@ -94,7 +94,7 @@ public class JournalFilesRepository
          }
          catch (Exception e)
          {
-            HornetQJournalLogger.LOGGER.errorPushingFile(e);
+            ActiveMQJournalLogger.LOGGER.errorPushingFile(e);
          }
       }
    };
@@ -153,7 +153,7 @@ public class JournalFilesRepository
          }
          catch (Exception e)
          {
-            HornetQJournalLogger.LOGGER.errorClosingFile(e);
+            ActiveMQJournalLogger.LOGGER.errorClosingFile(e);
          }
       }
       openedFiles.clear();
@@ -256,7 +256,7 @@ public class JournalFilesRepository
    {
       if (!dataFiles.remove(file))
       {
-         HornetQJournalLogger.LOGGER.couldNotRemoveFile(file);
+         ActiveMQJournalLogger.LOGGER.couldNotRemoveFile(file);
       }
    }
 
@@ -310,17 +310,17 @@ public class JournalFilesRepository
       {
          if (file.getFileID() <= seq)
          {
-            HornetQJournalLogger.LOGGER.checkFiles();
-            HornetQJournalLogger.LOGGER.info(debugFiles());
-            HornetQJournalLogger.LOGGER.seqOutOfOrder();
+            ActiveMQJournalLogger.LOGGER.checkFiles();
+            ActiveMQJournalLogger.LOGGER.info(debugFiles());
+            ActiveMQJournalLogger.LOGGER.seqOutOfOrder();
             System.exit(-1);
          }
 
          if (journal.getCurrentFile() != null && journal.getCurrentFile().getFileID() <= file.getFileID())
          {
-            HornetQJournalLogger.LOGGER.checkFiles();
-            HornetQJournalLogger.LOGGER.info(debugFiles());
-            HornetQJournalLogger.LOGGER.currentFile(file.getFileID(), journal.getCurrentFile().getFileID(),
+            ActiveMQJournalLogger.LOGGER.checkFiles();
+            ActiveMQJournalLogger.LOGGER.info(debugFiles());
+            ActiveMQJournalLogger.LOGGER.currentFile(file.getFileID(), journal.getCurrentFile().getFileID(),
                                                     file.getFileID(), (journal.getCurrentFile() == file));
 
             // throw new RuntimeException ("Check failure!");
@@ -339,9 +339,9 @@ public class JournalFilesRepository
       {
          if (file.getFileID() <= lastFreeId)
          {
-            HornetQJournalLogger.LOGGER.checkFiles();
-            HornetQJournalLogger.LOGGER.info(debugFiles());
-            HornetQJournalLogger.LOGGER.fileIdOutOfOrder();
+            ActiveMQJournalLogger.LOGGER.checkFiles();
+            ActiveMQJournalLogger.LOGGER.info(debugFiles());
+            ActiveMQJournalLogger.LOGGER.fileIdOutOfOrder();
 
             throw new RuntimeException("Check failure!");
          }
@@ -350,9 +350,9 @@ public class JournalFilesRepository
 
          if (file.getFileID() < seq)
          {
-            HornetQJournalLogger.LOGGER.checkFiles();
-            HornetQJournalLogger.LOGGER.info(debugFiles());
-            HornetQJournalLogger.LOGGER.fileTooSmall();
+            ActiveMQJournalLogger.LOGGER.checkFiles();
+            ActiveMQJournalLogger.LOGGER.info(debugFiles());
+            ActiveMQJournalLogger.LOGGER.fileTooSmall();
 
             // throw new RuntimeException ("Check failure!");
          }
@@ -406,7 +406,7 @@ public class JournalFilesRepository
       }
       if (calculatedSize != fileSize)
       {
-         HornetQJournalLogger.LOGGER.deletingFile(file);
+         ActiveMQJournalLogger.LOGGER.deletingFile(file);
          file.getFile().delete();
       }
       else
@@ -433,11 +433,11 @@ public class JournalFilesRepository
          {
             if (trace)
             {
-               HornetQJournalLogger.LOGGER.trace("DataFiles.size() = " + dataFiles.size());
-               HornetQJournalLogger.LOGGER.trace("openedFiles.size() = " + openedFiles.size());
-               HornetQJournalLogger.LOGGER.trace("minfiles = " + minFiles);
-               HornetQJournalLogger.LOGGER.trace("Free Files = " + freeFilesCount.get());
-               HornetQJournalLogger.LOGGER.trace("File " + file +
+               ActiveMQJournalLogger.LOGGER.trace("DataFiles.size() = " + dataFiles.size());
+               ActiveMQJournalLogger.LOGGER.trace("openedFiles.size() = " + openedFiles.size());
+               ActiveMQJournalLogger.LOGGER.trace("minfiles = " + minFiles);
+               ActiveMQJournalLogger.LOGGER.trace("Free Files = " + freeFilesCount.get());
+               ActiveMQJournalLogger.LOGGER.trace("File " + file +
                                                     " being deleted as freeFiles.size() + dataFiles.size() + 1 + openedFiles.size() (" +
                                                     (freeFilesCount.get() + dataFiles.size() + 1 + openedFiles.size()) +
                                                     ") < minFiles (" + minFiles + ")");
@@ -473,7 +473,7 @@ public class JournalFilesRepository
    /**
     * <p>This method will instantly return the opened file, and schedule opening and reclaiming.</p>
     * <p>In case there are no cached opened files, this method will block until the file was opened,
-    * what would happen only if the system is under heavy load by another system (like a backup system, or a DB sharing the same box as HornetQ).</p>
+    * what would happen only if the system is under heavy load by another system (like a backup system, or a DB sharing the same box as ActiveMQ).</p>
     */
    public JournalFile openFile() throws InterruptedException
    {
@@ -498,7 +498,7 @@ public class JournalFilesRepository
          nextFile = openedFiles.poll(5, TimeUnit.SECONDS);
          if (nextFile == null)
          {
-            HornetQJournalLogger.LOGGER.errorOpeningFile(new Exception("trace"));
+            ActiveMQJournalLogger.LOGGER.errorOpeningFile(new Exception("trace"));
          }
       }
 
@@ -524,7 +524,7 @@ public class JournalFilesRepository
 
       if (!openedFiles.offer(nextOpenedFile))
       {
-         HornetQJournalLogger.LOGGER.failedToAddFile(nextOpenedFile);
+         ActiveMQJournalLogger.LOGGER.failedToAddFile(nextOpenedFile);
       }
    }
 
@@ -733,7 +733,7 @@ public class JournalFilesRepository
       }
       catch (Throwable e)
       {
-         HornetQJournalLogger.LOGGER.errorRetrievingID(e, fileName);
+         ActiveMQJournalLogger.LOGGER.errorRetrievingID(e, fileName);
          return 0;
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 d5ba1ce..206a9eb 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
@@ -62,8 +62,8 @@ import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecord;
 import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX;
 import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord;
 import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX;
-import org.apache.activemq.journal.HornetQJournalBundle;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalBundle;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 import org.apache.activemq.utils.ConcurrentHashSet;
 import org.apache.activemq.utils.DataConstants;
 
@@ -85,7 +85,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
    private static final int[] COMPATIBLE_VERSIONS = new int[]{1};
 
    // Static --------------------------------------------------------
-   private static final boolean trace = HornetQJournalLogger.LOGGER.isTraceEnabled();
+   private static final boolean trace = ActiveMQJournalLogger.LOGGER.isTraceEnabled();
 
    // This is useful at debug time...
    // if you set it to true, all the appends, deletes, rollbacks, commits, etc.. are sent to System.out
@@ -96,12 +96,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
    // Journal
    private static void trace(final String message)
    {
-      HornetQJournalLogger.LOGGER.trace(message);
+      ActiveMQJournalLogger.LOGGER.trace(message);
    }
 
    private static void traceRecord(final String message)
    {
-      HornetQJournalLogger.LOGGER.trace(message);
+      ActiveMQJournalLogger.LOGGER.trace(message);
    }
 
    // The sizes of primitive types
@@ -288,7 +288,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
    {
       final int numIts = 100000000;
 
-      HornetQJournalLogger.LOGGER.runningJournalBlast(numIts);
+      ActiveMQJournalLogger.LOGGER.runningJournalBlast(numIts);
 
       final CountDownLatch latch = new CountDownLatch(numIts * 2);
 
@@ -747,7 +747,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       }
       catch (Throwable e)
       {
-         HornetQJournalLogger.LOGGER.errorReadingFile(e);
+         ActiveMQJournalLogger.LOGGER.errorReadingFile(e);
          throw new Exception(e.getMessage(), e);
       }
       finally
@@ -1329,7 +1329,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
             // HORNETQ-482 - Flush deletes only if memory is critical
             if (recordsToDelete.size() > DELETE_FLUSH && runtime.freeMemory() < runtime.maxMemory() * 0.2)
             {
-               HornetQJournalLogger.LOGGER.debug("Flushing deletes during loading, deleteCount = " + recordsToDelete.size());
+               ActiveMQJournalLogger.LOGGER.debug("Flushing deletes during loading, deleteCount = " + recordsToDelete.size());
                // Clean up when the list is too large, or it won't be possible to load large sets of files
                // Done as part of JBMESSAGING-1678
                Iterator<RecordInfo> iter = records.iterator();
@@ -1345,7 +1345,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
                recordsToDelete.clear();
 
-               HornetQJournalLogger.LOGGER.debug("flush delete done");
+               ActiveMQJournalLogger.LOGGER.debug("flush delete done");
             }
          }
 
@@ -1418,7 +1418,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
             catch (Throwable e)
             {
                errors.incrementAndGet();
-               HornetQJournalLogger.LOGGER.errorCompacting(e);
+               ActiveMQJournalLogger.LOGGER.errorCompacting(e);
                e.printStackTrace();
             }
             finally
@@ -1467,7 +1467,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
          try
          {
-            HornetQJournalLogger.LOGGER.debug("Starting compacting operation on journal");
+            ActiveMQJournalLogger.LOGGER.debug("Starting compacting operation on journal");
 
             onCompactStart();
 
@@ -1536,7 +1536,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                }
                catch (Throwable e)
                {
-                  HornetQJournalLogger.LOGGER.compactReadError(file);
+                  ActiveMQJournalLogger.LOGGER.compactReadError(file);
                   throw new Exception("Error on reading compacting for " + file, e);
                }
             }
@@ -1612,7 +1612,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                   }
                   else
                   {
-                     HornetQJournalLogger.LOGGER.compactMergeError(newTransaction.getId());
+                     ActiveMQJournalLogger.LOGGER.compactMergeError(newTransaction.getId());
                   }
                }
             }
@@ -1625,7 +1625,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
             renameFiles(dataFilesToProcess, newDatafiles);
             deleteControlFile(controlFile);
 
-            HornetQJournalLogger.LOGGER.debug("Finished compacting on journal");
+            ActiveMQJournalLogger.LOGGER.debug("Finished compacting on journal");
 
          }
          finally
@@ -1896,7 +1896,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                }
                else
                {
-                  HornetQJournalLogger.LOGGER.preparedTXIncomplete(transactionID);
+                  ActiveMQJournalLogger.LOGGER.preparedTXIncomplete(transactionID);
                   tx.invalid = true;
                }
             }
@@ -1946,7 +1946,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                   }
                   else
                   {
-                     HornetQJournalLogger.LOGGER.txMissingElements(transactionID);
+                     ActiveMQJournalLogger.LOGGER.txMissingElements(transactionID);
 
                      journalTransaction.forget();
                   }
@@ -2018,7 +2018,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       {
          if ((!transaction.prepared || transaction.invalid) && replicationSync != JournalState.SYNCING_UP_TO_DATE)
          {
-            HornetQJournalLogger.LOGGER.uncomittedTxFound(transaction.transactionID);
+            ActiveMQJournalLogger.LOGGER.uncomittedTxFound(transaction.transactionID);
 
             if (changeData)
             {
@@ -2164,7 +2164,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
             }
             catch (Throwable e)
             {
-               HornetQJournalLogger.LOGGER.errorCompacting(e);
+               ActiveMQJournalLogger.LOGGER.errorCompacting(e);
             }
             finally
             {
@@ -2350,7 +2350,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       new PerfBlast(pages).start();
    }
 
-   // HornetQComponent implementation
+   // ActiveMQComponent implementation
    // ---------------------------------------------------
 
    public synchronized boolean isStarted()
@@ -2412,7 +2412,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
             if (!compactorExecutor.awaitTermination(120, TimeUnit.SECONDS))
             {
-               HornetQJournalLogger.LOGGER.couldNotStopCompactor();
+               ActiveMQJournalLogger.LOGGER.couldNotStopCompactor();
             }
 
             filesExecutor.shutdown();
@@ -2421,7 +2421,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
             if (!filesExecutor.awaitTermination(60, TimeUnit.SECONDS))
             {
-               HornetQJournalLogger.LOGGER.couldNotStopJournalExecutor();
+               ActiveMQJournalLogger.LOGGER.couldNotStopJournalExecutor();
             }
 
             try
@@ -2433,7 +2433,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
             }
             catch (Throwable e)
             {
-               HornetQJournalLogger.LOGGER.warn(e.getMessage(), e);
+               ActiveMQJournalLogger.LOGGER.warn(e.getMessage(), e);
             }
 
             fileFactory.deactivateBuffer();
@@ -2515,7 +2515,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                   }
                   catch (Throwable e)
                   {
-                     HornetQJournalLogger.LOGGER.errorReinitializingFile(e, file);
+                     ActiveMQJournalLogger.LOGGER.errorReinitializingFile(e, file);
                   }
                }
             }
@@ -2690,7 +2690,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
          if (!isCompatible)
          {
-            throw HornetQJournalBundle.BUNDLE.journalFileMisMatch();
+            throw ActiveMQJournalBundle.BUNDLE.journalFileMisMatch();
          }
       }
 
@@ -2698,7 +2698,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       if (readUserVersion != userVersion)
       {
-         throw HornetQJournalBundle.BUNDLE.journalDifferentVersion();
+         throw ActiveMQJournalBundle.BUNDLE.journalDifferentVersion();
       }
 
       long fileID = bb.getLong();
@@ -2848,7 +2848,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
                }
                catch (Exception e)
                {
-                  HornetQJournalLogger.LOGGER.errorSchedulingCompacting(e);
+                  ActiveMQJournalLogger.LOGGER.errorSchedulingCompacting(e);
                }
             }
          });
@@ -2938,11 +2938,11 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       if (leftFiles.size() > 0)
       {
-         HornetQJournalLogger.LOGGER.tempFilesLeftOpen();
+         ActiveMQJournalLogger.LOGGER.tempFilesLeftOpen();
 
          for (String fileToDelete : leftFiles)
          {
-            HornetQJournalLogger.LOGGER.deletingOrphanedFile(fileToDelete);
+            ActiveMQJournalLogger.LOGGER.deletingOrphanedFile(fileToDelete);
             SequentialFile file = fileFactory.createSequentialFile(fileToDelete, 1);
             file.delete();
          }
@@ -3008,7 +3008,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       private PerfBlast(final int pages)
       {
-         super("hornetq-perfblast-thread");
+         super("activemq-perfblast-thread");
 
          this.pages = pages;
       }
@@ -3044,7 +3044,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
          }
          catch (Exception e)
          {
-            HornetQJournalLogger.LOGGER.failedToPerfBlast(e);
+            ActiveMQJournalLogger.LOGGER.failedToPerfBlast(e);
          }
          finally
          {
@@ -3219,7 +3219,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
       if (trace)
       {
-         HornetQJournalLogger.LOGGER.trace("Moving next file " + currentFile);
+         ActiveMQJournalLogger.LOGGER.trace("Moving next file " + currentFile);
       }
 
       fileFactory.activateBuffer(currentFile.getFile());

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 e8db83e..3dd74b3 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
@@ -28,8 +28,8 @@ 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;
-import org.apache.activemq.journal.HornetQJournalBundle;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalBundle;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A NIOSequentialFile
@@ -162,7 +162,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
       {
          while (!maxIOSemaphore.tryAcquire(maxIO, 60, TimeUnit.SECONDS))
          {
-            HornetQJournalLogger.LOGGER.errorClosingFile(getFileName());
+            ActiveMQJournalLogger.LOGGER.errorClosingFile(getFileName());
          }
       }
 
@@ -336,7 +336,7 @@ public final class NIOSequentialFile extends AbstractSequentialFile
          }
          else
          {
-            throw HornetQJournalBundle.BUNDLE.fileNotOpened();
+            throw ActiveMQJournalBundle.BUNDLE.fileNotOpened();
          }
          return;
       }
@@ -372,13 +372,13 @@ public final class NIOSequentialFile extends AbstractSequentialFile
                   }
                   catch (IOException e)
                   {
-                     HornetQJournalLogger.LOGGER.errorSubmittingWrite(e);
+                     ActiveMQJournalLogger.LOGGER.errorSubmittingWrite(e);
                      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);
+                     ActiveMQJournalLogger.LOGGER.errorSubmittingWrite(e);
                      callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getMessage());
                   }
                }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java
index 4638ff5..72cd90d 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java
@@ -13,7 +13,7 @@
 package org.apache.activemq.core.journal.impl;
 
 
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  *
@@ -36,11 +36,11 @@ import org.apache.activemq.journal.HornetQJournalLogger;
  */
 public class Reclaimer
 {
-   private static boolean trace = HornetQJournalLogger.LOGGER.isTraceEnabled();
+   private static boolean trace = ActiveMQJournalLogger.LOGGER.isTraceEnabled();
 
    private static void trace(final String message)
    {
-      HornetQJournalLogger.LOGGER.trace(message);
+      ActiveMQJournalLogger.LOGGER.trace(message);
    }
 
    public void scan(final JournalFile[] files)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java
index 5b17ddd..5650aee 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A SimpleWaitIOCallback
@@ -51,7 +51,7 @@ public final class SimpleWaitIOCallback extends SyncIOCompletion
 
       this.errorMessage = errorMessage1;
 
-      HornetQJournalLogger.LOGGER.errorOnIOCallback(errorMessage1);
+      ActiveMQJournalLogger.LOGGER.errorOnIOCallback(errorMessage1);
 
       latch.countDown();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java
index 72059af..0ca8aa0 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.SequentialFile;
 import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A SyncSpeedTest
@@ -169,7 +169,7 @@ public class SyncSpeedTest
          {
             if (!file.delete())
             {
-               HornetQJournalLogger.LOGGER.errorDeletingFile(file);
+               ActiveMQJournalLogger.LOGGER.errorDeletingFile(file);
             }
          }
 
@@ -309,7 +309,7 @@ public class SyncSpeedTest
 
          for (Thread t : threads)
          {
-            HornetQJournalLogger.LOGGER.startingThread();
+            ActiveMQJournalLogger.LOGGER.startingThread();
             t.start();
          }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java
index 50d71d1..3e54b70 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java
@@ -27,7 +27,7 @@ import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.core.journal.EncodingSupport;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding;
-import org.apache.activemq.journal.HornetQJournalLogger;
+import org.apache.activemq.journal.ActiveMQJournalLogger;
 
 /**
  * A TimedBuffer
@@ -151,7 +151,7 @@ public class TimedBuffer
 
       timerRunnable = new CheckTimer();
 
-      timerThread = new Thread(timerRunnable, "hornetq-buffer-timeout");
+      timerThread = new Thread(timerRunnable, "activemq-buffer-timeout");
 
       timerThread.start();
 
@@ -373,9 +373,9 @@ public class TimedBuffer
             if (lastExecution != 0)
             {
                double rate = 1000 * (double) (bytesF - lastBytesFlushed) / (now - lastExecution);
-               HornetQJournalLogger.LOGGER.writeRate(rate, (long) (rate / (1024 * 1024)));
+               ActiveMQJournalLogger.LOGGER.writeRate(rate, (long) (rate / (1024 * 1024)));
                double flushRate = 1000 * (double) (flushesD - lastFlushesDone) / (now - lastExecution);
-               HornetQJournalLogger.LOGGER.flushRate(flushRate);
+               ActiveMQJournalLogger.LOGGER.flushRate(flushRate);
             }
 
             lastExecution = now;
@@ -477,7 +477,7 @@ public class TimedBuffer
             catch (Exception e)
             {
                setUseSleep(false);
-               HornetQJournalLogger.LOGGER.warn(e.getMessage() + ", disabling sleep on TimedBuffer, using spin now", e);
+               ActiveMQJournalLogger.LOGGER.warn(e.getMessage() + ", disabling sleep on TimedBuffer, using spin now", e);
             }
 
             if (checks < MAX_CHECKS_ON_SLEEP)
@@ -494,7 +494,7 @@ public class TimedBuffer
                {
                   if (failedChecks > MAX_CHECKS_ON_SLEEP * 0.5)
                   {
-                     HornetQJournalLogger.LOGGER.debug("Thread.sleep with nano seconds is not working as expected, Your kernel possibly doesn't support real time. the Journal TimedBuffer will spin for timeouts");
+                     ActiveMQJournalLogger.LOGGER.debug("Thread.sleep with nano seconds is not working as expected, Your kernel possibly doesn't support real time. the Journal TimedBuffer will spin for timeouts");
                      setUseSleep(false);
                   }
                }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
new file mode 100644
index 0000000..4106e4e
--- /dev/null
+++ b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.journal;
+
+
+import org.apache.activemq.api.core.ActiveMQIOErrorException;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
+import org.jboss.logging.Messages;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ *         3/12/12
+ *
+ * Logger Code 14
+ *
+ * each message id must be 6 digits long starting with 14, the 3rd digit should be 9
+ *
+ * so 149000 to 149999
+ */
+@MessageBundle(projectCode = "AMQ")
+public interface ActiveMQJournalBundle
+{
+   ActiveMQJournalBundle BUNDLE = Messages.getBundle(ActiveMQJournalBundle.class);
+
+   @Message(id = 149000, value =  "failed to rename file {0} to {1}", format = Message.Format.MESSAGE_FORMAT)
+   ActiveMQIOErrorException ioRenameFileError(String name, String newFileName);
+
+   @Message(id = 149001, value =  "Journal data belong to a different version", format = Message.Format.MESSAGE_FORMAT)
+   ActiveMQIOErrorException journalDifferentVersion();
+
+   @Message(id = 149002, value =  "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual",
+         format = Message.Format.MESSAGE_FORMAT)
+   ActiveMQIOErrorException journalFileMisMatch();
+
+   @Message(id = 149003, value =   "File not opened", format = Message.Format.MESSAGE_FORMAT)
+   ActiveMQIOErrorException fileNotOpened();
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java
new file mode 100644
index 0000000..331df41
--- /dev/null
+++ b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.journal;
+
+import org.apache.activemq.core.journal.impl.JournalFile;
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ *         3/15/12
+ *
+ * Logger Code 14
+ *
+ * each message id must be 6 digits long starting with 14, the 3rd digit donates the level so
+ *
+ * INF0  1
+ * WARN  2
+ * DEBUG 3
+ * ERROR 4
+ * TRACE 5
+ * FATAL 6
+ *
+ * so an INFO message would be 141000 to 141999
+ */
+@MessageLogger(projectCode = "AMQ")
+public interface ActiveMQJournalLogger extends BasicLogger
+{
+   /**
+    * The journal logger.
+    */
+   ActiveMQJournalLogger LOGGER = Logger.getMessageLogger(ActiveMQJournalLogger.class, ActiveMQJournalLogger.class.getPackage().getName());
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141000, value = "*** running direct journal blast: {0}", format = Message.Format.MESSAGE_FORMAT)
+   void runningJournalBlast(Integer numIts);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141002, value = "starting thread for sync speed test", format = Message.Format.MESSAGE_FORMAT)
+   void startingThread();
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141003, value = "Write rate = {0} bytes / sec or {1} MiB / sec", format = Message.Format.MESSAGE_FORMAT)
+   void writeRate(Double rate, Long l);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141004, value = "Flush rate = {0} flushes / sec", format = Message.Format.MESSAGE_FORMAT)
+   void flushRate(Double rate);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141005, value = "Check Data Files:", format = Message.Format.MESSAGE_FORMAT)
+   void checkFiles();
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141006, value = "Sequence out of order on journal", format = Message.Format.MESSAGE_FORMAT)
+   void seqOutOfOrder();
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141007, value = "Current File on the journal is <= the sequence file.getFileID={0} on the dataFiles" +
+                                 "\nCurrentfile.getFileId={1} while the file.getFileID()={2}" +
+                                 "\nIs same = ({3})",
+            format = Message.Format.MESSAGE_FORMAT)
+   void currentFile(Long fileID, Long id, Long fileFileID, Boolean b);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141008, value = "Free File ID out of order", format = Message.Format.MESSAGE_FORMAT)
+   void fileIdOutOfOrder();
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 141009, value = "A Free File is less than the maximum data", format = Message.Format.MESSAGE_FORMAT)
+   void fileTooSmall();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142000, value = "You have a native library with a different version than expected", format = Message.Format.MESSAGE_FORMAT)
+   void incompatibleNativeLibrary();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142001, value = "Could not get lock after 60 seconds on closing Asynchronous File: {0}",
+            format = Message.Format.MESSAGE_FORMAT)
+   void couldNotGetLock(String fileName);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142002, value = "Asynchronous File: {0} being finalized with opened state", format = Message.Format.MESSAGE_FORMAT)
+   void fileFinalizedWhileOpen(String fileName);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142003, value = "AIO Callback Error: {0}", format = Message.Format.MESSAGE_FORMAT)
+   void callbackError(String error);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142004, value = "Inconsistency during compacting: CommitRecord ID = {0} for an already committed transaction during compacting",
+         format = Message.Format.MESSAGE_FORMAT)
+   void inconsistencyDuringCompacting(Long transactionID);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142005, value = "Inconsistency during compacting: Delete record being read on an existent record (id={0})",
+         format = Message.Format.MESSAGE_FORMAT)
+   void inconsistencyDuringCompactingDelete(Long recordID);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142006, value = "Could not find add Record information for record {0} during compacting",
+         format = Message.Format.MESSAGE_FORMAT)
+   void compactingWithNoAddRecord(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142007, value = "Can not find record {0} during compact replay",
+         format = Message.Format.MESSAGE_FORMAT)
+   void noRecordDuringCompactReplay(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142008, value = "Could not remove file {0} from the list of data files",
+         format = Message.Format.MESSAGE_FORMAT)
+   void couldNotRemoveFile(JournalFile file);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142009, value = "Deleting {0} as it does not have the configured size",
+         format = Message.Format.MESSAGE_FORMAT)
+   void deletingFile(JournalFile file);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142010, value = "Failed to add file to opened files queue: {0}. This should NOT happen!",
+         format = Message.Format.MESSAGE_FORMAT)
+   void failedToAddFile(JournalFile nextOpenedFile);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142011, value = "Error on reading compacting for {0}",
+         format = Message.Format.MESSAGE_FORMAT)
+   void compactReadError(JournalFile file);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142012, value = "Couldn''t find tx={0} to merge after compacting",
+         format = Message.Format.MESSAGE_FORMAT)
+   void compactMergeError(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142013, value = "Prepared transaction {0} was not considered completed, it will be ignored",
+         format = Message.Format.MESSAGE_FORMAT)
+   void preparedTXIncomplete(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142014, value = "Transaction {0} is missing elements so the transaction is being ignored",
+         format = Message.Format.MESSAGE_FORMAT)
+   void txMissingElements(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142015, value = "Uncommitted transaction with id {0} found and discarded",
+         format = Message.Format.MESSAGE_FORMAT)
+   void uncomittedTxFound(Long id);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142016, value = "Couldn''t stop compactor executor after 120 seconds",
+         format = Message.Format.MESSAGE_FORMAT)
+   void couldNotStopCompactor();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142017, value = "Couldn''t stop journal executor after 60 seconds",
+         format = Message.Format.MESSAGE_FORMAT)
+   void couldNotStopJournalExecutor();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142018, value = "Temporary files were left unnatended after a crash on journal directory, deleting invalid files now",
+         format = Message.Format.MESSAGE_FORMAT)
+   void tempFilesLeftOpen();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142019, value =  "Deleting orphaned file {0}", format = Message.Format.MESSAGE_FORMAT)
+   void deletingOrphanedFile(String fileToDelete);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142020, value =  "Couldn''t get lock after 60 seconds on closing Asynchronous File: {0}", format = Message.Format.MESSAGE_FORMAT)
+   void errorClosingFile(String fileToDelete);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142021, value =  "Error on IO callback, {0}", format = Message.Format.MESSAGE_FORMAT)
+   void errorOnIOCallback(String errorMessage);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142022, value =  "Timed out on AIO poller shutdown", format = Message.Format.MESSAGE_FORMAT)
+   void timeoutOnPollerShutdown(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142023, value =  "Executor on file {0} couldn''t complete its tasks in 60 seconds.", format = Message.Format.MESSAGE_FORMAT)
+   void couldNotCompleteTask(@Cause Exception e, String name);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142024, value =  "Error completing callback", format = Message.Format.MESSAGE_FORMAT)
+   void errorCompletingCallback(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142025, value =  "Error calling onError callback", format = Message.Format.MESSAGE_FORMAT)
+   void errorCallingErrorCallback(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142026, value =  "Timed out on AIO writer shutdown", format = Message.Format.MESSAGE_FORMAT)
+   void timeoutOnWriterShutdown(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142027, value =  "Error on writing data! {0} code - {1}", format = Message.Format.MESSAGE_FORMAT)
+   void errorWritingData(@Cause Throwable e, String errorMessage, Integer errorCode);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142028, value =  "Error replaying pending commands after compacting", format = Message.Format.MESSAGE_FORMAT)
+   void errorReplayingCommands(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142029, value =  "Error closing file", format = Message.Format.MESSAGE_FORMAT)
+   void errorClosingFile(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142030, value = "Could not open a file in 60 Seconds", format = Message.Format.MESSAGE_FORMAT)
+   void errorOpeningFile(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142031, value =  "Error retrieving ID part of the file name {0}", format = Message.Format.MESSAGE_FORMAT)
+   void errorRetrievingID(@Cause Throwable e, String fileName);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142032, value =  "Error reading journal file", format = Message.Format.MESSAGE_FORMAT)
+   void errorReadingFile(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142033, value =  "Error reinitializing file {0}", format = Message.Format.MESSAGE_FORMAT)
+   void errorReinitializingFile(@Cause Throwable e, JournalFile file);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 142034, value = "Exception on submitting write", format = Message.Format.MESSAGE_FORMAT)
+   void errorSubmittingWrite(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144000, value = "Failed to delete file {0}", format = Message.Format.MESSAGE_FORMAT)
+   void errorDeletingFile(Object e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144001, value = "Error starting poller", format = Message.Format.MESSAGE_FORMAT)
+   void errorStartingPoller(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144002, value = "Error pushing opened file", format = Message.Format.MESSAGE_FORMAT)
+   void errorPushingFile(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144003, value = "Error compacting", format = Message.Format.MESSAGE_FORMAT)
+   void errorCompacting(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144004, value = "Error scheduling compacting", format = Message.Format.MESSAGE_FORMAT)
+   void errorSchedulingCompacting(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144005, value = "Failed to performance blast", format = Message.Format.MESSAGE_FORMAT)
+   void failedToPerfBlast(@Cause Throwable e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 144006, value = "IOError code {0}, {1}", format = Message.Format.MESSAGE_FORMAT)
+   void ioError(final int errorCode, final String errorMessage);
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java
deleted file mode 100644
index 39a2adf..0000000
--- a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.journal;
-
-
-import org.apache.activemq.api.core.ActiveMQIOErrorException;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
-import org.jboss.logging.Messages;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- *         3/12/12
- *
- * Logger Code 14
- *
- * each message id must be 6 digits long starting with 14, the 3rd digit should be 9
- *
- * so 149000 to 149999
- */
-@MessageBundle(projectCode = "HQ")
-public interface HornetQJournalBundle
-{
-   HornetQJournalBundle BUNDLE = Messages.getBundle(HornetQJournalBundle.class);
-
-   @Message(id = 149000, value =  "failed to rename file {0} to {1}", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQIOErrorException ioRenameFileError(String name, String newFileName);
-
-   @Message(id = 149001, value =  "Journal data belong to a different version", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQIOErrorException journalDifferentVersion();
-
-   @Message(id = 149002, value =  "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual",
-         format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQIOErrorException journalFileMisMatch();
-
-   @Message(id = 149003, value =   "File not opened", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQIOErrorException fileNotOpened();
-}


Mime
View raw message