activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [02/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Date Tue, 18 Nov 2014 23:37:55 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 9d43f58..e86a22f 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
@@ -35,12 +35,12 @@ 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.ActiveMQServerLogger;
 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.ActiveMQServerSideProtocolManagerFactory;
 import org.apache.activemq.core.server.cluster.MessageFlowRecord;
 import org.apache.activemq.core.server.cluster.Transformer;
 import org.apache.activemq.utils.UUID;
@@ -139,9 +139,9 @@ public class ClusterConnectionBridge extends BridgeImpl
       // we need to disable DLQ check on the clustered bridges
       queue.setInternalQueue(true);
 
-      if (HornetQServerLogger.LOGGER.isTraceEnabled())
+      if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
       {
-         HornetQServerLogger.LOGGER.trace("Setting up bridge between " + clusterConnection.getConnector() + " and " + targetLocator,
+         ActiveMQServerLogger.LOGGER.trace("Setting up bridge between " + clusterConnection.getConnector() + " and " + targetLocator,
                                           new Exception("trace"));
       }
    }
@@ -149,13 +149,13 @@ public class ClusterConnectionBridge extends BridgeImpl
    @Override
    protected ClientSessionFactoryInternal createSessionFactory() throws Exception
    {
-      serverLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+      serverLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
       ClientSessionFactoryInternal factory = (ClientSessionFactoryInternal) serverLocator.createSessionFactory(targetNodeID);
       setSessionFactory(factory);
 
       if (factory == null)
       {
-         HornetQServerLogger.LOGGER.nodeNotAvailable(targetNodeID);
+         ActiveMQServerLogger.LOGGER.nodeNotAvailable(targetNodeID);
          return null;
       }
       factory.setReconnectAttempts(0);
@@ -173,9 +173,9 @@ public class ClusterConnectionBridge extends BridgeImpl
       // Note we must copy since same message may get routed to other nodes which require different headers
       ServerMessage messageCopy = message.copy();
 
-      if (HornetQServerLogger.LOGGER.isTraceEnabled())
+      if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
       {
-         HornetQServerLogger.LOGGER.trace("Clustered bridge  copied message " + message + " as " + messageCopy + " before delivery");
+         ActiveMQServerLogger.LOGGER.trace("Clustered bridge  copied message " + message + " as " + messageCopy + " before delivery");
       }
 
       // TODO - we can optimise this
@@ -187,7 +187,7 @@ public class ClusterConnectionBridge extends BridgeImpl
       if (queueIds == null)
       {
          // Sanity check only
-         HornetQServerLogger.LOGGER.noQueueIdDefined(message, messageCopy, idsHeaderName);
+         ActiveMQServerLogger.LOGGER.noQueueIdDefined(message, messageCopy, idsHeaderName);
          throw new IllegalStateException("no queueIDs defined");
       }
 
@@ -208,9 +208,9 @@ public class ClusterConnectionBridge extends BridgeImpl
 
    private void setupNotificationConsumer() throws Exception
    {
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
-         HornetQServerLogger.LOGGER.debug("Setting up notificationConsumer between " + this.clusterConnection.getConnector() +
+         ActiveMQServerLogger.LOGGER.debug("Setting up notificationConsumer between " + this.clusterConnection.getConnector() +
                                              " and " +
                                              flowRecord.getBridge().getForwardingConnection() +
                                              " clusterConnection = " +
@@ -226,7 +226,7 @@ public class ClusterConnectionBridge extends BridgeImpl
          {
             try
             {
-               HornetQServerLogger.LOGGER.debug("Closing notification Consumer for reopening " + notifConsumer +
+               ActiveMQServerLogger.LOGGER.debug("Closing notification Consumer for reopening " + notifConsumer +
                                                    " on bridge " +
                                                    this.getName());
                notifConsumer.close();
@@ -235,7 +235,7 @@ public class ClusterConnectionBridge extends BridgeImpl
             }
             catch (ActiveMQException e)
             {
-               HornetQServerLogger.LOGGER.errorClosingConsumer(e);
+               ActiveMQServerLogger.LOGGER.errorClosingConsumer(e);
             }
          }
 
@@ -282,9 +282,9 @@ public class ClusterConnectionBridge extends BridgeImpl
          session.start();
 
          ClientMessage message = session.createMessage(false);
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace("Requesting sendQueueInfoToQueue through " + this, new Exception("trace"));
+            ActiveMQServerLogger.LOGGER.trace("Requesting sendQueueInfoToQueue through " + this, new Exception("trace"));
          }
          ManagementHelper.putOperationInvocation(message,
                                                  ResourceNames.CORE_SERVER,
@@ -294,9 +294,9 @@ public class ClusterConnectionBridge extends BridgeImpl
 
          ClientProducer prod = session.createProducer(managementAddress);
 
-         if (HornetQServerLogger.LOGGER.isDebugEnabled())
+         if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
          {
-            HornetQServerLogger.LOGGER.debug("Cluster connetion bridge on " + clusterConnection + " requesting information on queues");
+            ActiveMQServerLogger.LOGGER.debug("Cluster connetion bridge on " + clusterConnection + " requesting information on queues");
          }
 
          prod.send(message);
@@ -392,12 +392,12 @@ public class ClusterConnectionBridge extends BridgeImpl
    @Override
    protected void fail(final boolean permanently)
    {
-      HornetQServerLogger.LOGGER.debug("Cluster Bridge " + this.getName() + " failed, permanently=" + permanently);
+      ActiveMQServerLogger.LOGGER.debug("Cluster Bridge " + this.getName() + " failed, permanently=" + permanently);
       super.fail(permanently);
 
       if (permanently)
       {
-         HornetQServerLogger.LOGGER.debug("cluster node for bridge " + this.getName() + " is permanently down");
+         ActiveMQServerLogger.LOGGER.debug("cluster node for bridge " + this.getName() + " is permanently down");
          clusterConnection.removeRecord(targetNodeID);
       }
       else

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 eb13e7e..0755f52 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
@@ -45,9 +45,9 @@ 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.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.Bridge;
@@ -55,7 +55,7 @@ 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.ActiveMQServerSideProtocolManagerFactory;
 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;
@@ -75,13 +75,13 @@ import org.apache.activemq.utils.TypedProperties;
  */
 public final class ClusterConnectionImpl implements ClusterConnection, AfterConnectInternalListener
 {
-   private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+   private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
 
    private final ExecutorFactory executorFactory;
 
    private final Executor executor;
 
-   private final HornetQServer server;
+   private final ActiveMQServer server;
 
    private final PostOffice postOffice;
 
@@ -182,7 +182,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
                                 final boolean routeWhenNoConsumers,
                                 final int confirmationWindowSize,
                                 final ExecutorFactory executorFactory,
-                                final HornetQServer server,
+                                final ActiveMQServer server,
                                 final PostOffice postOffice,
                                 final ManagementService managementService,
                                 final ScheduledExecutorService scheduledExecutor,
@@ -289,7 +289,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
                                 final boolean routeWhenNoConsumers,
                                 final int confirmationWindowSize,
                                 final ExecutorFactory executorFactory,
-                                final HornetQServer server,
+                                final ActiveMQServer server,
                                 final PostOffice postOffice,
                                 final ManagementService managementService,
                                 final ScheduledExecutorService scheduledExecutor,
@@ -399,9 +399,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          return;
       }
       stopping = true;
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
-         HornetQServerLogger.LOGGER.debug(this + "::stopping ClusterConnection");
+         ActiveMQServerLogger.LOGGER.debug(this + "::stopping ClusterConnection");
       }
 
       if (serverLocator != null)
@@ -409,7 +409,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          serverLocator.removeClusterTopologyListener(this);
       }
 
-      HornetQServerLogger.LOGGER.debug("Cluster connection being stopped for node" + nodeManager.getNodeId() +
+      ActiveMQServerLogger.LOGGER.debug("Cluster connection being stopped for node" + nodeManager.getNodeId() +
                                           ", server = " +
                                           this.server +
                                           " serverLocator = " +
@@ -490,9 +490,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
                              final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
                              final boolean backup)
    {
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
-         HornetQServerLogger.LOGGER.debug(this + "::NodeAnnounced, backup=" + backup + nodeID + connectorPair);
+         ActiveMQServerLogger.LOGGER.debug(this + "::NodeAnnounced, backup=" + backup + nodeID + connectorPair);
       }
 
       TransportConfiguration live = connectorPair.getA();
@@ -528,12 +528,12 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          }
          catch (ActiveMQException e)
          {
-            HornetQServerLogger.LOGGER.clusterControlAuthfailure();
+            ActiveMQServerLogger.LOGGER.clusterControlAuthfailure();
          }
       }
       else
       {
-         HornetQServerLogger.LOGGER.noLocalMemborOnClusterConnection(this);
+         ActiveMQServerLogger.LOGGER.noLocalMemborOnClusterConnection(this);
       }
 
       // TODO: shouldn't we send the current time here? and change the current topology?
@@ -559,7 +559,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
       return nodeManager.getNodeId().toString();
    }
 
-   public HornetQServer getServer()
+   public ActiveMQServer getServer()
    {
       return server;
    }
@@ -598,9 +598,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          return;
       }
 
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
-         HornetQServerLogger.LOGGER.debug("Activating cluster connection nodeID=" + nodeManager.getNodeId() + " for server=" + this.server);
+         ActiveMQServerLogger.LOGGER.debug("Activating cluster connection nodeID=" + nodeManager.getNodeId() + " for server=" + this.server);
       }
 
       liveNotifier = new LiveNotifier();
@@ -614,7 +614,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
          if (!useDuplicateDetection)
          {
-            HornetQServerLogger.LOGGER.debug("DuplicateDetection is disabled, sending clustered messages blocked");
+            ActiveMQServerLogger.LOGGER.debug("DuplicateDetection is disabled, sending clustered messages blocked");
          }
 
          final TopologyMember currentMember = topology.getMember(manager.getNodeId());
@@ -649,7 +649,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
          serverLocator.setAfterConnectionInternalListener(this);
 
-         serverLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+         serverLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
 
          serverLocator.start(server.getExecutorFactory().getExecutor());
       }
