activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [34/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Date Tue, 18 Nov 2014 23:38:27 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
index 1bbffc5..d56fddd 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java
@@ -19,7 +19,7 @@ import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.jms.HornetQJMSConstants;
+import org.apache.activemq.api.jms.ActiveMQJMSConstants;
 
 /**
  *
@@ -30,9 +30,9 @@ import org.apache.activemq.api.jms.HornetQJMSConstants;
  */
 public class JMSMessageListenerWrapper implements MessageHandler
 {
-   private final HornetQConnection connection;
+   private final ActiveMQConnection connection;
 
-   private final HornetQSession session;
+   private final ActiveMQSession session;
 
    private final MessageListener listener;
 
@@ -42,8 +42,8 @@ public class JMSMessageListenerWrapper implements MessageHandler
 
    private final boolean individualACK;
 
-   protected JMSMessageListenerWrapper(final HornetQConnection connection,
-                                       final HornetQSession session,
+   protected JMSMessageListenerWrapper(final ActiveMQConnection connection,
+                                       final ActiveMQSession session,
                                        final ClientConsumer consumer,
                                        final MessageListener listener,
                                        final int ackMode)
@@ -58,7 +58,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
 
       transactedOrClientAck = (ackMode == Session.SESSION_TRANSACTED || ackMode == Session.CLIENT_ACKNOWLEDGE) || session.isXA();
 
-      individualACK = (ackMode == HornetQJMSConstants.INDIVIDUAL_ACKNOWLEDGE);
+      individualACK = (ackMode == ActiveMQJMSConstants.INDIVIDUAL_ACKNOWLEDGE);
    }
 
    /**
@@ -67,7 +67,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
     */
    public void onMessage(final ClientMessage message)
    {
-      HornetQMessage msg = HornetQMessage.createMessage(message, session.getCoreSession());
+      ActiveMQMessage msg = ActiveMQMessage.createMessage(message, session.getCoreSession());
 
       if (individualACK)
       {
@@ -80,7 +80,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
       }
       catch (Exception e)
       {
-         HornetQJMSClientLogger.LOGGER.errorPreparingMessageForReceipt(e);
+         ActiveMQJMSClientLogger.LOGGER.errorPreparingMessageForReceipt(e);
 
          return;
       }
@@ -93,7 +93,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
          }
          catch (ActiveMQException e)
          {
-            HornetQJMSClientLogger.LOGGER.errorProcessingMessage(e);
+            ActiveMQJMSClientLogger.LOGGER.errorProcessingMessage(e);
          }
       }
 
@@ -106,7 +106,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
       {
          // See JMS 1.1 spec, section 4.5.2
 
-         HornetQJMSClientLogger.LOGGER.onMessageError(e);
+         ActiveMQJMSClientLogger.LOGGER.onMessageError(e);
 
          if (!transactedOrClientAck)
          {
@@ -123,7 +123,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
             }
             catch (Exception e2)
             {
-               HornetQJMSClientLogger.LOGGER.errorRecoveringSession(e2);
+               ActiveMQJMSClientLogger.LOGGER.errorRecoveringSession(e2);
             }
          }
       }
