http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java index 2f93ffe..f92a8e6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java @@ -41,7 +41,7 @@ import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; import org.apache.activemq.core.paging.cursor.PagedReference; import org.apache.activemq.core.paging.impl.Page; import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.Queue; import org.apache.activemq.core.server.ServerMessage; @@ -60,7 +60,7 @@ import org.apache.activemq.utils.LinkedListIterator; */ final class PageSubscriptionImpl implements PageSubscription { - private final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); private boolean empty = true; @@ -229,7 +229,7 @@ final class PageSubscriptionImpl implements PageSubscription } catch (Exception e) { - HornetQServerLogger.LOGGER.problemCleaningCursorPages(e); + ActiveMQServerLogger.LOGGER.problemCleaningCursorPages(e); } finally { @@ -285,7 +285,7 @@ final class PageSubscriptionImpl implements PageSubscription if (currentPage != null && entry.getKey() == pageStore.getCurrentPage().getPageId() && currentPage.isLive()) { - HornetQServerLogger.LOGGER.trace("We can't clear page " + entry.getKey() + + ActiveMQServerLogger.LOGGER.trace("We can't clear page " + entry.getKey() + " now since it's the current page"); } else @@ -533,7 +533,7 @@ final class PageSubscriptionImpl implements PageSubscription public void onError(final int errorCode, final String errorMessage) { error = " errorCode=" + errorCode + ", msg=" + errorMessage; - HornetQServerLogger.LOGGER.pageSubscriptionError(this, error); + ActiveMQServerLogger.LOGGER.pageSubscriptionError(this, error); } @Override @@ -737,7 +737,7 @@ final class PageSubscriptionImpl implements PageSubscription { if (isTrace) { - HornetQServerLogger.LOGGER.trace("********** processing reload!!!!!!!"); + ActiveMQServerLogger.LOGGER.trace("********** processing reload!!!!!!!"); } Collections.sort(recoveredACK); @@ -750,7 +750,7 @@ final class PageSubscriptionImpl implements PageSubscription if (pageInfo == null) { - HornetQServerLogger.LOGGER.pageNotFound(pos); + ActiveMQServerLogger.LOGGER.pageNotFound(pos); if (txDeleteCursorOnReload == -1) { txDeleteCursorOnReload = store.generateID(); @@ -779,7 +779,7 @@ final class PageSubscriptionImpl implements PageSubscription executor.execute(future); while (!future.await(1000)) { - HornetQServerLogger.LOGGER.timedOutFlushingExecutorsPagingCursor(this); + ActiveMQServerLogger.LOGGER.timedOutFlushingExecutorsPagingCursor(this); } } @@ -821,7 +821,7 @@ final class PageSubscriptionImpl implements PageSubscription } catch (Exception e) { - HornetQServerLogger.LOGGER.warn("Error while deleting page-complete-record", e); + ActiveMQServerLogger.LOGGER.warn("Error while deleting page-complete-record", e); } info.setCompleteInfo(null); } @@ -835,7 +835,7 @@ final class PageSubscriptionImpl implements PageSubscription } catch (Exception e) { - HornetQServerLogger.LOGGER.warn("Error while deleting page-complete-record", e); + ActiveMQServerLogger.LOGGER.warn("Error while deleting page-complete-record", e); } } } @@ -906,13 +906,13 @@ final class PageSubscriptionImpl implements PageSubscription { if (isTrace) { - HornetQServerLogger.LOGGER.trace("a new position is being processed as ACK"); + ActiveMQServerLogger.LOGGER.trace("a new position is being processed as ACK"); } if (lastAckedPosition != null && lastAckedPosition.getPageNr() != pos.getPageNr()) { if (isTrace) { - HornetQServerLogger.LOGGER.trace("Scheduling cleanup on pageSubscription for address = " + pageStore.getAddress() + " queue = " + this.getQueue().getName()); + ActiveMQServerLogger.LOGGER.trace("Scheduling cleanup on pageSubscription for address = " + pageStore.getAddress() + " queue = " + this.getQueue().getName()); } // there's a different page being acked, we will do the check right away @@ -930,7 +930,7 @@ final class PageSubscriptionImpl implements PageSubscription { // This could become null if the page file was deleted, or if the queue was removed maybe? // it's better to diagnose it (based on support tickets) instead of NPE - HornetQServerLogger.LOGGER.warn("PageCursorInfo == null on address " + this.getPagingStore().getAddress() + ", pos = " + pos + ", queue = " + cursorId); + ActiveMQServerLogger.LOGGER.warn("PageCursorInfo == null on address " + this.getPagingStore().getAddress() + ", pos = " + pos + ", queue = " + cursorId); } else { @@ -1130,7 +1130,7 @@ final class PageSubscriptionImpl implements PageSubscription if (isTrace) { - HornetQServerLogger.LOGGER.trace("numberOfMessages = " + getNumberOfMessages() + + ActiveMQServerLogger.LOGGER.trace("numberOfMessages = " + getNumberOfMessages() + " confirmed = " + (confirmed.get() + 1) + " pendingTX = " + pendingTX + @@ -1379,7 +1379,7 @@ final class PageSubscriptionImpl implements PageSubscription .getTransactionID()); if (tx == null) { - HornetQServerLogger.LOGGER.pageSubscriptionCouldntLoad(message.getPagedMessage().getTransactionID(), + ActiveMQServerLogger.LOGGER.pageSubscriptionCouldntLoad(message.getPagedMessage().getTransactionID(), message.getPosition(), pageStore.getAddress(), queue.getName()); valid = false; ignored = true;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java index 883ef3b..95f9d32 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java @@ -27,8 +27,8 @@ import org.apache.activemq.core.paging.PagedMessage; import org.apache.activemq.core.paging.cursor.LivePageCache; import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.HornetQMessageBundle; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.utils.ConcurrentHashSet; import org.apache.activemq.utils.DataConstants; @@ -39,8 +39,8 @@ import org.apache.activemq.utils.DataConstants; public final class Page implements Comparable<Page> { // Constants ----------------------------------------------------- - private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); - private static final boolean isDebug = HornetQServerLogger.LOGGER.isDebugEnabled(); + private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); + private static final boolean isDebug = ActiveMQServerLogger.LOGGER.isDebugEnabled(); public static final int SIZE_RECORD = DataConstants.SIZE_BYTE + DataConstants.SIZE_INT + DataConstants.SIZE_BYTE; @@ -103,12 +103,12 @@ public final class Page implements Comparable<Page> { if (isDebug) { - HornetQServerLogger.LOGGER.debug("reading page " + this.pageId + " on address = " + storeName); + ActiveMQServerLogger.LOGGER.debug("reading page " + this.pageId + " on address = " + storeName); } if (!file.isOpen()) { - throw HornetQMessageBundle.BUNDLE.invalidPageIO(); + throw ActiveMQMessageBundle.BUNDLE.invalidPageIO(); } ArrayList<PagedMessage> messages = new ArrayList<PagedMessage>(); @@ -156,7 +156,7 @@ public final class Page implements Comparable<Page> msg.initMessage(storage); if (isTrace) { - HornetQServerLogger.LOGGER.trace("Reading message " + msg + " on pageId=" + this.pageId + " for address=" + storeName); + ActiveMQServerLogger.LOGGER.trace("Reading message " + msg + " on pageId=" + this.pageId + " for address=" + storeName); } messages.add(msg); } @@ -277,7 +277,7 @@ public final class Page implements Comparable<Page> if (isDebug) { - HornetQServerLogger.LOGGER.debug("Deleting pageId=" + pageId + " on store " + storeName); + ActiveMQServerLogger.LOGGER.debug("Deleting pageId=" + pageId + " on store " + storeName); } if (messages != null) @@ -300,7 +300,7 @@ public final class Page implements Comparable<Page> { if (suspiciousRecords) { - HornetQServerLogger.LOGGER.pageInvalid(file.getFileName(), file.getFileName()); + ActiveMQServerLogger.LOGGER.pageInvalid(file.getFileName(), file.getFileName()); file.renameTo(file.getFileName() + ".invalidPage"); } else @@ -312,7 +312,7 @@ public final class Page implements Comparable<Page> } catch (Exception e) { - HornetQServerLogger.LOGGER.pageDeleteError(e); + ActiveMQServerLogger.LOGGER.pageDeleteError(e); return false; } } @@ -351,7 +351,7 @@ public final class Page implements Comparable<Page> } catch (Exception e) { - HornetQServerLogger.LOGGER.pageFinaliseError(e); + ActiveMQServerLogger.LOGGER.pageFinaliseError(e); } } @@ -385,7 +385,7 @@ public final class Page implements Comparable<Page> */ private void markFileAsSuspect(final String fileName, final int position, final int msgNumber) { - HornetQServerLogger.LOGGER.pageSuspectFile(fileName, position, msgNumber); + ActiveMQServerLogger.LOGGER.pageSuspectFile(fileName, position, msgNumber); suspiciousRecords = true; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java index dd172db..ea17a60 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java @@ -25,7 +25,7 @@ import org.apache.activemq.core.paging.PagingManager; import org.apache.activemq.core.paging.cursor.PagePosition; import org.apache.activemq.core.paging.cursor.PageSubscription; import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.transaction.Transaction; import org.apache.activemq.core.transaction.TransactionOperationAbstract; import org.apache.activemq.core.transaction.TransactionPropertyIndexes; @@ -98,7 +98,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo } catch (Exception e) { - HornetQServerLogger.LOGGER.pageTxDeleteError(e, recordID); + ActiveMQServerLogger.LOGGER.pageTxDeleteError(e, recordID); } pagingManager.removeTransaction(this.transactionID); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java index ea87e28..fb7549f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java @@ -24,7 +24,7 @@ import org.apache.activemq.core.paging.PageTransactionInfo; import org.apache.activemq.core.paging.PagingManager; import org.apache.activemq.core.paging.PagingStore; import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.settings.HierarchicalRepository; import org.apache.activemq.core.settings.impl.AddressSettings; @@ -59,7 +59,7 @@ public final class PagingManagerImpl implements PagingManager // Static // -------------------------------------------------------------------------------------------------------------------------- - private static boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private static boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); // Constructors // -------------------------------------------------------------------------------------------------------------------- @@ -200,7 +200,7 @@ public final class PagingManagerImpl implements PagingManager { if (isTrace) { - HornetQServerLogger.LOGGER.trace("Adding pageTransaction " + pageTransaction.getTransactionID()); + ActiveMQServerLogger.LOGGER.trace("Adding pageTransaction " + pageTransaction.getTransactionID()); } transactions.put(pageTransaction.getTransactionID(), pageTransaction); } @@ -209,7 +209,7 @@ public final class PagingManagerImpl implements PagingManager { if (isTrace) { - HornetQServerLogger.LOGGER.trace("Removing pageTransaction " + id); + ActiveMQServerLogger.LOGGER.trace("Removing pageTransaction " + id); } transactions.remove(id); } @@ -218,7 +218,7 @@ public final class PagingManagerImpl implements PagingManager { if (isTrace) { - HornetQServerLogger.LOGGER.trace("looking up pageTX = " + id); + ActiveMQServerLogger.LOGGER.trace("looking up pageTX = " + id); } return transactions.get(id); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java index 7a427ba..fe63613 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java @@ -32,7 +32,7 @@ import org.apache.activemq.core.paging.PagingManager; import org.apache.activemq.core.paging.PagingStore; import org.apache.activemq.core.paging.PagingStoreFactory; import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.settings.HierarchicalRepository; import org.apache.activemq.core.settings.impl.AddressSettings; import org.apache.activemq.utils.ExecutorFactory; @@ -164,7 +164,7 @@ public class PagingStoreFactoryNIO implements PagingStoreFactory if (!addressFile.exists()) { - HornetQServerLogger.LOGGER.pageStoreFactoryNoIdFile(file.toString(), PagingStoreFactoryNIO.ADDRESS_FILE); + ActiveMQServerLogger.LOGGER.pageStoreFactoryNoIdFile(file.toString(), PagingStoreFactoryNIO.ADDRESS_FILE); continue; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java index 7609165..d0c8ae1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java @@ -26,8 +26,8 @@ import org.apache.activemq.core.paging.cursor.impl.LivePageCacheImpl; import org.apache.activemq.core.paging.cursor.impl.PageCursorProviderImpl; import org.apache.activemq.core.persistence.StorageManager; import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.HornetQMessageBundle; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.RouteContextList; @@ -118,7 +118,7 @@ public class PagingStoreImpl implements PagingStore private volatile AtomicBoolean blocking = new AtomicBoolean(false); - private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); public PagingStoreImpl(final SimpleString address, final ScheduledExecutorService scheduledExecutor, @@ -391,7 +391,7 @@ public class PagingStoreImpl implements PagingStore if (!future.await(60000)) { - HornetQServerLogger.LOGGER.pageStoreTimeout(address); + ActiveMQServerLogger.LOGGER.pageStoreTimeout(address); } } @@ -550,7 +550,7 @@ public class PagingStoreImpl implements PagingStore { // If not possible to starting page due to an IO error, we will just consider it non paging. // This shouldn't happen anyway - HornetQServerLogger.LOGGER.pageStoreStartIOError(e); + ActiveMQServerLogger.LOGGER.pageStoreStartIOError(e); return false; } } @@ -661,7 +661,7 @@ public class PagingStoreImpl implements PagingStore returnPage.delete(null); // This will trigger this address to exit the page mode, - // and this will make HornetQ start using the journal again + // and this will make ActiveMQ start using the journal again return null; } else @@ -747,7 +747,7 @@ public class PagingStoreImpl implements PagingStore } else if (!blocking.get()) { - HornetQServerLogger.LOGGER.blockingMessageProduction(address, sizeInBytes.get(), maxSize); + ActiveMQServerLogger.LOGGER.blockingMessageProduction(address, sizeInBytes.get(), maxSize); blocking.set(true); } @@ -782,7 +782,7 @@ public class PagingStoreImpl implements PagingStore executor.execute(memoryFreedRunnablesExecutor); if (blocking.get()) { - HornetQServerLogger.LOGGER.unblockingMessageProduction(address, sizeInBytes.get(), maxSize); + ActiveMQServerLogger.LOGGER.unblockingMessageProduction(address, sizeInBytes.get(), maxSize); blocking.set(false); } } @@ -801,7 +801,7 @@ public class PagingStoreImpl implements PagingStore { if (startPaging()) { - HornetQServerLogger.LOGGER.pageStoreStart(storeName, addressSize, maxSize); + ActiveMQServerLogger.LOGGER.pageStoreStart(storeName, addressSize, maxSize); } } } @@ -835,7 +835,7 @@ public class PagingStoreImpl implements PagingStore { printedDropMessagesWarning = true; - HornetQServerLogger.LOGGER.pageStoreDropMessages(storeName, sizeInBytes.get(), maxSize); + ActiveMQServerLogger.LOGGER.pageStoreDropMessages(storeName, sizeInBytes.get(), maxSize); } if (message.isLargeMessage()) @@ -845,7 +845,7 @@ public class PagingStoreImpl implements PagingStore if (addressFullMessagePolicy == AddressFullMessagePolicy.FAIL) { - throw HornetQMessageBundle.BUNDLE.addressIsFull(address.toString()); + throw ActiveMQMessageBundle.BUNDLE.addressIsFull(address.toString()); } // Address is full, we just pretend we are paging, and drop the data @@ -933,7 +933,7 @@ public class PagingStoreImpl implements PagingStore if (isTrace) { - HornetQServerLogger.LOGGER.trace("Paging message " + pagedMessage + " on pageStore " + this.getStoreName() + + ActiveMQServerLogger.LOGGER.trace("Paging message " + pagedMessage + " on pageStore " + this.getStoreName() + " pageId=" + currentPage.getPageId()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java index 77415a4..02b9345 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java @@ -37,7 +37,7 @@ import org.apache.activemq.core.persistence.impl.PageCountPending; import org.apache.activemq.core.postoffice.Binding; import org.apache.activemq.core.postoffice.PostOffice; import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.ActiveMQComponent; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.RouteContextList; @@ -64,7 +64,7 @@ import org.apache.activemq.utils.IDGenerator; * */ -public interface StorageManager extends IDGenerator, HornetQComponent +public interface StorageManager extends IDGenerator, ActiveMQComponent { /** @@ -405,7 +405,7 @@ public interface StorageManager extends IDGenerator, HornetQComponent * Closes the {@link org.apache.activemq.utils.IDGenerator} persisting the current record ID. * <p/> * Effectively a "pre-stop" method. Necessary due to the "stop"-order at - * {@link org.apache.activemq.core.server.impl.HornetQServerImpl} + * {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl} */ void persistIdGenerator(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java index 07d6121..09fd1a7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.utils.DataConstants; import org.apache.activemq.utils.IDGenerator; @@ -101,7 +101,7 @@ public final class BatchingIDGenerator implements IDGenerator } catch (Exception e) { - HornetQServerLogger.LOGGER.batchingIdError(e); + ActiveMQServerLogger.LOGGER.batchingIdError(e); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java index 836b2be..e03f311 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java @@ -86,7 +86,7 @@ public final class DescribeJournal SequentialFileFactory bindingsFF = new NIOSequentialFileFactory(bindingsDir, null); - JournalImpl bindings = new JournalImpl(1024 * 1024, 2, -1, 0, bindingsFF, "hornetq-bindings", "bindings", 1); + JournalImpl bindings = new JournalImpl(1024 * 1024, 2, -1, 0, bindingsFF, "activemq-bindings", "bindings", 1); describeJournal(bindingsFF, bindings, bindingsDir); } @@ -103,8 +103,8 @@ public final class DescribeJournal 0, 0, messagesFF, - "hornetq-data", - "hq", + "activemq-data", + "amq", 1); describeJournal(messagesFF, messagesJournal, messagesDir); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java index 039eca2..2c630ed 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java @@ -88,8 +88,8 @@ import org.apache.activemq.core.postoffice.PostOffice; import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; import org.apache.activemq.core.replication.ReplicatedJournal; import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.HornetQMessageBundle; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.JournalType; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.MessageReference; @@ -110,7 +110,7 @@ import org.apache.activemq.utils.Base64; import org.apache.activemq.utils.ByteUtil; import org.apache.activemq.utils.DataConstants; import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.HornetQThreadFactory; +import org.apache.activemq.utils.ActiveMQThreadFactory; import org.apache.activemq.utils.XidCodecSupport; import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; @@ -235,7 +235,7 @@ public class JournalStorageManager implements StorageManager if (config.getJournalType() != JournalType.NIO && config.getJournalType() != JournalType.ASYNCIO) { - throw HornetQMessageBundle.BUNDLE.invalidJournal(); + throw ActiveMQMessageBundle.BUNDLE.invalidJournal(); } bindingsDir = config.getBindingsDirectory(); @@ -255,7 +255,7 @@ public class JournalStorageManager implements StorageManager config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), bindingsFF, - "hornetq-bindings", + "activemq-bindings", "bindings", 1); @@ -275,7 +275,7 @@ public class JournalStorageManager implements StorageManager if (config.getJournalType() == JournalType.ASYNCIO) { - HornetQServerLogger.LOGGER.journalUseAIO(); + ActiveMQServerLogger.LOGGER.journalUseAIO(); journalFF = new AIOSequentialFileFactory(journalDir, config.getJournalBufferSize_AIO(), @@ -285,7 +285,7 @@ public class JournalStorageManager implements StorageManager } else if (config.getJournalType() == JournalType.NIO) { - HornetQServerLogger.LOGGER.journalUseNIO(); + ActiveMQServerLogger.LOGGER.journalUseNIO(); journalFF = new NIOSequentialFileFactory(journalDir, true, config.getJournalBufferSize_NIO(), @@ -295,7 +295,7 @@ public class JournalStorageManager implements StorageManager } else { - throw HornetQMessageBundle.BUNDLE.invalidJournalType2(config.getJournalType()); + throw ActiveMQMessageBundle.BUNDLE.invalidJournalType2(config.getJournalType()); } idGenerator = new BatchingIDGenerator(0, JournalStorageManager.CHECKPOINT_BATCH_SIZE, this); @@ -305,8 +305,8 @@ public class JournalStorageManager implements StorageManager config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), journalFF, - "hornetq-data", - "hq", + "activemq-data", + "amq", config.getJournalType() == JournalType.ASYNCIO ? config.getJournalMaxIO_AIO() : config.getJournalMaxIO_NIO()); @@ -370,7 +370,7 @@ public class JournalStorageManager implements StorageManager if (!(messageJournal instanceof JournalImpl) || !(bindingsJournal instanceof JournalImpl)) { - throw HornetQMessageBundle.BUNDLE.notJournalImpl(); + throw ActiveMQMessageBundle.BUNDLE.notJournalImpl(); } @@ -512,7 +512,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - HornetQServerLogger.LOGGER.errorStoppingReplicationManager(e); + ActiveMQServerLogger.LOGGER.errorStoppingReplicationManager(e); } replicator = null; // delete inside the writeLock. Avoids a lot of state checking and races with @@ -540,7 +540,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - HornetQServerLogger.LOGGER.journalErrorDeletingMessage(e, largeMsgId); + ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(e, largeMsgId); } if (replicator != null) { @@ -664,7 +664,7 @@ public class JournalStorageManager implements StorageManager { if (!started) { - HornetQServerLogger.LOGGER.serverIsStopped(); + ActiveMQServerLogger.LOGGER.serverIsStopped(); throw new IllegalStateException("Server is stopped"); } waitOnOperations(0); @@ -675,7 +675,7 @@ public class JournalStorageManager implements StorageManager { if (!started) { - HornetQServerLogger.LOGGER.serverIsStopped(); + ActiveMQServerLogger.LOGGER.serverIsStopped(); throw new IllegalStateException("Server is stopped"); } return getContext().waitCompletion(timeout); @@ -898,7 +898,7 @@ public class JournalStorageManager implements StorageManager if (message.getMessageID() <= 0) { // Sanity check only... this shouldn't happen unless there is a bug - throw HornetQMessageBundle.BUNDLE.messageIdNotAssigned(); + throw ActiveMQMessageBundle.BUNDLE.messageIdNotAssigned(); } readLock(); @@ -1058,7 +1058,7 @@ public class JournalStorageManager implements StorageManager { if (message.getMessageID() <= 0) { - throw HornetQMessageBundle.BUNDLE.messageIdNotAssigned(); + throw ActiveMQMessageBundle.BUNDLE.messageIdNotAssigned(); } readLock(); @@ -1556,7 +1556,7 @@ public class JournalStorageManager implements StorageManager { long percent = (long) ((((double) reccount) / ((double) totalSize)) * 100f); - HornetQServerLogger.LOGGER.percentLoaded(percent); + ActiveMQServerLogger.LOGGER.percentLoaded(percent); } RecordInfo record = records.get(reccount); @@ -1622,7 +1622,7 @@ public class JournalStorageManager implements StorageManager if (message == null) { - HornetQServerLogger.LOGGER.cannotFindMessage(record.id); + ActiveMQServerLogger.LOGGER.cannotFindMessage(record.id); } else { @@ -1643,7 +1643,7 @@ public class JournalStorageManager implements StorageManager if (queueMessages == null) { - HornetQServerLogger.LOGGER.journalCannotFindQueue(encoding.queueID, messageID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueue(encoding.queueID, messageID); } else { @@ -1651,7 +1651,7 @@ public class JournalStorageManager implements StorageManager if (rec == null) { - HornetQServerLogger.LOGGER.cannotFindMessage(messageID); + ActiveMQServerLogger.LOGGER.cannotFindMessage(messageID); } } @@ -1669,7 +1669,7 @@ public class JournalStorageManager implements StorageManager if (queueMessages == null) { - HornetQServerLogger.LOGGER.journalCannotFindQueueDelCount(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueDelCount(encoding.queueID); } else { @@ -1677,7 +1677,7 @@ public class JournalStorageManager implements StorageManager if (rec == null) { - HornetQServerLogger.LOGGER.journalCannotFindMessageDelCount(messageID); + ActiveMQServerLogger.LOGGER.journalCannotFindMessageDelCount(messageID); } else { @@ -1724,7 +1724,7 @@ public class JournalStorageManager implements StorageManager if (queueMessages == null) { - HornetQServerLogger.LOGGER.journalCannotFindQueueScheduled(encoding.queueID, messageID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueScheduled(encoding.queueID, messageID); } else { @@ -1733,7 +1733,7 @@ public class JournalStorageManager implements StorageManager if (rec == null) { - HornetQServerLogger.LOGGER.cannotFindMessage(messageID); + ActiveMQServerLogger.LOGGER.cannotFindMessage(messageID); } else { @@ -1784,7 +1784,7 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.journalCannotFindQueueReloading(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueReloading(encoding.queueID); messageJournal.appendDeleteRecord(record.id, false); } @@ -1805,7 +1805,7 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.journalCannotFindQueueReloadingPage(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueReloadingPage(encoding.queueID); messageJournal.appendDeleteRecord(record.id, false); } @@ -1826,7 +1826,7 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.journalCannotFindQueueReloadingPageCursor(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueReloadingPageCursor(encoding.queueID); messageJournal.appendDeleteRecord(record.id, false); } @@ -1848,7 +1848,7 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.cantFindQueueOnPageComplete(encoding.queueID); + ActiveMQServerLogger.LOGGER.cantFindQueueOnPageComplete(encoding.queueID); messageJournal.appendDeleteRecord(record.id, false); } @@ -1908,7 +1908,7 @@ public class JournalStorageManager implements StorageManager { if (msg.getRefCount() == 0) { - HornetQServerLogger.LOGGER.largeMessageWithNoRef(msg.getMessageID()); + ActiveMQServerLogger.LOGGER.largeMessageWithNoRef(msg.getMessageID()); msg.decrementDelayDeletionCount(); } } @@ -2211,7 +2211,7 @@ public class JournalStorageManager implements StorageManager } } - // HornetQComponent implementation + // ActiveMQComponent implementation // ------------------------------------------------------ public synchronized void start() throws Exception @@ -2229,7 +2229,7 @@ public class JournalStorageManager implements StorageManager cleanupIncompleteFiles(); - singleThreadExecutor = Executors.newSingleThreadExecutor(new HornetQThreadFactory("HornetQ-IO-SingleThread", + singleThreadExecutor = Executors.newSingleThreadExecutor(new ActiveMQThreadFactory("ActiveMQ-IO-SingleThread", true, getThisClassLoader())); @@ -2392,7 +2392,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - HornetQServerLogger.LOGGER.warn(e.getMessage(), e); + ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e); } } } @@ -2466,7 +2466,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - HornetQServerLogger.LOGGER.journalErrorDeletingMessage(e, largeServerMessage.getMessageID()); + ActiveMQServerLogger.LOGGER.journalErrorDeletingMessage(e, largeServerMessage.getMessageID()); } } @@ -2518,7 +2518,7 @@ public class JournalStorageManager implements StorageManager } else { - throw HornetQMessageBundle.BUNDLE.cannotCreateDir(dir); + throw ActiveMQMessageBundle.BUNDLE.cannotCreateDir(dir); } } } @@ -2708,13 +2708,13 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.journalCannotFindQueueReloadingACK(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueReloadingACK(encoding.queueID); } break; } case PAGE_CURSOR_COUNTER_VALUE: { - HornetQServerLogger.LOGGER.journalPAGEOnPrepared(); + ActiveMQServerLogger.LOGGER.journalPAGEOnPrepared(); break; } @@ -2737,7 +2737,7 @@ public class JournalStorageManager implements StorageManager } else { - HornetQServerLogger.LOGGER.journalCannotFindQueueReloadingACK(encoding.queueID); + ActiveMQServerLogger.LOGGER.journalCannotFindQueueReloadingACK(encoding.queueID); } break; @@ -2745,7 +2745,7 @@ public class JournalStorageManager implements StorageManager default: { - HornetQServerLogger.LOGGER.journalInvalidRecordType(recordType); + ActiveMQServerLogger.LOGGER.journalInvalidRecordType(recordType); } } } @@ -2767,13 +2767,13 @@ public class JournalStorageManager implements StorageManager if (!pendingLargeMessages.remove(new Pair<Long, Long>(recordDeleted.id, messageID))) { // TODO: Logging - HornetQServerLogger.LOGGER.warn("Large message " + recordDeleted.id + " wasn't found when dealing with add pending large message"); + ActiveMQServerLogger.LOGGER.warn("Large message " + recordDeleted.id + " wasn't found when dealing with add pending large message"); } installLargeMessageConfirmationOnTX(tx, recordDeleted.id); break; } default: - HornetQServerLogger.LOGGER.journalInvalidRecordTypeOnPreparedTX(b); + ActiveMQServerLogger.LOGGER.journalInvalidRecordTypeOnPreparedTX(b); } } @@ -3110,7 +3110,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) */ public void decode(final ActiveMQBuffer buffer) { @@ -3118,7 +3118,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) */ public void encode(final ActiveMQBuffer buffer) { @@ -3149,7 +3149,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) */ public void decode(final ActiveMQBuffer buffer) { @@ -3157,7 +3157,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) */ public void encode(final ActiveMQBuffer buffer) { @@ -3283,7 +3283,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.api.core.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.api.core.ActiveMQBuffer) */ @Override public void encode(ActiveMQBuffer buffer) @@ -3293,7 +3293,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.api.core.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.api.core.ActiveMQBuffer) */ @Override public void decode(ActiveMQBuffer buffer) @@ -3730,7 +3730,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - HornetQServerLogger.LOGGER.journalError(e); + ActiveMQServerLogger.LOGGER.journalError(e); } } } @@ -3853,7 +3853,7 @@ public class JournalStorageManager implements StorageManager } catch (Throwable e) { - HornetQServerLogger.LOGGER.journalErrorConfirmingLargeMessage(e, msg); + ActiveMQServerLogger.LOGGER.journalErrorConfirmingLargeMessage(e, msg); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java index 5781e65..e8fca87 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java @@ -22,7 +22,7 @@ import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.Message; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.ServerMessage; @@ -38,7 +38,7 @@ import org.apache.activemq.utils.TypedProperties; public final class LargeServerMessageImpl extends ServerMessageImpl implements LargeServerMessage { // Constants ----------------------------------------------------- - private static boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private static boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); // Attributes ---------------------------------------------------- @@ -171,7 +171,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - HornetQServerLogger.LOGGER.errorIncrementDelayDeletionCount(e); + ActiveMQServerLogger.LOGGER.errorIncrementDelayDeletionCount(e); } } @@ -200,7 +200,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L { if (LargeServerMessageImpl.isTrace) { - HornetQServerLogger.LOGGER.trace("Deleting file " + file + " as the usage was complete"); + ActiveMQServerLogger.LOGGER.trace("Deleting file " + file + " as the usage was complete"); } try @@ -209,7 +209,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - HornetQServerLogger.LOGGER.error(e.getMessage(), e); + ActiveMQServerLogger.LOGGER.error(e.getMessage(), e); } } } @@ -273,7 +273,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - HornetQServerLogger.LOGGER.largeMessageErrorReleasingResources(e); + ActiveMQServerLogger.LOGGER.largeMessageErrorReleasingResources(e); } } } @@ -356,7 +356,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - HornetQServerLogger.LOGGER.lareMessageErrorCopying(e, this); + ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(e, this); return null; } } @@ -522,7 +522,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - HornetQServerLogger.LOGGER.warn(e.getMessage(), e); + ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e); } } return bodySize; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java index 25461f3..a8b46ae 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java @@ -23,7 +23,7 @@ import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.persistence.StorageManager; import org.apache.activemq.core.persistence.StorageManager.LargeMessageExtension; import org.apache.activemq.core.replication.ReplicatedLargeMessage; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.LargeServerMessage; public final class LargeServerMessageInSync implements ReplicatedLargeMessage @@ -103,7 +103,7 @@ public final class LargeServerMessageInSync implements ReplicatedLargeMessage } catch (Exception e) { - HornetQServerLogger.LOGGER.largeMessageErrorReleasingResources(e); + ActiveMQServerLogger.LOGGER.largeMessageErrorReleasingResources(e); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java index 8bdb709..8d6d1c7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java @@ -24,7 +24,7 @@ import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.journal.impl.SimpleWaitIOCallback; import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.utils.ExecutorFactory; /** @@ -241,7 +241,7 @@ public class OperationContextImpl implements OperationContext } catch (Throwable e) { - HornetQServerLogger.LOGGER.errorExecutingIOAsyncTask(e); + ActiveMQServerLogger.LOGGER.errorExecutingIOAsyncTask(e); executorsPending.decrementAndGet(); task.onError(ActiveMQExceptionType.INTERNAL_ERROR.getCode(), "It wasn't possible to complete IO operation - " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java index 7e7be9d..0cd4ca8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.postoffice; -import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.ActiveMQMessageBundle; /** * A BindingType @@ -49,7 +49,7 @@ public enum BindingType } else { - throw HornetQMessageBundle.BUNDLE.cannotConvertToInt(); + throw ActiveMQMessageBundle.BUNDLE.cannotConvertToInt(); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java index 7874779..2bd7218 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java @@ -16,7 +16,7 @@ import java.util.Map; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.ActiveMQComponent; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.Queue; import org.apache.activemq.core.server.RoutingContext; @@ -38,7 +38,7 @@ import org.apache.activemq.core.transaction.Transaction; * @author <a href="mailto:[email protected]";>Tim Fox</a> * */ -public interface PostOffice extends HornetQComponent +public interface PostOffice extends ActiveMQComponent { void addBinding(Binding binding) throws Exception; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java index 2cc396e..0fc360f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.List; import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.ActiveMQMessageBundle; /** * A QueueInfo @@ -56,15 +56,15 @@ public class QueueInfo implements Serializable { if (routingName == null) { - throw HornetQMessageBundle.BUNDLE.routeNameIsNull(); + throw ActiveMQMessageBundle.BUNDLE.routeNameIsNull(); } if (clusterName == null) { - throw HornetQMessageBundle.BUNDLE.clusterNameIsNull(); + throw ActiveMQMessageBundle.BUNDLE.clusterNameIsNull(); } if (address == null) { - throw HornetQMessageBundle.BUNDLE.addressIsNull(); + throw ActiveMQMessageBundle.BUNDLE.addressIsNull(); } this.routingName = routingName; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java index 900dbdb..9744d89 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java @@ -30,7 +30,7 @@ import org.apache.activemq.core.message.impl.MessageImpl; import org.apache.activemq.core.paging.PagingStore; import org.apache.activemq.core.postoffice.Binding; import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.Queue; import org.apache.activemq.core.server.RoutingContext; import org.apache.activemq.core.server.ServerMessage; @@ -51,7 +51,7 @@ public final class BindingsImpl implements Bindings // This is public as we use on test assertions public static final int MAX_GROUP_RETRY = 10; - private static boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private static boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); private final ConcurrentMap<SimpleString, List<Binding>> routingNameBindingMap = new ConcurrentHashMap<SimpleString, List<Binding>>(); @@ -98,7 +98,7 @@ public final class BindingsImpl implements Bindings { if (isTrace) { - HornetQServerLogger.LOGGER.trace("addBinding(" + binding + ") being called"); + ActiveMQServerLogger.LOGGER.trace("addBinding(" + binding + ") being called"); } if (binding.isExclusive()) { @@ -129,7 +129,7 @@ public final class BindingsImpl implements Bindings if (isTrace) { - HornetQServerLogger.LOGGER.trace("Adding binding " + binding + " into " + this + " bindingTable: " + debugBindings()); + ActiveMQServerLogger.LOGGER.trace("Adding binding " + binding + " into " + this + " bindingTable: " + debugBindings()); } } @@ -161,7 +161,7 @@ public final class BindingsImpl implements Bindings if (isTrace) { - HornetQServerLogger.LOGGER.trace("Removing binding " + binding + " into " + this + " bindingTable: " + debugBindings()); + ActiveMQServerLogger.LOGGER.trace("Removing binding " + binding + " into " + this + " bindingTable: " + debugBindings()); } } @@ -174,7 +174,7 @@ public final class BindingsImpl implements Bindings if (isTrace) { - HornetQServerLogger.LOGGER.trace("Redistributing message " + message); + ActiveMQServerLogger.LOGGER.trace("Redistributing message " + message); } SimpleString routingName = originatingQueue.getName(); @@ -326,7 +326,7 @@ public final class BindingsImpl implements Bindings { if (isTrace) { - HornetQServerLogger.LOGGER.trace("Routing message " + message + " on binding=" + this); + ActiveMQServerLogger.LOGGER.trace("Routing message " + message + " on binding=" + this); } for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) { @@ -512,7 +512,7 @@ public final class BindingsImpl implements Bindings if (resp == null) { - HornetQServerLogger.LOGGER.debug("it got a timeout on propose, trying again, number of retries: " + tries); + ActiveMQServerLogger.LOGGER.debug("it got a timeout on propose, trying again, number of retries: " + tries); // it timed out, so we will check it through routeAndcheckNull theBinding = null; } @@ -572,7 +572,7 @@ public final class BindingsImpl implements Bindings } else { - HornetQServerLogger.LOGGER.impossibleToRouteGrouped(); + ActiveMQServerLogger.LOGGER.impossibleToRouteGrouped(); route(message, context, false); } } @@ -683,7 +683,7 @@ public final class BindingsImpl implements Bindings } else { - HornetQServerLogger.LOGGER.warn("Couldn't find binding with id=" + bindingID + " on routeFromCluster for message=" + message + " binding = " + this); + ActiveMQServerLogger.LOGGER.warn("Couldn't find binding with id=" + bindingID + " on routeFromCluster for message=" + message + " binding = " + this); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java index f4d09de..5e55ded 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java @@ -21,7 +21,7 @@ import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.persistence.StorageManager; import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.transaction.Transaction; import org.apache.activemq.core.transaction.TransactionOperationAbstract; @@ -213,7 +213,7 @@ public class DuplicateIDCacheImpl implements DuplicateIDCache } catch (Exception e) { - HornetQServerLogger.LOGGER.errorDeletingDuplicateCache(e); + ActiveMQServerLogger.LOGGER.errorDeletingDuplicateCache(e); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java index 59d5133..c57d79c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java @@ -51,9 +51,9 @@ import org.apache.activemq.core.postoffice.BindingsFactory; import org.apache.activemq.core.postoffice.DuplicateIDCache; import org.apache.activemq.core.postoffice.PostOffice; import org.apache.activemq.core.postoffice.QueueInfo; -import org.apache.activemq.core.server.HornetQMessageBundle; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.Queue; @@ -86,7 +86,7 @@ import org.apache.activemq.utils.UUIDGenerator; */ public class PostOfficeImpl implements PostOffice, NotificationListener, BindingsFactory { - private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled(); + private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled(); public static final SimpleString HDR_RESET_QUEUE_DATA = new SimpleString("_HQ_RESET_QUEUE_DATA"); @@ -126,9 +126,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding private final HierarchicalRepository<AddressSettings> addressSettingsRepository; - private final HornetQServer server; + private final ActiveMQServer server; - public PostOfficeImpl(final HornetQServer server, + public PostOfficeImpl(final ActiveMQServer server, final StorageManager storageManager, final PagingManager pagingManager, final QueueFactory bindableFactory, @@ -171,7 +171,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding this.server = server; } - // HornetQComponent implementation --------------------------------------- + // ActiveMQComponent implementation --------------------------------------- public synchronized void start() throws Exception { @@ -223,7 +223,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (isTrace) { - HornetQServerLogger.LOGGER.trace("Receiving notification : " + notification + " on server " + this.server); + ActiveMQServerLogger.LOGGER.trace("Receiving notification : " + notification + " on server " + this.server); } synchronized (notificationLock) { @@ -237,7 +237,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (!props.containsProperty(ManagementHelper.HDR_BINDING_TYPE)) { - throw HornetQMessageBundle.BUNDLE.bindingTypeNotSpecified(); + throw ActiveMQMessageBundle.BUNDLE.bindingTypeNotSpecified(); } Integer bindingType = props.getIntProperty(ManagementHelper.HDR_BINDING_TYPE); @@ -256,7 +256,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (!props.containsProperty(ManagementHelper.HDR_BINDING_ID)) { - throw HornetQMessageBundle.BUNDLE.bindingIdNotSpecified(); + throw ActiveMQMessageBundle.BUNDLE.bindingIdNotSpecified(); } long id = props.getLongProperty(ManagementHelper.HDR_BINDING_ID); @@ -265,7 +265,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (!props.containsProperty(ManagementHelper.HDR_DISTANCE)) { - throw HornetQMessageBundle.BUNDLE.distancenotSpecified(); + throw ActiveMQMessageBundle.BUNDLE.distancenotSpecified(); } int distance = props.getIntProperty(ManagementHelper.HDR_DISTANCE); @@ -481,9 +481,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding String uid = UUIDGenerator.getInstance().generateStringUUID(); - if (HornetQServerLogger.LOGGER.isDebugEnabled()) + if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { - HornetQServerLogger.LOGGER.debug("ClusterCommunication::Sending notification for addBinding " + binding + " from server " + server); + ActiveMQServerLogger.LOGGER.debug("ClusterCommunication::Sending notification for addBinding " + binding + " from server " + server); } managementService.sendNotification(new Notification(uid, CoreNotificationType.BINDING_ADDED, props)); @@ -671,15 +671,15 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding else { // this is a debug and not warn because this could be a regular scenario on publish-subscribe queues (or topic subscriptions on JMS) - if (HornetQServerLogger.LOGGER.isDebugEnabled()) + if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { - HornetQServerLogger.LOGGER.debug("Couldn't find any bindings for address=" + address + " on message=" + message); + ActiveMQServerLogger.LOGGER.debug("Couldn't find any bindings for address=" + address + " on message=" + message); } } - if (HornetQServerLogger.LOGGER.isTraceEnabled()) + if (ActiveMQServerLogger.LOGGER.isTraceEnabled()) { - HornetQServerLogger.LOGGER.trace("Message after routed=" + message); + ActiveMQServerLogger.LOGGER.trace("Message after routed=" + message); } if (context.getQueueCount() == 0) @@ -696,14 +696,14 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding SimpleString dlaAddress = addressSettings.getDeadLetterAddress(); - if (HornetQServerLogger.LOGGER.isDebugEnabled()) + if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { - HornetQServerLogger.LOGGER.debug("sending message to dla address = " + dlaAddress + ", message=" + message); + ActiveMQServerLogger.LOGGER.debug("sending message to dla address = " + dlaAddress + ", message=" + message); } if (dlaAddress == null) { - HornetQServerLogger.LOGGER.noDLA(address); + ActiveMQServerLogger.LOGGER.noDLA(address); } else { @@ -716,9 +716,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding } else { - if (HornetQServerLogger.LOGGER.isDebugEnabled()) + if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { - HornetQServerLogger.LOGGER.debug("Message " + message + " is not going anywhere as it didn't have a binding on address:" + address); + ActiveMQServerLogger.LOGGER.debug("Message " + message + " is not going anywhere as it didn't have a binding on address:" + address); } if (message.isLargeMessage()) @@ -869,9 +869,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding throw new IllegalStateException("Cannot find queue " + queueName); } - if (HornetQServerLogger.LOGGER.isDebugEnabled()) + if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { - HornetQServerLogger.LOGGER.debug("PostOffice.sendQueueInfoToQueue on server=" + this.server + ", queueName=" + queueName + " and address=" + address); + ActiveMQServerLogger.LOGGER.debug("PostOffice.sendQueueInfoToQueue on server=" + this.server + ", queueName=" + queueName + " and address=" + address); } Queue queue = (Queue) binding.getBindable(); @@ -889,9 +889,9 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding for (QueueInfo info : queueInfos.values()) { - if (HornetQServerLogger.LOGGER.isTraceEnabled()) + if (ActiveMQServerLogger.LOGGER.isTraceEnabled()) { - HornetQServerLogger.LOGGER.trace("QueueInfo on sendQueueInfoToQueue = " + info); + ActiveMQServerLogger.LOGGER.trace("QueueInfo on sendQueueInfoToQueue = " + info); } if (info.matchesAddress(address)) { @@ -1162,7 +1162,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding { public void onError(final int errorCode, final String errorMessage) { - HornetQServerLogger.LOGGER.ioErrorAddingReferences(errorCode, errorMessage); + ActiveMQServerLogger.LOGGER.ioErrorAddingReferences(errorCode, errorMessage); } public void done() @@ -1264,7 +1264,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (cacheBridge.contains(bridgeDupBytes)) { - HornetQServerLogger.LOGGER.duplicateMessageDetectedThruBridge(message); + ActiveMQServerLogger.LOGGER.duplicateMessageDetectedThruBridge(message); if (context.getTransaction() != null) { @@ -1307,7 +1307,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (rejectDuplicates && isDuplicate) { - HornetQServerLogger.LOGGER.duplicateMessageDetected(message); + ActiveMQServerLogger.LOGGER.duplicateMessageDetected(message); String warnMessage = "Duplicate message detected - message will not be routed. Message information:" + message.toString(); @@ -1360,7 +1360,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (reaperRunnable != null) reaperRunnable.stop(); reaperRunnable = new Reaper(); - reaperThread = new Thread(reaperRunnable, "hornetq-expiry-reaper-thread"); + reaperThread = new Thread(reaperRunnable, "activemq-expiry-reaper-thread"); reaperThread.setPriority(reaperPriority); @@ -1433,7 +1433,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding } catch (Exception e) { - HornetQServerLogger.LOGGER.errorExpiringMessages(e); + ActiveMQServerLogger.LOGGER.errorExpiringMessages(e); } } } @@ -1530,7 +1530,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding return addressManager; } - public HornetQServer getServer() + public ActiveMQServer getServer() { return server; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java index 51c038b..2cf3dd4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java @@ -22,8 +22,8 @@ import org.apache.activemq.core.postoffice.AddressManager; import org.apache.activemq.core.postoffice.Binding; import org.apache.activemq.core.postoffice.Bindings; import org.apache.activemq.core.postoffice.BindingsFactory; -import org.apache.activemq.core.server.HornetQMessageBundle; -import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.server.ActiveMQServerLogger; import org.apache.activemq.core.transaction.Transaction; import org.apache.activemq.core.transaction.TransactionOperationAbstract; import org.apache.activemq.utils.ConcurrentHashSet; @@ -60,12 +60,12 @@ public class SimpleAddressManager implements AddressManager { if (nameMap.putIfAbsent(binding.getUniqueName(), binding) != null || pendingDeletes.contains(binding.getUniqueName())) { - throw HornetQMessageBundle.BUNDLE.bindingAlreadyExists(binding); + throw ActiveMQMessageBundle.BUNDLE.bindingAlreadyExists(binding); } - if (HornetQServerLogger.LOGGER.isTraceEnabled()) + if (ActiveMQServerLogger.LOGGER.isTraceEnabled()) { - HornetQServerLogger.LOGGER.trace("Adding binding " + binding + " with address = " + binding.getUniqueName(), new Exception("trace")); + ActiveMQServerLogger.LOGGER.trace("Adding binding " + binding + " with address = " + binding.getUniqueName(), new Exception("trace")); } return addMappingInternal(binding.getAddress(), binding); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java index a305c9c..68c07ff 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java @@ -31,7 +31,7 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ActiveMQClient; import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; import org.apache.activemq.core.protocol.stomp.WebSocketServerHandler; import org.apache.activemq.core.remoting.impl.netty.ConnectionCreator; @@ -112,7 +112,7 @@ public class ProtocolHandler ctx.fireChannelRead(msg); } // HORNETQ-1391 - else if (upgrade != null && upgrade.equalsIgnoreCase(NettyConnector.HORNETQ_REMOTING)) + else if (upgrade != null && upgrade.equalsIgnoreCase(NettyConnector.ACTIVEMQ_REMOTING)) { // Send the response and close the connection if necessary. ctx.writeAndFlush(new DefaultFullHttpResponse(HTTP_1_1, FORBIDDEN)).addListener(ChannelFutureListener.CLOSE); @@ -168,7 +168,7 @@ public class ProtocolHandler //if we get here we assume we use the core protocol as we match nothing else if (protocolToUse == null) { - protocolToUse = HornetQClient.DEFAULT_CORE_PROTOCOL; + protocolToUse = ActiveMQClient.DEFAULT_CORE_PROTOCOL; } ProtocolManager protocolManagerToUse = protocolMap.get(protocolToUse); ConnectionCreator channelHandler = nettyAcceptor.createConnectionCreator();
