activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [50/51] [partial] activemq-6 git commit: ACTIVEMQ6-2 Update to HQ master
Date Tue, 11 Nov 2014 11:01:20 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/assembly/dep.xml b/distribution/hornetq/src/main/assembly/dep.xml
index f2ee1d1..ff2b80f 100644
--- a/distribution/hornetq/src/main/assembly/dep.xml
+++ b/distribution/hornetq/src/main/assembly/dep.xml
@@ -21,473 +21,92 @@
     <format>tar.gz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-   <moduleSets>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-commons</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-journal</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-native</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-tools</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-bootstrap</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-server</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory></outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-               <includes>
-                  <include>**/*.xsd</include>
-               </includes>
-            </unpackOptions>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-native</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>bin</outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-               <includes>
-                  <include>**/*.so</include>
-               </includes>
-            </unpackOptions>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-core-client</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-server</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jboss-as-integration</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-client</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-server</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-server</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory></outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-               <includes>
-                  <include>**/*.xsd</include>
-               </includes>
-            </unpackOptions>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-client</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-ra</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-service-sar</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-spring-integration</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-twitter-integration</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-vertx-integration</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq.rest:hornetq-rest</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-amqp-protocol</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-aerogear-integration</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-stomp-protocol</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-       <moduleSet>
-           <useAllReactorProjects>true</useAllReactorProjects>
-           <includes>
-               <include>org.hornetq:hornetq-selector</include>
-           </includes>
-           <binaries>
-               <includeDependencies>false</includeDependencies>
-               <outputDirectory>lib</outputDirectory>
-               <unpack>false</unpack>
-               <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-           </binaries>
-       </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:jnp-client</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:jboss-mc</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:jboss-mc</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-core-client</include>
-         </includes>
-         <binaries>
-            <attachmentClassifier>javadoc</attachmentClassifier>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>docs/api/hornetq-client</outputDirectory>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-server</include>
-         </includes>
-         <binaries>
-            <attachmentClassifier>javadoc</attachmentClassifier>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>docs/api/hornetq-server</outputDirectory>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-client</include>
-         </includes>
-         <binaries>
-            <attachmentClassifier>javadoc</attachmentClassifier>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>docs/api/hornetq-jms-client</outputDirectory>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <useAllReactorProjects>true</useAllReactorProjects>
-         <includes>
-            <include>org.hornetq:hornetq-jms-server</include>
-         </includes>
-         <binaries>
-            <attachmentClassifier>javadoc</attachmentClassifier>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>docs/api/hornetq-jms-server</outputDirectory>
-         </binaries>
-      </moduleSet>
-   </moduleSets>
    <dependencySets>
       <dependencySet>
          <includes>
+            <!-- modules -->
+            <include>org.hornetq:*</include>
+            <include>org.hornetq.rest:hornetq-rest</include>
+            <!-- dependencies -->
             <include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include>
-         </includes>
+            <include>org.jboss.naming:jnpserver</include>
+            <include>org.jboss.logmanager:jboss-logmanager</include>
+            <include>org.jboss:jboss-common-core</include>
+            <include>io.netty:netty-all</include>
+            <include>org.apache.qpid:proton-j</include>
+            <include>org.apache.qpid:proton-jms</include>
+            <include>org.apache.activemq:activemq-client</include>
+            <include>org.slf4j:slf4j-api</include>
+            <include>io.airlift:airline</include>
+            <include>com.google.guava:guava</include>
+            <include>javax.inject:javax.inject</include>
+            <include>com.fasterxml.jackson.core:jackson-*</include>
+         </includes>
+         <excludes>
+           <exclude>*:javadoc</exclude>
+         </excludes>
          <outputDirectory>lib</outputDirectory>
          <unpack>false</unpack>
-         <outputFileNameMapping>jboss-jms-api.jar</outputFileNameMapping>
       </dependencySet>
+      <!-- native -->
       <dependencySet>
          <includes>
-            <include>org.jboss.naming:jnpserver</include>
+            <include>org.hornetq:hornetq-native</include>
          </includes>
-         <outputDirectory>lib</outputDirectory>
-         <unpack>false</unpack>
-         <outputFileNameMapping>jnpserver.jar</outputFileNameMapping>
+         <outputDirectory>bin</outputDirectory>
+         <unpack>true</unpack>
+         <unpackOptions>
+            <includes>
+               <include>**/*.so</include>
+            </includes>
+         </unpackOptions>
       </dependencySet>
