activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [02/17] activemq-6 git commit: ACTIVEMQ6-4 - more refactoring
Date Tue, 18 Nov 2014 12:34:17 GMT
ACTIVEMQ6-4 - more refactoring

https://issues.apache.org/jira/browse/ACTIVEMQ6-4

renamed all the scripts and run commands and variables to be ActiveMQ


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/f9bdb25a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/f9bdb25a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/f9bdb25a

Branch: refs/heads/master
Commit: f9bdb25aefc56b0a8d3571baa26309eda3aae22c
Parents: b5039ab
Author: Andy Taylor <andytaylor@apache.org>
Authored: Mon Nov 17 09:49:55 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Tue Nov 18 11:19:40 2014 +0000

----------------------------------------------------------------------
 .../java/org/apache/activemq/cli/ActiveMQ.java  |  76 ++++++++++
 .../java/org/apache/activemq/cli/HornetQ.java   |  76 ----------
 .../org/apache/activemq/cli/commands/Run.java   |  10 +-
 .../org/apache/activemq/cli/commands/Stop.java  |   4 +-
 .../apache/activemq/factory/BrokerFactory.java  |   2 +-
 .../apache/activemq/factory/CoreFactory.java    |   2 +-
 .../org/apache/activemq/factory/JmsFactory.java |   2 +-
 .../factory/SecurityManagerFactory.java         |   2 +-
 .../bootstrap/HornetQBootstrapLogger.java       |   4 +-
 .../activemq/src/main/resources/bin/activemq    |  87 ++++++++++++
 .../src/main/resources/bin/activemq-service     | 138 +++++++++++++++++++
 .../src/main/resources/bin/activemq.cmd         |  58 ++++++++
 .../activemq/src/main/resources/bin/hornetq     |  87 ------------
 .../src/main/resources/bin/hornetq-service      | 138 -------------------
 .../activemq/src/main/resources/bin/hornetq.cmd |  58 --------
 .../activemq/src/main/resources/bin/run.bat     |   2 +-
 .../activemq/src/main/resources/bin/run.sh      |   2 +-
 .../activemq/src/main/resources/bin/stop.bat    |   2 +-
 .../activemq/src/main/resources/bin/stop.sh     |   2 +-
 .../config/clustered/activemq-configuration.xml |  94 +++++++++++++
 .../resources/config/clustered/activemq-jms.xml |  53 +++++++
 .../config/clustered/activemq-users.xml         |   7 +
 .../resources/config/clustered/bootstrap.xml    |   4 +-
 .../config/clustered/hornetq-configuration.xml  |  94 -------------
 .../resources/config/clustered/hornetq-jms.xml  |  53 -------
 .../config/clustered/hornetq-users.xml          |   7 -
 .../non-clustered/activemq-configuration.xml    |  67 +++++++++
 .../config/non-clustered/activemq-jms.xml       |  53 +++++++
 .../config/non-clustered/activemq-users.xml     |   7 +
 .../config/non-clustered/bootstrap.xml          |   4 +-
 .../non-clustered/hornetq-configuration.xml     |  67 ---------
 .../config/non-clustered/hornetq-jms.xml        |  53 -------
 .../config/non-clustered/hornetq-users.xml      |   7 -
 .../replicated/activemq-configuration.xml       | 104 ++++++++++++++
 .../config/replicated/activemq-jms.xml          |  53 +++++++
 .../config/replicated/activemq-users.xml        |   7 +
 .../resources/config/replicated/bootstrap.xml   |   4 +-
 .../config/replicated/hornetq-configuration.xml | 104 --------------
 .../resources/config/replicated/hornetq-jms.xml |  53 -------
 .../config/replicated/hornetq-users.xml         |   7 -
 .../shared-store/activemq-configuration.xml     | 104 ++++++++++++++
 .../config/shared-store/activemq-jms.xml        |  53 +++++++
 .../config/shared-store/activemq-users.xml      |   7 +
 .../resources/config/shared-store/bootstrap.xml |   4 +-
 .../shared-store/hornetq-configuration.xml      | 104 --------------
 .../config/shared-store/hornetq-jms.xml         |  53 -------
 .../config/shared-store/hornetq-users.xml       |   7 -
 47 files changed, 993 insertions(+), 993 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