@@ -661,7 +661,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          Notification notification = new Notification(nodeManager.getNodeId().toString(),
                                                       CoreNotificationType.CLUSTER_CONNECTION_STARTED,
                                                       props);
-         HornetQServerLogger.LOGGER.debug("sending notification: " + notification);
+         ActiveMQServerLogger.LOGGER.debug("sending notification: " + notification);
          managementService.sendNotification(notification);
       }
       //we add as a listener after we have sent the cluster start notif as the listener may start sending notifs before
@@ -691,18 +691,18 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          return;
       }
       final String nodeID = topologyMember.getNodeId();
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
          String ClusterTestBase = "receiving nodeUP for nodeID=";
-         HornetQServerLogger.LOGGER.debug(this + ClusterTestBase + nodeID + " connectionPair=" + topologyMember);
+         ActiveMQServerLogger.LOGGER.debug(this + ClusterTestBase + nodeID + " connectionPair=" + topologyMember);
       }
       // discard notifications about ourselves unless its from our backup
 
       if (nodeID.equals(nodeManager.getNodeId().toString()))
       {
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace(this + "::informing about backup to itself, nodeUUID=" +
+            ActiveMQServerLogger.LOGGER.trace(this + "::informing about backup to itself, nodeUUID=" +
                                                 nodeManager.getNodeId() + ", connectorPair=" + topologyMember + ", this = " + this);
          }
          return;
@@ -725,7 +725,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
       {
          if (isTrace)
          {
-            HornetQServerLogger.LOGGER.trace(this + " ignoring call with nodeID=" + nodeID + ", topologyMember=" +
+            ActiveMQServerLogger.LOGGER.trace(this + " ignoring call with nodeID=" + nodeID + ", topologyMember=" +
                                                 topologyMember + ", last=" + last);
          }
          return;
@@ -739,9 +739,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
             if (record == null)
             {
-               if (HornetQServerLogger.LOGGER.isDebugEnabled())
+               if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
                {
-                  HornetQServerLogger.LOGGER.debug(this + "::Creating record for nodeID=" + nodeID + ", topologyMember=" +
+                  ActiveMQServerLogger.LOGGER.debug(this + "::Creating record for nodeID=" + nodeID + ", topologyMember=" +
                                                       topologyMember);
                }
 
@@ -774,14 +774,14 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
             {
                if (isTrace)
                {
-                  HornetQServerLogger.LOGGER.trace(this + " ignored nodeUp record for " + topologyMember + " on nodeID=" +
+                  ActiveMQServerLogger.LOGGER.trace(this + " ignored nodeUp record for " + topologyMember + " on nodeID=" +
                                                       nodeID + " as the record already existed");
                }
             }
          }
          catch (Exception e)
          {
-            HornetQServerLogger.LOGGER.errorUpdatingTopology(e);
+            ActiveMQServerLogger.LOGGER.errorUpdatingTopology(e);
          }
       }
    }
@@ -842,7 +842,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       targetLocator.setAfterConnectionInternalListener(this);
 
-      serverLocator.setProtocolManagerFactory(HornetQServerSideProtocolManagerFactory.getInstance());
+      serverLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance());
 
       targetLocator.setNodeID(nodeId);
 
@@ -893,9 +893,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       targetLocator.setIdentity("(Cluster-connection-bridge::" + bridge.toString() + "::" + this.toString() + ")");
 
-      if (HornetQServerLogger.LOGGER.isDebugEnabled())
+      if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
       {
-         HornetQServerLogger.LOGGER.debug("creating record between " + this.connector + " and " + connector + bridge);
+         ActiveMQServerLogger.LOGGER.debug("creating record between " + this.connector + " and " + connector + bridge);
       }
 
       record.setBridge(bridge);
@@ -1032,7 +1032,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
       {
          if (isTrace)
          {
-            HornetQServerLogger.LOGGER.trace("Stopping bridge " + bridge);
+            ActiveMQServerLogger.LOGGER.trace("Stopping bridge " + bridge);
          }
 
          isClosed = true;
@@ -1063,7 +1063,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
                }
                catch (Exception ignored)
                {
-                  HornetQServerLogger.LOGGER.debug(ignored.getMessage(), ignored);
+                  ActiveMQServerLogger.LOGGER.debug(ignored.getMessage(), ignored);
                }
             }
          });