@@ -143,7 +143,7 @@ public class JMSMessageListenerWrapper implements MessageHandler
          }
          catch (ActiveMQException e)
          {
-            HornetQJMSClientLogger.LOGGER.errorProcessingMessage(e);
+            ActiveMQJMSClientLogger.LOGGER.errorProcessingMessage(e);
          }
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java
index 0c9b5cf..3ff6ea4 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java
@@ -17,12 +17,12 @@ import java.util.List;
 
 /**
  *
- * This class converts a JMS selector expression into a HornetQ core filter expression.
+ * This class converts a JMS selector expression into a ActiveMQ core filter expression.
  *
- * JMS selector and HornetQ filters use the same syntax but have different identifiers.
+ * JMS selector and ActiveMQ filters use the same syntax but have different identifiers.
  *
  * We basically just need to replace the JMS header and property Identifier names
- * with the corresponding HornetQ field and header Identifier names.
+ * with the corresponding ActiveMQ field and header Identifier names.
  *
  * We must be careful not to substitute any literals, or identifiers whose name contains the name
  * of one we want to substitute.
@@ -34,7 +34,7 @@ import java.util.List;
  */
 public class SelectorTranslator
 {
-   public static String convertToHornetQFilterString(final String selectorString)
+   public static String convertToActiveMQFilterString(final String selectorString)
    {
       if (selectorString == null)
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java
index ec34209..84937d2 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java
@@ -90,7 +90,7 @@ public class ThreadAwareContext
    {
       if (completionListenerThread == Thread.currentThread())
       {
-         throw HornetQJMSClientBundle.BUNDLE.callingMethodFromCompletionListenerRuntime();
+         throw ActiveMQJMSClientBundle.BUNDLE.callingMethodFromCompletionListenerRuntime();
       }
    }
 
@@ -109,7 +109,7 @@ public class ThreadAwareContext
    {
       if (completionListenerThread == Thread.currentThread())
       {
-         throw HornetQJMSClientBundle.BUNDLE.callingMethodFromCompletionListener();
+         throw ActiveMQJMSClientBundle.BUNDLE.callingMethodFromCompletionListener();
       }
    }
 
@@ -126,7 +126,7 @@ public class ThreadAwareContext
    {
       if (messageListenerThreads.contains(Thread.currentThread().getId()))
       {
-         throw HornetQJMSClientBundle.BUNDLE.callingMethodFromListenerRuntime();
+         throw ActiveMQJMSClientBundle.BUNDLE.callingMethodFromListenerRuntime();
       }
    }
 
@@ -145,7 +145,7 @@ public class ThreadAwareContext
    {
       if (messageListenerThreads.contains(Thread.currentThread().getId()))
       {
-         throw HornetQJMSClientBundle.BUNDLE.callingMethodFromListener();
+         throw ActiveMQJMSClientBundle.BUNDLE.callingMethodFromListener();
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java
index acce764..74fbb39 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java
@@ -14,7 +14,7 @@
  * Implementation of the JMS API.
  * <br>
  * Classes in this package are not meant to be used directly
- * except {@link org.apache.activemq.jms.client.HornetQConnectionFactory} which can be instantiated directly
+ * except {@link org.apache.activemq.jms.client.ActiveMQConnectionFactory} which can be instantiated directly
  * if JMS resources are not looked up in JNDI.
  *
  */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java
index 5b11b24..f717e1f 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java
@@ -23,7 +23,7 @@ import javax.naming.spi.ObjectFactory;
  *
  * A ConnectionFactoryObjectFactory.
  *
- * Given a reference - reconstructs a HornetQRAConnectionFactory
+ * Given a reference - reconstructs a ActiveMQRAConnectionFactory
  *
  * @author <a href="tim.fox@jboss.com">Tim Fox</a>
  * @version $Revision$
@@ -35,7 +35,7 @@ public class ConnectionFactoryObjectFactory implements ObjectFactory
    {
       Reference r = (Reference)ref;
 
-      byte[] bytes = (byte[])r.get("HornetQ-CF").getContent();
+      byte[] bytes = (byte[])r.get("ActiveMQ-CF").getContent();
 
       // Deserialize
       return SerializableObjectRefAddr.deserialize(bytes);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java
index af18fb9..5be2a40 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java
@@ -23,7 +23,7 @@ import javax.naming.spi.ObjectFactory;
  *
  * A DestinationObjectFactory.
  *
- * Given a Reference - reconstructs a HornetQDestination
+ * Given a Reference - reconstructs a ActiveMQDestination
  *
  * @author <a href="tim.fox@jboss.com">Tim Fox</a>
  * @version $Revision$
@@ -35,7 +35,7 @@ public class DestinationObjectFactory implements ObjectFactory
    {
       Reference r = (Reference)ref;
 
-      byte[] bytes = (byte[])r.get("HornetQ-DEST").getContent();
+      byte[] bytes = (byte[])r.get("ActiveMQ-DEST").getContent();
 
       // Deserialize
       return SerializableObjectRefAddr.deserialize(bytes);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java
new file mode 100644
index 0000000..8084f78
--- /dev/null
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java
@@ -0,0 +1,101 @@
+/*
+ * 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.jms.bridge;
+
+import javax.management.ObjectName;
+
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
+
+/**
+ * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
+ *
+ * Logger Code 34
+ *
+ * each message id must be 6 digits long starting with 12, the 3rd digit donates the level so
+ *
+ * INF0  1
+ * WARN  2
+ * DEBUG 3
+ * ERROR 4
+ * TRACE 5
+ * FATAL 6
+ *
+ * so an INFO message would be 341000 to 341999
+ */
+@MessageLogger(projectCode = "AMQ")
+public interface ActiveMQJMSBridgeLogger extends BasicLogger
+{
+   /**
+    * The default logger.
+    */
+   ActiveMQJMSBridgeLogger LOGGER = Logger.getMessageLogger(ActiveMQJMSBridgeLogger.class, ActiveMQJMSBridgeLogger.class.getPackage().getName());
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 341000, value = "Failed to set up JMS bridge connections. Most probably the source or target servers are unavailable." +
+         " Will retry after a pause of {0} ms", format = Message.Format.MESSAGE_FORMAT)
+   void failedToSetUpBridge(long failureRetryInterval);
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 341001, value = "JMS Bridge Succeeded in reconnecting to servers" , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeReconnected();
+
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 341002, value = "Succeeded in connecting to servers" , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeConnected();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342000, value = "Attempt to start JMS Bridge, but is already started" , format = Message.Format.MESSAGE_FORMAT)
+   void errorBridgeAlreadyStarted();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342001, value = "Failed to start JMS Bridge" , format = Message.Format.MESSAGE_FORMAT)
+   void errorStartingBridge();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342002, value = "Failed to unregisted JMS Bridge {0}" , format = Message.Format.MESSAGE_FORMAT)
+   void errorUnregisteringBridge(ObjectName objectName);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342003, value = "JMS Bridge unable to set up connections, bridge will be stopped" , format = Message.Format.MESSAGE_FORMAT)
+   void errorConnectingBridge();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342004, value = "JMS Bridge Will retry after a pause of {0} ms" , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeRetry(long failureRetryInterval);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342005, value = "JMS Bridge unable to set up connections, bridge will not be started" , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeNotStarted();
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342006, value = "Detected failure on bridge connection" , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeFailure(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342009, value = "JMS Bridge failed to send + acknowledge batch, closing JMS objects"  , format = Message.Format.MESSAGE_FORMAT)
+   void bridgeAckError(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.WARN)
+   @Message(id = 342010, value = "Failed to connect JMS Bridge", format = Message.Format.MESSAGE_FORMAT)
+   void bridgeConnectError(@Cause Exception e);
+
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 344001, value = "Failed to start source connection" , format = Message.Format.MESSAGE_FORMAT)
+   void jmsBridgeSrcConnectError(@Cause Exception e);
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java
deleted file mode 100644
index 5b89fce..0000000
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/HornetQJMSBridgeLogger.java
+++ /dev/null
@@ -1,101 +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.jms.bridge;
-
-import javax.management.ObjectName;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
-
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- *
- * Logger Code 34
- *
- * each message id must be 6 digits long starting with 12, the 3rd digit donates the level so
- *
- * INF0  1
- * WARN  2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 341000 to 341999
- */
-@MessageLogger(projectCode = "HQ")
-public interface HornetQJMSBridgeLogger extends BasicLogger
-{
-   /**
-    * The default logger.
-    */
-   HornetQJMSBridgeLogger LOGGER = Logger.getMessageLogger(HornetQJMSBridgeLogger.class, HornetQJMSBridgeLogger.class.getPackage().getName());
-
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 341000, value = "Failed to set up JMS bridge connections. Most probably the source or target servers are unavailable." +
-         " Will retry after a pause of {0} ms", format = Message.Format.MESSAGE_FORMAT)
-   void failedToSetUpBridge(long failureRetryInterval);
-
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 341001, value = "JMS Bridge Succeeded in reconnecting to servers" , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeReconnected();
-
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 341002, value = "Succeeded in connecting to servers" , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeConnected();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342000, value = "Attempt to start JMS Bridge, but is already started" , format = Message.Format.MESSAGE_FORMAT)
-   void errorBridgeAlreadyStarted();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342001, value = "Failed to start JMS Bridge" , format = Message.Format.MESSAGE_FORMAT)
-   void errorStartingBridge();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342002, value = "Failed to unregisted JMS Bridge {0}" , format = Message.Format.MESSAGE_FORMAT)
-   void errorUnregisteringBridge(ObjectName objectName);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342003, value = "JMS Bridge unable to set up connections, bridge will be stopped" , format = Message.Format.MESSAGE_FORMAT)
-   void errorConnectingBridge();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342004, value = "JMS Bridge Will retry after a pause of {0} ms" , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeRetry(long failureRetryInterval);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342005, value = "JMS Bridge unable to set up connections, bridge will not be started" , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeNotStarted();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342006, value = "Detected failure on bridge connection" , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeFailure(@Cause Exception e);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342009, value = "JMS Bridge failed to send + acknowledge batch, closing JMS objects"  , format = Message.Format.MESSAGE_FORMAT)
-   void bridgeAckError(@Cause Exception e);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 342010, value = "Failed to connect JMS Bridge", format = Message.Format.MESSAGE_FORMAT)
-   void bridgeConnectError(@Cause Exception e);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 344001, value = "Failed to start source connection" , format = Message.Format.MESSAGE_FORMAT)
-   void jmsBridgeSrcConnectError(@Cause Exception e);
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java
index 936e61e..13e7c10 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java
@@ -14,13 +14,13 @@ package org.apache.activemq.jms.bridge;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 
 /**
  * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
  */