new file mode 100644
index 0000000..4b1c439
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
@@ -0,0 +1,76 @@
+/*
+ * 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.cli;
+
+import io.airlift.command.Cli;
+import io.airlift.command.ParseArgumentsUnexpectedException;
+import org.apache.activemq.cli.commands.Action;
+import org.apache.activemq.cli.commands.ActionContext;
+import org.apache.activemq.cli.commands.HelpAction;
+import org.apache.activemq.cli.commands.Run;
+import org.apache.activemq.cli.commands.Stop;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class ActiveMQ
+{
+
+   public static void main(String[] args) throws Exception
+   {
+      Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq")
+               .withDefaultCommand(HelpAction.class)
+               .withCommand(Run.class)
+               .withCommand(Stop.class)
+               .withCommand(HelpAction.class)
+               .withDescription("ActiveMQ Command Line");
+
+      Cli<Action> parser = builder.build();
+
+      try
+      {
+         parser.parse(args).execute(ActionContext.system());
+      }
+      catch (ParseArgumentsUnexpectedException e)
+      {
+         System.err.println(e.getMessage());
+         System.out.println();
+         parser.parse("help").execute(ActionContext.system());
+      }
+      catch (ConfigurationException configException)
+      {
+         System.err.println(configException.getMessage());
+         System.out.println();
+         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'");
+      }
+
+   }
+
+   public static void printBanner() throws Exception
+   {
+      copy(ActiveMQ.class.getResourceAsStream("banner.txt"), System.out);
+   }
+
+   private static long copy(InputStream in, OutputStream out) throws Exception
+   {
+      byte[] buffer = new byte[1024];
+      int len = in.read(buffer);
+      while (len != -1)
+      {
+         out.write(buffer, 0, len);
+         len = in.read(buffer);
+      }
+      return len;
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
deleted file mode 100644
index 6f53eb5..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
+++ /dev/null
@@ -1,76 +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.cli;
-
-import io.airlift.command.Cli;
-import io.airlift.command.ParseArgumentsUnexpectedException;
-import org.apache.activemq.cli.commands.Action;
-import org.apache.activemq.cli.commands.ActionContext;
-import org.apache.activemq.cli.commands.HelpAction;
-import org.apache.activemq.cli.commands.Run;
-import org.apache.activemq.cli.commands.Stop;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class HornetQ
-{
-
-   public static void main(String[] args) throws Exception
-   {
-      Cli.CliBuilder<Action> builder = Cli.<Action>builder("hornetq")
-               .withDefaultCommand(HelpAction.class)
-               .withCommand(Run.class)
-               .withCommand(Stop.class)
-               .withCommand(HelpAction.class)
-               .withDescription("HornetQ Command Line");
-
-      Cli<Action> parser = builder.build();
-
-      try
-      {
-         parser.parse(args).execute(ActionContext.system());
-      }
-      catch (ParseArgumentsUnexpectedException e)
-      {
-         System.err.println(e.getMessage());
-         System.out.println();
-         parser.parse("help").execute(ActionContext.system());
-      }
-      catch (ConfigurationException configException)
-      {
-         System.err.println(configException.getMessage());
-         System.out.println();
-         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'");
-      }
-
-   }
-
-   public static void printBanner() throws Exception
-   {
-      copy(HornetQ.class.getResourceAsStream("banner.txt"), System.out);
-   }
-
-   private static long copy(InputStream in, OutputStream out) throws Exception
-   {
-      byte[] buffer = new byte[1024];
-      int len = in.read(buffer);
-      while (len != -1)
-      {
-         out.write(buffer, 0, len);
-         len = in.read(buffer);
-      }
-      return len;
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
index 8aa0c0f..8751f77 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
@@ -15,7 +15,7 @@ package org.apache.activemq.cli.commands;
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
 
-import org.apache.activemq.cli.HornetQ;
+import org.apache.activemq.cli.ActiveMQ;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.dto.BrokerDTO;
@@ -41,7 +41,7 @@ import java.util.TimerTask;
 public class Run implements Action
 {
 
-   @Arguments(description = "Broker Configuration URI, default 'xml:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'")
+   @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'")
    String configuration;
    private StandaloneNamingServer namingServer;
    private JMSServerManager jmsServerManager;
@@ -50,11 +50,11 @@ public class Run implements Action
    public Object execute(ActionContext context) throws Exception
    {
 
-      HornetQ.printBanner();
+      ActiveMQ.printBanner();
 
       if (configuration == null)
       {
-         configuration = "xml:" + System.getProperty("hornetq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
+         configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
       }
 
       System.out.println("Loading configuration file: " + configuration);
@@ -117,7 +117,7 @@ public class Run implements Action
             HornetQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath());
          }
       }
-      final Timer timer = new Timer("HornetQ Server Shutdown Timer", true);
+      final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true);
       timer.scheduleAtFixedRate(new TimerTask()
       {
          @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
index 19a7226..6322ea9 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
@@ -22,7 +22,7 @@ import java.io.File;
 @Command(name = "stop", description = "stops the broker instance")
 public class Stop implements Action
 {
-   @Arguments(description = "Broker Configuration URI, default 'xml:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'")
+   @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'")
    String configuration;
 
    @Override
@@ -30,7 +30,7 @@ public class Stop implements Action
    {
       if (configuration == null)
       {
-         configuration = "xml:" + System.getProperty("hornetq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
+         configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
       }
       BrokerDTO broker = BrokerFactory.createBroker(configuration);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
index 3e5c86e..b7ff90c 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
@@ -32,7 +32,7 @@ public class BrokerFactory
       BrokerFactoryHandler factory = null;
       try
       {
-         FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/");
+         FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");
          factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme());
       }
       catch (IOException ioe )

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
index 942c79a..de989d6 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
@@ -31,7 +31,7 @@ public class CoreFactory
          URI configURI = new URI(core.configuration.replace("\\", "/"));
          try
          {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/core/");
+            FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/core/");
             factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme());
          }
          catch (IOException ioe )

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
index 35fd6f2..148dbbc 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
@@ -30,7 +30,7 @@ public class JmsFactory
          URI configURI = new URI(jms.configuration.replace("\\", "/"));
          try
          {
-            FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/jms/");
+            FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/jms/");
             factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme());
          }
          catch (IOException ioe )

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
index b0a7dfb..1432460 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
@@ -25,7 +25,7 @@ public class SecurityManagerFactory
    {
       if (config != null)
       {
-         FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/security/");
+         FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/security/");
          HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
          return manager;
       }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java
index 0ee6e60..eb40644 100644
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java
@@ -46,11 +46,11 @@ public interface HornetQBootstrapLogger extends BasicLogger
    HornetQBootstrapLogger LOGGER = Logger.getMessageLogger(HornetQBootstrapLogger.class, HornetQBootstrapLogger.class.getPackage().getName());
 
    @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101000, value = "Starting HornetQ Server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 101000, value = "Starting ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
    void serverStarting();
 
    @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101001, value = "Stopping HornetQ Server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 101001, value = "Stopping ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
    void serverStopping();
 
    @LogMessage(level = Logger.Level.INFO)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/activemq
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/activemq/src/main/resources/bin/activemq
new file mode 100755
index 0000000..1e632d5
--- /dev/null
+++ b/distribution/activemq/src/main/resources/bin/activemq
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+
+if [ -z "$ACTIVEMQ_HOME" ] ; then
+
+  ## resolve links - $0 may be a link to ActiveMQ's home
+  PRG="$0"
+  progname=`basename "$0"`
+  saveddir=`pwd`
+
+  # need this for relative symlinks
+  dirname_prg=`dirname "$PRG"`
+  cd "$dirname_prg"
+
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+    else
+    PRG=`dirname "$PRG"`"/$link"
+    fi
+  done
+
+  ACTIVEMQ_HOME=`dirname "$PRG"`
+  cd "$saveddir"
+
+  # make it fully qualified
+  ACTIVEMQ_HOME=`cd "$ACTIVEMQ_HOME/.." && pwd`
+fi
+
+# OS specific support.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true
+    OSTYPE=cygwin
+    export OSTYPE
+    ;;
+  Darwin*) darwin=true
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+           fi
+           ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$ACTIVEMQ_HOME" ] &&
+    ACTIVEMQ_HOME=`cygpath --unix "$ACTIVEMQ_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+for i in `ls $ACTIVEMQ_HOME/lib/*.jar`; do
+	CLASSPATH=$i:$CLASSPATH
+done
+
+
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$ACTIVEMQ_HOME/config/logging.properties -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64"
+#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"
+
+exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.ActiveMQ $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/activemq-service
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq-service b/distribution/activemq/src/main/resources/bin/activemq-service
new file mode 100755
index 0000000..840b7f0
--- /dev/null
+++ b/distribution/activemq/src/main/resources/bin/activemq-service
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+service=`basename "$0"`
+
+#
+# Discover the ACTIVEMQ_BASE from the location of this script.
+#
+if [ -z "$ACTIVEMQ_BASE" ] ; then
+
+  ## resolve links - $0 may be a link to ActiveMQ's home
+  PRG="$0"
+  saveddir=`pwd`
+
+  # need this for relative symlinks
+  dirname_prg=`dirname "$PRG"`
+  cd "$dirname_prg"
+
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '.*/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG=`dirname "$PRG"`"/$link"
+    fi
+  done
+
+  ACTIVEMQ_BASE=`dirname "$PRG"`
+  cd "$saveddir"
+
+  # make it fully qualified
+  ACTIVEMQ_BASE=`cd "$ACTIVEMQ_BASE/.." && pwd`
+  export ACTIVEMQ_BASE
+
+fi
+
+PID_FILE="${ACTIVEMQ_BASE}/data/activemq.pid"
+
+if [ ! -d "${ACTIVEMQ_BASE}/data/" ]; then
+    mkdir "${ACTIVEMQ_BASE}/data/"
+fi
+
+status() {
+  if [ -f "${PID_FILE}" ] ; then
+    pid=`cat "${PID_FILE}"`
+    # check to see if it's gone...
+    ps -p ${pid} > /dev/null
+    if [ $? -eq 0 ] ; then
+      return 0
+    else
+      rm "${PID_FILE}"
+      return 3
+    fi
+  fi
+  return 3
+}
+
+stop() {
+  if [ -f "${PID_FILE}" ] ; then
+    pid=`cat "${PID_FILE}"`
+    kill $@ ${pid} > /dev/null
+  fi
+  for i in 1 2 3 4 5 ; do
+    status
+    if [ $? -ne 0 ] ; then
+      return 0
+    fi
+    sleep 1
+  done
+  echo "Could not stop process ${pid}"
+  return 1
+}
+
+start() {
+
+  status
+  if [ $? -eq 0 ] ; then
+    echo "Already running."
+    return 1
+  fi
+
+  nohup ${ACTIVEMQ_BASE}/bin/activemq run > /dev/null 2> /dev/null &
+
+  echo $! > "${PID_FILE}"
+
+  # check to see if stays up...
+  sleep 1
+  status
+  if [ $? -ne 0 ] ; then
+    echo "Could not start ${service}"
+    return 1
+  fi
+  echo "${service} is now running (${pid})"
+  return 0
+}
+
+case $1 in
+  start)
+    echo "Starting ${service}"
+    start
+    exit $?
+  ;;
+
+  force-stop)
+    echo "Forcibly Stopping ${service}"
+    stop -9
+    exit $?
+  ;;
+
+  stop)
+    echo "Gracefully Stopping ${service}"
+    stop
+    exit $?
+  ;;
+
+  restart)
+    echo "Restarting ${service}"
+    stop
+    start
+    exit $?
+  ;;
+
+  status)
+    status
+    rc=$?
+    if [ $rc -eq 0 ] ; then
+      echo "${service} is running (${pid})"
+    else
+      echo "${service} is stopped"
+    fi
+    exit $rc
+  ;;
+
+  *)
+    echo "Usage: $0 {start|stop|restart|force-stop|status}" >&2
+    exit 2
+  ;;
+esac
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/activemq.cmd
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.cmd b/distribution/activemq/src/main/resources/bin/activemq.cmd
new file mode 100755
index 0000000..32dbb36
--- /dev/null
+++ b/distribution/activemq/src/main/resources/bin/activemq.cmd
@@ -0,0 +1,58 @@
+@echo off
+
+setlocal
+
+if NOT "%ACTIVEMQ_HOME%"=="" goto CHECK_ACTIVEMQ_HOME
+PUSHD .
+CD %~dp0..
+set ACTIVEMQ_HOME=%CD%
+POPD
+
+:CHECK_ACTIVEMQ_HOME
+if exist "%ACTIVEMQ_HOME%\bin\activemq.cmd" goto CHECK_JAVA
+
+:NO_HOME
+echo ACTIVEMQ_HOME environment variable is set incorrectly. Please set ACTIVEMQ_HOME.
+goto END
+
+:CHECK_JAVA
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto NO_JAVA_HOME
+if not exist "%JAVA_HOME%\bin\java.exe" goto NO_JAVA_HOME
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto RUN_JAVA
+
+:NO_JAVA_HOME
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo.
+
+:RUN_JAVA
+
+if "%JVM_FLAGS%" == "" set JVM_FLAGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration="file:%ACTIVEMQ_HOME%\config\logging.properties" -Djava.library.path="%ACTIVEMQ_HOME%/bin/lib/linux-i686:%ACTIVEMQ_HOME%/bin/lib/linux-x86_64"
+
+if "x%ACTIVEMQ_OPTS%" == "x" goto noACTIVEMQ_OPTS
+  set JVM_FLAGS=%JVM_FLAGS% %ACTIVEMQ_OPTS%
+:noACTIVEMQ_OPTS
+
+if "x%ACTIVEMQ_DEBUG%" == "x" goto noDEBUG
+  set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+:noDEBUG
+
+if "x%ACTIVEMQ_PROFILE%" == "x" goto noPROFILE
+  set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS%
+:noPROFILE
+
+rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
+
+set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dactivemq.home="%ACTIVEMQ_HOME%" -classpath "%ACTIVEMQ_HOME%\lib\*"
+
+"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.cli.ActiveMQ %*
+
+:END
+endlocal
+GOTO :EOF
+
+:EOF

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/hornetq
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/hornetq b/distribution/activemq/src/main/resources/bin/hornetq
deleted file mode 100755
index 112a780..0000000
--- a/distribution/activemq/src/main/resources/bin/hornetq
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-
-if [ -z "$HORNETQ_HOME" ] ; then
-
-  ## resolve links - $0 may be a link to hornetq's home
-  PRG="$0"
-  progname=`basename "$0"`
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '.*/.*' > /dev/null; then
-    PRG="$link"
-    else
-    PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-  HORNETQ_HOME=`dirname "$PRG"`
-  cd "$saveddir"
-
-  # make it fully qualified
-  HORNETQ_HOME=`cd "$HORNETQ_HOME/.." && pwd`
-fi
-
-# OS specific support.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true
-    OSTYPE=cygwin
-    export OSTYPE
-    ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-           fi
-           ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$HORNETQ_HOME" ] &&
-    HORNETQ_HOME=`cygpath --unix "$HORNETQ_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-for i in `ls $HORNETQ_HOME/lib/*.jar`; do
-	CLASSPATH=$i:$CLASSPATH
-done
-
-
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/bin/lib/linux-i686:$HORNETQ_HOME/bin/lib/linux-x86_64"
-#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"
-
-exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.HornetQ $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/hornetq-service
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/hornetq-service b/distribution/activemq/src/main/resources/bin/hornetq-service
deleted file mode 100755
index 5767556..0000000
--- a/distribution/activemq/src/main/resources/bin/hornetq-service
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-service=`basename "$0"`
-
-#
-# Discover the HORNETQ_BASE from the location of this script.
-#
-if [ -z "$HORNETQ_BASE" ] ; then
-
-  ## resolve links - $0 may be a link to HORNETQ's home
-  PRG="$0"
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '.*/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-  HORNETQ_BASE=`dirname "$PRG"`
-  cd "$saveddir"
-
-  # make it fully qualified
-  HORNETQ_BASE=`cd "$HORNETQ_BASE/.." && pwd`
-  export HORNETQ_BASE
-
-fi
-
-PID_FILE="${HORNETQ_BASE}/data/hornetq.pid"
-
-if [ ! -d "${HORNETQ_BASE}/data/" ]; then
-    mkdir "${HORNETQ_BASE}/data/"
-fi
-
-status() {
-  if [ -f "${PID_FILE}" ] ; then
-    pid=`cat "${PID_FILE}"`
-    # check to see if it's gone...
-    ps -p ${pid} > /dev/null
-    if [ $? -eq 0 ] ; then
-      return 0
-    else
-      rm "${PID_FILE}"
-      return 3
-    fi
-  fi
-  return 3
-}
-
-stop() {
-  if [ -f "${PID_FILE}" ] ; then
-    pid=`cat "${PID_FILE}"`
-    kill $@ ${pid} > /dev/null
-  fi
-  for i in 1 2 3 4 5 ; do
-    status
-    if [ $? -ne 0 ] ; then
-      return 0
-    fi
-    sleep 1
-  done
-  echo "Could not stop process ${pid}"
-  return 1
-}
-
-start() {
-
-  status
-  if [ $? -eq 0 ] ; then
-    echo "Already running."
-    return 1
-  fi
-
-  nohup ${HORNETQ_BASE}/bin/hornetq run > /dev/null 2> /dev/null &
-
-  echo $! > "${PID_FILE}"
-
-  # check to see if stays up...
-  sleep 1
-  status
-  if [ $? -ne 0 ] ; then
-    echo "Could not start ${service}"
-    return 1
-  fi
-  echo "${service} is now running (${pid})"
-  return 0
-}
-
-case $1 in
-  start)
-    echo "Starting ${service}"
-    start
-    exit $?
-  ;;
-
-  force-stop)
-    echo "Forcibly Stopping ${service}"
-    stop -9
-    exit $?
-  ;;
-
-  stop)
-    echo "Gracefully Stopping ${service}"
-    stop
-    exit $?
-  ;;
-
-  restart)
-    echo "Restarting ${service}"
-    stop
-    start
-    exit $?
-  ;;
-
-  status)
-    status
-    rc=$?
-    if [ $rc -eq 0 ] ; then
-      echo "${service} is running (${pid})"
-    else
-      echo "${service} is stopped"
-    fi
-    exit $rc
-  ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|force-stop|status}" >&2
-    exit 2
-  ;;
-esac
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/hornetq.cmd
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/hornetq.cmd b/distribution/activemq/src/main/resources/bin/hornetq.cmd
deleted file mode 100755
index 3129403..0000000
--- a/distribution/activemq/src/main/resources/bin/hornetq.cmd
+++ /dev/null
@@ -1,58 +0,0 @@
-@echo off
-
-setlocal
-
-if NOT "%HORNETQ_HOME%"=="" goto CHECK_HORNETQ_HOME
-PUSHD .
-CD %~dp0..
-set HORNETQ_HOME=%CD%
-POPD
-
-:CHECK_HORNETQ_HOME
-if exist "%HORNETQ_HOME%\bin\hornetq.cmd" goto CHECK_JAVA
-
-:NO_HOME
-echo HORNETQ_HOME environment variable is set incorrectly. Please set HORNETQ_HOME.
-goto END
-
-:CHECK_JAVA
-set _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto NO_JAVA_HOME
-if not exist "%JAVA_HOME%\bin\java.exe" goto NO_JAVA_HOME
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto RUN_JAVA
-
-:NO_JAVA_HOME
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-echo.
-echo Warning: JAVA_HOME environment variable is not set.
-echo.
-
-:RUN_JAVA
-
-if "%JVM_FLAGS%" == "" set JVM_FLAGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration="file:%HORNETQ_HOME%\config\logging.properties" -Djava.library.path="%HORNETQ_HOME%/bin/lib/linux-i686:%HORNETQ_HOME%/bin/lib/linux-x86_64"
-
-if "x%HORNETQ_OPTS%" == "x" goto noHORNETQ_OPTS
-  set JVM_FLAGS=%JVM_FLAGS% %HORNETQ_OPTS%
-:noHORNETQ_OPTS
-
-if "x%HORNETQ_DEBUG%" == "x" goto noDEBUG
-  set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-:noDEBUG
-
-if "x%HORNETQ_PROFILE%" == "x" goto noPROFILE
-  set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS%
-:noPROFILE
-
-rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
-
-set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dhornetq.home="%HORNETQ_HOME%" -classpath "%HORNETQ_HOME%\lib\*"
-
-"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.cli.HornetQ %*
-
-:END
-endlocal
-GOTO :EOF
-
-:EOF

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/run.bat
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/run.bat b/distribution/activemq/src/main/resources/bin/run.bat
index 7e6a23f..8ad6a50 100755
--- a/distribution/activemq/src/main/resources/bin/run.bat
+++ b/distribution/activemq/src/main/resources/bin/run.bat
@@ -1 +1 @@
-hornetq.cmd run %*
\ No newline at end of file
+activemq.cmd run %*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/run.sh
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/run.sh b/distribution/activemq/src/main/resources/bin/run.sh
index 781f954..bc96bc2 100755
--- a/distribution/activemq/src/main/resources/bin/run.sh
+++ b/distribution/activemq/src/main/resources/bin/run.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./hornetq run $@
+./activemq run $@

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/stop.bat
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/stop.bat b/distribution/activemq/src/main/resources/bin/stop.bat
index cd16950..056dda3 100755
--- a/distribution/activemq/src/main/resources/bin/stop.bat
+++ b/distribution/activemq/src/main/resources/bin/stop.bat
@@ -1 +1 @@
-hornetq.cmd stop %*
\ No newline at end of file
+activemq.cmd stop %*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/bin/stop.sh
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/stop.sh b/distribution/activemq/src/main/resources/bin/stop.sh
index ce0270f..4556683 100755
--- a/distribution/activemq/src/main/resources/bin/stop.sh
+++ b/distribution/activemq/src/main/resources/bin/stop.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./hornetq stop $@
+./activemq stop $@

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
new file mode 100644
index 0000000..4c924b5
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -0,0 +1,94 @@
+<configuration xmlns="urn:hornetq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   
+   <paging-directory>${data.dir:../data}/paging</paging-directory>
+   
+   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
+   
+   <journal-directory>${data.dir:../data}/journal</journal-directory>
+   
+   <journal-min-files>10</journal-min-files>
+   
+   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
+
+   <connectors>      
+      <connector name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </connector>
+      
+      <connector name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </acceptor>
+      
+      <acceptor name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+         <param key="direct-deliver" value="false"/>
+      </acceptor>
+   </acceptors>
+
+   <broadcast-groups>
+      <broadcast-group name="bg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <broadcast-period>5000</broadcast-period>
+         <connector-ref>netty</connector-ref>
+      </broadcast-group>
+   </broadcast-groups>
+
+   <discovery-groups>
+      <discovery-group name="dg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+   </discovery-groups>
+   
+   <cluster-connections>
+      <cluster-connection name="my-cluster">
+         <address>jms</address>	 
+         <connector-ref>netty</connector-ref>
+	      <discovery-group-ref discovery-group-name="dg-group1"/>
+      </cluster-connection>
+   </cluster-connections>
+   
+   <security-settings>
+      <security-setting match="#">
+         <permission type="createNonDurableQueue" roles="guest"/>
+         <permission type="deleteNonDurableQueue" roles="guest"/>
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <address-settings>
+      <!--default for catch all-->
+      <address-setting match="#">
+         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+         <redelivery-delay>0</redelivery-delay>
+         <max-size-bytes>10485760</max-size-bytes>       
+         <message-counter-history-day-limit>10</message-counter-history-day-limit>
+         <address-full-policy>BLOCK</address-full-policy>
+      </address-setting>
+   </address-settings>
+
+   
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
@@ -0,0 +1,53 @@
+<configuration xmlns="urn:hornetq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+   <connection-factory name="NettyXAConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/XAThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/ThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+   
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
+   <!-- the default user.  this is used where username is null-->
+   <defaultuser name="guest" password="guest">
+      <role name="guest"/>
+   </defaultuser>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index d5bc84d..28b9dce 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -14,8 +14,8 @@
 
 <broker xmlns="http://hornetq.org/schema">
 
