activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [49/51] [partial] activemq-6 git commit: ACTIVEMQ6-2 Update to HQ master
Date Tue, 11 Nov 2014 11:01:19 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/replicated/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/replicated/hornetq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/replicated/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/replicated/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/replicated/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/replicated/hornetq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/replicated/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/replicated/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/replicated/jndi.properties b/distribution/hornetq/src/main/resources/config/replicated/jndi.properties
new file mode 100644
index 0000000..e2a9832
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/replicated/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/shared-store/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/hornetq/src/main/resources/config/shared-store/bootstrap.xml
new file mode 100644
index 0000000..9834d3b
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/shared-store/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/shared-store/hornetq-configuration.xml"></core>
+   <jms configuration="file:${hornetq.home}/config/shared-store/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/shared-store/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/shared-store/hornetq-configuration.xml
new file mode 100644
index 0000000..007acc1
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/shared-store/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>
+      <shared-store>
+         <master/>
+      </shared-store>
+   </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/177e6820/distribution/hornetq/src/main/resources/config/shared-store/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/shared-store/hornetq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/shared-store/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/shared-store/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/shared-store/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/shared-store/hornetq-users.xml
new file mode 100644
index 0000000..934306c
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/shared-store/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/shared-store/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/shared-store/jndi.properties b/distribution/hornetq/src/main/resources/config/shared-store/jndi.properties
new file mode 100644
index 0000000..e2a9832
--- /dev/null
+++ b/distribution/hornetq/src/main/resources/config/shared-store/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/stand-alone/clustered/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-beans.xml
deleted file mode 100644
index 423c8cb..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-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="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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 Stand alone server that controls the jndi server-->
-   <bean name="StandaloneServer" class="org.hornetq.jms.server.impl.StandaloneNamingServer">
-      <constructor>
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>
-      </constructor>
-      <property name="port">${jnp.port:1099}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1098}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-  
-   
-</deployment>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-configuration.xml
deleted file mode 100644
index 474d507..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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.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/stand-alone/clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/clustered/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/jndi.properties b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/jndi.properties
deleted file mode 100644
index e2a9832..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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/stand-alone/clustered/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties b/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties
deleted file mode 100644
index 3b725af..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/clustered/logging.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 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,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=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/stand-alone/non-clustered/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml
deleted file mode 100644
index 2cbcb12..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-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="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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 Stand alone server that controls the jndi server-->
-   <bean name="StandaloneServer" class="org.hornetq.jms.server.impl.StandaloneNamingServer">
-      <constructor>
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>
-      </constructor>
-      <property name="port">${jnp.port:1099}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1098}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-  
-   
-</deployment>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-configuration.xml
deleted file mode 100644
index 8b0922d..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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.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/stand-alone/non-clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/jndi.properties b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/jndi.properties
deleted file mode 100644
index e2a9832..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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/stand-alone/non-clustered/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties b/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties
deleted file mode 100644
index e9b2580..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 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,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=FINE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=FINE
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=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/stand-alone/replicated/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-beans.xml
deleted file mode 100644
index 423c8cb..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-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="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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 Stand alone server that controls the jndi server-->
-   <bean name="StandaloneServer" class="org.hornetq.jms.server.impl.StandaloneNamingServer">
-      <constructor>
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>
-      </constructor>
-      <property name="port">${jnp.port:1099}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1098}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-  
-   
-</deployment>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-configuration.xml
deleted file mode 100644
index 5605f00..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-configuration.xml
+++ /dev/null
@@ -1,101 +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"
-   -->
-   <shared-store>false</shared-store>
-
-   <backup>${hornetq.backup:false}</backup>
-
-   <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/stand-alone/replicated/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/replicated/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/jndi.properties b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/jndi.properties
deleted file mode 100644
index e2a9832..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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/stand-alone/replicated/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/logging.properties b/distribution/hornetq/src/main/resources/config/stand-alone/replicated/logging.properties
deleted file mode 100644
index 3b725af..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/replicated/logging.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 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,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=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/stand-alone/shared-store/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-beans.xml
deleted file mode 100644
index 423c8cb..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-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="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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 Stand alone server that controls the jndi server-->
-   <bean name="StandaloneServer" class="org.hornetq.jms.server.impl.StandaloneNamingServer">
-      <constructor>
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>
-      </constructor>
-      <property name="port">${jnp.port:1099}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1098}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-   
-   <!-- The JMS server -->
-   <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
-      <constructor>         
-         <parameter>
-            <inject bean="HornetQServer"/>
-         </parameter>         
-      </constructor>
-   </bean>
-  
-   
-</deployment>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-configuration.xml
deleted file mode 100644
index dea7a7b..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-configuration.xml
+++ /dev/null
@@ -1,101 +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"
-   -->
-   <shared-store>true</shared-store>
-
-   <backup>${hornetq.backup:false}</backup>
-
-   <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/stand-alone/shared-store/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/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/177e6820/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/jndi.properties b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/jndi.properties
deleted file mode 100644
index e2a9832..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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/stand-alone/shared-store/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/logging.properties b/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/logging.properties
deleted file mode 100644
index 3b725af..0000000
--- a/distribution/hornetq/src/main/resources/config/stand-alone/shared-store/logging.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# 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,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=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/trunk/clustered-backup/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-beans.xml
deleted file mode 100644
index 9705de0..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-beans.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ 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.
-  -->
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
-   <!-- JNDI server. Disable this if you don't want JNDI -->
-   <bean name="JNDIServer" class="org.jnp.server.Main">
-      <property name="namingInfo">
-         <inject bean="Naming"/>
-      </property>
-      <property name="port">${jnp.port:1199}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1198}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-
-   <!-- MBean server -->
-   <bean name="MBeanServer" class="javax.management.MBeanServer">
-      <constructor factoryClass="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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>
-  
-   
-</deployment>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-configuration.xml
deleted file mode 100644
index f0a2dc2..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-configuration.xml
+++ /dev/null
@@ -1,88 +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">
-
-    <backup>true</backup>
-
-    <allow-failback>true</allow-failback>
-
-    <shared-store>true</shared-store>
-	
-	<journal-min-files>10</journal-min-files>
-	
-	<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:5446}"/>
-		</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:5446}"/>
-		</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>60000</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/trunk/clustered-backup/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-jms.xml
deleted file mode 100644
index 3346589..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-jms.xml
+++ /dev/null
@@ -1,28 +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="ConnectionFactory">
-	   <connectors>
-         <connector-ref connector-name="netty"/>
-	   </connectors>
-		<entries>
-			<entry name="/ConnectionFactory"/>
-			<entry name="/XAConnectionFactory"/>
-		</entries>
-	</connection-factory>
-	
-	<queue name="DLQ">
-		<entry name="/queue/DLQ"/>
-	</queue>
-	<queue name="ExpiryQueue">
-		<entry name="/queue/ExpiryQueue"/>
-	</queue>   
-	<queue name="ExampleQueue">
-		<entry name="/queue/ExampleQueue"/>
-	</queue>
-	<topic name="ExampleTopic">
-		<entry name="/topic/ExampleTopic"/>
-	</topic>
-	
-</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/trunk/clustered-backup/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-users.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/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/177e6820/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/jndi.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/jndi.properties b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/jndi.properties
deleted file mode 100644
index 629072e..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/jndi.properties
+++ /dev/null
@@ -1,15 +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.
-#
-
-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/trunk/clustered-backup/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/logging.properties b/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/logging.properties
deleted file mode 100644
index dd49ead..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered-backup/logging.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
-java.util.logging.ConsoleHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
-java.util.logging.FileHandler.level=INFO
-java.util.logging.FileHandler.pattern=logs/hornetq.log
-java.util.logging.FileHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-beans.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-beans.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-beans.xml
deleted file mode 100644
index 58afc78..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-beans.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
-   <!-- JNDI server. Disable this if you don't want JNDI -->
-   <bean name="JNDIServer" class="org.jnp.server.Main">
-      <property name="namingInfo">
-         <inject bean="Naming"/>
-      </property>
-      <property name="port">${jnp.port:1099}</property>
-      <property name="bindAddress">${jnp.host:localhost}</property>
-      <property name="rmiPort">${jnp.rmiPort:1098}</property>
-      <property name="rmiBindAddress">${jnp.host:localhost}</property>
-   </bean>
-
-   <!-- MBean server -->
-   <bean name="MBeanServer" class="javax.management.MBeanServer">
-      <constructor factoryClass="java.lang.management.ManagementFactory"
-                   factoryMethod="getPlatformMBeanServer"/>
-   </bean> 
-
-   <!-- The core configuration -->
-   <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration">
-   </bean>
-
-    <!-- The security manager -->
-   <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl">
-      <start ignored="true"/>
-      <stop ignored="true"/>
-   </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>
-  
-   
-</deployment>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-configuration.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-configuration.xml
deleted file mode 100644
index 41fe395..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-configuration.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<configuration xmlns="urn:hornetq"
-	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	       xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-    <failover-on-shutdown>false</failover-on-shutdown>
-
-    <shared-store>true</shared-store>
-	
-	<journal-min-files>10</journal-min-files>
-	
-	<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>
-	</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>
-	</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>60000</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/trunk/clustered/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-jms.xml b/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-jms.xml
deleted file mode 100644
index 3346589..0000000
--- a/distribution/hornetq/src/main/resources/config/trunk/clustered/hornetq-jms.xml
+++ /dev/null
@@ -1,28 +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="ConnectionFactory">
-	   <connectors>
-         <connector-ref connector-name="netty"/>
-	   </connectors>
-		<entries>
-			<entry name="/ConnectionFactory"/>
-			<entry name="/XAConnectionFactory"/>
-		</entries>
-	</connection-factory>
-	
-	<queue name="DLQ">
-		<entry name="/queue/DLQ"/>
-	</queue>
-	<queue name="ExpiryQueue">
-		<entry name="/queue/ExpiryQueue"/>
-	</queue>   
-	<queue name="ExampleQueue">
-		<entry name="/queue/ExampleQueue"/>
-	</queue>
-	<topic name="ExampleTopic">
-		<entry name="/topic/ExampleTopic"/>
-	</topic>
-	
-</configuration>
\ No newline at end of file


Mime
View raw message