activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [12/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Date Tue, 18 Nov 2014 23:38:05 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
index e0eb4e5..8efdb78 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
@@ -27,7 +27,7 @@ import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
 import org.apache.activemq.core.settings.impl.AddressSettings;
 
 /**
- * A Configuration is used to configure HornetQ servers.
+ * A Configuration is used to configure ActiveMQ servers.
  *
  * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  */
@@ -225,7 +225,7 @@ public interface Configuration extends Serializable
    /**
     * Sets the domain used by JMX MBeans (provided JMX management is enabled).
     * <p/>
-    * Changing this JMX domain is required if multiple HornetQ servers are run inside
+    * Changing this JMX domain is required if multiple ActiveMQ servers are run inside
     * the same JVM and all servers are using the same MBeanServer.
     */
    Configuration setJMXDomain(String domain);
@@ -234,7 +234,7 @@ public interface Configuration extends Serializable
     * Returns the list of interceptors classes used by this server for incoming messages
(i.e. those being delivered to
     * the server from clients).  Invoking this method is the same as invoking <code>getIncomingInterceptorClassNames().</code>
     *
-    * @deprecated As of HornetQ 2.3.0.Final, replaced by
+    * @deprecated As of ActiveMQ 2.3.0.Final, replaced by
     * {@link #getIncomingInterceptorClassNames()} and
     * {@link #getOutgoingInterceptorClassNames()}
     */
@@ -261,7 +261,7 @@ public interface Configuration extends Serializable
     * <p/>
     * Deprecated but not immediately deleted, as embedded users may be using this file.
     *
-    * @deprecated As of HornetQ 2.3.0.Final, replaced by
+    * @deprecated As of ActiveMQ 2.3.0.Final, replaced by
     * {@link #setIncomingInterceptorClassNames(List)} and
     * {@link #setOutgoingInterceptorClassNames(List)}
     */
@@ -990,14 +990,14 @@ public interface Configuration extends Serializable
    String getReplicationClustername();
 
    /*
-   * Whether or not that HornetQ should use all protocols available on the classpath. If
false only the core protocol will
-   * be set, any other protocols will need to be set directly on the HornetQServer
+   * Whether or not that ActiveMQ should use all protocols available on the classpath. If
false only the core protocol will
+   * be set, any other protocols will need to be set directly on the ActiveMQServer
    * */
    Configuration setResolveProtocols(boolean resolveProtocols);
 
    /*
    * @see #setResolveProtocols()
-   * @return whether HornetQ should resolve and use any Protocols available on the classpath
+   * @return whether ActiveMQ should resolve and use any Protocols available on the classpath
    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}.
    * */
    boolean isResolveProtocols();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
index 056211d..ded1890 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
@@ -19,7 +19,7 @@ import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
 import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
 import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
 import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQMessageBundle;
 import org.apache.activemq.core.server.cluster.ha.BackupPolicy;
 import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy;
 import org.apache.activemq.core.server.cluster.ha.HAPolicy;
@@ -119,7 +119,7 @@ public final class ConfigurationUtils
          }
 
       }
-      throw HornetQMessageBundle.BUNDLE.unsupportedHAPolicyConfiguration(conf);
+      throw ActiveMQMessageBundle.BUNDLE.unsupportedHAPolicyConfiguration(conf);
    }
 
    public static ScaleDownPolicy getScaleDownPolicy(ScaleDownConfiguration scaleDownConfiguration)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
index adb971f..bcab5ec 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
@@ -1069,7 +1069,7 @@ public class ConfigurationImpl implements Configuration
    @Override
    public String toString()
    {
-      StringBuilder sb = new StringBuilder("HornetQ Configuration (");
+      StringBuilder sb = new StringBuilder("ActiveMQ Configuration (");
       sb.append("clustered=").append(isClustered()).append(",");
       sb.append("journalDirectory=").append(journalDirectory).append(",");
       sb.append("bindingsDirectory=").append(bindingsDirectory).append(",");

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
index 86ec8c8..92986dc 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java
@@ -17,7 +17,7 @@ import java.io.Reader;
 import java.net.URL;
 
 import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.utils.XMLUtil;
 import org.w3c.dom.Element;
 
@@ -67,7 +67,7 @@ public final class FileConfiguration extends ConfigurationImpl
          url = new URL(configurationUrl);
       }
 
-      HornetQServerLogger.LOGGER.debug("Loading server configuration from " + url);
+      ActiveMQServerLogger.LOGGER.debug("Loading server configuration from " + url);
 
       Reader reader = new InputStreamReader(url.openStream());
       String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader);
@@ -78,7 +78,7 @@ public final class FileConfiguration extends ConfigurationImpl
 
       // https://jira.jboss.org/browse/HORNETQ-478 - We only want to validate AIO when
       //     starting the server
-      //     and we don't want to do it when deploying hornetq-queues.xml which uses the
same parser and XML format
+      //     and we don't want to do it when deploying activemq-queues.xml which uses the
same parser and XML format
       parser.setValidateAIO(true);
 
       parser.parseMainConfig(e, this);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java
b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java
index 9a760b4..bf40f4e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.config.impl;
 
-import org.apache.activemq.core.server.HornetQMessageBundle;
+import org.apache.activemq.core.server.ActiveMQMessageBundle;
 import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.SlowConsumerPolicy;
@@ -44,7 +44,7 @@ public final class Validators
          String str = (String) value;
          if (str == null || str.length() == 0)
          {
-            throw HornetQMessageBundle.BUNDLE.emptyOrNull(name);
+            throw ActiveMQMessageBundle.BUNDLE.emptyOrNull(name);
          }
       }
    };
