http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java index f7837b7..8c0a063 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerMessage; public final class AddMessageRecord {
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ca24d7b..c3859a6 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 @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq.api.core.HornetQBuffer; +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.utils.DataConstants; +import org.apache.activemq.utils.IDGenerator; /** * An ID generator that allocates a batch of IDs of size {@link #checkpointSize} and records the ID http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 364e704..df660ae 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.PrintStream; @@ -19,60 +19,60 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.TransactionFailureCallback; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.JournalReaderCallback; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.paging.cursor.impl.PageSubscriptionCounterImpl; -import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq6.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.RefEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.utils.Base64; -import org.apache.activemq6.utils.XidCodecSupport; - -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_REF; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.TransactionFailureCallback; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.JournalReaderCallback; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.paging.cursor.impl.PageSubscriptionCounterImpl; +import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.RefEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.utils.Base64; +import org.apache.activemq.utils.XidCodecSupport; + +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_REF; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; /** * Outputs a String description of the Journals contents. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java index 020dc05..bebb510 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; /** * These record IDs definitions are meant to be public. @@ -33,7 +33,7 @@ public final class JournalRecordIds /** * Records storing the current recordID number. - * @see org.apache.activemq6.utils.IDGenerator + * @see org.apache.activemq.utils.IDGenerator * @see BatchingIDGenerator */ public static final byte ID_COUNTER_RECORD = 24; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 103c129..a170934 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.File; @@ -41,85 +41,85 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.JournalLoadInformation; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.TransactionFailureCallback; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PagedReferenceImpl; -import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq6.core.persistence.GroupingInfo; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.QueueBindingInfo; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq6.core.persistence.config.PersistedRoles; -import org.apache.activemq6.core.persistence.impl.PageCountPending; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; -import org.apache.activemq6.core.replication.ReplicatedJournal; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.impl.GroupBinding; -import org.apache.activemq6.core.server.impl.JournalLoader; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.Transaction.State; -import org.apache.activemq6.core.transaction.TransactionOperation; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.utils.Base64; -import org.apache.activemq6.utils.ByteUtil; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.ExecutorFactory; -import org.apache.activemq6.utils.HornetQThreadFactory; -import org.apache.activemq6.utils.XidCodecSupport; - -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.JournalLoadInformation; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.TransactionFailureCallback; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.core.persistence.GroupingInfo; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.QueueBindingInfo; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.core.persistence.config.PersistedRoles; +import org.apache.activemq.core.persistence.impl.PageCountPending; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.DuplicateIDCache; +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.JournalType; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.impl.GroupBinding; +import org.apache.activemq.core.server.impl.JournalLoader; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.Transaction.State; +import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +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.XidCodecSupport; + +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; /** * Controls access to the journals and other storage files such as the ones used to store pages and @@ -352,7 +352,7 @@ public class JournalStorageManager implements StorageManager * To achieve (2), instead of writing directly to instances of {@link JournalImpl}, we write to * instances of {@link ReplicatedJournal}. * <p/> - * At the backup-side replication is handled by {@link org.apache.activemq6.core.replication.ReplicationEndpoint}. + * At the backup-side replication is handled by {@link org.apache.activemq.core.replication.ReplicationEndpoint}. * * @param replicationManager * @param pagingManager @@ -3110,7 +3110,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ public void decode(final HornetQBuffer buffer) { @@ -3118,7 +3118,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ public void encode(final HornetQBuffer buffer) { @@ -3126,7 +3126,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3149,7 +3149,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ public void decode(final HornetQBuffer buffer) { @@ -3157,7 +3157,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.spi.core.remoting.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ public void encode(final HornetQBuffer buffer) { @@ -3165,7 +3165,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3274,7 +3274,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() */ @Override public int getEncodeSize() @@ -3283,7 +3283,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#encode(org.apache.activemq6.api.core.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.api.core.HornetQBuffer) */ @Override public void encode(HornetQBuffer buffer) @@ -3293,7 +3293,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.EncodingSupport#decode(org.apache.activemq6.api.core.HornetQBuffer) + * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.api.core.HornetQBuffer) */ @Override public void decode(HornetQBuffer buffer) @@ -3466,7 +3466,7 @@ public class JournalStorageManager implements StorageManager * This is only used when loading a transaction. * <p/> * it might be possible to merge the functionality of this class with - * {@link org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} + * {@link org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} */ // TODO: merge this class with the one on the PagingStoreImpl private static class FinishPageMessageOperation extends TransactionOperationAbstract implements TransactionOperation http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 a872319..ca0f5c4 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 @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.message.BodyEncoder; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQInternalErrorException; +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.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.utils.TypedProperties; /** * A LargeServerMessageImpl @@ -510,7 +510,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } /* (non-Javadoc) - * @see org.apache.activemq6.core.message.BodyEncoder#getLargeBodySize() + * @see org.apache.activemq.core.message.BodyEncoder#getLargeBodySize() */ public long getLargeBodySize() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ccfe730..0204230 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 @@ -13,18 +13,18 @@ /** * */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import java.nio.ByteBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.StorageManager.LargeMessageExtension; -import org.apache.activemq6.core.replication.ReplicatedLargeMessage; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +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.LargeServerMessage; public final class LargeServerMessageInSync implements ReplicatedLargeMessage { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 6a22209..ce79381 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.journal; +package org.apache.activemq.core.persistence.impl.journal; import java.util.Iterator; import java.util.LinkedList; @@ -19,13 +19,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.impl.SimpleWaitIOCallback; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +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.utils.ExecutorFactory; /** * @@ -250,7 +250,7 @@ public class OperationContextImpl implements OperationContext /* * (non-Javadoc) - * @see org.apache.activemq6.core.replication.ReplicationToken#complete() + * @see org.apache.activemq.core.replication.ReplicationToken#complete() */ public void complete() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java index b2e3289..0c46c26 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.nullpm; +package org.apache.activemq.core.persistence.impl.nullpm; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; /** * A NullStorageLargeServerMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java index d097ab3..68883d4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl.nullpm; +package org.apache.activemq.core.persistence.impl.nullpm; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -21,36 +21,36 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.JournalLoadInformation; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.persistence.GroupingInfo; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.QueueBindingInfo; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq6.core.persistence.config.PersistedRoles; -import org.apache.activemq6.core.persistence.impl.PageCountPending; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.impl.GroupBinding; -import org.apache.activemq6.core.server.impl.JournalLoader; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.JournalLoadInformation; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.persistence.GroupingInfo; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.QueueBindingInfo; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.core.persistence.config.PersistedRoles; +import org.apache.activemq.core.persistence.impl.PageCountPending; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.replication.ReplicationManager; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.impl.GroupBinding; +import org.apache.activemq.core.server.impl.JournalLoader; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; /** * A NullStorageManager http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java index ef0251d..289797f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.util.List; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * USed to hold a hierarchical style address, delimited by a '.'. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java index 92077e6..2a0d058 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.util.Map; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.transaction.Transaction; /** * Used to maintain addresses and BindingsImpl. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java index 4585d77..f14b998 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.server.Bindable; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.UnproposalListener; +package org.apache.activemq.core.postoffice; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.server.Bindable; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.UnproposalListener; /** * A Binding http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 e546ce8..7e7be9d 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 @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; -import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQMessageBundle; /** * A BindingType http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java index 526ce68..1f40708 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.util.Collection; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.UnproposalListener; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.UnproposalListener; /** * A Bindings http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java index 65643f7..b4412b9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * A factory for creating bindings http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java index 2b90c57..216920e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.util.List; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.transaction.Transaction; /** * A DuplicateIDCache http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 070c5c8..7874779 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 @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.util.Map; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java index 35a8e52..aa9c347 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; -import org.apache.activemq6.core.server.Queue; +import org.apache.activemq.core.server.Queue; /** * A QueueBinding http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ee3f463..2cc396e 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 @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice; +package org.apache.activemq.core.postoffice; import java.io.Serializable; import java.util.List; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.HornetQMessageBundle; /** * A QueueInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java index e77ad38..371a2bb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.postoffice.Address; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.postoffice.Address; /** * splits an address string into its hierarchical parts split by '.' http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 3781a6f..900dbdb 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -23,21 +23,21 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.group.impl.Proposal; -import org.apache.activemq6.core.server.group.impl.Response; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.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.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.group.impl.Proposal; +import org.apache.activemq.core.server.group.impl.Response; /** * A BindingsImpl @@ -264,7 +264,7 @@ public final class BindingsImpl implements Bindings private void route(final ServerMessage message, final RoutingContext context, final boolean groupRouting) throws Exception { /* This is a special treatment for scaled-down messages involving SnF queues. - * See org.apache.activemq6.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property + * See org.apache.activemq.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property */ if (message.containsProperty(MessageImpl.HDR_SCALEDOWN_TO_IDS)) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java index 55e35f8..e335657 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.server.Bindable; -import org.apache.activemq6.core.server.Divert; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; +package org.apache.activemq.core.postoffice.impl; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.server.Bindable; +import org.apache.activemq.core.server.Divert; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 e0e59f5..f4d09de 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 @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; +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.MessageReference; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; /** * A DuplicateIDCacheImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java index cfcd90f..b41e6f2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.server.Bindable; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; +package org.apache.activemq.core.postoffice.impl; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.server.Bindable; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; /** * A LocalQueueBinding http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ab5cffa..440cafb 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.util.ArrayList; import java.util.Collections; @@ -27,55 +27,55 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq6.api.core.HornetQAddressFullException; -import org.apache.activemq6.api.core.HornetQDuplicateIdException; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.api.core.management.NotificationType; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.AddressManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.BindingsFactory; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueInfo; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.impl.RoutingContextImpl; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationListener; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperation; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQAddressFullException; +import org.apache.activemq.api.core.HornetQDuplicateIdException; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.api.core.management.NotificationType; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.AddressManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.postoffice.Bindings; +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.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.impl.RoutingContextImpl; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationListener; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUIDGenerator; /** * A PostOfficeImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 9453335..51c038b 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 @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.postoffice.Address; -import org.apache.activemq6.core.postoffice.AddressManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.BindingsFactory; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.postoffice.Address; +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.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.utils.ConcurrentHashSet; /** * A simple address manager that maintains the addresses and bindings. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java index 1816b76..6815db7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.postoffice.impl; +package org.apache.activemq.core.postoffice.impl; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.postoffice.Address; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.BindingsFactory; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.postoffice.Address; +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.transaction.Transaction; /** * extends the simple manager to allow wildcard addresses to be used. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 3ced253..a305c9c 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol; +package org.apache.activemq.core.protocol; import java.util.List; import java.util.Map; @@ -31,18 +31,18 @@ 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.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq6.core.protocol.stomp.WebSocketServerHandler; -import org.apache.activemq6.core.remoting.impl.netty.ConnectionCreator; -import org.apache.activemq6.core.remoting.impl.netty.HttpAcceptorHandler; -import org.apache.activemq6.core.remoting.impl.netty.HttpKeepAliveRunnable; -import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptor; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.utils.ConfigurationHelper; +import org.apache.activemq.api.core.client.HornetQClient; +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; +import org.apache.activemq.core.remoting.impl.netty.HttpAcceptorHandler; +import org.apache.activemq.core.remoting.impl.netty.HttpKeepAliveRunnable; +import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.utils.ConfigurationHelper; import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