-   <core configuration="file:${hornetq.home}/config/clustered/hornetq-configuration.xml"></core>
-   <jms configuration="file:${hornetq.home}/config/clustered/hornetq-jms.xml"></jms>
+   <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"></core>
+   <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"></jms>
 
    <basic-security/>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml
deleted file mode 100644
index 4c924b5..0000000
--- a/distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-   
-   <paging-directory>${data.dir:../data}/paging</paging-directory>
-   
-   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
-   
-   <journal-directory>${data.dir:../data}/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-   
-   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
-
-   <connectors>      
-      <connector name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-   </acceptors>
-
-   <broadcast-groups>
-      <broadcast-group name="bg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <broadcast-period>5000</broadcast-period>
-         <connector-ref>netty</connector-ref>
-      </broadcast-group>
-   </broadcast-groups>
-
-   <discovery-groups>
-      <discovery-group name="dg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <refresh-timeout>10000</refresh-timeout>
-      </discovery-group>
-   </discovery-groups>
-   
-   <cluster-connections>
-      <cluster-connection name="my-cluster">
-         <address>jms</address>	 
-         <connector-ref>netty</connector-ref>
-	      <discovery-group-ref discovery-group-name="dg-group1"/>
-      </cluster-connection>
-   </cluster-connections>
-   
-   <security-settings>
-      <security-setting match="#">
-         <permission type="createNonDurableQueue" roles="guest"/>
-         <permission type="deleteNonDurableQueue" roles="guest"/>
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <address-settings>
-      <!--default for catch all-->
-      <address-setting match="#">
-         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-         <redelivery-delay>0</redelivery-delay>
-         <max-size-bytes>10485760</max-size-bytes>       
-         <message-counter-history-day-limit>10</message-counter-history-day-limit>
-         <address-full-policy>BLOCK</address-full-policy>
-      </address-setting>
-   </address-settings>
-
-   
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<configuration xmlns="urn:hornetq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="NettyXAConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/XAThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/ThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <queue name="DLQ">
-      <entry name="/queue/DLQ"/>
-   </queue>
-   
-   <queue name="ExpiryQueue">
-      <entry name="/queue/ExpiryQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml b/distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
-   <!-- the default user.  this is used where username is null-->
-   <defaultuser name="guest" password="guest">
-      <role name="guest"/>
-   </defaultuser>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
new file mode 100644
index 0000000..3bb9be5
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -0,0 +1,67 @@
+<configuration xmlns="urn:hornetq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+
+   <paging-directory>${data.dir:../data}/paging</paging-directory>
+   
+   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
+   
+   <journal-directory>${data.dir:../data}/journal</journal-directory>
+   
+   <journal-min-files>10</journal-min-files>
+   
+   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
+   
+   <connectors>
+      <connector name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </connector>
+      
+      <connector name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </acceptor>
+      
+      <acceptor name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+         <param key="direct-deliver" value="false"/>
+      </acceptor>
+   </acceptors>
+
+   <security-settings>
+      <security-setting match="#">
+         <permission type="createNonDurableQueue" roles="guest"/>
+         <permission type="deleteNonDurableQueue" roles="guest"/>
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <address-settings>
+      <!--default for catch all-->
+      <address-setting match="#">
+         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+         <redelivery-delay>0</redelivery-delay>
+         <max-size-bytes>10485760</max-size-bytes>       
+         <message-counter-history-day-limit>10</message-counter-history-day-limit>
+         <address-full-policy>BLOCK</address-full-policy>
+      </address-setting>
+   </address-settings>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
@@ -0,0 +1,53 @@
+<configuration xmlns="urn:hornetq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+   <connection-factory name="NettyXAConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/XAThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/ThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+   
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
+   <!-- the default user.  this is used where username is null-->
+   <defaultuser name="guest" password="guest">
+      <role name="guest"/>
+   </defaultuser>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
index 30e3761..de3147e 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
@@ -14,8 +14,8 @@
 
 <broker xmlns="http://hornetq.org/schema">
 