@@ -1091,9 +1091,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       public synchronized void onMessage(final ClientMessage message)
       {
-         if (HornetQServerLogger.LOGGER.isDebugEnabled())
+         if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
          {
-            HornetQServerLogger.LOGGER.debug("ClusterCommunication::Flow record on " + clusterConnector + " Receiving message " + message);
+            ActiveMQServerLogger.LOGGER.debug("ClusterCommunication::Flow record on " + clusterConnector + " Receiving message " + message);
          }
          try
          {
@@ -1112,7 +1112,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
             if (!reset)
             {
-               HornetQServerLogger.LOGGER.debug("Notification being ignored since first reset wasn't received yet: " + message);
+               ActiveMQServerLogger.LOGGER.debug("Notification being ignored since first reset wasn't received yet: " + message);
                return;
             }
 
@@ -1120,7 +1120,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
          }
          catch (Exception e)
          {
-            HornetQServerLogger.LOGGER.errorHandlingMessage(e);
+            ActiveMQServerLogger.LOGGER.errorHandlingMessage(e);
          }
       }
 
@@ -1176,7 +1176,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
             }
             default:
             {
-               throw HornetQMessageBundle.BUNDLE.invalidType(ntype);
+               throw ActiveMQMessageBundle.BUNDLE.invalidType(ntype);
             }
          }
       }