-public interface JMSBridge extends HornetQComponent
+public interface JMSBridge extends ActiveMQComponent
 {
    void pause() throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java
index 3ed1d61..b116b4f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.jms.bridge;
 
-import org.apache.activemq.api.core.management.HornetQComponentControl;
+import org.apache.activemq.api.core.management.ActiveMQComponentControl;
 
 /**
  * A JMSBridgeControl
@@ -20,7 +20,7 @@ import org.apache.activemq.api.core.management.HornetQComponentControl;
  * @author <a href="jose@voxeo.com">Jose de Castro</a>
  *
  */
-public interface JMSBridgeControl extends HornetQComponentControl
+public interface JMSBridgeControl extends ActiveMQComponentControl
 {
    void pause() throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java
index 188aa05..d07dd78 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java
@@ -38,7 +38,7 @@ package org.apache.activemq.jms.bridge;
  *
  * This QoS mode ensures messages will reach the destination from the source
  * once and only once. (Sometimes this mode is known as "exactly once"). If both
- * the source and the destination are on the same HornetQ server
+ * the source and the destination are on the same ActiveMQ server
  * instance then this can be achieved by sending and acknowledging the messages
  * in the same local transaction. If the source and destination are on different
  * servers this is achieved by enlisting the sending and consuming sessions in a

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
index f04d59b..e30e795 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
@@ -49,18 +49,18 @@ import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.api.core.client.FailoverEventListener;
 import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.api.jms.HornetQJMSConstants;
+import org.apache.activemq.api.jms.ActiveMQJMSConstants;
 import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
 import org.apache.activemq.jms.bridge.DestinationFactory;
-import org.apache.activemq.jms.bridge.HornetQJMSBridgeLogger;
+import org.apache.activemq.jms.bridge.ActiveMQJMSBridgeLogger;
 import org.apache.activemq.jms.bridge.JMSBridge;
 import org.apache.activemq.jms.bridge.JMSBridgeControl;
 import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.client.HornetQConnection;
-import org.apache.activemq.jms.client.HornetQConnectionFactory;
-import org.apache.activemq.jms.client.HornetQMessage;
-import org.apache.activemq.jms.server.HornetQJMSServerBundle;
-import org.apache.activemq.jms.server.recovery.HornetQRegistryBase;
+import org.apache.activemq.jms.client.ActiveMQConnection;
+import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.jms.client.ActiveMQMessage;
+import org.apache.activemq.jms.server.ActiveMQJMSServerBundle;
+import org.apache.activemq.jms.server.recovery.ActiveMQRegistryBase;
 import org.apache.activemq.jms.server.recovery.XARecoveryConfig;
 import org.apache.activemq.utils.ClassloadingUtil;
 import org.apache.activemq.utils.DefaultSensitiveStringCodec;
@@ -78,7 +78,7 @@ public final class JMSBridgeImpl implements JMSBridge
 {
    private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"};
 
-   private static boolean trace = HornetQJMSBridgeLogger.LOGGER.isTraceEnabled();
+   private static boolean trace = ActiveMQJMSBridgeLogger.LOGGER.isTraceEnabled();
 
    private static final int TEN_YEARS = 60 * 60 * 24 * 365 * 10; // in ms
 
@@ -183,7 +183,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
    private static final int FORWARD_MODE_NONTX = 2;
 
-   private HornetQRegistryBase registry;
+   private ActiveMQRegistryBase registry;
 
    /*
     * Constructor for MBean
@@ -349,7 +349,7 @@ public final class JMSBridgeImpl implements JMSBridge
                this.objectName = ObjectName.getInstance(objectName);
                StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class);
                mbeanServer.registerMBean(mbean, this.objectName);
-               HornetQJMSBridgeLogger.LOGGER.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName());
+               ActiveMQJMSBridgeLogger.LOGGER.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName());
             }
             catch (Exception e)
             {
@@ -364,11 +364,11 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Created " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Created " + this);
       }
    }
 
-   // HornetQComponent overrides --------------------------------------------------
+   // ActiveMQComponent overrides --------------------------------------------------
 
    public synchronized void start() throws Exception
    {
@@ -381,13 +381,13 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (started)
       {
-         HornetQJMSBridgeLogger.LOGGER.errorBridgeAlreadyStarted();
+         ActiveMQJMSBridgeLogger.LOGGER.errorBridgeAlreadyStarted();
          return;
       }
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Starting " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Starting " + this);
       }
 
       // bridge has been stopped and is restarted
@@ -429,7 +429,7 @@ public final class JMSBridgeImpl implements JMSBridge
       }
       else
       {
-         HornetQJMSBridgeLogger.LOGGER.errorStartingBridge();
+         ActiveMQJMSBridgeLogger.LOGGER.errorStartingBridge();
          handleFailureOnStartup();
       }
 
@@ -447,7 +447,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Starting time checker thread");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Starting time checker thread");
          }
 
          timeChecker = new BatchTimeChecker();
@@ -457,7 +457,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Started time checker thread");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Started time checker thread");
          }
       }
 
@@ -465,7 +465,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Started " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Started " + this);
       }
    }
 
@@ -494,7 +494,7 @@ public final class JMSBridgeImpl implements JMSBridge
          }
          catch (Exception e)
          {
-            throw HornetQJMSServerBundle.BUNDLE.errorDecodingPassword(e);
+            throw ActiveMQJMSServerBundle.BUNDLE.errorDecodingPassword(e);
          }
 
       }
@@ -512,7 +512,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Stopping " + this);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Stopping " + this);
          }
          if (!connectedSource && sourceConn != null)
          {
@@ -541,7 +541,7 @@ public final class JMSBridgeImpl implements JMSBridge
             // Terminate any transaction
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Rolling back remaining tx");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Rolling back remaining tx");
             }
 
             try
@@ -552,13 +552,13 @@ public final class JMSBridgeImpl implements JMSBridge
             {
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
                }
             }
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Rolled back remaining tx");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Rolled back remaining tx");
             }
          }
 
@@ -570,7 +570,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source conn", ignore);
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close source conn", ignore);
             }
          }
 
@@ -584,14 +584,14 @@ public final class JMSBridgeImpl implements JMSBridge
             {
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target conn", ignore);
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close target conn", ignore);
                }
             }
          }
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Stopped " + this);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Stopped " + this);
          }
       }
    }
@@ -611,7 +611,7 @@ public final class JMSBridgeImpl implements JMSBridge
          }
          catch (Exception e)
          {
-            HornetQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName);
+            ActiveMQJMSBridgeLogger.LOGGER.errorUnregisteringBridge(objectName);
          }
       }
    }
@@ -622,7 +622,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Pausing " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Pausing " + this);
       }
 
       synchronized (lock)
@@ -634,7 +634,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Paused " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Paused " + this);
       }
    }
 
@@ -642,7 +642,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Resuming " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Resuming " + this);
       }
 
       synchronized (lock)
@@ -654,7 +654,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Resumed " + this);
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Resumed " + this);
       }
    }
 
@@ -969,7 +969,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Enlisting resources in tx");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Enlisting resources in tx");
       }
 
       XAResource resSource = ((XASession) sourceSession).getXAResource();
@@ -982,7 +982,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Enlisted resources in tx");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Enlisted resources in tx");
       }
    }
 
@@ -990,7 +990,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Delisting resources from tx");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Delisting resources from tx");
       }
 
       XAResource resSource = ((XASession) sourceSession).getXAResource();
@@ -1003,7 +1003,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist source resource", e);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist source resource", e);
          }
       }
 
@@ -1017,13 +1017,13 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist target resource", e);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist target resource", e);
          }
       }
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Delisted resources from tx");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Delisted resources from tx");
       }
    }
 
@@ -1031,7 +1031,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction");
       }
 
       TransactionManager tm = getTm();
@@ -1051,7 +1051,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Started JTA transaction");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Started JTA transaction");
       }
 
       return tx;
@@ -1094,9 +1094,9 @@ public final class JMSBridgeImpl implements JMSBridge
 
       Object cf = cff.createConnectionFactory();
 
-      if (cf instanceof HornetQConnectionFactory && registry != null)
+      if (cf instanceof ActiveMQConnectionFactory && registry != null)
       {
-         registry.register(XARecoveryConfig.newConfig((HornetQConnectionFactory) cf, username, password));
+         registry.register(XARecoveryConfig.newConfig((ActiveMQConnectionFactory) cf, username, password));
       }
 
       if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE && !(cf instanceof XAConnectionFactory))
@@ -1110,7 +1110,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
             }
             conn = ((XAConnectionFactory) cf).createXAConnection();
          }
@@ -1118,7 +1118,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
             }
             conn = ((ConnectionFactory) cf).createConnection();
          }
@@ -1129,7 +1129,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Creating an XA connection");
             }
             conn = ((XAConnectionFactory) cf).createXAConnection(username, password);
          }
@@ -1137,7 +1137,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Creating a non XA connection");
             }
             conn = ((ConnectionFactory) cf).createConnection(username, password);
          }
@@ -1151,16 +1151,16 @@ public final class JMSBridgeImpl implements JMSBridge
       boolean ha = false;
       BridgeFailoverListener failoverListener = null;
 
-      if (conn instanceof HornetQConnection)
+      if (conn instanceof ActiveMQConnection)
       {
-         HornetQConnectionFactory hornetQCF = (HornetQConnectionFactory) cf;
-         ha = hornetQCF.isHA();
+         ActiveMQConnectionFactory activeMQCF = (ActiveMQConnectionFactory) cf;
+         ha = activeMQCF.isHA();
 
          if (ha)
          {
-            HornetQConnection hornetQConn = (HornetQConnection) conn;
+            ActiveMQConnection activeMQConn = (ActiveMQConnection) conn;
             failoverListener = new BridgeFailoverListener(isSource);
-            hornetQConn.setFailoverListener(failoverListener);
+            activeMQConn.setFailoverListener(failoverListener);
          }
       }
 
@@ -1249,7 +1249,7 @@ public final class JMSBridgeImpl implements JMSBridge
                // Create an XASession for consuming from the source
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Creating XA source session");
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Creating XA source session");
                }
 
                sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, true, true);
@@ -1259,7 +1259,7 @@ public final class JMSBridgeImpl implements JMSBridge
             {
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA source session");
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA source session");
                }
 
                sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff, clientID, false, true);
@@ -1313,7 +1313,7 @@ public final class JMSBridgeImpl implements JMSBridge
             {
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Creating XA dest session");
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Creating XA dest session");
                }
 
                // Create an XA session for sending to the destination
@@ -1326,7 +1326,7 @@ public final class JMSBridgeImpl implements JMSBridge
             {
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session");
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Creating non XA dest session");
                }
 
                // Create a standard session for sending to the target
@@ -1346,7 +1346,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction");
             }
 
             tx = startTx();
@@ -1365,7 +1365,7 @@ public final class JMSBridgeImpl implements JMSBridge
          // If this fails we should attempt to cleanup or we might end up in some weird state
 
          // Adding a log.warn, so the use may see the cause of the failure and take actions
-         HornetQJMSBridgeLogger.LOGGER.bridgeConnectError(e);
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeConnectError(e);
 
          cleanup();
 
@@ -1384,7 +1384,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failed to stop source connection", ignore);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to stop source connection", ignore);
          }
       }
 
@@ -1398,7 +1398,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Failed to delist resources", ignore);
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to delist resources", ignore);
             }
          }
          try
@@ -1410,7 +1410,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to rollback", ignore);
             }
          }
       }
@@ -1424,7 +1424,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failed to close source connection", ignore);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close source connection", ignore);
          }
       }
       try
@@ -1438,7 +1438,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failed to close target connection", ignore);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failed to close target connection", ignore);
          }
       }
    }
@@ -1462,7 +1462,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Setting up connections");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Setting up connections");
       }
 
       int count = 0;
@@ -1483,7 +1483,7 @@ public final class JMSBridgeImpl implements JMSBridge
             break;
          }
 
-         HornetQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval);
+         ActiveMQJMSBridgeLogger.LOGGER.failedToSetUpBridge(failureRetryInterval);
 
          pause(failureRetryInterval);
       }
@@ -1496,7 +1496,7 @@ public final class JMSBridgeImpl implements JMSBridge
    {
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Sending batch of " + messages.size() + " messages");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Sending batch of " + messages.size() + " messages");
       }
 
       if (paused)
@@ -1504,7 +1504,7 @@ public final class JMSBridgeImpl implements JMSBridge
          // Don't send now
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Paused, so not sending now");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Paused, so not sending now");
          }
 
          return;
@@ -1535,14 +1535,14 @@ public final class JMSBridgeImpl implements JMSBridge
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Client acking source session");
             }
 
             messages.getLast().acknowledge();
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Client acked source session");
             }
          }
 
@@ -1557,7 +1557,7 @@ public final class JMSBridgeImpl implements JMSBridge
             }
             catch (TransactionRolledbackException e)
             {
-               HornetQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e);
+               ActiveMQJMSBridgeLogger.LOGGER.warn(e.getMessage() + ", retrying TX", e);
                exHappened = true;
             }
          }
@@ -1569,14 +1569,14 @@ public final class JMSBridgeImpl implements JMSBridge
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Committing target session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Committing target session");
             }
 
             targetSession.commit();
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Committed target session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Committed target session");
             }
          }
 
@@ -1589,14 +1589,14 @@ public final class JMSBridgeImpl implements JMSBridge
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Client acking source session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Client acking source session");
             }
 
             messages.getLast().acknowledge();
 
             if (JMSBridgeImpl.trace)
             {
-               HornetQJMSBridgeLogger.LOGGER.trace("Client acked source session");
+               ActiveMQJMSBridgeLogger.LOGGER.trace("Client acked source session");
             }
          }
       }
@@ -1604,10 +1604,10 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (!stopping)
          {
-            HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e);
+            ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e);
          }
 
-         // We don't call failure otherwise failover would be broken with HornetQ
+         // We don't call failure otherwise failover would be broken with ActiveMQ
          // We let the ExceptionListener to deal with failures
 
          if (connectedSource)
@@ -1641,14 +1641,14 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Committing JTA transaction");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Committing JTA transaction");
          }
 
          tx.commit();
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Committed JTA transaction");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Committed JTA transaction");
          }
       }
       catch (Exception e)
@@ -1662,7 +1662,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
          }
 
-         HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e);
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e);
 
          //we don't do handle failure here because the tx
          //may be rolledback due to failover. All failure handling
@@ -1683,7 +1683,7 @@ public final class JMSBridgeImpl implements JMSBridge
          }
          catch (Exception e)
          {
-            HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e);
+            ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e);
 
             handleFailureOnSend();
          }
@@ -1698,20 +1698,20 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Committing source session");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Committing source session");
          }
 
          sourceSession.commit();
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Committed source session");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Committed source session");
          }
 
       }
       catch (Exception e)
       {
-         HornetQJMSBridgeLogger.LOGGER.bridgeAckError(e);
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeAckError(e);
 
          try
          {
@@ -1753,7 +1753,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Sending message " + msg);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Sending message " + msg);
          }
 
          // Make sure the correct time to live gets propagated
@@ -1774,7 +1774,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Sent message " + msg);
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Sent message " + msg);
          }
       }
    }
@@ -1810,14 +1810,14 @@ public final class JMSBridgeImpl implements JMSBridge
       // distributed request/response
       if (JMSBridgeImpl.trace)
       {
-         HornetQJMSBridgeLogger.LOGGER.trace("Adding old message id in Message header");
+         ActiveMQJMSBridgeLogger.LOGGER.trace("Adding old message id in Message header");
       }
 
       JMSBridgeImpl.copyProperties(msg);
 
       String val = null;
 
-      val = msg.getStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
+      val = msg.getStringProperty(ActiveMQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST);
 
       if (val == null)
       {
@@ -1832,7 +1832,7 @@ public final class JMSBridgeImpl implements JMSBridge
          val = sb.toString();
       }
 
-      msg.setStringProperty(HornetQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val);
+      msg.setStringProperty(ActiveMQJMSConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val);
    }
 
    /*
@@ -1875,12 +1875,12 @@ public final class JMSBridgeImpl implements JMSBridge
 
             if (val instanceof byte[] == false)
             {
-               //Can't set byte[] array props through the JMS API - if we're bridging a HornetQ message it might have such props
+               //Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ message it might have such props
                msg.setObjectProperty(propName, entry.getValue());
             }
-            else if (msg instanceof HornetQMessage)
+            else if (msg instanceof ActiveMQMessage)
             {
-               ((HornetQMessage) msg).getCoreMessage().putBytesProperty(propName, (byte[]) val);
+               ((ActiveMQMessage) msg).getCoreMessage().putBytesProperty(propName, (byte[]) val);
             }
          }
       }
@@ -1942,18 +1942,18 @@ public final class JMSBridgeImpl implements JMSBridge
                {
                   msg = sourceConsumer.receive(1000);
 
-                  if (msg instanceof HornetQMessage)
+                  if (msg instanceof ActiveMQMessage)
                   {
                      // We need to check the buffer mainly in the case of LargeMessages
                      // As we need to reconstruct the buffer before resending the message
-                     ((HornetQMessage) msg).checkBuffer();
+                     ((ActiveMQMessage) msg).checkBuffer();
                   }
                }
                catch (JMSException jmse)
                {
                   if (JMSBridgeImpl.trace)
                   {
-                     HornetQJMSBridgeLogger.LOGGER.trace(this + " exception while receiving a message", jmse);
+                     ActiveMQJMSBridgeLogger.LOGGER.trace(this + " exception while receiving a message", jmse);
                   }
                }
 
@@ -1967,7 +1967,7 @@ public final class JMSBridgeImpl implements JMSBridge
                   {
                      if (JMSBridgeImpl.trace)
                      {
-                        HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
+                        ActiveMQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
                      }
                      if (stopping)
                      {
@@ -1980,7 +1980,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace(this + " received message " + msg);
+                  ActiveMQJMSBridgeLogger.LOGGER.trace(this + " received message " + msg);
                }
 
                messages.add(msg);
@@ -1989,21 +1989,21 @@ public final class JMSBridgeImpl implements JMSBridge
 
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime);
+                  ActiveMQJMSBridgeLogger.LOGGER.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime);
                }
 
                if (maxBatchSize != -1 && messages.size() >= maxBatchSize)
                {
                   if (JMSBridgeImpl.trace)
                   {
-                     HornetQJMSBridgeLogger.LOGGER.trace(this + " maxBatchSize has been reached so sending batch");
+                     ActiveMQJMSBridgeLogger.LOGGER.trace(this + " maxBatchSize has been reached so sending batch");
                   }
 
                   sendBatch();
 
                   if (JMSBridgeImpl.trace)
                   {
-                     HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch");
+                     ActiveMQJMSBridgeLogger.LOGGER.trace(this + " sent batch");
                   }
                }
             }
@@ -2025,13 +2025,13 @@ public final class JMSBridgeImpl implements JMSBridge
          }
          catch (JMSException e)
          {
-            HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e);
+            ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e);
          }
       }
 
       protected void succeeded()
       {
-         HornetQJMSBridgeLogger.LOGGER.bridgeReconnected();
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeReconnected();
          connectedSource = true;
          connectedTarget = true;
          synchronized (lock)
@@ -2045,7 +2045,7 @@ public final class JMSBridgeImpl implements JMSBridge
       protected void failed()
       {
          // We haven't managed to recreate connections or maxRetries = 0
-         HornetQJMSBridgeLogger.LOGGER.errorConnectingBridge();
+         ActiveMQJMSBridgeLogger.LOGGER.errorConnectingBridge();
 
          try
          {
@@ -2060,7 +2060,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace("Failure handler running");
+            ActiveMQJMSBridgeLogger.LOGGER.trace("Failure handler running");
          }
 
          // Clear the messages
@@ -2072,7 +2072,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (maxRetries > 0 || maxRetries == -1)
          {
-            HornetQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval);
+            ActiveMQJMSBridgeLogger.LOGGER.bridgeRetry(failureRetryInterval);
 
             pause(failureRetryInterval);
 
@@ -2097,14 +2097,14 @@ public final class JMSBridgeImpl implements JMSBridge
       protected void failed()
       {
          // Don't call super
-         HornetQJMSBridgeLogger.LOGGER.bridgeNotStarted();
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeNotStarted();
       }
 
       @Override
       protected void succeeded()
       {
          // Don't call super - a bit ugly in this case but better than taking the lock twice.
-         HornetQJMSBridgeLogger.LOGGER.bridgeConnected();
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeConnected();
 
          synchronized (lock)
          {
@@ -2123,7 +2123,7 @@ public final class JMSBridgeImpl implements JMSBridge
             }
             catch (JMSException e)
             {
-               HornetQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e);
+               ActiveMQJMSBridgeLogger.LOGGER.jmsBridgeSrcConnectError(e);
             }
          }
       }
@@ -2135,7 +2135,7 @@ public final class JMSBridgeImpl implements JMSBridge
       {
          if (JMSBridgeImpl.trace)
          {
-            HornetQJMSBridgeLogger.LOGGER.trace(this + " running");
+            ActiveMQJMSBridgeLogger.LOGGER.trace(this + " running");
          }
 
          synchronized (lock)
@@ -2148,7 +2148,7 @@ public final class JMSBridgeImpl implements JMSBridge
                {
                   if (JMSBridgeImpl.trace)
                   {
-                     HornetQJMSBridgeLogger.LOGGER.trace(this + " waited enough");
+                     ActiveMQJMSBridgeLogger.LOGGER.trace(this + " waited enough");
                   }
 
                   synchronized (lock)
@@ -2157,14 +2157,14 @@ public final class JMSBridgeImpl implements JMSBridge
                      {
                         if (JMSBridgeImpl.trace)
                         {
-                           HornetQJMSBridgeLogger.LOGGER.trace(this + " got some messages so sending batch");
+                           ActiveMQJMSBridgeLogger.LOGGER.trace(this + " got some messages so sending batch");
                         }
 
                         sendBatch();
 
                         if (JMSBridgeImpl.trace)
                         {
-                           HornetQJMSBridgeLogger.LOGGER.trace(this + " sent batch");
+                           ActiveMQJMSBridgeLogger.LOGGER.trace(this + " sent batch");
                         }
                      }
                   }
@@ -2177,21 +2177,21 @@ public final class JMSBridgeImpl implements JMSBridge
                   {
                      if (JMSBridgeImpl.trace)
                      {
-                        HornetQJMSBridgeLogger.LOGGER.trace(this + " waiting for " + toWait);
+                        ActiveMQJMSBridgeLogger.LOGGER.trace(this + " waiting for " + toWait);
                      }
 
                      lock.wait(toWait);
 
                      if (JMSBridgeImpl.trace)
                      {
-                        HornetQJMSBridgeLogger.LOGGER.trace(this + " woke up");
+                        ActiveMQJMSBridgeLogger.LOGGER.trace(this + " woke up");
                      }
                   }
                   catch (InterruptedException e)
                   {
                      if (JMSBridgeImpl.trace)
                      {
-                        HornetQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
+                        ActiveMQJMSBridgeLogger.LOGGER.trace(this + " thread was interrupted");
                      }
                      if (stopping)
                      {
@@ -2225,7 +2225,7 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             return;
          }
-         HornetQJMSBridgeLogger.LOGGER.bridgeFailure(e);
+         ActiveMQJMSBridgeLogger.LOGGER.bridgeFailure(e);
          if (isSource)
          {
             connectedSource = false;
@@ -2246,7 +2246,7 @@ public final class JMSBridgeImpl implements JMSBridge
                // The failure has already been detected and is being handled
                if (JMSBridgeImpl.trace)
                {
-                  HornetQJMSBridgeLogger.LOGGER.trace("Failure recovery already in progress");
+                  ActiveMQJMSBridgeLogger.LOGGER.trace("Failure recovery already in progress");
                }
             }
             else
@@ -2276,11 +2276,11 @@ public final class JMSBridgeImpl implements JMSBridge
          {
             try
             {
-               registry = (HornetQRegistryBase) safeInitNewInstance(locatorClasse);
+               registry = (ActiveMQRegistryBase) safeInitNewInstance(locatorClasse);
             }
             catch (Throwable e)
             {
-               HornetQJMSBridgeLogger.LOGGER.debug("unable to load  recovery registry " + locatorClasse, e);
+               ActiveMQJMSBridgeLogger.LOGGER.debug("unable to load  recovery registry " + locatorClasse, e);
             }
             if (registry != null)
             {
@@ -2290,7 +2290,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
          if (registry != null)
          {
-            HornetQJMSBridgeLogger.LOGGER.debug("Recovery Registry located = " + registry);
+            ActiveMQJMSBridgeLogger.LOGGER.debug("Recovery Registry located = " + registry);
          }
       }
    }
@@ -2400,7 +2400,7 @@ public final class JMSBridgeImpl implements JMSBridge
          if (timedOut)
          {
             //timeout, presumably failover failed.
-            HornetQJMSBridgeLogger.LOGGER.debug("Timed out waiting for failover completion " + this);
+            ActiveMQJMSBridgeLogger.LOGGER.debug("Timed out waiting for failover completion " + this);
             return false;
          }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
index 2a38b7e..1d9b13f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
@@ -21,7 +21,7 @@ import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.management.Parameter;
 import org.apache.activemq.api.jms.management.ConnectionFactoryControl;
 import org.apache.activemq.core.management.impl.MBeanInfoHelper;
-import org.apache.activemq.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.jms.server.JMSServerManager;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 
@@ -36,7 +36,7 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
 
    private final ConnectionFactoryConfiguration cfConfig;
 
-   private HornetQConnectionFactory cf;
+   private ActiveMQConnectionFactory cf;
 
    private final String name;
 
@@ -47,7 +47,7 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
    // Constructors --------------------------------------------------
 
    public JMSConnectionFactoryControlImpl(final ConnectionFactoryConfiguration cfConfig,
-                                          final HornetQConnectionFactory cf,
+                                          final ActiveMQConnectionFactory cf,
                                           final JMSServerManager jmsManager,
                                           final String name) throws NotCompliantMBeanException
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
index 36394ed..1dc4d6d 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
@@ -25,8 +25,8 @@ import org.apache.activemq.api.jms.management.JMSQueueControl;
 import org.apache.activemq.core.management.impl.MBeanInfoHelper;
 import org.apache.activemq.core.messagecounter.MessageCounter;
 import org.apache.activemq.core.messagecounter.impl.MessageCounterHelper;
-import org.apache.activemq.jms.client.HornetQDestination;
-import org.apache.activemq.jms.client.HornetQMessage;
+import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.jms.client.ActiveMQMessage;
 import org.apache.activemq.jms.client.SelectorTranslator;
 import org.apache.activemq.jms.server.JMSServerManager;
 import org.apache.activemq.utils.json.JSONArray;
@@ -37,7 +37,7 @@ import org.apache.activemq.utils.json.JSONObject;
  */
 public class JMSQueueControlImpl extends StandardMBean implements JMSQueueControl
 {
-   private final HornetQDestination managedQueue;
+   private final ActiveMQDestination managedQueue;
 
    private final JMSServerManager jmsServerManager;
 
@@ -53,12 +53,12 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
    public static String createFilterFromJMSSelector(final String selectorStr) throws ActiveMQException
    {
       return selectorStr == null || selectorStr.trim().length() == 0 ? null
-         : SelectorTranslator.convertToHornetQFilterString(selectorStr);
+         : SelectorTranslator.convertToActiveMQFilterString(selectorStr);
    }
 
    private static String createFilterForJMSMessageID(final String jmsMessageID) throws Exception
    {
-      return FilterConstants.HORNETQ_USERID + " = '" + jmsMessageID + "'";
+      return FilterConstants.ACTIVEMQ_USERID + " = '" + jmsMessageID + "'";
    }
 
    static String toJSON(final Map<String, Object>[] messages)
@@ -73,7 +73,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
 
    // Constructors --------------------------------------------------
 
-   public JMSQueueControlImpl(final HornetQDestination managedQueue,
+   public JMSQueueControlImpl(final ActiveMQDestination managedQueue,
                               final QueueControl coreQueueControl,
                               final JMSServerManager jmsServerManager,
                               final MessageCounter counter) throws Exception
@@ -200,7 +200,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
 
          for (Map<String, Object> coreMessage : coreMessages)
          {
-            Map<String, Object> jmsMessage = HornetQMessage.coreMaptoJMSMap(coreMessage);
+            Map<String, Object> jmsMessage = ActiveMQMessage.coreMaptoJMSMap(coreMessage);
             jmsMessages[i++] = jmsMessage;
          }
          return jmsMessages;
@@ -281,7 +281,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
    public boolean moveMessage(final String messageID, final String otherQueueName, final boolean rejectDuplicates) throws Exception
    {
       String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID);
-      HornetQDestination otherQueue = HornetQDestination.createQueue(otherQueueName);
+      ActiveMQDestination otherQueue = ActiveMQDestination.createQueue(otherQueueName);
       int moved = coreQueueControl.moveMessages(filter, otherQueue.getAddress(), rejectDuplicates);
       if (moved != 1)
       {
@@ -294,7 +294,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
    public int moveMessages(final String filterStr, final String otherQueueName, final boolean rejectDuplicates) throws Exception
    {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
-      HornetQDestination otherQueue = HornetQDestination.createQueue(otherQueueName);
+      ActiveMQDestination otherQueue = ActiveMQDestination.createQueue(otherQueueName);
       return coreQueueControl.moveMessages(filter, otherQueue.getAddress(), rejectDuplicates);
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
index f7f0ef8..6f745d6 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
@@ -41,8 +41,8 @@ import org.apache.activemq.core.management.impl.AbstractControl;
 import org.apache.activemq.core.management.impl.MBeanInfoHelper;
 import org.apache.activemq.core.server.ServerConsumer;
 import org.apache.activemq.core.server.ServerSession;
-import org.apache.activemq.jms.client.HornetQDestination;
-import org.apache.activemq.jms.server.HornetQJMSServerLogger;
+import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.jms.server.ActiveMQJMSServerLogger;
 import org.apache.activemq.jms.server.JMSServerManager;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
@@ -101,29 +101,29 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
    private static String[] determineJMSDestination(String coreAddress)
    {
       String[] result = new String[2]; // destination name & type
-      if (coreAddress.startsWith(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX))
+      if (coreAddress.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX))
       {
-         result[0] = coreAddress.substring(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX.length());
+         result[0] = coreAddress.substring(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX.length());
          result[1] = "queue";
       }
-      else if (coreAddress.startsWith(HornetQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX))
+      else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX))
       {
-         result[0] = coreAddress.substring(HornetQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length());
+         result[0] = coreAddress.substring(ActiveMQDestination.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length());
          result[1] = "tempqueue";
       }
-      else if (coreAddress.startsWith(HornetQDestination.JMS_TOPIC_ADDRESS_PREFIX))
+      else if (coreAddress.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX))
       {
-         result[0] = coreAddress.substring(HornetQDestination.JMS_TOPIC_ADDRESS_PREFIX.length());
+         result[0] = coreAddress.substring(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX.length());
          result[1] = "topic";
       }
-      else if (coreAddress.startsWith(HornetQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX))
+      else if (coreAddress.startsWith(ActiveMQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX))
       {
-         result[0] = coreAddress.substring(HornetQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length());
+         result[0] = coreAddress.substring(ActiveMQDestination.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length());
          result[1] = "temptopic";
       }
       else
       {
-         HornetQJMSServerLogger.LOGGER.debug("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
+         ActiveMQJMSServerLogger.LOGGER.debug("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
          // not related to JMS
          return null;
       }
@@ -147,10 +147,10 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    public JMSServerControlImpl(final JMSServerManager server) throws Exception
    {
-      super(JMSServerControl.class, server.getHornetQServer().getStorageManager());
+      super(JMSServerControl.class, server.getActiveMQServer().getStorageManager());
       this.server = server;
       broadcaster = new NotificationBroadcasterSupport();
-      server.getHornetQServer().getManagementService().addNotificationListener(this);
+      server.getActiveMQServer().getManagementService().addNotificationListener(this);
    }
 
    // Public --------------------------------------------------------
@@ -536,7 +536,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
       try
       {
-         Object[] queueControls = server.getHornetQServer().getManagementService().getResources(JMSQueueControl.class);
+         Object[] queueControls = server.getActiveMQServer().getManagementService().getResources(JMSQueueControl.class);
          String[] names = new String[queueControls.length];
          for (int i = 0; i < queueControls.length; i++)
          {
@@ -559,7 +559,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
       try
       {
-         Object[] topicControls = server.getHornetQServer().getManagementService().getResources(TopicControl.class);
+         Object[] topicControls = server.getActiveMQServer().getManagementService().getResources(TopicControl.class);
          String[] names = new String[topicControls.length];
          for (int i = 0; i < topicControls.length; i++)
          {
@@ -582,7 +582,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
       try
       {
-         Object[] cfControls = server.getHornetQServer()
+         Object[] cfControls = server.getActiveMQServer()
             .getManagementService()
             .getResources(ConnectionFactoryControl.class);
          String[] names = new String[cfControls.length];
@@ -731,9 +731,9 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       {
          JSONArray array = new JSONArray();
 
-         Set<RemotingConnection> connections = server.getHornetQServer().getRemotingService().getConnections();
+         Set<RemotingConnection> connections = server.getActiveMQServer().getRemotingService().getConnections();
 
-         Set<ServerSession> sessions = server.getHornetQServer().getSessions();
+         Set<ServerSession> sessions = server.getActiveMQServer().getSessions();
 
          Map<Object, ServerSession> jmsSessions = new HashMap<Object, ServerSession>();
 
@@ -777,12 +777,12 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       {
          JSONArray array = new JSONArray();
 
-         Set<RemotingConnection> connections = server.getHornetQServer().getRemotingService().getConnections();
+         Set<RemotingConnection> connections = server.getActiveMQServer().getRemotingService().getConnections();
          for (RemotingConnection connection : connections)
          {
             if (connectionID.equals(connection.getID().toString()))
             {
-               List<ServerSession> sessions = server.getHornetQServer().getSessions(connectionID);
+               List<ServerSession> sessions = server.getActiveMQServer().getSessions(connectionID);
                for (ServerSession session : sessions)
                {
                   Set<ServerConsumer> consumers = session.getServerConsumers();
@@ -815,7 +815,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       {
          JSONArray array = new JSONArray();
 
-         Set<ServerSession> sessions = server.getHornetQServer().getSessions();
+         Set<ServerSession> sessions = server.getActiveMQServer().getSessions();
          for (ServerSession session : sessions)
          {
             Set<ServerConsumer> consumers = session.getServerConsumers();
@@ -902,7 +902,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
    {
       if (!server.isStarted())
       {
-         throw new IllegalStateException("HornetQ JMS Server is not started. it can not be managed yet");
+         throw new IllegalStateException("ActiveMQ JMS Server is not started. it can not be managed yet");
       }
    }
 
@@ -910,17 +910,17 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    public String[] listTargetDestinations(String sessionID) throws Exception
    {
-      String[] addresses = server.getHornetQServer().getHornetQServerControl().listTargetAddresses(sessionID);
+      String[] addresses = server.getActiveMQServer().getActiveMQServerControl().listTargetAddresses(sessionID);
       Map<String, DestinationControl> allDests = new HashMap<String, DestinationControl>();
 
-      Object[] queueControls = server.getHornetQServer().getManagementService().getResources(JMSQueueControl.class);
+      Object[] queueControls = server.getActiveMQServer().getManagementService().getResources(JMSQueueControl.class);
       for (Object queueControl2 : queueControls)
       {
          JMSQueueControl queueControl = (JMSQueueControl) queueControl2;
          allDests.put(queueControl.getAddress(), queueControl);
       }
 
-      Object[] topicControls = server.getHornetQServer().getManagementService().getResources(TopicControl.class);
+      Object[] topicControls = server.getActiveMQServer().getManagementService().getResources(TopicControl.class);
       for (Object topicControl2 : topicControls)
       {
          TopicControl topicControl = (TopicControl) topicControl2;
@@ -941,7 +941,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    public String getLastSentMessageID(String sessionID, String address) throws Exception
    {
-      ServerSession session = server.getHornetQServer().getSessionByID(sessionID);
+      ServerSession session = server.getActiveMQServer().getSessionByID(sessionID);
       if (session != null)
       {
          return session.getLastSentMessageID(address);
@@ -951,7 +951,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    public String getSessionCreationTime(String sessionID) throws Exception
    {
-      ServerSession session = server.getHornetQServer().getSessionByID(sessionID);
+      ServerSession session = server.getActiveMQServer().getSessionByID(sessionID);
       if (session != null)
       {
          return String.valueOf(session.getCreationTime());
@@ -968,7 +968,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       JSONArray array = new JSONArray();
       try
       {
-         List<ServerSession> sessions = server.getHornetQServer().getSessions(connectionID);
+         List<ServerSession> sessions = server.getActiveMQServer().getSessions(connectionID);
          for (ServerSession sess : sessions)
          {
             JSONObject obj = new JSONObject();
@@ -986,7 +986,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    public String closeConnectionWithClientID(final String clientID) throws Exception
    {
-      return server.getHornetQServer().destroyConnectionWithSessionMetadata("jms-client-id", clientID);
+      return server.getActiveMQServer().destroyConnectionWithSessionMetadata("jms-client-id", clientID);
    }
 
    private JSONObject toJSONObject(ServerConsumer consumer) throws Exception
@@ -1015,7 +1015,9 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       {
          try
          {
-            HornetQDestination.decomposeQueueNameForDurableSubscription(consumer.getQueue().getName().toString());
+            ActiveMQDestination.decomposeQueueNameForDurableSubscription(consumer.getQueue()
+                                                                            .getName()
+                                                                            .toString());
             obj.put("durable", true);
          }
          catch (IllegalArgumentException e)


Mime
View raw message