@@ -60,7 +60,7 @@ public final class Validators
          }
          else
          {
-            throw HornetQMessageBundle.BUNDLE.greaterThanZero(name, val);
+            throw ActiveMQMessageBundle.BUNDLE.greaterThanZero(name, val);
          }
       }
    };
@@ -72,7 +72,7 @@ public final class Validators
          Number val = (Number) value;
          if (val == null || (val.intValue() < 0 || val.intValue() > 100))
          {
-            throw HornetQMessageBundle.BUNDLE.notPercent(name, val);
+            throw ActiveMQMessageBundle.BUNDLE.notPercent(name, val);
          }
       }
    };
@@ -88,7 +88,7 @@ public final class Validators
          }
          else
          {
-            throw HornetQMessageBundle.BUNDLE.greaterThanZero(name, val);
+            throw ActiveMQMessageBundle.BUNDLE.greaterThanZero(name, val);
          }
       }
    };
@@ -104,7 +104,7 @@ public final class Validators
          }
          else
          {
-            throw HornetQMessageBundle.BUNDLE.greaterThanMinusOne(name, val);
+            throw ActiveMQMessageBundle.BUNDLE.greaterThanMinusOne(name, val);
          }
       }
    };
@@ -120,7 +120,7 @@ public final class Validators
          }
          else
          {
-            throw HornetQMessageBundle.BUNDLE.greaterThanZeroOrMinusOne(name, val);
+            throw ActiveMQMessageBundle.BUNDLE.greaterThanZeroOrMinusOne(name, val);
          }
       }
    };
@@ -136,7 +136,7 @@ public final class Validators
          }
          else
          {
-            throw HornetQMessageBundle.BUNDLE.mustbeBetween(name, Thread.MIN_PRIORITY, Thread.MAX_PRIORITY,
value);
+            throw ActiveMQMessageBundle.BUNDLE.mustbeBetween(name, Thread.MIN_PRIORITY, Thread.MAX_PRIORITY,
value);
          }
       }
    };
@@ -148,7 +148,7 @@ public final class Validators
          String val = (String) value;
          if (val == null || !val.equals(JournalType.NIO.toString()) && !val.equals(JournalType.ASYNCIO.toString()))
          {
-            throw HornetQMessageBundle.BUNDLE.invalidJournalType(val);
+            throw ActiveMQMessageBundle.BUNDLE.invalidJournalType(val);
          }
       }
    };
@@ -163,7 +163,7 @@ public final class Validators
                !val.equals(AddressFullMessagePolicy.BLOCK.toString()) &&
                !val.equals(AddressFullMessagePolicy.FAIL.toString()))
          {
-            throw HornetQMessageBundle.BUNDLE.invalidAddressFullPolicyType(val);
+            throw ActiveMQMessageBundle.BUNDLE.invalidAddressFullPolicyType(val);
          }
       }
    };
