http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java index 41004e5..4717c8d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.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.server.impl; +package org.apache.activemq.core.server.impl; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.utils.MemorySize; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.utils.MemorySize; /** * Implementation of a MessageReference @@ -49,7 +49,7 @@ public class MessageReferenceImpl implements MessageReference { // This is an estimate of how much memory a ServerMessageImpl takes up, exclusing body and properties // Note, it is only an estimate, it's not possible to be entirely sure with Java - // This figure is calculated using the test utilities in org.apache.activemq6.tests.unit.util.sizeof + // This figure is calculated using the test utilities in org.apache.activemq.tests.unit.util.sizeof // The value is somewhat higher on 64 bit architectures, probably due to different alignment if (MemorySize.is64bitArch())
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java index bf91603..16683d8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java @@ -11,25 +11,25 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.server.LiveNodeLocator; -import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.server.LiveNodeLocator; +import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * NamedLiveNodeLocatorForReplication looks for a live server in the cluster with a specific backupGroupName * * @author <a href="mailto:[email protected]";>Andy Taylor</a> - * @see org.apache.activemq6.core.server.cluster.ha.HAPolicy#getGroupName() + * @see org.apache.activemq.core.server.cluster.ha.HAPolicy#getGroupName() */ public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java index 2f6f1fd..7e67be9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.util.HashMap; import java.util.Iterator; @@ -21,18 +21,18 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.LiveNodeLocator; /** * NamedLiveNodeLocatorForScaleDown looks for a live server in the cluster with a specific scaleDownGroupName * * @author Justin Bertram - * @see org.apache.activemq6.core.config.Configuration#getScaleDownGroupName() + * @see org.apache.activemq.core.config.Configuration#getScaleDownGroupName() */ public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java index bbcbc3a..efe73ed 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.server.LiveNodeLocator; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.server.LiveNodeLocator; public class NamedNodeIdNodeLocator extends LiveNodeLocator { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java index 683f84b..f71094a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.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.server.impl; +package org.apache.activemq.core.server.impl; import javax.transaction.xa.Xid; import java.util.Collection; @@ -20,40 +20,40 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -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.filter.impl.FilterImpl; -import org.apache.activemq6.core.journal.Journal; -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.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.persistence.GroupingInfo; -import org.apache.activemq6.core.persistence.QueueBindingInfo; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.impl.PageCountPending; -import org.apache.activemq6.core.persistence.impl.journal.AddMessageRecord; -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.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.group.impl.GroupBinding; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; +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.filter.impl.FilterImpl; +import org.apache.activemq.core.journal.Journal; +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.PageSubscription; +import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.persistence.GroupingInfo; +import org.apache.activemq.core.persistence.QueueBindingInfo; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.impl.PageCountPending; +import org.apache.activemq.core.persistence.impl.journal.AddMessageRecord; +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.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.group.impl.GroupBinding; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.impl.TransactionImpl; public class PostOfficeJournalLoader implements JournalLoader { @@ -278,7 +278,7 @@ public class PostOfficeJournalLoader implements JournalLoader queue.resume(); } - if (System.getProperty("org.apache.activemq6.opt.directblast") != null) + if (System.getProperty("org.apache.activemq.opt.directblast") != null) { messageJournal.runDirectJournalBlast(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java index 26d816b..508277c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.utils.ExecutorFactory; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java index 234be02..1a95ea4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.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.server.impl; +package org.apache.activemq.core.server.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -36,54 +36,54 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -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.core.filter.Filter; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PagedReference; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq6.core.remoting.server.RemotingService; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HandleStatus; -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.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ScheduledDeliveryHandler; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq6.core.server.cluster.impl.Redistributor; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.core.transaction.impl.BindingsTransactionImpl; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.PriorityLinkedList; -import org.apache.activemq6.utils.PriorityLinkedListImpl; -import org.apache.activemq6.utils.ReferenceCounter; -import org.apache.activemq6.utils.ReusableLatch; -import org.apache.activemq6.utils.TypedProperties; +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.core.filter.Filter; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PagedReference; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.DuplicateIDCache; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.core.remoting.server.RemotingService; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HandleStatus; +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.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ScheduledDeliveryHandler; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.core.server.cluster.impl.Redistributor; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.core.transaction.impl.BindingsTransactionImpl; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.PriorityLinkedList; +import org.apache.activemq.utils.PriorityLinkedListImpl; +import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.utils.TypedProperties; /** * Implementation of a Queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java index 8dfaff4..f3a805f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.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.server.impl; - -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; +package org.apache.activemq.core.server.impl; + +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.impl.TransactionImpl; import java.util.ArrayList; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java index 7429dbf..ab41397 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java @@ -13,24 +13,24 @@ /** * */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.LiveNodeLocator; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.LiveNodeLocator; +import org.apache.activemq.spi.core.protocol.RemotingConnection; /** * Stops the backup in case of an error at the start of Replication. * <p> * Using an interceptor for the task to avoid a server reference inside of the 'basic' channel-0 - * handler at {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager} + * handler at {@link org.apache.activemq.core.protocol.core.impl.HornetQClientProtocolManager.Channel0Handler}. As {@link org.apache.activemq.core.protocol.core.impl.HornetQClientProtocolManager} * is also shipped in the HQ-client JAR (which does not include {@link HornetQServer}). */ final class ReplicationError implements Interceptor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java index 64c06e1..82fb3f6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.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.server.impl; +package org.apache.activemq.core.server.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.transaction.Transaction; /** * A RoutingContextImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java index 940b11b..19d341b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.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.server.impl; +package org.apache.activemq.core.server.impl; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -22,37 +22,37 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -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.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientRequestor; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -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.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PagedReference; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.ClusterControl; -import org.apache.activemq6.core.server.cluster.ClusterController; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperation; -import org.apache.activemq6.utils.LinkedListIterator; +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.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientRequestor; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +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.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PagedReference; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.ClusterControl; +import org.apache.activemq.core.server.cluster.ClusterController; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.utils.LinkedListIterator; public class ScaleDownHandler { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java index 4190386..7145bc8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.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.server.impl; +package org.apache.activemq.core.server.impl; import java.util.ArrayList; import java.util.Comparator; @@ -24,11 +24,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ScheduledDeliveryHandler; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ScheduledDeliveryHandler; /** * Handles scheduling deliveries to a queue at the correct time. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java index e775d43..a68533a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.math.BigDecimal; import java.util.Iterator; @@ -23,37 +23,37 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReadWriteLock; 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.SimpleString; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.core.client.impl.ClientConsumerImpl; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.message.BodyEncoder; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.server.HandleStatus; -import org.apache.activemq6.core.server.HornetQMessageBundle; -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.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.spi.core.remoting.ReadyListener; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.TypedProperties; +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.SimpleString; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.core.client.impl.ClientConsumerImpl; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.message.BodyEncoder; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.server.HandleStatus; +import org.apache.activemq.core.server.HornetQMessageBundle; +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.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.TypedProperties; /** * Concrete implementation of a ClientConsumer. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java index f46435e..73d293d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; import java.util.Date; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.utils.SizeFormatterUtil; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.utils.SizeFormatterUtil; /** * A ServerInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java index 3fe5553..d3b43c0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.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.server.impl; +package org.apache.activemq.core.server.impl; import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.MemorySize; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.utils.MemorySize; +import org.apache.activemq.utils.TypedProperties; /** * A ServerMessageImpl @@ -51,7 +51,7 @@ public class ServerMessageImpl extends MessageImpl implements ServerMessage { // This is an estimate of how much memory a ServerMessageImpl takes up, exclusing body and properties // Note, it is only an estimate, it's not possible to be entirely sure with Java - // This figure is calculated using the test utilities in org.apache.activemq6.tests.unit.util.sizeof + // This figure is calculated using the test utilities in org.apache.activemq.tests.unit.util.sizeof // The value is somewhat higher on 64 bit architectures, probably due to different alignment if (MemorySize.is64bitArch()) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java index 7f8e0ce..44871cb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java @@ -22,7 +22,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; @@ -38,58 +38,58 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQException; -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.core.client.impl.ClientMessageImpl; -import org.apache.activemq6.core.exception.HornetQXAException; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.filter.impl.FilterImpl; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.StorageManager; -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.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.FailureListener; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.SecurityStore; -import org.apache.activemq6.core.server.BindingQueryResult; -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.QueueQueryResult; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -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.TransactionFactory; -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.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUID; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.HornetQException; +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.core.client.impl.ClientMessageImpl; +import org.apache.activemq.core.exception.HornetQXAException; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.filter.impl.FilterImpl; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.StorageManager; +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.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.FailureListener; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.SecurityStore; +import org.apache.activemq.core.server.BindingQueryResult; +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.QueueQueryResult; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +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.TransactionFactory; +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.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUID; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * Server side Session implementation http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java index 98b3b52..d85f78e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.util.Collection; import java.util.Collections; @@ -20,10 +20,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.config.ConnectorServiceConfiguration; -import org.apache.activemq6.core.server.ConnectorServiceFactory; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.core.server.ConnectorServiceFactory; /** * @author <a href="mailto:[email protected]";>Martyn Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java index 5acbf6a..f84aa61 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java @@ -10,42 +10,42 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.protocol.core.Channel; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq6.core.replication.ReplicationEndpoint; -import org.apache.activemq6.core.server.ActivationParams; -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.LiveNodeLocator; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.cluster.ClusterControl; -import org.apache.activemq6.core.server.cluster.ClusterController; -import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.utils.ReusableLatch; +package org.apache.activemq.core.server.impl; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.protocol.core.Channel; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.core.replication.ReplicationEndpoint; +import org.apache.activemq.core.server.ActivationParams; +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.LiveNodeLocator; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.cluster.ClusterControl; +import org.apache.activemq.core.server.cluster.ClusterController; +import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.utils.ReusableLatch; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; -import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; -import static org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; +import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; +import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; +import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; public final class SharedNothingBackupActivation extends Activation { @@ -425,7 +425,7 @@ public final class SharedNothingBackupActivation extends Activation } /** - * @throws org.apache.activemq6.api.core.HornetQException + * @throws org.apache.activemq.api.core.HornetQException */ public void remoteFailOver(ReplicationLiveIsStoppingMessage.LiveStopping finalMessage) throws HornetQException { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java index 3cd33d5..8621912 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java @@ -10,40 +10,40 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; - -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQAlreadyReplicatingException; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClusterTopologyListener; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.ConfigurationUtils; -import org.apache.activemq6.core.protocol.core.Channel; -import org.apache.activemq6.core.protocol.core.ChannelHandler; -import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.FailureListener; -import org.apache.activemq6.core.remoting.server.RemotingService; -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.NodeManager; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq6.spi.core.remoting.Acceptor; +package org.apache.activemq.core.server.impl; + +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQAlreadyReplicatingException; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClusterTopologyListener; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.ConfigurationUtils; +import org.apache.activemq.core.protocol.core.Channel; +import org.apache.activemq.core.protocol.core.ChannelHandler; +import org.apache.activemq.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.FailureListener; +import org.apache.activemq.core.remoting.server.RemotingService; +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.NodeManager; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.spi.core.remoting.Acceptor; import java.lang.reflect.Array; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java index 072554e..02b4f68 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.management.ManagementService; +package org.apache.activemq.core.server.impl; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.management.ManagementService; import java.nio.channels.ClosedChannelException; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java index fa1cfd1..85305cd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.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.server.impl; +package org.apache.activemq.core.server.impl; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; /** * Created by andy on 04/09/14. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java index b8f49b4..7c1d7db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.TransientQueueManager; -import org.apache.activemq6.utils.ReferenceCounterUtil; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.TransientQueueManager; +import org.apache.activemq.utils.ReferenceCounterUtil; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java index e1ea0fc..809803c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java @@ -10,41 +10,41 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.management; +package org.apache.activemq.core.server.management; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import javax.management.ObjectName; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.remoting.server.RemotingService; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.Divert; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.BroadcastGroup; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.remoting.server.RemotingService; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.Divert; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.BroadcastGroup; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.spi.core.remoting.Acceptor; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java index a41d7be..609455c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.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.server.management.impl; +package org.apache.activemq.core.server.management.impl; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; @@ -29,56 +29,56 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.AcceptorControl; -import org.apache.activemq6.api.core.management.BridgeControl; -import org.apache.activemq6.api.core.management.BroadcastGroupControl; -import org.apache.activemq6.api.core.management.ClusterConnectionControl; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.management.impl.AcceptorControlImpl; -import org.apache.activemq6.core.management.impl.AddressControlImpl; -import org.apache.activemq6.core.management.impl.BridgeControlImpl; -import org.apache.activemq6.core.management.impl.BroadcastGroupControlImpl; -import org.apache.activemq6.core.management.impl.ClusterConnectionControlImpl; -import org.apache.activemq6.core.management.impl.DivertControlImpl; -import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; -import org.apache.activemq6.core.management.impl.QueueControlImpl; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; -import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.remoting.server.RemotingService; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.Divert; -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.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.BroadcastGroup; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -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.ResourceManager; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.AcceptorControl; +import org.apache.activemq.api.core.management.BridgeControl; +import org.apache.activemq.api.core.management.BroadcastGroupControl; +import org.apache.activemq.api.core.management.ClusterConnectionControl; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.management.impl.AcceptorControlImpl; +import org.apache.activemq.core.management.impl.AddressControlImpl; +import org.apache.activemq.core.management.impl.BridgeControlImpl; +import org.apache.activemq.core.management.impl.BroadcastGroupControlImpl; +import org.apache.activemq.core.management.impl.ClusterConnectionControlImpl; +import org.apache.activemq.core.management.impl.DivertControlImpl; +import org.apache.activemq.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq.core.management.impl.QueueControlImpl; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.remoting.server.RemotingService; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.Divert; +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.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.BroadcastGroup; +import org.apache.activemq.core.server.cluster.ClusterConnection; +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.ResourceManager; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.utils.TypedProperties; /* * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> @@ -125,7 +125,7 @@ public class ManagementServiceImpl implements ManagementService private boolean notificationsEnabled; - private final Set<NotificationListener> listeners = new org.apache.activemq6.utils.ConcurrentHashSet<NotificationListener>(); + private final Set<NotificationListener> listeners = new org.apache.activemq.utils.ConcurrentHashSet<NotificationListener>(); private final ObjectNameBuilder objectNameBuilder; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java index b00e4c5..deda2b5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.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.settings; +package org.apache.activemq.core.settings; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java index c3059f4..43785c0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.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.settings; +package org.apache.activemq.core.settings; /** * @author <a href="[email protected]">Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java index a22303d..8ae6b03 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.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.settings; +package org.apache.activemq.core.settings; /** * Used when merging objects together. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java index 25e1b44..a88b209 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.settings.impl; +package org.apache.activemq.core.settings.impl; import java.io.Serializable; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.settings.Mergeable; -import org.apache.activemq6.utils.BufferHelper; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.settings.Mergeable; +import org.apache.activemq.utils.BufferHelper; /** * Configuration settings that are applied on the address level http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java index 3c7f5d3..cf49d05 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.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.settings.impl; +package org.apache.activemq.core.settings.impl; import java.io.Serializable; import java.util.ArrayList; @@ -26,10 +26,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; -import org.apache.activemq6.core.settings.Mergeable; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.core.settings.Mergeable; /** * allows objects to be mapped against a regex pattern and held in order in a list http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java index 516c80d..bef7cdc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.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.settings.impl; +package org.apache.activemq.core.settings.impl; import java.util.regex.Pattern; -import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQMessageBundle; /** a Match is the holder for the match string and the object to hold against it.