@@ -1263,7 +1263,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void clearBindings() throws Exception
       {
-         HornetQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " clearing bindings");
+         ActiveMQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " clearing bindings");
          for (RemoteQueueBinding binding : new HashSet<RemoteQueueBinding>(bindings.values()))
          {
             removeBinding(binding.getClusterName());
@@ -1272,7 +1272,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void resetBindings() throws Exception
       {
-         HornetQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " reset bindings");
+         ActiveMQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " reset bindings");
          for (RemoteQueueBinding binding : new HashSet<>(bindings.values()))
          {
             resetBinding(binding.getClusterName());
@@ -1281,7 +1281,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void clearDisconnectedBindings() throws Exception
       {
-         HornetQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " reset bindings");
+         ActiveMQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " reset bindings");
          for (RemoteQueueBinding binding : new HashSet<>(bindings.values()))
          {
             if (!binding.isConnected())
@@ -1294,7 +1294,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       public synchronized void disconnectBindings() throws Exception
       {
-         HornetQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " disconnect bindings");
+         ActiveMQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + " disconnect bindings");
          reset = false;
          for (RemoteQueueBinding binding : new HashSet<>(bindings.values()))
          {
@@ -1304,9 +1304,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void doBindingAdded(final ClientMessage message) throws Exception
       {
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Adding binding " + message);
+            ActiveMQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Adding binding " + message);
          }
          if (!message.containsProperty(ManagementHelper.HDR_DISTANCE))
          {
@@ -1358,7 +1358,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
             // hops is too high
             // or there are multiple cluster connections for the same address
 
-            HornetQServerLogger.LOGGER.remoteQueueAlreadyBoundOnClusterConnection(this, clusterName);
+            ActiveMQServerLogger.LOGGER.remoteQueueAlreadyBoundOnClusterConnection(this, clusterName);
 
             return;
          }
@@ -1375,7 +1375,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
          if (isTrace)
          {
-            HornetQServerLogger.LOGGER.trace("Adding binding " + clusterName + " into " + ClusterConnectionImpl.this);
+            ActiveMQServerLogger.LOGGER.trace("Adding binding " + clusterName + " into " + ClusterConnectionImpl.this);
          }
 
          bindings.put(clusterName, binding);
@@ -1396,9 +1396,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private void doBindingRemoved(final ClientMessage message) throws Exception
       {
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Removing binding " + message);
+            ActiveMQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Removing binding " + message);
          }
          if (!message.containsProperty(ManagementHelper.HDR_CLUSTER_NAME))
          {
@@ -1447,9 +1447,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void doConsumerCreated(final ClientMessage message) throws Exception
       {
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Consumer created " + message);
+            ActiveMQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Consumer created " + message);
          }
          if (!message.containsProperty(ManagementHelper.HDR_DISTANCE))
          {
@@ -1507,9 +1507,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
 
       private synchronized void doConsumerClosed(final ClientMessage message) throws Exception
       {
-         if (HornetQServerLogger.LOGGER.isTraceEnabled())
+         if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
          {
-            HornetQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Consumer closed " + message);
+            ActiveMQServerLogger.LOGGER.trace(ClusterConnectionImpl.this + " Consumer closed " + message);
          }
          if (!message.containsProperty(ManagementHelper.HDR_DISTANCE))
          {
@@ -1621,9 +1621,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
       {
          if (tcConfigs != null && tcConfigs.length > 0)
          {
-            if (HornetQServerLogger.LOGGER.isDebugEnabled())
+            if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
             {
-               HornetQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + "Creating a serverLocator for " + Arrays.toString(tcConfigs));
+               ActiveMQServerLogger.LOGGER.debug(ClusterConnectionImpl.this + "Creating a serverLocator for " + Arrays.toString(tcConfigs));
             }
             ServerLocatorImpl locator = new ServerLocatorImpl(topology, true, tcConfigs);
             locator.setClusterConnection(true);
@@ -1664,7 +1664,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
    @Override
    public void removeRecord(String targetNodeID)
    {
-      HornetQServerLogger.LOGGER.debug("Removing record for: " + targetNodeID);
+      ActiveMQServerLogger.LOGGER.debug("Removing record for: " + targetNodeID);
       MessageFlowRecord record = records.remove(targetNodeID);
       try
       {
@@ -1679,7 +1679,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
    @Override
    public void disconnectRecord(String targetNodeID)
    {
-      HornetQServerLogger.LOGGER.debug("Disconnecting record for: " + targetNodeID);
+      ActiveMQServerLogger.LOGGER.debug("Disconnecting record for: " + targetNodeID);
       MessageFlowRecord record = records.get(targetNodeID);
       try
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
index 1826cd7..e356162 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java
@@ -24,7 +24,7 @@ import org.apache.activemq.core.persistence.StorageManager;
 import org.apache.activemq.core.postoffice.PostOffice;
 import org.apache.activemq.core.server.Consumer;
 import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.MessageReference;
 import org.apache.activemq.core.server.Queue;
 import org.apache.activemq.core.server.RoutingContext;
@@ -112,7 +112,7 @@ public class Redistributor implements Consumer
 
       if (!ok)
       {
-         HornetQServerLogger.LOGGER.errorStoppingRedistributor();
+         ActiveMQServerLogger.LOGGER.errorStoppingRedistributor();
       }
    }
 
@@ -137,7 +137,7 @@ public class Redistributor implements Consumer
       }
       catch (InterruptedException e)
       {
-         HornetQServerLogger.LOGGER.warn(e.getMessage(), e);
+         ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e);
          return false;
       }
    }
@@ -206,7 +206,7 @@ public class Redistributor implements Consumer
                      // Nothing much we can do now
 
                      // TODO log
-                     HornetQServerLogger.LOGGER.warn(e2.getMessage(), e2);
+                     ActiveMQServerLogger.LOGGER.warn(e2.getMessage(), e2);
                   }
                }
             }
@@ -255,7 +255,7 @@ public class Redistributor implements Consumer
 
          public void onError(final int errorCode, final String errorMessage)
          {
-            HornetQServerLogger.LOGGER.ioErrorRedistributing(errorCode, errorMessage);
+            ActiveMQServerLogger.LOGGER.ioErrorRedistributing(errorCode, errorMessage);
          }
 
          public void done()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
index 77032e0..d218e42 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java
@@ -25,7 +25,7 @@ import org.apache.activemq.core.filter.impl.FilterImpl;
 import org.apache.activemq.core.message.impl.MessageImpl;
 import org.apache.activemq.core.postoffice.BindingType;
 import org.apache.activemq.core.server.Bindable;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.Queue;
 import org.apache.activemq.core.server.RoutingContext;
 import org.apache.activemq.core.server.ServerMessage;
@@ -370,9 +370,9 @@ public class RemoteQueueBindingImpl implements RemoteQueueBinding
 
       message.putBytesProperty(idsHeaderName, ids);
 
-      if (HornetQServerLogger.LOGGER.isTraceEnabled())
+      if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
       {
-         HornetQServerLogger.LOGGER.trace("Adding remoteQueue ID = " + remoteQueueID + " into message=" + message + " store-forward-queue=" + storeAndForwardQueue);
+         ActiveMQServerLogger.LOGGER.trace("Adding remoteQueue ID = " + remoteQueueID + " into message=" + message + " store-forward-queue=" + storeAndForwardQueue);
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
index 1ac2475..b52f8e8 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java
@@ -23,7 +23,7 @@ import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClusterTopologyListener;
 import org.apache.activemq.api.core.client.TopologyMember;
 import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 import org.apache.activemq.core.server.cluster.ClusterControl;
 import org.apache.activemq.core.server.cluster.ClusterController;
 
@@ -32,7 +32,7 @@ import org.apache.activemq.core.server.cluster.ClusterController;
  * about changes to the cluster. A {@link org.apache.activemq.core.server.cluster.qourum.Quorum} can then issue a vote to the
  * remaining nodes in a cluster for a specific outcome
  */
-public final class QuorumManager implements ClusterTopologyListener, HornetQComponent
+public final class QuorumManager implements ClusterTopologyListener, ActiveMQComponent
 {
    private final ExecutorService executor;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
index 2285b5a..05dee26 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java
@@ -25,7 +25,7 @@ import org.apache.activemq.core.persistence.StorageManager;
 import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
 import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage;
 import org.apache.activemq.core.remoting.FailureListener;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.NodeManager;
 
 /**
@@ -108,7 +108,7 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
             catch (ActiveMQException e)
             {
                if (e.getType() != ActiveMQExceptionType.NOT_CONNECTED)
-                  HornetQServerLogger.LOGGER.errorReConnecting(e);
+                  ActiveMQServerLogger.LOGGER.errorReConnecting(e);
             }
          }
          // live is assumed to be down, backup fails-over

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java
new file mode 100644
index 0000000..313ae71
--- /dev/null
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java
@@ -0,0 +1,118 @@
+/*
+ * 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.embedded;
+
+import javax.management.MBeanServer;
+
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.FileConfiguration;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+
+/**
+ * Helper class to simplify bootstrap of ActiveMQ server.  Bootstraps from classpath-based config files.
+ *
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class EmbeddedActiveMQ
+{
+   protected ActiveMQSecurityManager securityManager;
+   protected String configResourcePath = null;
+   protected Configuration configuration;
+   protected ActiveMQServer activeMQServer;
+   protected MBeanServer mbeanServer;
+
+   /**
+    * Classpath resource for activemq server config.  Defaults to 'activemq-configuration.xml'.
+    *
+    * @param filename
+    */
+   public void setConfigResourcePath(String filename)
+   {
+      configResourcePath = filename;
+   }
+
+   /**
+    * Set the activemq security manager.  This defaults to org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl
+    *
+    * @param securityManager
+    */
+   public void setSecurityManager(ActiveMQSecurityManager securityManager)
+   {
+      this.securityManager = securityManager;
+   }
+
+   /**
+    * Use this mbean server to register management beans.  If not set, no mbeans will be registered.
+    *
+    * @param mbeanServer
+    */
+   public void setMbeanServer(MBeanServer mbeanServer)
+   {
+      this.mbeanServer = mbeanServer;
+   }
+
+   /**
+    * Set this object if you are not using file-based configuration.  The default implementation will load
+    * configuration from a file.
+    *
+    * @param configuration
+    */
+   public void setConfiguration(Configuration configuration)
+   {
+      this.configuration = configuration;
+   }
+
+   public ActiveMQServer getActiveMQServer()
+   {
+      return activeMQServer;
+   }
+
+   public void start() throws Exception
+   {
+      initStart();
+      activeMQServer.start();
+
+   }
+
+   protected void initStart() throws Exception
+   {
+      if (configuration == null)
+      {
+         if (configResourcePath == null) configResourcePath = "activemq-configuration.xml";
+         FileConfiguration config = new FileConfiguration(configResourcePath);
+         config.start();
+         configuration = config;
+      }
+      if (securityManager == null)
+      {
+         securityManager = new ActiveMQSecurityManagerImpl();
+      }
+      if (mbeanServer == null)
+      {
+         activeMQServer = new ActiveMQServerImpl(configuration, securityManager);
+      }
+      else
+      {
+         activeMQServer = new ActiveMQServerImpl(configuration, mbeanServer, securityManager);
+      }
+   }
+
+   public void stop() throws Exception
+   {
+      activeMQServer.stop();
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
deleted file mode 100644
index bd9acde..0000000
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java
+++ /dev/null
@@ -1,118 +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.embedded;
-
-import javax.management.MBeanServer;
-
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.core.server.HornetQServer;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
-import org.apache.activemq.spi.core.security.HornetQSecurityManager;
-import org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl;
-
-/**
- * Helper class to simplify bootstrap of HornetQ server.  Bootstraps from classpath-based config files.
- *
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class EmbeddedHornetQ
-{
-   protected HornetQSecurityManager securityManager;
-   protected String configResourcePath = null;
-   protected Configuration configuration;
-   protected HornetQServer hornetQServer;
-   protected MBeanServer mbeanServer;
-
-   /**
-    * Classpath resource for hornetq server config.  Defaults to 'activemq-configuration.xml'.
-    *
-    * @param filename
-    */
-   public void setConfigResourcePath(String filename)
-   {
-      configResourcePath = filename;
-   }
-
-   /**
-    * Set the hornetq security manager.  This defaults to org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl
-    *
-    * @param securityManager
-    */
-   public void setSecurityManager(HornetQSecurityManager securityManager)
-   {
-      this.securityManager = securityManager;
-   }
-
-   /**
-    * Use this mbean server to register management beans.  If not set, no mbeans will be registered.
-    *
-    * @param mbeanServer
-    */
-   public void setMbeanServer(MBeanServer mbeanServer)
-   {
-      this.mbeanServer = mbeanServer;
-   }
-
-   /**
-    * Set this object if you are not using file-based configuration.  The default implementation will load
-    * configuration from a file.
-    *
-    * @param configuration
-    */
-   public void setConfiguration(Configuration configuration)
-   {
-      this.configuration = configuration;
-   }
-
-   public HornetQServer getHornetQServer()
-   {
-      return hornetQServer;
-   }
-
-   public void start() throws Exception
-   {
-      initStart();
-      hornetQServer.start();
-
-   }
-
-   protected void initStart() throws Exception
-   {
-      if (configuration == null)
-      {
-         if (configResourcePath == null) configResourcePath = "activemq-configuration.xml";
-         FileConfiguration config = new FileConfiguration(configResourcePath);
-         config.start();
-         configuration = config;
-      }
-      if (securityManager == null)
-      {
-         securityManager = new HornetQSecurityManagerImpl();
-      }
-      if (mbeanServer == null)
-      {
-         hornetQServer = new HornetQServerImpl(configuration, securityManager);
-      }
-      else
-      {
-         hornetQServer = new HornetQServerImpl(configuration, mbeanServer, securityManager);
-      }
-   }
-
-   public void stop() throws Exception
-   {
-      hornetQServer.stop();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
index d840f72..418e6a6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java
@@ -13,7 +13,7 @@
 package org.apache.activemq.core.server.group;
 
 import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 import org.apache.activemq.core.server.group.impl.GroupBinding;
 import org.apache.activemq.core.server.group.impl.Proposal;
 import org.apache.activemq.core.server.group.impl.Response;
@@ -22,7 +22,7 @@ import org.apache.activemq.core.server.management.NotificationListener;
 /**
  * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
-public interface GroupingHandler extends NotificationListener, HornetQComponent
+public interface GroupingHandler extends NotificationListener, ActiveMQComponent
 {
    // this method should maintain a WeakHash list, no need to remove the elements
    void addListener(UnproposalListener listener);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
index 8dd9be9..a92190f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java
@@ -22,7 +22,7 @@ import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.management.CoreNotificationType;
 import org.apache.activemq.api.core.management.ManagementHelper;
 import org.apache.activemq.core.postoffice.BindingType;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.group.GroupingHandler;
 import org.apache.activemq.core.server.group.UnproposalListener;
 import org.apache.activemq.core.server.management.ManagementService;
@@ -117,7 +117,7 @@ public abstract class GroupHandlingAbstract implements GroupingHandler
       }
       catch (Exception e)
       {
-         HornetQServerLogger.LOGGER.errorHandlingMessage(e);
+         ActiveMQServerLogger.LOGGER.errorHandlingMessage(e);
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
index 1e62b03..d8763dc 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
@@ -31,7 +31,7 @@ import org.apache.activemq.api.core.management.ManagementHelper;
 import org.apache.activemq.core.persistence.OperationContext;
 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.ActiveMQServerLogger;
 import org.apache.activemq.core.server.management.ManagementService;
 import org.apache.activemq.core.server.management.Notification;
 import org.apache.activemq.utils.ExecutorFactory;
@@ -200,7 +200,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
 
    public Response receive(final Proposal proposal, final int distance) throws Exception
    {
-      HornetQServerLogger.LOGGER.trace("received proposal " + proposal);
+      ActiveMQServerLogger.LOGGER.trace("received proposal " + proposal);
       return propose(proposal);
    }
 
@@ -251,7 +251,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
          catch (Exception e)
          {
             // nothing we can do being log
-            HornetQServerLogger.LOGGER.warn(e.getMessage(), e);
+            ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e);
          }
       }
    }
@@ -287,12 +287,12 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
 
             if (expectedBindings.size() > 0)
             {
-               HornetQServerLogger.LOGGER.debug("Waiting remote group bindings to arrive before starting the server. timeout=" + timeout + " milliseconds");
+               ActiveMQServerLogger.LOGGER.debug("Waiting remote group bindings to arrive before starting the server. timeout=" + timeout + " milliseconds");
                //now we wait here for the rest to be received in onNotification, it will signal once all have been received.
                //if we arent signaled then bindingsAdded still has some groupids we need to remove.
                if (!awaitCondition.await(timeout, TimeUnit.MILLISECONDS))
                {
-                  HornetQServerLogger.LOGGER.remoteGroupCoordinatorsNotStarted();
+                  ActiveMQServerLogger.LOGGER.remoteGroupCoordinatorsNotStarted();
                }
 
             }
@@ -330,24 +330,24 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
                {
                   if (expectedBindings.remove(clusterName))
                   {
-                     HornetQServerLogger.LOGGER.debug("OnNotification for waitForbindings::Removed clusterName=" + clusterName + " from lis succesffully");
+                     ActiveMQServerLogger.LOGGER.debug("OnNotification for waitForbindings::Removed clusterName=" + clusterName + " from lis succesffully");
                   }
                   else
                   {
-                     HornetQServerLogger.LOGGER.debug("OnNotification for waitForbindings::Couldn't remove clusterName=" + clusterName + " as it wasn't on the original list");
+                     ActiveMQServerLogger.LOGGER.debug("OnNotification for waitForbindings::Couldn't remove clusterName=" + clusterName + " as it wasn't on the original list");
                   }
                }
                else
                {
                   expectedBindings.add(clusterName);
-                  HornetQServerLogger.LOGGER.debug("Notification for waitForbindings::Adding previously known item clusterName=" + clusterName);
+                  ActiveMQServerLogger.LOGGER.debug("Notification for waitForbindings::Adding previously known item clusterName=" + clusterName);
                }
 
-               if (HornetQServerLogger.LOGGER.isDebugEnabled())
+               if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
                {
                   for (SimpleString stillWaiting : expectedBindings)
                   {
-                     HornetQServerLogger.LOGGER.debug("Notification for waitForbindings::Still waiting for clusterName=" + stillWaiting);
+                     ActiveMQServerLogger.LOGGER.debug("Notification for waitForbindings::Still waiting for clusterName=" + stillWaiting);
                   }
                }
 
@@ -435,7 +435,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
                      }
                      catch (Exception e)
                      {
-                        HornetQServerLogger.LOGGER.unableToDeleteGroupBindings(e, val.getGroupId());
+                        ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, val.getGroupId());
                      }
                   }
                }
@@ -449,7 +449,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
                   }
                   catch (Exception e)
                   {
-                     HornetQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
+                     ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
                   }
                }
             }
@@ -512,7 +512,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
                   }
                   catch (Exception e)
                   {
-                     HornetQServerLogger.LOGGER.unableToDeleteGroupBindings(e, groupBinding.getGroupId());
+                     ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, groupBinding.getGroupId());
                   }
                }
             }
@@ -525,7 +525,7 @@ public final class LocalGroupingHandler extends GroupHandlingAbstract
                }
                catch (Exception e)
                {
-                  HornetQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
+                  ActiveMQServerLogger.LOGGER.unableToDeleteGroupBindings(e, SimpleString.toSimpleString("TX:" + txID));
                }
             }
          }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
index bcd76a4..02ca7a2 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
@@ -26,8 +26,8 @@ import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.management.CoreNotificationType;
 import org.apache.activemq.api.core.management.ManagementHelper;
 import org.apache.activemq.core.postoffice.BindingType;
-import org.apache.activemq.core.server.HornetQMessageBundle;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.management.ManagementService;
 import org.apache.activemq.core.server.management.Notification;
 import org.apache.activemq.utils.ConcurrentHashSet;
@@ -141,7 +141,7 @@ public final class RemoteGroupingHandler extends GroupHandlingAbstract
 
       if (!started)
       {
-         throw HornetQMessageBundle.BUNDLE.groupWhileStopping();
+         throw ActiveMQMessageBundle.BUNDLE.groupWhileStopping();
       }
 
       Notification notification = null;
@@ -183,7 +183,7 @@ public final class RemoteGroupingHandler extends GroupHandlingAbstract
       }
       if (response == null)
       {
-         HornetQServerLogger.LOGGER.groupHandlerSendTimeout();
+         ActiveMQServerLogger.LOGGER.groupHandlerSendTimeout();
       }
       return response;
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
index 1dfebae..0c614ce 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
@@ -19,7 +19,7 @@ import java.nio.channels.FileLock;
 import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
 
 /**
- * This is using the HornetQ Libaio Native to perform calls to flock on a Linux system. At the
+ * This is using the ActiveMQ Libaio Native to perform calls to flock on a Linux system. At the
  * current version of RHEL there's a bug on GFS2 and because of that fctl is not functional what
  * will cause issues on Failover over Shared Storage.
  * <p/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
index 4d1e874..bc9347d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java
@@ -21,7 +21,7 @@ import org.apache.activemq.core.protocol.core.Channel;
 import org.apache.activemq.core.protocol.core.ChannelHandler;
 import org.apache.activemq.core.remoting.server.RemotingService;
 import org.apache.activemq.core.replication.ReplicationManager;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.server.NodeManager;
 import org.apache.activemq.core.server.QueueFactory;
 import org.apache.activemq.core.server.cluster.ha.HAManager;
@@ -96,7 +96,7 @@ public abstract class Activation implements Runnable
    /*
    * create the Journal loader needed for this Activation.
    * */
-   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, HornetQServer parentServer) throws ActiveMQException
+   public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, ActiveMQServer parentServer) throws ActiveMQException
    {
       return new PostOfficeJournalLoader(postOffice,
             pagingManager,


Mime
View raw message