+      <!-- javadoc -->
       <dependencySet>
-         <includes>
-            <include>io.netty:netty-all</include>
-         </includes>
-         <outputDirectory>lib</outputDirectory>
-         <unpack>false</unpack>
-         <outputFileNameMapping>netty.jar</outputFileNameMapping>
+        <includes>
+          <include>org.hornetq:hornetq-core-client:*:javadoc</include>
+          <include>org.hornetq:hornetq-server:*:javadoc</include>
+          <include>org.hornetq:hornetq-jms-server:*:javadoc</include>
+          <include>org.hornetq:hornetq-jms-client:*:javadoc</include>
+        </includes>
+        <outputDirectory>docs/api/${artifact.artifactId}</outputDirectory>
+        <unpack>true</unpack>
       </dependencySet>
-       <dependencySet>
-           <includes>
-               <include>org.apache.qpid:proton-api</include>
-           </includes>
-           <outputDirectory>lib</outputDirectory>
-           <unpack>false</unpack>
-           <outputFileNameMapping>proton-api.jar</outputFileNameMapping>
-       </dependencySet>
-       <dependencySet>
-           <includes>
-               <include>org.apache.qpid:proton-jms</include>
-           </includes>
-           <outputDirectory>lib</outputDirectory>
-           <unpack>false</unpack>
-           <outputFileNameMapping>proton-jms.jar</outputFileNameMapping>
-       </dependencySet>
-       <dependencySet>
-           <includes>
-               <include>org.apache.qpid:proton-j-impl</include>
-           </includes>
-           <outputDirectory>lib</outputDirectory>
-           <unpack>false</unpack>
-           <outputFileNameMapping>proton-j-impl.jar</outputFileNameMapping>
-       </dependencySet>
    </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/resources/config</directory>
