Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BA2CCBE2 for ; Mon, 17 Nov 2014 14:48:40 +0000 (UTC) Received: (qmail 60155 invoked by uid 500); 17 Nov 2014 14:48:38 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 60043 invoked by uid 500); 17 Nov 2014 14:48:38 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 58399 invoked by uid 99); 17 Nov 2014 14:48:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 14:48:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AECE998D07A; Mon, 17 Nov 2014 14:48:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Mon, 17 Nov 2014 14:49:06 -0000 Message-Id: <58d509b94fee47d396d68c95dd8685d7@git.apache.org> In-Reply-To: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org> References: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java index 7a4c664..6e4bce8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.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; +package org.apache.activemq.core.server; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.replication.ReplicatedLargeMessage; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.replication.ReplicatedLargeMessage; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java index ab7e7ac..2adbfcd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server; +package org.apache.activemq.core.server; -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.ClusterTopologyListener; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -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.ClusterTopologyListener; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * A class that will locate a particular live server running in a cluster. How this live is chosen http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java index e5fa4ff..b8544e7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.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.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.utils.SizeFormatterUtil; +import org.apache.activemq.utils.SizeFormatterUtil; /** * A memory usage watcher. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java b/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java index f1a94ef..d563114 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.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; +package org.apache.activemq.core.server; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java index c40c640..20dc50a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.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; +package org.apache.activemq.core.server; import java.io.File; import java.io.IOException; @@ -18,10 +18,10 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.utils.UUID; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.utils.UUID; +import org.apache.activemq.utils.UUIDGenerator; /** * @author Andy Taylor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java b/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java index e973aeb..b85c3c5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.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.server; +package org.apache.activemq.core.server; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -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.transaction.Transaction; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.ReferenceCounter; +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.transaction.Transaction; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.ReferenceCounter; /** * A Queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java index 1f4a74e..1e7dd21 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.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.server; +package org.apache.activemq.core.server; -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.postoffice.PostOffice; +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.postoffice.PostOffice; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java b/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java index db06ac8..541e180 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.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; +package org.apache.activemq.core.server; 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/RoutingContext.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java b/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java index 75207f9..1d7450b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.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.server; +package org.apache.activemq.core.server; import java.util.List; 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; /** * A RoutingContext http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java index 960681f..e5fb05e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.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.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.core.filter.Filter; +import org.apache.activemq.core.filter.Filter; 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/ServerConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java index 9a56fcb..297d16b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.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; +package org.apache.activemq.core.server; import java.util.List; -import org.apache.activemq6.core.transaction.Transaction; +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/server/ServerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java index 10d484a..53433c2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.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.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.paging.PagingStore; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.paging.PagingStore; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java index 21f4a70..849360a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.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; +package org.apache.activemq.core.server; import javax.transaction.xa.Xid; import java.util.List; import java.util.Set; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.json.JSONArray; /** * A ServerSession http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java index 194237c..cb4faa8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.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.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.security.SecurityStore; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.ServerSessionImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.security.SecurityStore; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.ServerSessionImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.protocol.SessionCallback; public interface ServerSessionFactory { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java index 14c80cb..16dfd08 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.utils.ReferenceCounter; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.utils.ReferenceCounter; /** * @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/cluster/BackupManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java index 14fc942..ef6af02 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.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.cluster; +package org.apache.activemq.core.server.cluster; import java.util.ArrayList; @@ -21,19 +21,19 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQComponent; -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.utils.ExecutorFactory; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQComponent; +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.utils.ExecutorFactory; /* * takes care of updating the cluster with a backups transport configuration which is based on each cluster connection. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java index febad92..9e68b40 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.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.cluster; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.management.NotificationService; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; +package org.apache.activemq.core.server.cluster; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.spi.core.protocol.RemotingConnection; /** * A Core Bridge http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java index 3496689..996b3a6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.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.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.management.NotificationService; /** * A BroadcastGroup http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java index 454f67e..8cd4dda 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.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.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServerLogger; 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/cluster/ClusterConnection.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java index 2f1bcdc..e5facf7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.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.cluster; +package org.apache.activemq.core.server.cluster; import java.util.Map; -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.core.client.impl.Topology; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; +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.core.client.impl.Topology; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; /** * A ClusterConnection http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java index e10f564..ed1d004 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java @@ -11,33 +11,33 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster; - - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -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.CoreRemotingConnection; -import org.apache.activemq6.core.protocol.core.impl.ChannelImpl; -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.BackupRequestMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -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.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq6.core.server.cluster.qourum.Vote; +package org.apache.activemq.core.server.cluster; + + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +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.CoreRemotingConnection; +import org.apache.activemq.core.protocol.core.impl.ChannelImpl; +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.BackupRequestMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +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.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.core.server.cluster.qourum.Vote; /** * handles the communication between a cluster node and the cluster, either the whole cluster or a specific node in the @@ -90,7 +90,7 @@ public class ClusterControl implements AutoCloseable * @param attemptingFailBack if {@code true} then this server wants to trigger a fail-back when * up-to-date, that is it wants to take over the role of 'live' from the current 'live' * server. - * @throws org.apache.activemq6.api.core.HornetQException + * @throws org.apache.activemq.api.core.HornetQException */ public void announceReplicatingBackupToLive(final boolean attemptingFailBack, String replicationClusterName) throws HornetQException { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java index 383ca1d..39accdc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster; +package org.apache.activemq.core.server.cluster; import java.util.HashMap; import java.util.Map; @@ -20,38 +20,38 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -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.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.client.impl.Topology; -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.ClusterConnectMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.cluster.qourum.QuorumManager; -import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq6.core.server.cluster.qourum.Vote; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Interceptor; +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.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.client.impl.Topology; +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.ClusterConnectMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.core.server.cluster.qourum.Vote; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.spi.core.remoting.Acceptor; /** * used for creating and managing cluster control connections for each cluster connection and the replication connection http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java index 3e63de8..150701b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.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.cluster; +package org.apache.activemq.core.server.cluster; import java.io.PrintWriter; import java.io.StringWriter; @@ -24,50 +24,50 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -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.filter.impl.FilterImpl; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.protocol.core.Channel; -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.HornetQExceptionMessage; -import org.apache.activemq6.core.server.HornetQComponent; -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.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.cluster.ha.HAManager; -import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq6.core.server.cluster.impl.BroadcastGroupImpl; -import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq6.core.server.cluster.qourum.QuorumManager; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.ExecutorFactory; -import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +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.filter.impl.FilterImpl; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.protocol.core.Channel; +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.HornetQExceptionMessage; +import org.apache.activemq.core.server.HornetQComponent; +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.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.cluster.ha.HAManager; +import org.apache.activemq.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.core.server.cluster.impl.BroadcastGroupImpl; +import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.utils.FutureLatch; /** * A ClusterManager manages {@link ClusterConnection}s, {@link BroadcastGroup}s and {@link Bridge}s. *

- * Note that {@link org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through - * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq6.core.server.cluster.impl.ClusterConnectionBridge} is + * Note that {@link org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through + * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge} is * deployed. * * @author Tim Fox http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java index b24b758..a08a3b1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.core.protocol.ServerPacketDecoder; -import org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager; -import org.apache.activemq6.core.protocol.core.impl.PacketDecoder; -import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq6.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.core.protocol.ServerPacketDecoder; +import org.apache.activemq.core.protocol.core.impl.HornetQClientProtocolManager; +import org.apache.activemq.core.protocol.core.impl.PacketDecoder; +import org.apache.activemq.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; /** * A protocol manager that will replace the packet manager for inter-server communications http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java index 83c1564..da91cd0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.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.server.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.api.core.client.MessageHandler; +import org.apache.activemq.api.core.client.MessageHandler; /** * A MessageFlowRecord http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java index 9086021..6da93de 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.postoffice.QueueBinding; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.postoffice.QueueBinding; /** * A RemoteQueueBinding http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java index 29a3157..1ba2667 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.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.server.cluster; +package org.apache.activemq.core.server.cluster; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerMessage; /** * A Transformer http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java index cd1b870..8e9013f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.Activation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.Activation; public abstract class BackupPolicy implements HAPolicy { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java index e383e33..b53a2be 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.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.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -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.TopologyMember; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.ActivationParams; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.cluster.ClusterControl; -import org.apache.activemq6.core.server.cluster.ClusterController; +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.TopologyMember; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.ActivationParams; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.cluster.ClusterControl; +import org.apache.activemq.core.server.cluster.ClusterController; import java.util.HashMap; 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/cluster/ha/ColocatedPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java index db53553..a781527 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.ColocatedActivation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.LiveActivation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.ColocatedActivation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.LiveActivation; import java.util.ArrayList; 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/cluster/ha/HAManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java index 3a9240f..c5ca29b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java index b9d3f5a..747b864 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; import java.util.Map; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; /** * Every live server will have an HAPolicy that configures the type of server that it should be either live, backup or http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java index 586b447..1b83bb2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.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.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.LiveOnlyActivation; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.LiveOnlyActivation; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java index ffef588..6b8923a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java index 342dae1..da28fd5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.LiveActivation; -import org.apache.activemq6.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.LiveActivation; +import org.apache.activemq.core.server.impl.SharedNothingLiveActivation; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java index 854ef7e..b186a7f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.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.cluster.ha; - -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; +package org.apache.activemq.core.server.cluster.ha; + +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; import java.lang.reflect.Array; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java index 70eefe4..2384d91 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.LiveActivation; -import org.apache.activemq6.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.LiveActivation; +import org.apache.activemq.core.server.impl.SharedStoreLiveActivation; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java index f5988f3..7fdad9d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.SharedStoreBackupActivation; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java index 9af1644..94cedb2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.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.server.cluster.ha; +package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServer; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java index e0121ba..be427be 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.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.cluster.impl; +package org.apache.activemq.core.server.cluster.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -22,41 +22,41 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClusterTopologyListener; -import org.apache.activemq6.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HandleStatus; -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.ServerMessage; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.Transformer; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationService; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.ReusableLatch; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClusterTopologyListener; +import org.apache.activemq.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HandleStatus; +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.ServerMessage; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.Transformer; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUID; /** * A Core BridgeImpl @@ -223,7 +223,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled } /* (non-Javadoc) - * @see org.apache.activemq6.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java index fd44414..639f8b2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.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.cluster.impl; +package org.apache.activemq.core.server.cluster.impl; import java.util.ArrayList; import java.util.List; @@ -18,20 +18,20 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.BroadcastEndpoint; -import org.apache.activemq6.api.core.BroadcastEndpointFactory; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.cluster.BroadcastGroup; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationService; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.BroadcastEndpoint; +import org.apache.activemq.api.core.BroadcastEndpointFactory; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.cluster.BroadcastGroup; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUIDGenerator; /** *

This class will use the {@link BroadcastEndpoint} to send periodical updates on the list for connections http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java index 5a856c9..9dc8503 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.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.cluster.impl; +package org.apache.activemq.core.server.cluster.impl; import java.util.ArrayList; import java.util.HashSet; @@ -19,32 +19,32 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.management.CoreNotificationType; -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.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ClusterManager; -import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.apache.activemq6.core.server.cluster.MessageFlowRecord; -import org.apache.activemq6.core.server.cluster.Transformer; -import org.apache.activemq6.utils.UUID; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.management.CoreNotificationType; +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.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ClusterManager; +import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq.core.server.cluster.MessageFlowRecord; +import org.apache.activemq.core.server.cluster.Transformer; +import org.apache.activemq.utils.UUID; +import org.apache.activemq.utils.UUIDGenerator; /** * A bridge with extra functionality only available when the server is clustered. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java index 24469a8..4dc8b00 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.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.cluster.impl; +package org.apache.activemq.core.server.cluster.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -25,47 +25,47 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -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.ClientMessage; -import org.apache.activemq6.api.core.client.ClusterTopologyListener; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.core.client.impl.AfterConnectInternalListener; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.client.impl.TopologyMemberImpl; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; -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.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ClusterControl; -import org.apache.activemq6.core.server.cluster.ClusterManager; -import org.apache.activemq6.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; -import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.apache.activemq6.core.server.cluster.MessageFlowRecord; -import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq6.core.server.group.impl.Proposal; -import org.apache.activemq6.core.server.group.impl.Response; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.ExecutorFactory; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +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.ClientMessage; +import org.apache.activemq.api.core.client.ClusterTopologyListener; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.core.client.impl.AfterConnectInternalListener; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; +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.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ClusterControl; +import org.apache.activemq.core.server.cluster.ClusterManager; +import org.apache.activemq.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; +import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq.core.server.cluster.MessageFlowRecord; +import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.core.server.group.impl.Proposal; +import org.apache.activemq.core.server.group.impl.Response; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.TypedProperties; /** * A ClusterConnectionImpl