@@ -176,7 +176,7 @@ public final class Validators
          if (val == null || !val.equals(SlowConsumerPolicy.KILL.toString()) &&
             !val.equals(SlowConsumerPolicy.NOTIFY.toString()))
          {
-            throw HornetQMessageBundle.BUNDLE.invalidSlowConsumerPolicyType(val);
+            throw ActiveMQMessageBundle.BUNDLE.invalidSlowConsumerPolicyType(val);
          }
       }
    };

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java
index 3b585af..1329486 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java
@@ -14,14 +14,14 @@ package org.apache.activemq.core.deployers;
 
 import java.net.URI;
 
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 
 /**
  * abstract class that helps with deployment of messaging components.
  *
  * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
-public interface Deployer extends HornetQComponent
+public interface Deployer extends ActiveMQComponent
 {
    /**
     * The name of the configuration files to look for for deployment

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java
index d39d2e4..430122b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java
@@ -12,14 +12,14 @@
  */
 package org.apache.activemq.core.deployers;
 
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
 
 /**
  * This class manages any configuration files available. It will notify any deployers registered
with it on changes.
  *
  * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
-public interface DeploymentManager extends HornetQComponent
+public interface DeploymentManager extends ActiveMQComponent
 {
    /**
     * registers a deployable object which will handle the deployment of URL's

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
index c72f90d..4bd0d12 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
@@ -13,20 +13,20 @@
 package org.apache.activemq.core.deployers.impl;
 
 import org.apache.activemq.core.deployers.DeploymentManager;
-import org.apache.activemq.spi.core.security.HornetQSecurityManager;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
 import org.apache.activemq.utils.PasswordMaskingUtil;
 import org.apache.activemq.utils.SensitiveDataCodec;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- * deployer for adding security loaded from the file "hornetq-users.xml"
+ * deployer for adding security loaded from the file "activemq-users.xml"
  *
  * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
 public class BasicUserCredentialsDeployer extends XmlDeployer
 {
-   private final HornetQSecurityManager hornetQSecurityManager;
+   private final ActiveMQSecurityManager activeMQSecurityManager;
 
    private static final String PASSWORD_ATTRIBUTE = "password";
 
@@ -47,11 +47,11 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
    private SensitiveDataCodec<String> passwordCodec;
 
    public BasicUserCredentialsDeployer(final DeploymentManager deploymentManager,
-                                       final HornetQSecurityManager hornetQSecurityManager)
+                                       final ActiveMQSecurityManager activeMQSecurityManager)
    {
       super(deploymentManager);
 
-      this.hornetQSecurityManager = hornetQSecurityManager;
+      this.activeMQSecurityManager = activeMQSecurityManager;
    }
 
    @Override
@@ -109,11 +109,11 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
       }
 
       // add the user
-      hornetQSecurityManager.addUser(username, password);
+      activeMQSecurityManager.addUser(username, password);
 
       if (BasicUserCredentialsDeployer.DEFAULT_USER.equalsIgnoreCase(nodeName))
       {
-         hornetQSecurityManager.setDefaultUser(username);
+         activeMQSecurityManager.setDefaultUser(username);
       }
       NodeList children = node.getChildNodes();
       for (int i = 0; i < children.getLength(); i++)
@@ -125,7 +125,7 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
             String role = child.getAttributes()
                .getNamedItem(BasicUserCredentialsDeployer.ROLE_ATTR_NAME)
                .getNodeValue();
-            hornetQSecurityManager.addRole(username, role);
+            activeMQSecurityManager.addRole(username, role);
          }
       }
    }
@@ -134,7 +134,7 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
    public void undeploy(final Node node) throws Exception
    {
       String username = node.getAttributes().getNamedItem("name").getNodeValue();
-      hornetQSecurityManager.removeUser(username);
+      activeMQSecurityManager.removeUser(username);
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
index 739bd4d..b78ce3e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
@@ -31,7 +31,7 @@ import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration;
-import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ActiveMQClient;
 import org.apache.activemq.core.config.BridgeConfiguration;
 import org.apache.activemq.core.config.ClusterConnectionConfiguration;
 import org.apache.activemq.core.config.Configuration;
@@ -52,7 +52,7 @@ import org.apache.activemq.core.config.impl.Validators;
 import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
 import org.apache.activemq.core.journal.impl.JournalConstants;
 import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
@@ -204,7 +204,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       NodeList elems = e.getElementsByTagName("clustered");
       if (elems != null && elems.getLength() > 0)
       {
-         HornetQServerLogger.LOGGER.deprecatedConfigurationOption("clustered");
+         ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("clustered");
       }
 
       // these are combined because they are both required for setting the correct HAPolicyConfiguration
@@ -217,24 +217,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
          {
             if (parameterExists(e, "backup"))
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("backup");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("backup");
             }
 
             if (parameterExists(e, "shared-store"))
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("shared-store");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("shared-store");
             }
          }
          else
          {
             if (parameterExists(e, "backup"))
             {
-               HornetQServerLogger.LOGGER.deprecatedConfigurationOption("backup");
+               ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("backup");
             }
 
             if (parameterExists(e, "shared-store"))
             {
-               HornetQServerLogger.LOGGER.deprecatedConfigurationOption("shared-store");
+               ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("shared-store");
             }
 
             if (backup && sharedStore)
@@ -262,11 +262,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("check-for-live-server");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("check-for-live-server");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("check-for-live-server");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("check-for-live-server");
 
             if (haPolicyConfig instanceof ReplicatedPolicyConfiguration)
             {
@@ -280,11 +280,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("allow-failback");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("allow-failback");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("allow-failback");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("allow-failback");
 
             if (haPolicyConfig instanceof ReplicaPolicyConfiguration)
             {
@@ -298,7 +298,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("check-for-live-server");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("check-for-live-server");
             }
          }
       }
@@ -307,11 +307,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("backup-group-name");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("backup-group-name");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("backup-group-name");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("backup-group-name");
 
             if (haPolicyConfig instanceof ReplicaPolicyConfiguration)
             {
@@ -325,7 +325,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("backup-group-name");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("backup-group-name");
             }
          }
       }
@@ -334,11 +334,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("failback-delay");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("failback-delay");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("failback-delay");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("failback-delay");
 
             if (haPolicyConfig instanceof ReplicaPolicyConfiguration)
             {
@@ -357,7 +357,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("failback-delay");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("failback-delay");
             }
          }
       }
@@ -366,11 +366,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("failover-on-shutdown");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("failover-on-shutdown");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("failover-on-shutdown");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("failover-on-shutdown");
 
             if (haPolicyConfig instanceof SharedStoreMasterPolicyConfiguration)
             {
@@ -384,7 +384,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("failover-on-shutdown");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("failover-on-shutdown");
             }
          }
       }
@@ -393,11 +393,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("replication-clustername");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("replication-clustername");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("replication-clustername");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("replication-clustername");
 
             if (haPolicyConfig instanceof ReplicaPolicyConfiguration)
             {
@@ -411,7 +411,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("replication-clustername");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("replication-clustername");
             }
          }
       }
@@ -420,11 +420,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       {
          if (containsHAPolicy)
          {
-            HornetQServerLogger.LOGGER.incompatibleWithHAPolicy("max-saved-replicated-journals-size");
+            ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicy("max-saved-replicated-journals-size");
          }
          else
          {
-            HornetQServerLogger.LOGGER.deprecatedConfigurationOption("max-saved-replicated-journals-size");
+            ActiveMQServerLogger.LOGGER.deprecatedConfigurationOption("max-saved-replicated-journals-size");
 
             if (haPolicyConfig instanceof ReplicaPolicyConfiguration)
             {
@@ -435,7 +435,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
             }
             else
             {
-               HornetQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("max-saved-replicated-journals-size");
+               ActiveMQServerLogger.LOGGER.incompatibleWithHAPolicyChosen("max-saved-replicated-journals-size");
             }
          }
       }
@@ -619,14 +619,14 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
          if (connectorConfig.getName() == null)
          {
-            HornetQServerLogger.LOGGER.connectorWithNoName();
+            ActiveMQServerLogger.LOGGER.connectorWithNoName();
 
             continue;
          }
 
          if (config.getConnectorConfigurations().containsKey(connectorConfig.getName()))
          {
-            HornetQServerLogger.LOGGER.connectorAlreadyDeployed(connectorConfig.getName());
+            ActiveMQServerLogger.LOGGER.connectorAlreadyDeployed(connectorConfig.getName());
 
             continue;
          }
@@ -756,7 +756,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
          {
             if (validateAIO)
             {
-               HornetQServerLogger.LOGGER.AIONotFound();
+               ActiveMQServerLogger.LOGGER.AIONotFound();
             }
 
             config.setJournalType(JournalType.NIO);
@@ -1003,7 +1003,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
                }
                else
                {
-                  HornetQServerLogger.LOGGER.rolePermissionConfigurationError(type);
+                  ActiveMQServerLogger.LOGGER.rolePermissionConfigurationError(type);
                }
                if (!allRoles.contains(role.trim()))
                {
@@ -1528,7 +1528,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       String name = e.getAttribute("name");
 
       long discoveryInitialWaitTimeout =
-         getLong(e, "initial-wait-timeout", HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT,
+         getLong(e, "initial-wait-timeout", ActiveMQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT,
                  Validators.GT_ZERO);
 
       long refreshTimeout =
@@ -1570,7 +1570,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       if (mainConfig.getDiscoveryGroupConfigurations().containsKey(name))
       {
-         HornetQServerLogger.LOGGER.discoveryGroupAlreadyDeployed(name);
+         ActiveMQServerLogger.LOGGER.discoveryGroupAlreadyDeployed(name);
 
          return;
       }
@@ -1612,14 +1612,14 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
          getLong(e, "retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval(),
                  Validators.GT_ZERO);
 
-      long callTimeout = getLong(e, "call-timeout", HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GT_ZERO);
+      long callTimeout = getLong(e, "call-timeout", ActiveMQClient.DEFAULT_CALL_TIMEOUT,
Validators.GT_ZERO);
 
-      long callFailoverTimeout = getLong(e, "call-failover-timeout", HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
Validators.MINUS_ONE_OR_GT_ZERO);
+      long callFailoverTimeout = getLong(e, "call-failover-timeout", ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
Validators.MINUS_ONE_OR_GT_ZERO);
 
       double retryIntervalMultiplier = getDouble(e, "retry-interval-multiplier",
                                                  ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(),
Validators.GT_ZERO);
 
-      int minLargeMessageSize = getInteger(e, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
Validators.GT_ZERO);
+      int minLargeMessageSize = getInteger(e, "min-large-message-size", ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
Validators.GT_ZERO);
 
       long maxRetryInterval = getLong(e, "max-retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval(),
Validators.GT_ZERO);
 
@@ -1734,22 +1734,22 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
          getInteger(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(),
                     Validators.GT_ZERO);
 
-      long retryInterval = getLong(brNode, "retry-interval", HornetQClient.DEFAULT_RETRY_INTERVAL,
Validators.GT_ZERO);
+      long retryInterval = getLong(brNode, "retry-interval", ActiveMQClient.DEFAULT_RETRY_INTERVAL,
Validators.GT_ZERO);
 
       long clientFailureCheckPeriod =
-         getLong(brNode, "check-period", HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
Validators.GT_ZERO);
+         getLong(brNode, "check-period", ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
Validators.GT_ZERO);
 
-      long connectionTTL = getLong(brNode, "connection-ttl", HornetQClient.DEFAULT_CONNECTION_TTL,
Validators.GT_ZERO);
+      long connectionTTL = getLong(brNode, "connection-ttl", ActiveMQClient.DEFAULT_CONNECTION_TTL,
Validators.GT_ZERO);
 
       int minLargeMessageSize =
-         getInteger(brNode, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+         getInteger(brNode, "min-large-message-size", ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
                     Validators.GT_ZERO);
 
-      long maxRetryInterval = getLong(brNode, "max-retry-interval", HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
Validators.GT_ZERO);
+      long maxRetryInterval = getLong(brNode, "max-retry-interval", ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL,
Validators.GT_ZERO);
 
 
       double retryIntervalMultiplier =
-         getDouble(brNode, "retry-interval-multiplier", HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
+         getDouble(brNode, "retry-interval-multiplier", ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
                    Validators.GT_ZERO);
 
       int initialConnectAttempts =

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java
index 84121ae..238879b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.core.deployers.Deployer;
 import org.apache.activemq.core.deployers.DeploymentManager;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 
 /**
  * @author <a href="ataylor@redhat.com">Andy Taylor</a>
@@ -114,7 +114,7 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
 
          for (String filename : filenames)
          {
-            HornetQServerLogger.LOGGER.debug("the filename is " + filename);
+            ActiveMQServerLogger.LOGGER.debug("the filename is " + filename);
 
             Enumeration<URL> urls = Thread.currentThread().getContextClassLoader().getResources(filename);
 
@@ -122,16 +122,16 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
             {
                URI uri = urls.nextElement().toURI();
 
-               HornetQServerLogger.LOGGER.debug("Got URI " + uri);
+               ActiveMQServerLogger.LOGGER.debug("Got URI " + uri);
 
                try
                {
-                  HornetQServerLogger.LOGGER.debug("Deploying " + uri + " for " + deployer.getClass().getSimpleName());
+                  ActiveMQServerLogger.LOGGER.debug("Deploying " + uri + " for " + deployer.getClass().getSimpleName());
                   deployer.deploy(uri);
                }
                catch (Exception e)
                {
-                  HornetQServerLogger.LOGGER.errorDeployingURI(e, uri);
+                  ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri);
                }
 
                Pair<URI, Deployer> pair = new Pair<URI, Deployer>(uri, deployer);
@@ -198,7 +198,7 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
                   }
                   catch (URISyntaxException e)
                   {
-                     HornetQServerLogger.LOGGER.errorDeployingURI(e);
+                     ActiveMQServerLogger.LOGGER.errorDeployingURI(e);
                      continue;
                   }
 
@@ -218,7 +218,7 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
                      }
                      catch (Exception e)
                      {
-                        HornetQServerLogger.LOGGER.errorDeployingURI(e, uri);
+                        ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri);
                      }
                   }
                   else if (newLastModified > info.lastModified)
@@ -231,7 +231,7 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
                      }
                      catch (Exception e)
                      {
-                        HornetQServerLogger.LOGGER.errorDeployingURI(e, uri);
+                        ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri);
                      }
                   }
                }
@@ -246,18 +246,18 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
                if (!fileExists(pair.getA()))
                {
                   Deployer deployer = entry.getValue().deployer;
-                  HornetQServerLogger.LOGGER.debug("Undeploying " + deployer + " with url
" + pair.getA());
+                  ActiveMQServerLogger.LOGGER.debug("Undeploying " + deployer + " with url
" + pair.getA());
                   deployer.undeploy(pair.getA());
                   toRemove.add(pair);
                }
             }
             catch (URISyntaxException e)
             {
-               HornetQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA());
+               ActiveMQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA());
             }
             catch (Exception e)
             {
-               HornetQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA());
+               ActiveMQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA());
             }
          }
          for (Pair<URI, Deployer> pair : toRemove)
@@ -267,7 +267,7 @@ public class FileDeploymentManager implements Runnable, DeploymentManager
       }
       catch (IOException e)
       {
-         HornetQServerLogger.LOGGER.errorScanningURLs(e);
+         ActiveMQServerLogger.LOGGER.errorScanningURLs(e);
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
index ece4fac..9df7961 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
@@ -15,7 +15,7 @@ package org.apache.activemq.core.deployers.impl;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.config.CoreQueueConfiguration;
 import org.apache.activemq.core.deployers.DeploymentManager;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQServer;
 import org.w3c.dom.Node;
 
 /**
@@ -27,11 +27,11 @@ import org.w3c.dom.Node;
  */
 public class QueueDeployer extends XmlDeployer
 {
-   private final HornetQServer server;
+   private final ActiveMQServer server;
 
    private final FileConfigurationParser parser = new FileConfigurationParser();
 
-   public QueueDeployer(final DeploymentManager deploymentManager, final HornetQServer server)
+   public QueueDeployer(final DeploymentManager deploymentManager, final ActiveMQServer server)
    {
       super(deploymentManager);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
index dce1bda..55a8822 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Node;
  */
 public class SecurityDeployer extends XmlDeployer
 {
-   private static final String QUEUES_XML = "hornetq-queues.xml";
+   private static final String QUEUES_XML = "activemq-queues.xml";
 
    private static final String MATCH = "match";
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java
b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java
index 87c4724..75dd47f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.deployers.Deployer;
 import org.apache.activemq.core.deployers.DeploymentManager;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.utils.XMLUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -182,7 +182,7 @@ public abstract class XmlDeployer implements Deployer
             }
             catch (Exception e1)
             {
-               HornetQServerLogger.LOGGER.unableToDeployNode(e1, node);
+               ActiveMQServerLogger.LOGGER.unableToDeployNode(e1, node);
                continue;
             }
 
@@ -232,7 +232,7 @@ public abstract class XmlDeployer implements Deployer
             }
             catch (Exception e)
             {
-               HornetQServerLogger.LOGGER.problemUndeployingNode(e, node);
+               ActiveMQServerLogger.LOGGER.problemUndeployingNode(e, node);
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
index ac2df63..16fa5d9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
@@ -13,6 +13,7 @@
 package org.apache.activemq.core.filter.impl;
 
 import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.selector.filter.BooleanExpression;
 import org.apache.activemq.selector.filter.FilterException;
 import org.apache.activemq.selector.filter.Filterable;
@@ -20,17 +21,16 @@ import org.apache.activemq.selector.SelectorParser;
 import org.apache.activemq.api.core.FilterConstants;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.filter.Filter;
-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.ServerMessage;
 
 /**
-* This class implements a HornetQ filter
+* This class implements a ActiveMQ filter
 *
 * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
 * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
 *
-* HornetQ filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
+* ActiveMQ filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
 *
 * Valid identifiers that can be used are:
 *
@@ -93,8 +93,8 @@ public class FilterImpl implements Filter
       }
       catch (Throwable e)
       {
-         HornetQServerLogger.LOGGER.invalidFilter(e, filterStr);
-         throw HornetQMessageBundle.BUNDLE.invalidFilter(e, filterStr);
+         ActiveMQServerLogger.LOGGER.invalidFilter(e, filterStr);
+         throw ActiveMQMessageBundle.BUNDLE.invalidFilter(e, filterStr);
       }
       return new FilterImpl(filterStr, booleanExpression);
    }
@@ -123,7 +123,7 @@ public class FilterImpl implements Filter
       }
       catch (Exception e)
       {
-         HornetQServerLogger.LOGGER.invalidFilter(e, sfilterString);
+         ActiveMQServerLogger.LOGGER.invalidFilter(e, sfilterString);
          return false;
       }
    }
@@ -167,28 +167,28 @@ public class FilterImpl implements Filter
 
    private static Object getHeaderFieldValue(final ServerMessage msg, final SimpleString
fieldName)
    {
-      if (FilterConstants.HORNETQ_USERID.equals(fieldName))
+      if (FilterConstants.ACTIVEMQ_USERID.equals(fieldName))
       {
          // It's the stringified (hex) representation of a user id that can be used in a
selector expression
          return new SimpleString("ID:" + msg.getUserID());
       }
-      else if (FilterConstants.HORNETQ_PRIORITY.equals(fieldName))
+      else if (FilterConstants.ACTIVEMQ_PRIORITY.equals(fieldName))
       {
          return Integer.valueOf(msg.getPriority());
       }
-      else if (FilterConstants.HORNETQ_TIMESTAMP.equals(fieldName))
+      else if (FilterConstants.ACTIVEMQ_TIMESTAMP.equals(fieldName))
       {
          return msg.getTimestamp();
       }
-      else if (FilterConstants.HORNETQ_DURABLE.equals(fieldName))
+      else if (FilterConstants.ACTIVEMQ_DURABLE.equals(fieldName))
       {
          return msg.isDurable() ? FilterConstants.DURABLE : FilterConstants.NON_DURABLE;
       }
-      else if (FilterConstants.HORNETQ_EXPIRATION.equals(fieldName))
+      else if (FilterConstants.ACTIVEMQ_EXPIRATION.equals(fieldName))
       {
          return msg.getExpiration();
       }
-      else if (FilterConstants.HORNETQ_SIZE.equals(fieldName))
+      else if (FilterConstants.ACTIVEMQ_SIZE.equals(fieldName))
       {
          return msg.getEncodeSize();
       }
@@ -211,7 +211,7 @@ public class FilterImpl implements Filter
       public Object getProperty(String id)
       {
          Object result = null;
-         if (id.startsWith(FilterConstants.HORNETQ_PREFIX.toString()))
+         if (id.startsWith(FilterConstants.ACTIVEMQ_PREFIX.toString()))
          {
             result = getHeaderFieldValue(message, new SimpleString(id));
          }


Mime
View raw message