-   <core configuration="file:${hornetq.home}/config/non-clustered/hornetq-configuration.xml"></core>
-   <jms configuration="file:${hornetq.home}/config/non-clustered/hornetq-jms.xml"></jms>
+   <core configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"></core>
+   <jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"></jms>
 
    <basic-security/>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml
deleted file mode 100644
index 3bb9be5..0000000
--- a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-   <paging-directory>${data.dir:../data}/paging</paging-directory>
-   
-   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
-   
-   <journal-directory>${data.dir:../data}/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-   
-   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
-   
-   <connectors>
-      <connector name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-   </acceptors>
-
-   <security-settings>
-      <security-setting match="#">
-         <permission type="createNonDurableQueue" roles="guest"/>
-         <permission type="deleteNonDurableQueue" roles="guest"/>
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <address-settings>
-      <!--default for catch all-->
-      <address-setting match="#">
-         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-         <redelivery-delay>0</redelivery-delay>
-         <max-size-bytes>10485760</max-size-bytes>       
-         <message-counter-history-day-limit>10</message-counter-history-day-limit>
-         <address-full-policy>BLOCK</address-full-policy>
-      </address-setting>
-   </address-settings>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<configuration xmlns="urn:hornetq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="NettyXAConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/XAThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/ThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <queue name="DLQ">
-      <entry name="/queue/DLQ"/>
-   </queue>
-   
-   <queue name="ExpiryQueue">
-      <entry name="/queue/ExpiryQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
-   <!-- the default user.  this is used where username is null-->
-   <defaultuser name="guest" password="guest">
-      <role name="guest"/>
-   </defaultuser>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
new file mode 100644
index 0000000..4c92c67
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -0,0 +1,104 @@
+<configuration xmlns="urn:hornetq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   <!--
+   if you want to run this as a backup on different ports you would need to set the following variable
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   -->
+
+   <paging-directory>${data.dir:../data}/paging</paging-directory>
+   
+   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
+   
+   <journal-directory>${data.dir:../data}/journal</journal-directory>
+   
+   <journal-min-files>10</journal-min-files>
+   
+   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
+
+   <connectors>      
+      <connector name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </connector>
+      
+      <connector name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </acceptor>
+      
+      <acceptor name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+         <param key="direct-deliver" value="false"/>
+      </acceptor>
+   </acceptors>
+
+   <broadcast-groups>
+      <broadcast-group name="bg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <broadcast-period>5000</broadcast-period>
+         <connector-ref>netty</connector-ref>
+      </broadcast-group>
+   </broadcast-groups>
+
+   <discovery-groups>
+      <discovery-group name="dg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+   </discovery-groups>
+   
+   <cluster-connections>
+      <cluster-connection name="my-cluster">
+         <address>jms</address>	 
+         <connector-ref>netty</connector-ref>
+	      <discovery-group-ref discovery-group-name="dg-group1"/>
+      </cluster-connection>
+   </cluster-connections>
+
+   <ha-policy>
+      <replication>
+         <master/>
+      </replication>
+   </ha-policy>
+   
+   <security-settings>
+      <security-setting match="#">
+         <permission type="createNonDurableQueue" roles="guest"/>
+         <permission type="deleteNonDurableQueue" roles="guest"/>
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <address-settings>
+      <!--default for catch all-->
+      <address-setting match="#">
+         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+         <redelivery-delay>0</redelivery-delay>
+         <max-size-bytes>10485760</max-size-bytes>       
+         <message-counter-history-day-limit>10</message-counter-history-day-limit>
+         <address-full-policy>BLOCK</address-full-policy>
+      </address-setting>
+   </address-settings>
+
+   
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
@@ -0,0 +1,53 @@
+<configuration xmlns="urn:hornetq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+   <connection-factory name="NettyXAConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/XAThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/ThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+   
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
+   <!-- the default user.  this is used where username is null-->
+   <defaultuser name="guest" password="guest">
+      <role name="guest"/>
+   </defaultuser>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 62a253c..977dea4 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -14,8 +14,8 @@
 
 <broker xmlns="http://hornetq.org/schema">
 