-      <outputDirectory>config</outputDirectory>
-      <lineEnding>keep</lineEnding>
-      <excludes>
-         <exclude>**/trunk/**</exclude>
-         <exclude>*.properties</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <lineEnding>keep</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/licenses</directory>
-      <outputDirectory>licenses</outputDirectory>
-      <lineEnding>keep</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/examples</directory>
-      <outputDirectory>examples</outputDirectory>
-      <lineEnding>keep</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>../../examples</directory>
-      <outputDirectory>examples</outputDirectory>
-      <lineEnding>keep</lineEnding>
-      <excludes>
+   <fileSets>
+     <!-- schema -->
+     <fileSet>
+       <directory>../../hornetq-server/src/main/resources/schema/</directory>
+       <outputDirectory>schema</outputDirectory>
+       <lineEnding>keep</lineEnding>
+     </fileSet>
+     <fileSet>
+       <directory>../../hornetq-jms-server/src/main/resources/schema/</directory>
+       <outputDirectory>schema</outputDirectory>
+       <lineEnding>keep</lineEnding>
+     </fileSet>
+     <!-- resources -->
+     <fileSet>
+       <directory>src/main/resources</directory>
+       <outputDirectory>/</outputDirectory>
+       <lineEnding>keep</lineEnding>
+       <includes>
+         <include>bin/*</include>
+         <include>config/**</include>
+         <include>licenses/*</include>
+       </includes>
+     </fileSet>
+     <fileSet>
+       <directory>../../examples</directory>
+       <outputDirectory>examples</outputDirectory>
+       <lineEnding>keep</lineEnding>
+       <excludes>
          <exclude>**/target/**</exclude>
          <exclude>**/**/*.iml</exclude>
          <exclude>**/**/*.dat</exclude>
-      </excludes>
-    </fileSet>
+       </excludes>
+     </fileSet>
+     <!-- docs -->
      <!--todo, this is crap, there must be better jdocbook assembly integration-->
       <fileSet>
          <directory>../../docs/user-manual/target/docbook/publish/en</directory>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/hornetq
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/hornetq b/distribution/hornetq/src/main/resources/bin/hornetq
new file mode 100755
index 0000000..a6abed2
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/bin/hornetq
@@ -0,0 +1,87 @@
+#!/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.hornetq.cli.HornetQ $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/hornetq-service
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/hornetq-service b/distribution/hornetq/src/main/resources/bin/hornetq-service
new file mode 100755
index 0000000..5767556
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/bin/hornetq-service
@@ -0,0 +1,138 @@
+#!/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/177e6820/distribution/hornetq/src/main/resources/bin/hornetq.cmd
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/hornetq.cmd b/distribution/hornetq/src/main/resources/bin/hornetq.cmd
new file mode 100755
index 0000000..00427d4
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/bin/hornetq.cmd
@@ -0,0 +1,58 @@
+@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.hornetq.cli.HornetQ %*
+
+:END
+endlocal
+GOTO :EOF
+
+:EOF

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/run.bat
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/run.bat b/distribution/hornetq/src/main/resources/bin/run.bat
old mode 100644
new mode 100755
index 0772410..7e6a23f
--- a/distribution/hornetq/src/main/resources/bin/run.bat
+++ b/distribution/hornetq/src/main/resources/bin/run.bat
@@ -1,21 +1 @@
-@ echo off
-setlocal ENABLEDELAYEDEXPANSION
-set HORNETQ_HOME=..
-IF "a%1"== "a" ( 
-set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
-) ELSE (
-SET CONFIG_DIR=%1
-)
-set CLASSPATH=%CONFIG_DIR%;%HORNETQ_HOME%\schemas\
-REM you can use the following line if you want to run with different ports
-REM set CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
-set JVM_ARGS=%CLUSTER_PROPS% -XX:+UseParallelGC  -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=%CONFIG_DIR% -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Djava.library.path=.
-REM export JVM_ARGS="-Xmx512M -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-for /R ..\lib %%A in (*.jar) do (
-SET CLASSPATH=!CLASSPATH!;%%A
-)
-mkdir ..\logs
-echo ***********************************************************************************
-echo "java %JVM_ARGS% -classpath %CLASSPATH% org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml"
-echo ***********************************************************************************
-java %JVM_ARGS% -classpath "%CLASSPATH%" org.hornetq.integration.bootstrap.HornetQBootstrapServer hornetq-beans.xml
+hornetq.cmd run %*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/run.sh
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/run.sh b/distribution/hornetq/src/main/resources/bin/run.sh
index 87e5aa8..781f954 100755
--- a/distribution/hornetq/src/main/resources/bin/run.sh
+++ b/distribution/hornetq/src/main/resources/bin/run.sh
@@ -1,35 +1,3 @@
 #!/bin/sh
-#------------------------------------------------
-# Simple shell-script to run HornetQ standalone
-#------------------------------------------------
 
-export HORNETQ_HOME=..
-mkdir -p ../logs
-
-# By default, the server is started in the non-clustered standalone configuration
-
-if [ a"$1" = a ]; then CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1"; fi
-if [ a"$2" = a ]; then FILENAME=hornetq-beans.xml; else FILENAME="$2"; fi
-
-if [ ! -d $CONFIG_DIR ]; then
-    echo script needs to be run from the HORNETQ_HOME/bin directory >&2
-    exit 1
-fi
-
-RESOLVED_CONFIG_DIR=`cd "$CONFIG_DIR"; pwd`
-export CLASSPATH=$RESOLVED_CONFIG_DIR:$HORNETQ_HOME/schemas/
-
-# Use the following line to run with different ports
-#export CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5445"
-
-export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dhornetq.config.dir=$RESOLVED_CONFIG_DIR -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file://$RESOLVED_CONFIG_DIR/logging.properties -Djava.library.path=./lib/linux-i686:./lib/linux-x86_64"
-#export JVM_ARGS="-Xmx512M -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=$CONFIG_DIR/logging.properties -Dhornetq.config.dir=$CONFIG_DIR -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-
-for i in `ls $HORNETQ_HOME/lib/*.jar`; do
-	CLASSPATH=$i:$CLASSPATH
-done
-
-echo "***********************************************************************************"
-echo "java $JVM_ARGS -classpath $CLASSPATH org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME"
-echo "***********************************************************************************"
-java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote org.hornetq.integration.bootstrap.HornetQBootstrapServer $FILENAME
+./hornetq run $@

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/stop.bat
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/stop.bat b/distribution/hornetq/src/main/resources/bin/stop.bat
old mode 100644
new mode 100755
index 4a1aa8e..cd16950
--- a/distribution/hornetq/src/main/resources/bin/stop.bat
+++ b/distribution/hornetq/src/main/resources/bin/stop.bat
@@ -1,9 +1 @@
-@ echo off
-setlocal ENABLEDELAYEDEXPANSION
-set HORNETQ_HOME=..
-IF "a%1"== "a" ( 
-set CONFIG_DIR=%HORNETQ_HOME%\config\stand-alone\non-clustered
-) ELSE (
-SET CONFIG_DIR=%1
-)
-dir >> %CONFIG_DIR%\STOP_ME
\ No newline at end of file
+hornetq.cmd stop %*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/bin/stop.sh
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/bin/stop.sh b/distribution/hornetq/src/main/resources/bin/stop.sh
index 9f55248..ce0270f 100755
--- a/distribution/hornetq/src/main/resources/bin/stop.sh
+++ b/distribution/hornetq/src/main/resources/bin/stop.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export HORNETQ_HOME=..
-if [ a"$1" = a ]; then CONFIG_DIR=$HORNETQ_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1"; fi
-touch $CONFIG_DIR/STOP_ME;
\ No newline at end of file
+./hornetq stop $@

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml b/distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml
new file mode 100644
index 0000000..d5bc84d
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/clustered/bootstrap.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<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>
+
+   <basic-security/>
+
+   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
+
+</broker>
+

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/clustered/hornetq-configuration.xml
new file mode 100644
index 0000000..474d507
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/clustered/hornetq-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.hornetq.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.hornetq.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.hornetq.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.hornetq.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/177e6820/distribution/hornetq/src/main/resources/config/clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/clustered/hornetq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/clustered/hornetq-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/177e6820/distribution/hornetq/src/main/resources/config/clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/clustered/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/clustered/hornetq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/clustered/hornetq-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/177e6820/distribution/hornetq/src/main/resources/config/clustered/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/clustered/jndi.properties b/distribution/hornetq/src/main/resources/config/clustered/jndi.properties
new file mode 100644
index 0000000..e2a9832
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/clustered/jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-configuration.xml
deleted file mode 100644
index fb54135..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-configuration.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<!--
-  ~ Copyright 2009 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.
-  -->
-
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-   <!--  Don't change this name.
-         This is used by the dependency framework on the deployers,
-         to make sure this deployment is done before any other deployment -->
-   <name>HornetQ.main.config</name>
-
-   <bindings-directory>${jboss.server.data.dir}/${hornetq.data.dir:hornetq}/bindings</bindings-directory>
-
-   <journal-directory>${jboss.server.data.dir}/${hornetq.data.dir:hornetq}/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-
-   <large-messages-directory>${jboss.server.data.dir}/${hornetq.data.dir:hornetq}/largemessages</large-messages-directory>
-
-   <paging-directory>${jboss.server.data.dir}/${hornetq.data.dir:hornetq}/paging</paging-directory>
-
-   <connectors>
-      <connector name="netty">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-
-      <connector name="in-vm">
-         <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
-         <param key="server-id" value="${hornetq.server-id:0}"/>
-      </connector>
-
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-
-      <acceptor name="in-vm">
-        <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
-        <param key="server-id" value="0"/>
-      </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/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jboss-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jboss-beans.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jboss-beans.xml
deleted file mode 100644
index 50768e0..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jboss-beans.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- MBean server -->
-   <bean name="MBeanServer" class="javax.management.MBeanServer">
-      <constructor factoryClass="org.jboss.mx.util.MBeanServerLocator"
-                   factoryMethod="locateJBoss"/>
-   </bean>
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-      <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq/hornetq-configuration.xml</property>
-   </bean>
-
-	<!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-      <depends>JBossSecurityJNDIContextEstablishment</depends>
-      <property name="allowClientLogin">false</property>
-      <property name="authoriseOnClientLogin">false</property>
-   </bean>
-
-	<!-- The core server -->
-   <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
-      <constructor>
-         <parameter>
-            <inject bean="Configuration"/>
-         </parameter>
-         <parameter>
-            <inject bean="MBeanServer"/>
-         </parameter>
-         <parameter>
-            <inject bean="HornetQSecurityManager"/>
-         </parameter>        
-      </constructor>
-      <start ignored="true"/>
-      <stop ignored="true"/>   
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-
-   <!-- POJO which ensures HornetQ Resource Adapter is stopped before HornetQServer -->
-   <bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">
-      <constructor>
-         <parameter>
-            <inject bean="MBeanServer"/>
-         </parameter>
-         <parameter>jboss.jca:name='jms-ra.rar',service=RARDeployment</parameter>
-      </constructor>
-      <depends>HornetQServer</depends>
-   </bean>
-
-</deployment>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jms.xml
deleted file mode 100644
index 8d4bd7a..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/hornetq-jms.xml
+++ /dev/null
@@ -1,47 +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="NettyConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/ConnectionFactory"/>
-         <entry name="/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>true</xa>
-	   <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-	   </connectors>
-		<entries>
-			<entry name="/ThroughputConnectionFactory"/>
-			<entry name="/XAThroughputConnectionFactory"/>
-		</entries>
-	</connection-factory>
-   
-   <connection-factory name="InVMConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="in-vm"/>
-      </connectors>
-      <entries>
-         <entry name="java:/ConnectionFactory"/>
-         <entry name="java:/XAConnectionFactory"/>
-      </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/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/jms-ds.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/jms-ds.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/jms-ds.xml
deleted file mode 100644
index f387cf9..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/clustered/jms-ds.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<connection-factories>
-   <!--
-    JMS Stuff
-   -->
-
-   <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider">
-      <attribute name="ProviderName">DefaultJMSProvider</attribute>
-      <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
-      <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
-   </mbean>
-   <!--
-    JMS XA Resource adapter, use this to get transacted JMS in beans
-   -->
-   <tx-connection-factory>
-      <jndi-name>JmsXA</jndi-name>
-      <xa-transaction/>
-      <rar-name>jms-ra.rar</rar-name>
-      <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition>
-      <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
-      <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
-      <max-pool-size>20</max-pool-size>
-      <security-domain-and-application>JmsXARealm</security-domain-and-application>
-   </tx-connection-factory>
-</connection-factories>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml
deleted file mode 100644
index a92796f..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!--
-  ~ Copyright 2009 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.
-  -->
-
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-   <!--  Don't change this name.
-         This is used by the dependency framework on the deployers,
-         to make sure this deployment is done before any other deployment -->
-   <name>HornetQ.main.config</name>
-   
-   <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory>
-
-   <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-
-   <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory>
-
-   <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory>
-
-   <connectors>
-      <connector name="netty">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-
-      <connector name="in-vm">
-         <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
-         <param key="server-id" value="${hornetq.server-id:0}"/>
-      </connector>
-
-   </connectors>
-
-   <acceptors>   
-      <acceptor name="netty">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${jboss.bind.address:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-
-      <acceptor name="in-vm">
-        <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
-        <param key="server-id" value="0"/>
-      </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/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml
deleted file mode 100644
index 238792c..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- MBean server -->
-   <bean name="MBeanServer" class="javax.management.MBeanServer">
-      <constructor factoryClass="org.jboss.mx.util.MBeanServerLocator"
-                   factoryMethod="locateJBoss"/>
-   </bean>
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-      <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq/hornetq-configuration.xml</property>
-   </bean>
-
-	<!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-      <depends>JBossSecurityJNDIContextEstablishment</depends>
-      <property name="allowClientLogin">false</property>
-      <property name="authoriseOnClientLogin">false</property>
-   </bean>
-
-	<!-- The core server -->
-   <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
-      <constructor>
-         <parameter>
-            <inject bean="Configuration"/>
-         </parameter>
-         <parameter>
-            <inject bean="MBeanServer"/>
-         </parameter>
-         <parameter>
-            <inject bean="HornetQSecurityManager"/>
-         </parameter>        
-      </constructor>
-      <start ignored="true"/>
-      <stop ignored="true"/>          
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-
-   <!-- POJO which ensures HornetQ Resource Adapter is stopped before HornetQServer -->
-   <bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">
-      <constructor>
-         <parameter>
-            <inject bean="MBeanServer"/>
-         </parameter>
-         <parameter>jboss.jca:name='jms-ra.rar',service=RARDeployment</parameter>
-      </constructor>
-      <depends>HornetQServer</depends>
-   </bean>
-</deployment>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jms.xml
deleted file mode 100644
index 8fcc227..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-jms.xml
+++ /dev/null
@@ -1,46 +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="NettyConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/ConnectionFactory"/>
-         <entry name="/XAConnectionFactory"/>
-      </entries>
-   </connection-factory>
-   
-   <connection-factory name="NettyThroughputConnectionFactory">
-      <xa>true</xa>
-	   <connectors>
-         <connector-ref connector-name="netty-throughput"/>
-	   </connectors>
-		<entries>
-			<entry name="/ThroughputConnectionFactory"/>
-			<entry name="/XAThroughputConnectionFactory"/>
-		</entries>
-	</connection-factory>
-   
-   <connection-factory name="InVMConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="in-vm"/>
-      </connectors>
-      <entries>
-         <entry name="java:/ConnectionFactory"/>
-         <entry name="java:/XAConnectionFactory"/>
-      </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/177e6820/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/jms-ds.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/jms-ds.xml b/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/jms-ds.xml
deleted file mode 100644
index f387cf9..0000000
--- a/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/jms-ds.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<connection-factories>
-   <!--
-    JMS Stuff
-   -->
-
-   <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider">
-      <attribute name="ProviderName">DefaultJMSProvider</attribute>
-      <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
-      <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
-   </mbean>
-   <!--
-    JMS XA Resource adapter, use this to get transacted JMS in beans
-   -->
-   <tx-connection-factory>
-      <jndi-name>JmsXA</jndi-name>
-      <xa-transaction/>
-      <rar-name>jms-ra.rar</rar-name>
-      <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition>
-      <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
-      <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
-      <max-pool-size>20</max-pool-size>
-      <security-domain-and-application>JmsXARealm</security-domain-and-application>
-   </tx-connection-factory>
-</connection-factories>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/logging.properties b/distribution/hornetq/src/main/resources/config/logging.properties
new file mode 100644
index 0000000..b3f37aa
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/logging.properties
@@ -0,0 +1,56 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2010, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# Additional logger names to configure (root logger is always configured)
+# Root logger option
+loggers=org.jboss.logging,org.hornetq.core.server,org.hornetq.utils,org.hornetq.journal,org.hornetq.jms.server,org.hornetq.integration.bootstrap
+
+# Root logger level
+logger.level=INFO
+# HornetQ logger levels
+logger.org.hornetq.core.server.level=INFO
+logger.org.hornetq.journal.level=INFO
+logger.org.hornetq.utils.level=INFO
+logger.org.hornetq.jms.level=INFO
+logger.org.hornetq.integration.bootstrap.level=INFO
+# Root logger handlers
+logger.handlers=FILE,CONSOLE
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=DEBUG
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.level=DEBUG
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${hornetq.home}/logs/hornetq.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml
new file mode 100644
index 0000000..30e3761
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/non-clustered/bootstrap.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<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>
+
+   <basic-security/>
+
+   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
+
+</broker>
+

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-configuration.xml
new file mode 100644
index 0000000..8b0922d
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-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.hornetq.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.hornetq.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.hornetq.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.hornetq.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/177e6820/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-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/177e6820/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/non-clustered/hornetq-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/177e6820/distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties b/distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties
new file mode 100644
index 0000000..e2a9832
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/non-clustered/jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml b/distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml
new file mode 100644
index 0000000..62a253c
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/replicated/bootstrap.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
+
+<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>
+
+   <basic-security/>
+
+   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
+
+</broker>
+

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/replicated/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/replicated/hornetq-configuration.xml
new file mode 100644
index 0000000..7a048cf
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/replicated/hornetq-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.hornetq.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.hornetq.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.hornetq.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.hornetq.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>


Mime
View raw message