You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/11/19 00:37:56 UTC
[03/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename
HornetQ* classes to ActiveMQ*
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
new file mode 100644
index 0000000..6922004
--- /dev/null
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.apache.activemq.core.server.cluster;
+
+import org.apache.activemq.core.protocol.ServerPacketDecoder;
+import org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManager;
+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
+ * @author Clebert Suconic
+ */
+public class ActiveMQServerSideProtocolManagerFactory implements ClientProtocolManagerFactory
+{
+ private static final ActiveMQServerSideProtocolManagerFactory INSTANCE = new ActiveMQServerSideProtocolManagerFactory();
+
+ public static ActiveMQServerSideProtocolManagerFactory getInstance()
+ {
+ return INSTANCE;
+ }
+
+ private ActiveMQServerSideProtocolManagerFactory()
+ {
+ }
+
+ private static final long serialVersionUID = 1;
+
+ @Override
+ public ClientProtocolManager newProtocolManager()
+ {
+ return new ActiveMQReplicationProtocolManager();
+ }
+
+ class ActiveMQReplicationProtocolManager extends ActiveMQClientProtocolManager
+ {
+ @Override
+ protected PacketDecoder getPacketDecoder()
+ {
+ return ServerPacketDecoder.INSTANCE;
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 ef6af02..8a7c428 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
@@ -29,18 +29,18 @@ 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.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
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.
* */
-public class BackupManager implements HornetQComponent
+public class BackupManager implements ActiveMQComponent
{
- private HornetQServer server;
+ private ActiveMQServer server;
private Executor executor;
private ScheduledExecutorService scheduledExecutor;
private NodeManager nodeManager;
@@ -51,7 +51,7 @@ public class BackupManager implements HornetQComponent
private boolean started;
- public BackupManager(HornetQServer server, ExecutorFactory executorFactory, ScheduledExecutorService scheduledExecutor, NodeManager nodeManager,
+ public BackupManager(ActiveMQServer server, ExecutorFactory executorFactory, ScheduledExecutorService scheduledExecutor, NodeManager nodeManager,
Configuration configuration, ClusterManager clusterManager)
{
this.server = server;
@@ -218,7 +218,7 @@ public class BackupManager implements HornetQComponent
backupServerLocator.setIdentity("backupLocatorFor='" + server + "'");
backupServerLocator.setReconnectAttempts(-1);
backupServerLocator.setInitialConnectAttempts(-1);
- backupServerLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+ backupServerLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
}
}
@@ -242,12 +242,12 @@ public class BackupManager implements HornetQComponent
if (localBackupLocator == null)
{
if (!stopping)
- HornetQServerLogger.LOGGER.error("Error announcing backup: backupServerLocator is null. " + this);
+ ActiveMQServerLogger.LOGGER.error("Error announcing backup: backupServerLocator is null. " + this);
return;
}
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(BackupConnector.this + ":: announcing " + connector + " to " + backupServerLocator);
+ ActiveMQServerLogger.LOGGER.debug(BackupConnector.this + ":: announcing " + connector + " to " + backupServerLocator);
}
announcingBackup = true;
//connect to the cluster
@@ -264,7 +264,7 @@ public class BackupManager implements HornetQComponent
true,
connector,
null);
- HornetQServerLogger.LOGGER.backupAnnounced();
+ ActiveMQServerLogger.LOGGER.backupAnnounced();
backupAnnounced = true;
}
}
@@ -278,7 +278,7 @@ public class BackupManager implements HornetQComponent
return;
if (stopping)
return;
- HornetQServerLogger.LOGGER.errorAnnouncingBackup();
+ ActiveMQServerLogger.LOGGER.errorAnnouncingBackup();
scheduledExecutor.schedule(new Runnable()
{
@@ -365,13 +365,13 @@ public class BackupManager implements HornetQComponent
{
if (tcConfigs != null && tcConfigs.length > 0)
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(BackupManager.this + "Creating a serverLocator for " + Arrays.toString(tcConfigs));
+ ActiveMQServerLogger.LOGGER.debug(BackupManager.this + "Creating a serverLocator for " + Arrays.toString(tcConfigs));
}
ServerLocatorImpl locator = new ServerLocatorImpl(topology, true, tcConfigs);
locator.setClusterConnection(true);
- locator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+ locator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
return locator;
}
return null;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 9e68b40..e4cc604 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
@@ -14,7 +14,7 @@ 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.ActiveMQComponent;
import org.apache.activemq.core.server.Queue;
import org.apache.activemq.core.server.management.NotificationService;
import org.apache.activemq.spi.core.protocol.RemotingConnection;
@@ -29,7 +29,7 @@ import org.apache.activemq.spi.core.protocol.RemotingConnection;
*
*
*/
-public interface Bridge extends Consumer, HornetQComponent
+public interface Bridge extends Consumer, ActiveMQComponent
{
SimpleString getName();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 996b3a6..4853c0e 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
@@ -13,7 +13,7 @@
package org.apache.activemq.core.server.cluster;
import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
import org.apache.activemq.core.server.management.NotificationService;
/**
@@ -26,7 +26,7 @@ import org.apache.activemq.core.server.management.NotificationService;
*
*
*/
-public interface BroadcastGroup extends HornetQComponent
+public interface BroadcastGroup extends ActiveMQComponent
{
void setNotificationService(NotificationService notificationService);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 8cd4dda..48fe192 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
@@ -17,7 +17,7 @@ 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 org.apache.activemq.core.server.ActiveMQServerLogger;
import java.lang.reflect.Array;
import java.util.List;
@@ -28,14 +28,14 @@ public class ClusterConfigurationUtil
{
if (config.getName() == null)
{
- HornetQServerLogger.LOGGER.clusterConnectionNotUnique();
+ ActiveMQServerLogger.LOGGER.clusterConnectionNotUnique();
return null;
}
if (config.getAddress() == null)
{
- HornetQServerLogger.LOGGER.clusterConnectionNoForwardAddress();
+ ActiveMQServerLogger.LOGGER.clusterConnectionNoForwardAddress();
return null;
}
@@ -44,7 +44,7 @@ public class ClusterConfigurationUtil
if (connector == null)
{
- HornetQServerLogger.LOGGER.clusterConnectionNoConnector(config.getConnectorName());
+ ActiveMQServerLogger.LOGGER.clusterConnectionNoConnector(config.getConnectorName());
return null;
}
return connector;
@@ -57,7 +57,7 @@ public class ClusterConfigurationUtil
if (dg == null)
{
- HornetQServerLogger.LOGGER.clusterConnectionNoDiscoveryGroup(config.getDiscoveryGroupName());
+ ActiveMQServerLogger.LOGGER.clusterConnectionNoDiscoveryGroup(config.getDiscoveryGroupName());
return null;
}
return dg;
@@ -80,7 +80,7 @@ public class ClusterConfigurationUtil
if (connector == null)
{
- HornetQServerLogger.LOGGER.bridgeNoConnector(connectorName);
+ ActiveMQServerLogger.LOGGER.bridgeNoConnector(connectorName);
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 e5facf7..dcabbc3 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
@@ -19,8 +19,8 @@ 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;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
/**
* A ClusterConnection
@@ -31,13 +31,13 @@ import org.apache.activemq.core.server.HornetQServer;
*
*
*/
-public interface ClusterConnection extends HornetQComponent, ClusterTopologyListener
+public interface ClusterConnection extends ActiveMQComponent, ClusterTopologyListener
{
SimpleString getName();
String getNodeID();
- HornetQServer getServer();
+ ActiveMQServer getServer();
void nodeAnnounced(long eventUID, String nodeID, String backupGroupName, String scaleDownGroupName, Pair<TransportConfiguration, TransportConfiguration> connectorPair, boolean backup);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 ccd4805..1567374 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
@@ -33,9 +33,9 @@ import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessag
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.ActiveMQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler;
import org.apache.activemq.core.server.cluster.qourum.Vote;
@@ -49,13 +49,13 @@ public class ClusterControl implements AutoCloseable
private final ClientSessionFactoryInternal sessionFactory;
- private final HornetQServer server;
+ private final ActiveMQServer server;
private final String clusterUser;
private final String clusterPassword;
- public ClusterControl(ClientSessionFactoryInternal sessionFactory, HornetQServer server)
+ public ClusterControl(ClientSessionFactoryInternal sessionFactory, ActiveMQServer server)
{
this.sessionFactory = sessionFactory;
this.server = server;
@@ -80,7 +80,7 @@ public class ClusterControl implements AutoCloseable
if (!packet.isAuthorized())
{
- throw HornetQMessageBundle.BUNDLE.unableToValidateClusterUser(clusterUser);
+ throw ActiveMQMessageBundle.BUNDLE.unableToValidateClusterUser(clusterUser);
}
}
@@ -98,7 +98,7 @@ public class ClusterControl implements AutoCloseable
ClusterConnectionConfiguration config = ConfigurationUtils.getReplicationClusterConfiguration(server.getConfiguration(), replicationClusterName);
if (config == null)
{
- HornetQServerLogger.LOGGER.announceBackupNoClusterConnections();
+ ActiveMQServerLogger.LOGGER.announceBackupNoClusterConnections();
throw new ActiveMQException("lacking cluster connection");
}
@@ -106,7 +106,7 @@ public class ClusterControl implements AutoCloseable
if (connector == null)
{
- HornetQServerLogger.LOGGER.announceBackupNoConnector(config.getConnectorName());
+ ActiveMQServerLogger.LOGGER.announceBackupNoConnector(config.getConnectorName());
throw new ActiveMQException("lacking cluster connection");
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 3836788..371994e 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
@@ -27,7 +27,7 @@ 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.ActiveMQClient;
import org.apache.activemq.api.core.client.ServerLocator;
import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
import org.apache.activemq.core.client.impl.ServerLocatorImpl;
@@ -44,9 +44,9 @@ import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessag
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.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
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;
@@ -56,13 +56,13 @@ import org.apache.activemq.spi.core.remoting.Acceptor;
/**
* used for creating and managing cluster control connections for each cluster connection and the replication connection
*/
-public class ClusterController implements HornetQComponent
+public class ClusterController implements ActiveMQComponent
{
- private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+ private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
private final QuorumManager quorumManager;
- private final HornetQServer server;
+ private final ActiveMQServer server;
private Map<SimpleString, ServerLocatorInternal> locators = new HashMap<>();
@@ -79,7 +79,7 @@ public class ClusterController implements HornetQComponent
private boolean started;
private SimpleString replicatedClusterName;
- public ClusterController(HornetQServer server, ScheduledExecutorService scheduledExecutor)
+ public ClusterController(ActiveMQServer server, ScheduledExecutorService scheduledExecutor)
{
this.server = server;
executor = server.getExecutorFactory().getExecutor();
@@ -99,7 +99,7 @@ public class ClusterController implements HornetQComponent
replicationLocator = locators.get(replicatedClusterName);
if (replicationLocator == null)
{
- HornetQServerLogger.LOGGER.noClusterConnectionForReplicationCluster();
+ ActiveMQServerLogger.LOGGER.noClusterConnectionForReplicationCluster();
replicationLocator = defaultLocator;
}
}
@@ -162,12 +162,12 @@ public class ClusterController implements HornetQComponent
*/
public void addClusterConnection(SimpleString name, DiscoveryGroupConfiguration dg)
{
- ServerLocatorImpl serverLocator = (ServerLocatorImpl) HornetQClient.createServerLocatorWithHA(dg);
+ ServerLocatorImpl serverLocator = (ServerLocatorImpl) ActiveMQClient.createServerLocatorWithHA(dg);
//if the cluster isn't available we want to hang around until it is
serverLocator.setReconnectAttempts(-1);
serverLocator.setInitialConnectAttempts(-1);
//this is used for replication so need to use the server packet decoder
- serverLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+ serverLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
locators.put(name, serverLocator);
}
@@ -179,12 +179,12 @@ public class ClusterController implements HornetQComponent
*/
public void addClusterConnection(SimpleString name, TransportConfiguration[] tcConfigs)
{
- ServerLocatorImpl serverLocator = (ServerLocatorImpl) HornetQClient.createServerLocatorWithHA(tcConfigs);
+ ServerLocatorImpl serverLocator = (ServerLocatorImpl) ActiveMQClient.createServerLocatorWithHA(tcConfigs);
//if the cluster isn't available we want to hang around until it is
serverLocator.setReconnectAttempts(-1);
serverLocator.setInitialConnectAttempts(-1);
//this is used for replication so need to use the server packet decoder
- serverLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+ serverLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
locators.put(name, serverLocator);
}
@@ -248,7 +248,7 @@ public class ClusterController implements HornetQComponent
*/
public ClusterControl connectToNodeInCluster(ClientSessionFactoryInternal sf)
{
- sf.getServerLocator().setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+ sf.getServerLocator().setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
return new ClusterControl(sf, server);
}
@@ -374,7 +374,7 @@ public class ClusterController implements HornetQComponent
}
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Server " + server + " receiving nodeUp from NodeID=" + msg.getNodeID() + ", pair=" + pair);
+ ActiveMQServerLogger.LOGGER.trace("Server " + server + " receiving nodeUp from NodeID=" + msg.getNodeID() + ", pair=" + pair);
}
if (acceptorUsed != null)
@@ -387,12 +387,12 @@ public class ClusterController implements HornetQComponent
}
else
{
- HornetQServerLogger.LOGGER.debug("Cluster connection is null on acceptor = " + acceptorUsed);
+ ActiveMQServerLogger.LOGGER.debug("Cluster connection is null on acceptor = " + acceptorUsed);
}
}
else
{
- HornetQServerLogger.LOGGER.debug("there is no acceptor used configured at the CoreProtocolManager " + this);
+ ActiveMQServerLogger.LOGGER.debug("there is no acceptor used configured at the CoreProtocolManager " + this);
}
}
else if (packet.getType() == PacketImpl.QUORUM_VOTE)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 3ecdbaa..5da2be8 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
@@ -31,7 +31,7 @@ import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
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.api.core.client.ActiveMQClient;
import org.apache.activemq.core.client.impl.ServerLocatorInternal;
import org.apache.activemq.core.config.BridgeConfiguration;
import org.apache.activemq.core.config.ClusterConnectionConfiguration;
@@ -43,11 +43,11 @@ 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.protocol.core.impl.wireformat.ActiveMQExceptionMessage;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
import org.apache.activemq.core.server.NodeManager;
import org.apache.activemq.core.server.Queue;
import org.apache.activemq.core.server.cluster.ha.HAManager;
@@ -73,7 +73,7 @@ import org.apache.activemq.utils.FutureLatch;
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
* @author Clebert Suconic
*/
-public final class ClusterManager implements HornetQComponent
+public final class ClusterManager implements ActiveMQComponent
{
private ClusterController clusterController;
@@ -85,7 +85,7 @@ public final class ClusterManager implements HornetQComponent
private final ExecutorFactory executorFactory;
- private final HornetQServer server;
+ private final ActiveMQServer server;
private final PostOffice postOffice;
@@ -146,7 +146,7 @@ public final class ClusterManager implements HornetQComponent
private final NodeManager nodeManager;
public ClusterManager(final ExecutorFactory executorFactory,
- final HornetQServer server,
+ final ActiveMQServer server,
final PostOffice postOffice,
final ScheduledExecutorService scheduledExecutor,
final ManagementService managementService,
@@ -288,7 +288,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.unableToStartBroadcastGroup(e, group.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartBroadcastGroup(e, group.getName());
}
}
@@ -300,7 +300,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.unableToStartClusterConnection(e, conn.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartClusterConnection(e, conn.getName());
}
}
@@ -314,7 +314,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.unableToStartBridge(e, bridge.getName());
+ ActiveMQServerLogger.LOGGER.unableToStartBridge(e, bridge.getName());
}
}
@@ -376,7 +376,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.errorClosingServerLocator(e, clusterLocator);
+ ActiveMQServerLogger.LOGGER.errorClosingServerLocator(e, clusterLocator);
}
}
clusterLocators.clear();
@@ -433,26 +433,26 @@ public final class ClusterManager implements HornetQComponent
{
if (config.getName() == null)
{
- HornetQServerLogger.LOGGER.bridgeNotUnique();
+ ActiveMQServerLogger.LOGGER.bridgeNotUnique();
return;
}
if (config.getQueueName() == null)
{
- HornetQServerLogger.LOGGER.bridgeNoQueue(config.getName());
+ ActiveMQServerLogger.LOGGER.bridgeNoQueue(config.getName());
return;
}
if (config.getForwardingAddress() == null)
{
- HornetQServerLogger.LOGGER.bridgeNoForwardAddress(config.getName());
+ ActiveMQServerLogger.LOGGER.bridgeNoForwardAddress(config.getName());
}
if (bridges.containsKey(config.getName()))
{
- HornetQServerLogger.LOGGER.bridgeAlreadyDeployed(config.getName());
+ ActiveMQServerLogger.LOGGER.bridgeAlreadyDeployed(config.getName());
return;
}
@@ -463,7 +463,7 @@ public final class ClusterManager implements HornetQComponent
if (binding == null)
{
- HornetQServerLogger.LOGGER.bridgeQueueNotFound(config.getQueueName(), config.getName());
+ ActiveMQServerLogger.LOGGER.bridgeQueueNotFound(config.getQueueName(), config.getName());
return;
}
@@ -478,18 +478,18 @@ public final class ClusterManager implements HornetQComponent
.get(config.getDiscoveryGroupName());
if (discoveryGroupConfiguration == null)
{
- HornetQServerLogger.LOGGER.bridgeNoDiscoveryGroup(config.getDiscoveryGroupName());
+ ActiveMQServerLogger.LOGGER.bridgeNoDiscoveryGroup(config.getDiscoveryGroupName());
return;
}
if (config.isHA())
{
- serverLocator = (ServerLocatorInternal) HornetQClient.createServerLocatorWithHA(discoveryGroupConfiguration);
+ serverLocator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithHA(discoveryGroupConfiguration);
}
else
{
- serverLocator = (ServerLocatorInternal) HornetQClient.createServerLocatorWithoutHA(discoveryGroupConfiguration);
+ serverLocator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithoutHA(discoveryGroupConfiguration);
}
}
@@ -499,17 +499,17 @@ public final class ClusterManager implements HornetQComponent
if (tcConfigs == null)
{
- HornetQServerLogger.LOGGER.bridgeCantFindConnectors(config.getName());
+ ActiveMQServerLogger.LOGGER.bridgeCantFindConnectors(config.getName());
return;
}
if (config.isHA())
{
- serverLocator = (ServerLocatorInternal) HornetQClient.createServerLocatorWithHA(tcConfigs);
+ serverLocator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithHA(tcConfigs);
}
else
{
- serverLocator = (ServerLocatorInternal) HornetQClient.createServerLocatorWithoutHA(tcConfigs);
+ serverLocator = (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithoutHA(tcConfigs);
}
}
@@ -541,7 +541,7 @@ public final class ClusterManager implements HornetQComponent
if (!config.isUseDuplicateDetection())
{
- HornetQServerLogger.LOGGER.debug("Bridge " + config.getName() +
+ ActiveMQServerLogger.LOGGER.debug("Bridge " + config.getName() +
" is configured to not use duplicate detecion, it will send messages synchronously");
}
@@ -595,11 +595,11 @@ public final class ClusterManager implements HornetQComponent
{
if (packet.getType() == PacketImpl.EXCEPTION)
{
- HornetQExceptionMessage msg = (HornetQExceptionMessage) packet;
+ ActiveMQExceptionMessage msg = (ActiveMQExceptionMessage) packet;
final ActiveMQException exception = msg.getException();
if (exception.getType() == ActiveMQExceptionType.CLUSTER_SECURITY_EXCEPTION)
{
- HornetQServerLogger.LOGGER.clusterManagerAuthenticationError(exception.getMessage());
+ ActiveMQServerLogger.LOGGER.clusterManagerAuthenticationError(exception.getMessage());
executor.execute(new Runnable()
{
@Override
@@ -652,7 +652,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.warn(e.getMessage(), e);
+ ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e);
}
}
bridges.clear();
@@ -696,7 +696,7 @@ public final class ClusterManager implements HornetQComponent
if (clusterConnections.containsKey(config.getName()))
{
- HornetQServerLogger.LOGGER.clusterConnectionAlreadyExists(config.getConnectorName());
+ ActiveMQServerLogger.LOGGER.clusterConnectionAlreadyExists(config.getConnectorName());
return;
}
@@ -708,9 +708,9 @@ public final class ClusterManager implements HornetQComponent
if (dg == null) return;
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(this + " Starting a Discovery Group Cluster Connection, name=" +
+ ActiveMQServerLogger.LOGGER.debug(this + " Starting a Discovery Group Cluster Connection, name=" +
config.getDiscoveryGroupName() +
", dg=" +
dg);
@@ -753,9 +753,9 @@ public final class ClusterManager implements HornetQComponent
{
TransportConfiguration[] tcConfigs = ClusterConfigurationUtil.getTransportConfigurations(config, configuration);
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(this + " defining cluster connection towards " + Arrays.toString(tcConfigs));
+ ActiveMQServerLogger.LOGGER.debug(this + " defining cluster connection towards " + Arrays.toString(tcConfigs));
}
clusterConnection = new ClusterConnectionImpl(this,
@@ -804,9 +804,9 @@ public final class ClusterManager implements HornetQComponent
clusterConnections.put(config.getName(), clusterConnection);
- if (HornetQServerLogger.LOGGER.isTraceEnabled())
+ if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
{
- HornetQServerLogger.LOGGER.trace("ClusterConnection.start at " + clusterConnection, new Exception("trace"));
+ ActiveMQServerLogger.LOGGER.trace("ClusterConnection.start at " + clusterConnection, new Exception("trace"));
}
}
@@ -824,7 +824,7 @@ public final class ClusterManager implements HornetQComponent
}
catch (Exception e)
{
- throw HornetQMessageBundle.BUNDLE.errorCreatingTransformerClass(e, transformerClassName);
+ throw ActiveMQMessageBundle.BUNDLE.errorCreatingTransformerClass(e, transformerClassName);
}
}
return transformer;
@@ -835,7 +835,7 @@ public final class ClusterManager implements HornetQComponent
{
if (broadcastGroups.containsKey(config.getName()))
{
- HornetQServerLogger.LOGGER.broadcastGroupAlreadyExists(config.getName());
+ ActiveMQServerLogger.LOGGER.broadcastGroupAlreadyExists(config.getName());
return;
}
@@ -882,7 +882,7 @@ public final class ClusterManager implements HornetQComponent
private void logWarnNoConnector(final String connectorName, final String bgName)
{
- HornetQServerLogger.LOGGER.broadcastGroupNoConnector(connectorName, bgName);
+ ActiveMQServerLogger.LOGGER.broadcastGroupNoConnector(connectorName, bgName);
}
private synchronized Collection<ClusterConnection> cloneClusterConnections()
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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
deleted file mode 100644
index a08a3b1..0000000
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/HornetQServerSideProtocolManagerFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.apache.activemq.core.server.cluster;
-
-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
- * @author Clebert Suconic
- */
-public class HornetQServerSideProtocolManagerFactory implements ClientProtocolManagerFactory
-{
- private static final HornetQServerSideProtocolManagerFactory INSTANCE = new HornetQServerSideProtocolManagerFactory();
-
- public static HornetQServerSideProtocolManagerFactory getInstance()
- {
- return INSTANCE;
- }
-
- private HornetQServerSideProtocolManagerFactory()
- {
- }
-
- private static final long serialVersionUID = 1;
-
- @Override
- public ClientProtocolManager newProtocolManager()
- {
- return new HornetQReplicationProtocolManager();
- }
-
- class HornetQReplicationProtocolManager extends HornetQClientProtocolManager
- {
- @Override
- protected PacketDecoder getPacketDecoder()
- {
- return ServerPacketDecoder.INSTANCE;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 b53a2be..bf1a58c 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
@@ -18,8 +18,8 @@ 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.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
import org.apache.activemq.core.server.cluster.ClusterControl;
import org.apache.activemq.core.server.cluster.ClusterController;
@@ -33,16 +33,16 @@ public class ColocatedHAManager implements HAManager
private final ColocatedPolicy haPolicy;
- private final HornetQServer server;
+ private final ActiveMQServer server;
- private Map<String, HornetQServer> backupServers = new HashMap<>();
+ private Map<String, ActiveMQServer> backupServers = new HashMap<>();
private boolean started;
- public ColocatedHAManager(ColocatedPolicy haPolicy, HornetQServer hornetQServer)
+ public ColocatedHAManager(ColocatedPolicy haPolicy, ActiveMQServer activeMQServer)
{
this.haPolicy = haPolicy;
- server = hornetQServer;
+ server = activeMQServer;
}
/**
@@ -63,11 +63,11 @@ public class ColocatedHAManager implements HAManager
*/
public void stop()
{
- for (HornetQServer hornetQServer : backupServers.values())
+ for (ActiveMQServer activeMQServer : backupServers.values())
{
try
{
- hornetQServer.stop();
+ activeMQServer.stop();
}
catch (Exception e)
{
@@ -107,7 +107,7 @@ public class ColocatedHAManager implements HAManager
*
* @return the backups
*/
- public Map<String, HornetQServer> getBackupServers()
+ public Map<String, ActiveMQServer> getBackupServers()
{
return backupServers;
}
@@ -149,7 +149,7 @@ public class ColocatedHAManager implements HAManager
private synchronized boolean activateSharedStoreBackup(String journalDirectory, String bindingsDirectory, String largeMessagesDirectory, String pagingDirectory) throws Exception
{
Configuration configuration = server.getConfiguration().copy();
- HornetQServer backup = server.createBackupServer(configuration);
+ ActiveMQServer backup = server.createBackupServer(configuration);
try
{
int portOffset = haPolicy.getBackupPortOffset() * (backupServers.size() + 1);
@@ -166,10 +166,10 @@ public class ColocatedHAManager implements HAManager
catch (Exception e)
{
backup.stop();
- HornetQServerLogger.LOGGER.activateSharedStoreSlaveFailed(e);
+ ActiveMQServerLogger.LOGGER.activateSharedStoreSlaveFailed(e);
return false;
}
- HornetQServerLogger.LOGGER.activatingSharedStoreSlave();
+ ActiveMQServerLogger.LOGGER.activatingSharedStoreSlave();
return true;
}
@@ -184,7 +184,7 @@ public class ColocatedHAManager implements HAManager
private synchronized boolean activateReplicatedBackup(SimpleString nodeID) throws Exception
{
Configuration configuration = server.getConfiguration().copy();
- HornetQServer backup = server.createBackupServer(configuration);
+ ActiveMQServer backup = server.createBackupServer(configuration);
try
{
TopologyMember member = server.getClusterManager().getDefaultConnection(null).getTopology().getMember(nodeID.toString());
@@ -202,10 +202,10 @@ public class ColocatedHAManager implements HAManager
catch (Exception e)
{
backup.stop();
- HornetQServerLogger.LOGGER.activateReplicatedBackupFailed(e);
+ ActiveMQServerLogger.LOGGER.activateReplicatedBackupFailed(e);
return false;
}
- HornetQServerLogger.LOGGER.activatingReplica(nodeID);
+ ActiveMQServerLogger.LOGGER.activatingReplica(nodeID);
return true;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 bd897a4..3f32ca8 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
@@ -14,7 +14,7 @@ package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.ColocatedActivation;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
import java.util.ArrayList;
@@ -86,7 +86,7 @@ public class ColocatedPolicy implements HAPolicy<LiveActivation>
}
@Override
- public LiveActivation createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception
+ public LiveActivation createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception
{
return new ColocatedActivation(server, this, livePolicy.createActivation(server, wasLive, activationParams, shutdownOnCriticalIO));
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 c5ca29b..b9d0410 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
@@ -12,20 +12,20 @@
*/
package org.apache.activemq.core.server.cluster.ha;
-import org.apache.activemq.core.server.HornetQComponent;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
import java.util.Map;
/*
* An HAManager takes care of any colocated backups in a VM.
* */
-public interface HAManager extends HornetQComponent
+public interface HAManager extends ActiveMQComponent
{
/**
* return the current backup servers
*
* @return the backups
*/
- Map<String, HornetQServer> getBackupServers();
+ Map<String, ActiveMQServer> getBackupServers();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 747b864..44274d2 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
@@ -15,7 +15,7 @@ package org.apache.activemq.core.server.cluster.ha;
import java.util.Map;
import org.apache.activemq.core.server.impl.Activation;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
/**
* Every live server will have an HAPolicy that configures the type of server that it should be either live, backup or
@@ -26,7 +26,7 @@ public interface HAPolicy<T extends Activation>
/*
* created the Activation associated with this policy.
* */
- T createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception;
+ T createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception;
boolean isSharedStore();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 1b83bb2..25b1798 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
@@ -13,7 +13,7 @@
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.core.server.impl.Activation;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.LiveOnlyActivation;
import java.util.Map;
@@ -32,7 +32,7 @@ public class LiveOnlyPolicy implements HAPolicy<Activation>
}
@Override
- public Activation createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
+ public Activation createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
{
return new LiveOnlyActivation(server, this);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 f0c623d..c472e28 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
@@ -14,7 +14,7 @@ package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.Activation;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
import java.util.Map;
@@ -125,9 +125,9 @@ public class ReplicaPolicy extends BackupPolicy
}
@Override
- public Activation createActivation(HornetQServerImpl server, boolean wasLive,
+ public Activation createActivation(ActiveMQServerImpl server, boolean wasLive,
Map<String, Object> activationParams,
- HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception
+ ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO) throws Exception
{
SharedNothingBackupActivation backupActivation = new SharedNothingBackupActivation(server, wasLive, activationParams, shutdownOnCriticalIO, this);
backupActivation.init();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 e528d37..94929c2 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
@@ -13,7 +13,7 @@
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
import org.apache.activemq.core.server.impl.SharedNothingLiveActivation;
@@ -160,7 +160,7 @@ public class ReplicatedPolicy implements HAPolicy<LiveActivation>
}
@Override
- public LiveActivation createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
+ public LiveActivation createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
{
return new SharedNothingLiveActivation(server, this);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 dfb6f57..f36a8bc 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
@@ -15,12 +15,12 @@ package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ActiveMQClient;
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 org.apache.activemq.core.server.ActiveMQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -110,48 +110,48 @@ public class ScaleDownPolicy
this.enabled = enabled;
}
- public static ServerLocatorInternal getScaleDownConnector(ScaleDownPolicy scaleDownPolicy, HornetQServer hornetQServer) throws ActiveMQException
+ public static ServerLocatorInternal getScaleDownConnector(ScaleDownPolicy scaleDownPolicy, ActiveMQServer activeMQServer) throws ActiveMQException
{
if (!scaleDownPolicy.getConnectors().isEmpty())
{
- return (ServerLocatorInternal) HornetQClient.createServerLocatorWithHA(connectorNameListToArray(scaleDownPolicy.getConnectors(), hornetQServer));
+ return (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithHA(connectorNameListToArray(scaleDownPolicy.getConnectors(), activeMQServer));
}
else if (scaleDownPolicy.getDiscoveryGroup() != null)
{
- DiscoveryGroupConfiguration dg = hornetQServer.getConfiguration().getDiscoveryGroupConfigurations().get(scaleDownPolicy.getDiscoveryGroup());
+ DiscoveryGroupConfiguration dg = activeMQServer.getConfiguration().getDiscoveryGroupConfigurations().get(scaleDownPolicy.getDiscoveryGroup());
if (dg == null)
{
- throw HornetQMessageBundle.BUNDLE.noDiscoveryGroupFound(dg);
+ throw ActiveMQMessageBundle.BUNDLE.noDiscoveryGroupFound(dg);
}
- return (ServerLocatorInternal) HornetQClient.createServerLocatorWithHA(dg);
+ return (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithHA(dg);
}
else
{
- Map<String, TransportConfiguration> connectorConfigurations = hornetQServer.getConfiguration().getConnectorConfigurations();
+ Map<String, TransportConfiguration> connectorConfigurations = activeMQServer.getConfiguration().getConnectorConfigurations();
for (TransportConfiguration transportConfiguration : connectorConfigurations.values())
{
if (transportConfiguration.getFactoryClassName().equals(InVMConnectorFactory.class.getName()))
{
- return (ServerLocatorInternal) HornetQClient.createServerLocatorWithHA(transportConfiguration);
+ return (ServerLocatorInternal) ActiveMQClient.createServerLocatorWithHA(transportConfiguration);
}
}
}
- throw HornetQMessageBundle.BUNDLE.noConfigurationFoundForScaleDown();
+ throw ActiveMQMessageBundle.BUNDLE.noConfigurationFoundForScaleDown();
}
- private static TransportConfiguration[] connectorNameListToArray(final List<String> connectorNames, HornetQServer hornetQServer)
+ private static TransportConfiguration[] connectorNameListToArray(final List<String> connectorNames, ActiveMQServer activeMQServer)
{
TransportConfiguration[] tcConfigs = (TransportConfiguration[]) Array.newInstance(TransportConfiguration.class,
connectorNames.size());
int count = 0;
for (String connectorName : connectorNames)
{
- TransportConfiguration connector = hornetQServer.getConfiguration().getConnectorConfigurations().get(connectorName);
+ TransportConfiguration connector = activeMQServer.getConfiguration().getConnectorConfigurations().get(connectorName);
if (connector == null)
{
- HornetQServerLogger.LOGGER.bridgeNoConnector(connectorName);
+ ActiveMQServerLogger.LOGGER.bridgeNoConnector(connectorName);
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 4f625c3..682c9f5 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
@@ -13,7 +13,7 @@
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
import org.apache.activemq.core.server.impl.SharedStoreLiveActivation;
@@ -86,7 +86,7 @@ public class SharedStoreMasterPolicy implements HAPolicy<LiveActivation>
}
@Override
- public LiveActivation createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
+ public LiveActivation createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
{
return new SharedStoreLiveActivation(server, this);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 51ad6e9..56e5faa 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
@@ -14,7 +14,7 @@ package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.Activation;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.impl.SharedStoreBackupActivation;
import java.util.Map;
@@ -97,7 +97,7 @@ public class SharedStoreSlavePolicy extends BackupPolicy
}
@Override
- public Activation createActivation(HornetQServerImpl server, boolean wasLive, Map<String, Object> activationParams, HornetQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
+ public Activation createActivation(ActiveMQServerImpl server, boolean wasLive, Map<String, Object> activationParams, ActiveMQServerImpl.ShutdownOnCriticalErrorListener shutdownOnCriticalIO)
{
return new SharedStoreBackupActivation(server, this);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 94cedb2..a828cdf 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
@@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQServer;
import java.util.HashMap;
import java.util.Map;
@@ -22,12 +22,12 @@ import java.util.Map;
* */
public class StandaloneHAManager implements HAManager
{
- Map<String, HornetQServer> servers = new HashMap<>();
+ Map<String, ActiveMQServer> servers = new HashMap<>();
boolean isStarted = false;
@Override
- public Map<String, HornetQServer> getBackupServers()
+ public Map<String, ActiveMQServer> getBackupServers()
{
return servers;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 93af434..9bead5d 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
@@ -41,8 +41,8 @@ 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.ActiveMQServerLogger;
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;
@@ -72,7 +72,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
// Constants -----------------------------------------------------
- private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+ private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
// Attributes ----------------------------------------------------
@@ -282,14 +282,14 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Cancelling reference " + ref + " on bridge " + this);
+ ActiveMQServerLogger.LOGGER.trace("Cancelling reference " + ref + " on bridge " + this);
}
list.addFirst(ref);
}
if (isTrace && list.isEmpty())
{
- HornetQServerLogger.LOGGER.trace("didn't have any references to cancel on bridge " + this);
+ ActiveMQServerLogger.LOGGER.trace("didn't have any references to cancel on bridge " + this);
}
Queue refqueue = null;
@@ -307,7 +307,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
catch (Exception e)
{
// There isn't much we can do besides log an error
- HornetQServerLogger.LOGGER.errorCancellingRefOnBridge(e, ref2);
+ ActiveMQServerLogger.LOGGER.errorCancellingRefOnBridge(e, ref2);
}
}
}
@@ -323,7 +323,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (!ok)
{
- HornetQServerLogger.LOGGER.timedOutWaitingToStopBridge();
+ ActiveMQServerLogger.LOGGER.timedOutWaitingToStopBridge();
}
}
@@ -341,7 +341,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception dontcare)
{
- HornetQServerLogger.LOGGER.debug(dontcare.getMessage(), dontcare);
+ ActiveMQServerLogger.LOGGER.debug(dontcare.getMessage(), dontcare);
}
session = null;
}
@@ -372,9 +372,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
stopping = true;
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Bridge " + this.name + " being stopped");
+ ActiveMQServerLogger.LOGGER.debug("Bridge " + this.name + " being stopped");
}
if (futureScheduledReconnection != null)
@@ -395,16 +395,16 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.broadcastBridgeStoppedError(e);
+ ActiveMQServerLogger.LOGGER.broadcastBridgeStoppedError(e);
}
}
}
public void pause() throws Exception
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Bridge " + this.name + " being paused");
+ ActiveMQServerLogger.LOGGER.debug("Bridge " + this.name + " being paused");
}
executor.execute(new PauseRunnable());
@@ -420,7 +420,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.notificationBridgeStoppedError(e);
+ ActiveMQServerLogger.LOGGER.notificationBridgeStoppedError(e);
}
}
}
@@ -491,7 +491,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace(this + " Acking " + ref + " on queue " + ref.getQueue());
+ ActiveMQServerLogger.LOGGER.trace(this + " Acking " + ref + " on queue " + ref.getQueue());
}
ref.getQueue().acknowledge(ref);
pendingAcks.countDown();
@@ -499,7 +499,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.bridgeFailedToAck(e);
+ ActiveMQServerLogger.LOGGER.bridgeFailedToAck(e);
}
}
}
@@ -525,9 +525,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
final ServerMessage transformedMessage = transformer.transform(message);
if (transformedMessage != message)
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("The transformer " + transformer +
+ ActiveMQServerLogger.LOGGER.debug("The transformer " + transformer +
" made a copy of the message " +
message +
" as transformedMessage");
@@ -552,9 +552,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (!active)
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(this + "::Ignoring reference on bridge as it is set to inactive ref=" + ref);
+ ActiveMQServerLogger.LOGGER.debug(this + "::Ignoring reference on bridge as it is set to inactive ref=" + ref);
}
return HandleStatus.BUSY;
}
@@ -566,7 +566,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Bridge " + this + " is handling reference=" + ref);
+ ActiveMQServerLogger.LOGGER.trace("Bridge " + this + " is handling reference=" + ref);
}
ref.handled();
@@ -626,7 +626,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID)
{
- HornetQServerLogger.LOGGER.bridgeConnectionFailed(me, failedOver);
+ ActiveMQServerLogger.LOGGER.bridgeConnectionFailed(me, failedOver);
synchronized (connectionGuard)
{
@@ -660,7 +660,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
try
{
- HornetQServerLogger.LOGGER.debug("Moving " + queue.getMessageCount() + " messages from " + queue.getName() + " to " + scaleDownTargetNodeID);
+ ActiveMQServerLogger.LOGGER.debug("Moving " + queue.getMessageCount() + " messages from " + queue.getName() + " to " + scaleDownTargetNodeID);
((QueueImpl)queue).moveReferencesBetweenSnFQueues(SimpleString.toSimpleString(scaleDownTargetNodeID));
// stop the bridge from trying to reconnect and clean up all the bindings
@@ -668,19 +668,19 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.warn(e.getMessage(), e);
+ ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e);
}
}
}
else if (scaleDownTargetNodeID != null)
{
// the disconnected node is scaling down to me, no need to reconnect to it
- HornetQServerLogger.LOGGER.debug("Received scaleDownTargetNodeID: " + scaleDownTargetNodeID + "; cancelling reconnect.");
+ ActiveMQServerLogger.LOGGER.debug("Received scaleDownTargetNodeID: " + scaleDownTargetNodeID + "; cancelling reconnect.");
fail(true);
}
else
{
- HornetQServerLogger.LOGGER.debug("Received invalid scaleDownTargetNodeID: " + scaleDownTargetNodeID);
+ ActiveMQServerLogger.LOGGER.debug("Received invalid scaleDownTargetNodeID: " + scaleDownTargetNodeID);
//we never fail permanently here, this only happens once all reconnect tries have happened
fail(false);
@@ -725,7 +725,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
catch (final ActiveMQException e)
{
unsetLargeMessageDelivery();
- HornetQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
+ ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
connectionFailed(e, false);
}
@@ -745,9 +745,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
// from the acks so it will get resent, duplicate detection will cope
// with any messages resent
- if (HornetQServerLogger.LOGGER.isTraceEnabled())
+ if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
{
- HornetQServerLogger.LOGGER.trace("going to send message: " + message + " from " + this.getQueue());
+ ActiveMQServerLogger.LOGGER.trace("going to send message: " + message + " from " + this.getQueue());
}
try
@@ -756,7 +756,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (final ActiveMQException e)
{
- HornetQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
+ ActiveMQServerLogger.LOGGER.bridgeUnableToSendMessage(e, ref);
// We remove this reference as we are returning busy which means the reference will never leave the Queue.
// because of this we have to remove the reference here
@@ -810,7 +810,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
protected void fail(final boolean permanently)
{
- HornetQServerLogger.LOGGER.debug(this + "\n\t::fail being called, permanently=" + permanently);
+ ActiveMQServerLogger.LOGGER.debug(this + "\n\t::fail being called, permanently=" + permanently);
if (queue != null)
{
@@ -818,13 +818,13 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Removing consumer on fail " + this + " from queue " + queue);
+ ActiveMQServerLogger.LOGGER.trace("Removing consumer on fail " + this + " from queue " + queue);
}
queue.removeConsumer(this);
}
catch (Exception dontcare)
{
- HornetQServerLogger.LOGGER.debug(dontcare);
+ ActiveMQServerLogger.LOGGER.debug(dontcare);
}
}
@@ -916,7 +916,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (!keepConnecting) return;
- HornetQServerLogger.LOGGER.debug("Connecting " + this + " to its destination [" + nodeUUID.toString() + "], csf=" + this.csf);
+ ActiveMQServerLogger.LOGGER.debug("Connecting " + this + " to its destination [" + nodeUUID.toString() + "], csf=" + this.csf);
retryCount++;
@@ -947,7 +947,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Throwable e)
{
- HornetQServerLogger.LOGGER.errorQueryingBridge(e, name);
+ ActiveMQServerLogger.LOGGER.errorQueryingBridge(e, name);
// This was an issue during startup, we will not count this retry
retryCount--;
@@ -959,7 +959,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (!query.isExists())
{
- HornetQServerLogger.LOGGER.errorQueryingBridge(forwardingAddress, retryCount);
+ ActiveMQServerLogger.LOGGER.errorQueryingBridge(forwardingAddress, retryCount);
scheduleRetryConnect();
return;
}
@@ -968,7 +968,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (!query.isExists())
{
- HornetQServerLogger.LOGGER.bridgeNoBindings(getName(), getForwardingAddress(), getForwardingAddress());
+ ActiveMQServerLogger.LOGGER.bridgeNoBindings(getName(), getForwardingAddress(), getForwardingAddress());
}
}
}
@@ -985,7 +985,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
queue.addConsumer(BridgeImpl.this);
queue.deliverAsync();
- HornetQServerLogger.LOGGER.bridgeConnected(this);
+ ActiveMQServerLogger.LOGGER.bridgeConnected(this);
// We only do this on plain core bridges
if (isPlainCoreBridge())
@@ -1001,7 +1001,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
// the session was created while its server was starting, retry it:
if (e.getType() == ActiveMQExceptionType.SESSION_CREATION_REJECTED)
{
- HornetQServerLogger.LOGGER.errorStartingBridge(name);
+ ActiveMQServerLogger.LOGGER.errorStartingBridge(name);
// We are not going to count this one as a retry
retryCount--;
@@ -1011,9 +1011,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
else
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Bridge " + this + " is unable to connect to destination. Retrying", e);
+ ActiveMQServerLogger.LOGGER.debug("Bridge " + this + " is unable to connect to destination. Retrying", e);
}
scheduleRetryConnect();
@@ -1021,7 +1021,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.errorConnectingBridge(e, this);
+ ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
}
}
}
@@ -1030,19 +1030,19 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
if (serverLocator.isClosed())
{
- HornetQServerLogger.LOGGER.bridgeLocatorShutdown();
+ ActiveMQServerLogger.LOGGER.bridgeLocatorShutdown();
return;
}
if (stopping)
{
- HornetQServerLogger.LOGGER.bridgeStopping();
+ ActiveMQServerLogger.LOGGER.bridgeStopping();
return;
}
if (reconnectAttemptsInUse >= 0 && retryCount > reconnectAttemptsInUse)
{
- HornetQServerLogger.LOGGER.bridgeAbortStart(name, retryCount, reconnectAttempts);
+ ActiveMQServerLogger.LOGGER.bridgeAbortStart(name, retryCount, reconnectAttempts);
fail(true);
return;
}
@@ -1057,7 +1057,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
timeout = maxRetryInterval;
}
- HornetQServerLogger.LOGGER.debug("Bridge " + this +
+ ActiveMQServerLogger.LOGGER.debug("Bridge " + this +
" retrying connection #" +
retryCount +
", maxRetry=" +
@@ -1084,9 +1084,9 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (stopping)
return;
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Scheduling retry for bridge " + this.name + " in " + milliseconds + " milliseconds");
+ ActiveMQServerLogger.LOGGER.debug("Scheduling retry for bridge " + this.name + " in " + milliseconds + " milliseconds");
}
futureScheduledReconnection =
@@ -1154,18 +1154,18 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
{
try
{
- HornetQServerLogger.LOGGER.debug("stopping bridge " + BridgeImpl.this);
+ ActiveMQServerLogger.LOGGER.debug("stopping bridge " + BridgeImpl.this);
queue.removeConsumer(BridgeImpl.this);
if (!pendingAcks.await(10, TimeUnit.SECONDS))
{
- HornetQServerLogger.LOGGER.timedOutWaitingCompletions(BridgeImpl.this.toString(),
+ ActiveMQServerLogger.LOGGER.timedOutWaitingCompletions(BridgeImpl.this.toString(),
pendingAcks.getCount());
}
synchronized (BridgeImpl.this)
{
- HornetQServerLogger.LOGGER.debug("Closing Session for bridge " + BridgeImpl.this.name);
+ ActiveMQServerLogger.LOGGER.debug("Closing Session for bridge " + BridgeImpl.this.name);
started = false;
@@ -1178,7 +1178,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (session != null)
{
- HornetQServerLogger.LOGGER.debug("Cleaning up session " + session);
+ ActiveMQServerLogger.LOGGER.debug("Cleaning up session " + session);
session.removeFailureListener(BridgeImpl.this);
try
{
@@ -1202,17 +1202,17 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Removing consumer on stopRunnable " + this + " from queue " + queue);
+ ActiveMQServerLogger.LOGGER.trace("Removing consumer on stopRunnable " + this + " from queue " + queue);
}
- HornetQServerLogger.LOGGER.bridgeStopped(name);
+ ActiveMQServerLogger.LOGGER.bridgeStopped(name);
}
catch (RuntimeException e)
{
- HornetQServerLogger.LOGGER.error("Failed to stop bridge", e);
+ ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
}
catch (InterruptedException e)
{
- HornetQServerLogger.LOGGER.error("Failed to stop bridge", e);
+ ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
}
}
}
@@ -1227,7 +1227,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
if (!pendingAcks.await(60, TimeUnit.SECONDS))
{
- HornetQServerLogger.LOGGER.timedOutWaitingCompletions(BridgeImpl.this.toString(),
+ ActiveMQServerLogger.LOGGER.timedOutWaitingCompletions(BridgeImpl.this.toString(),
pendingAcks.getCount());
}
@@ -1239,11 +1239,11 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
internalCancelReferences();
- HornetQServerLogger.LOGGER.bridgePaused(name);
+ ActiveMQServerLogger.LOGGER.bridgePaused(name);
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.errorPausingBridge(e);
+ ActiveMQServerLogger.LOGGER.errorPausingBridge(e);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 33e8fae..46ae3b7 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
@@ -25,7 +25,7 @@ import org.apache.activemq.api.core.BroadcastEndpointFactory;
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.ActiveMQServerLogger;
import org.apache.activemq.core.server.NodeManager;
import org.apache.activemq.core.server.cluster.BroadcastGroup;
import org.apache.activemq.core.server.management.Notification;
@@ -137,7 +137,7 @@ public class BroadcastGroupImpl implements BroadcastGroup, Runnable
}
catch (Exception e1)
{
- HornetQServerLogger.LOGGER.broadcastGroupClosed(e1);
+ ActiveMQServerLogger.LOGGER.broadcastGroupClosed(e1);
}
started = false;
@@ -153,7 +153,7 @@ public class BroadcastGroupImpl implements BroadcastGroup, Runnable
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.broadcastGroupClosed(e);
+ ActiveMQServerLogger.LOGGER.broadcastGroupClosed(e);
}
}
@@ -232,12 +232,12 @@ public class BroadcastGroupImpl implements BroadcastGroup, Runnable
// only log the exception at ERROR level once, even if it fails multiple times in a row - HORNETQ-919
if (!loggedBroadcastException)
{
- HornetQServerLogger.LOGGER.errorBroadcastingConnectorConfigs(e);
+ ActiveMQServerLogger.LOGGER.errorBroadcastingConnectorConfigs(e);
loggedBroadcastException = true;
}
else
{
- HornetQServerLogger.LOGGER.debug("Failed to broadcast connector configs...again", e);
+ ActiveMQServerLogger.LOGGER.debug("Failed to broadcast connector configs...again", e);
}
}
}