-   <core configuration="file:${hornetq.home}/config/replicated/hornetq-configuration.xml"></core>
-   <jms configuration="file:${hornetq.home}/config/replicated/hornetq-jms.xml"></jms>
+   <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"></core>
+   <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"></jms>
 
    <basic-security/>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml
deleted file mode 100644
index 4c92c67..0000000
--- a/distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-   <!--
-   if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-   -->
-
-   <paging-directory>${data.dir:../data}/paging</paging-directory>
-   
-   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
-   
-   <journal-directory>${data.dir:../data}/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-   
-   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
-
-   <connectors>      
-      <connector name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-   </acceptors>
-
-   <broadcast-groups>
-      <broadcast-group name="bg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <broadcast-period>5000</broadcast-period>
-         <connector-ref>netty</connector-ref>
-      </broadcast-group>
-   </broadcast-groups>
-
-   <discovery-groups>
-      <discovery-group name="dg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <refresh-timeout>10000</refresh-timeout>
-      </discovery-group>
-   </discovery-groups>
-   
-   <cluster-connections>
-      <cluster-connection name="my-cluster">
-         <address>jms</address>	 
-         <connector-ref>netty</connector-ref>
-	      <discovery-group-ref discovery-group-name="dg-group1"/>
-      </cluster-connection>
-   </cluster-connections>
-
-   <ha-policy>
-      <replication>
-         <master/>
-      </replication>
-   </ha-policy>
-   
-   <security-settings>
-      <security-setting match="#">
-         <permission type="createNonDurableQueue" roles="guest"/>
-         <permission type="deleteNonDurableQueue" roles="guest"/>
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <address-settings>
-      <!--default for catch all-->
-      <address-setting match="#">
-         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-         <redelivery-delay>0</redelivery-delay>
-         <max-size-bytes>10485760</max-size-bytes>       
-         <message-counter-history-day-limit>10</message-counter-history-day-limit>
-         <address-full-policy>BLOCK</address-full-policy>
-      </address-setting>
-   </address-settings>
-
-   
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<configuration xmlns="urn:hornetq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="NettyXAConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/XAThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>false</xa>
-      <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-      </connectors>
-      <entries>
-         <entry name="/ThroughputConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <queue name="DLQ">
-      <entry name="/queue/DLQ"/>
-   </queue>
-   
-   <queue name="ExpiryQueue">
-      <entry name="/queue/ExpiryQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml b/distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
-   <!-- the default user.  this is used where username is null-->
-   <defaultuser name="guest" password="guest">
-      <role name="guest"/>
-   </defaultuser>
-</configuration>
\ No newline at end of file


Mime
View raw message