You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2014/11/18 13:34:16 UTC

[01/17] activemq-6 git commit: ACTIVEMQ6-4 - more refactoring

Repository: activemq-6
Updated Branches:
  refs/heads/master b5039ab8d -> 571fb7a23


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
new file mode 100644
index 0000000..4caa289
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -0,0 +1,104 @@
+<configuration xmlns="urn:hornetq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   <!--
+   if you want to run this as a backup on different ports you would need to set the following variable
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   -->
+
+   <paging-directory>${data.dir:../data}/paging</paging-directory>
+   
+   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
+   
+   <journal-directory>${data.dir:../data}/journal</journal-directory>
+   
+   <journal-min-files>10</journal-min-files>
+   
+   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
+
+   <connectors>      
+      <connector name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </connector>
+      
+      <connector name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
+      </acceptor>
+      
+      <acceptor name="netty-throughput">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+         <param key="direct-deliver" value="false"/>
+      </acceptor>
+   </acceptors>
+
+   <broadcast-groups>
+      <broadcast-group name="bg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <broadcast-period>5000</broadcast-period>
+         <connector-ref>netty</connector-ref>
+      </broadcast-group>
+   </broadcast-groups>
+
+   <discovery-groups>
+      <discovery-group name="dg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+   </discovery-groups>
+   
+   <cluster-connections>
+      <cluster-connection name="my-cluster">
+         <address>jms</address>	 
+         <connector-ref>netty</connector-ref>
+	      <discovery-group-ref discovery-group-name="dg-group1"/>
+      </cluster-connection>
+   </cluster-connections>
+
+   <ha-policy>
+      <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/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
new file mode 100644
index 0000000..044d7e8
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
@@ -0,0 +1,53 @@
+<configuration xmlns="urn:hornetq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+   <connection-factory name="NettyXAConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/XAThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
+   <connection-factory name="NettyThroughputConnectionFactory">
+      <xa>false</xa>
+      <connectors>
+         <connector-ref connector-name="netty-throughput"/>
+      </connectors>
+      <entries>
+         <entry name="/ThroughputConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+   
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 9834d3b..192cdb9 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -14,8 +14,8 @@
 
 <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>
+   <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"></core>
+   <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms>
 
    <basic-security/>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml
deleted file mode 100644
index 4caa289..0000000
--- a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-   <!--
-   if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-   -->
-
-   <paging-directory>${data.dir:../data}/paging</paging-directory>
-   
-   <bindings-directory>${data.dir:../data}/bindings</bindings-directory>
-   
-   <journal-directory>${data.dir:../data}/journal</journal-directory>
-   
-   <journal-min-files>10</journal-min-files>
-   
-   <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
-
-   <connectors>      
-      <connector name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-      
-      <connector name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-      
-      <acceptor name="netty-throughput">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-         <param key="batch-delay" value="50"/>
-         <param key="direct-deliver" value="false"/>
-      </acceptor>
-   </acceptors>
-
-   <broadcast-groups>
-      <broadcast-group name="bg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <broadcast-period>5000</broadcast-period>
-         <connector-ref>netty</connector-ref>
-      </broadcast-group>
-   </broadcast-groups>
-
-   <discovery-groups>
-      <discovery-group name="dg-group1">
-         <group-address>231.7.7.7</group-address>
-         <group-port>9876</group-port>
-         <refresh-timeout>10000</refresh-timeout>
-      </discovery-group>
-   </discovery-groups>
-   
-   <cluster-connections>
-      <cluster-connection name="my-cluster">
-         <address>jms</address>	 
-         <connector-ref>netty</connector-ref>
-	      <discovery-group-ref discovery-group-name="dg-group1"/>
-      </cluster-connection>
-   </cluster-connections>
-
-   <ha-policy>
-      <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/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml
deleted file mode 100644
index 044d7e8..0000000
--- a/distribution/activemq/src/main/resources/config/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/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml
deleted file mode 100644
index 934306c..0000000
--- a/distribution/activemq/src/main/resources/config/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


[09/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/resources/schema/hornetq-configuration.xsd
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/resources/schema/hornetq-configuration.xsd b/activemq-server/src/main/resources/schema/hornetq-configuration.xsd
deleted file mode 100644
index 73e911f..0000000
--- a/activemq-server/src/main/resources/schema/hornetq-configuration.xsd
+++ /dev/null
@@ -1,2319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:hq="urn:org.apache.activemq"
-            xmlns:csd="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq"
-            version="1.0">
-
-   <xsd:element name="configuration" type="configurationType" hq:schema="hornetq-configuration"/>
-
-   <xsd:complexType name="configurationType">
-      <xsd:all>
-         <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Node name. If set, it will be used in topology notifications.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="resolve-protocols" type="xsd:boolean" default="true" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="resolveProtocols" hq:field_name="DEFAULT_RESOLVE_PROTOCOLS">
-               <xsd:documentation>
-                  If true then the HornetQ Server will make use of any Protocol Managers that are in available on the
-                  classpath. If false then only the core protocol will be available, unless in Embedded mode where users
-                  can inject their own Protocol Managers.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="clustered" type="xsd:boolean" default="false" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="clusters">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated and its value will be ignored (HQ221038). A HornetQ server will
-                  be "clustered" when its configuration contain a cluster-configuration.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="check-for-live-server" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="hq.check-for-live-server">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Whether to check the cluster for a (live) server using our own server ID when starting up. This
-                  option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this
-                  setting only applies to live servers and not to backups.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="file-deployment-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="using-server.configuration"
-                            hq:field_name="DEFAULT_FILE_DEPLOYMENT_ENABLED">
-               <xsd:documentation>
-                  true means that the server will load configuration from the configuration files
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="persistence-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="persistence.enabled" hq:field_name="DEFAULT_PERSISTENCE_ENABLED">
-               <xsd:documentation>
-                  true means that the server will use the file based journal for persistence.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="server.scheduled.thread.pool"
-                            hq:field_name="DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE">
-               <xsd:documentation>
-                  Maximum number of threads to use for the scheduled thread pool
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="thread-pool-max-size" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="server.scheduled.thread.pool"
-                            hq:field_name="DEFAULT_THREAD_POOL_MAX_SIZE">
-               <xsd:documentation>
-                  Maximum number of threads to use for the thread pool. -1 means 'no limits'.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="security-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="security" hq:field_name="DEFAULT_SECURITY_ENABLED">
-               <xsd:documentation>
-                  true means that security is enabled
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="security-invalidation-interval" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="security" hq:field_name="DEFAULT_SECURITY_INVALIDATION_INTERVAL">
-               <xsd:documentation>
-                  how long (in ms) to wait before invalidating the security cache
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-lock-acquisition-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="using-server.configuration"
-                            hq:field_name="DEFAULT_JOURNAL_LOCK_ACQUISITION_TIMEOUT">
-               <xsd:documentation>
-                  how long (in ms) to wait to acquire a file lock on the journal
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="wild-card-routing-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="wildcard-routing" hq:field_name="DEFAULT_WILDCARD_ROUTING_ENABLED">
-               <xsd:documentation>
-                  true means that the server supports wild card routing
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="management-address" type="xsd:string" default="jms.queue.hornetq.management" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="management.core.configuration"
-                            hq:field_name="DEFAULT_MANAGEMENT_ADDRESS"
-                            hq:type="SimpleString">
-               <xsd:documentation>
-                  the name of the management address to send management messages to. It is prefixed with "jms.queue" so
-                  that JMS clients can send messages to it.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="management-notification-address" type="xsd:string" default="hornetq.notifications"
-                      maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="management.notifications.core.configuration"
-                            hq:field_name="DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS"
-                            hq:type="SimpleString">
-               <xsd:documentation>
-                  the name of the address that consumers bind to receive management notifications
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="cluster-user" type="xsd:string" default="HORNETQ.CLUSTER.ADMIN.USER" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="clusters" hq:field_name="DEFAULT_CLUSTER_USER">
-               <xsd:documentation>
-                  Cluster username. It applies to all cluster configurations.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="cluster-password" maxOccurs="1" minOccurs="0" type="xsd:string" default="CHANGE ME!!">
-            <xsd:annotation hq:linkend="clusters" hq:field_name="DEFAULT_CLUSTER_PASSWORD">
-               <xsd:documentation>
-                  Cluster password. It applies to all cluster configurations.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="replication-clustername" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Name of the cluster configuration to use for replication. This setting is only necessary in case
-                  you configure multiple cluster connections. It is used by a replicating backups and by live servers
-                  that may attempt fail-back.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="scale-down-clustername" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Name of the cluster configuration to use for scaling down. This setting is only necessary in
-                  case you configure multiple cluster connections.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. This specifies how many times a replicated backup server can restart after moving its files on
-                  start. Once there are this number of backup journal files the server will stop permanently after if
-                  fails back.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="password-codec" type="xsd:string"
-                      default="org.apache.activemq.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuration.masked-password">
-               <xsd:documentation>
-                  Class name and its parameters for the Decoder used to decode the masked password. Ignored if
-                  mask-password is false. The format of this property is a full qualified class name optionally followed
-                  by key/value pairs.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="mask-password" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuration.masked-password" hq:field_name="DEFAULT_MASK_PASSWORD">
-               <xsd:documentation>
-                  This option controls whether passwords in server configuration need be masked. If set to "true" the
-                  passwords are masked.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="log-delegate-factory-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="XXX">
-               <xsd:documentation>
-                  XXX
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="jmx-management-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="management.jmx.configuration"
-                            hq:field_name="DEFAULT_JMX_MANAGEMENT_ENABLED">
-               <xsd:documentation>
-                  true means that the management API is available via JMX
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="management.jmx.configuration" hq:field_name="DEFAULT_JMX_DOMAIN">
-               <xsd:documentation>
-                  the JMX domain used to registered HornetQ MBeans in the MBeanServer
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="message-counter-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.counters" hq:field_name="DEFAULT_MESSAGE_COUNTER_ENABLED">
-               <xsd:documentation>
-                  true means that message counters are enabled
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="message-counter-sample-period" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.counters"
-                            hq:field_name="DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD">
-               <xsd:documentation>
-                  the sample period (in ms) to use for message counters
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="message-counter-max-day-history" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.counters" hq:default="(days)"
-                            hq:field_name="DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY">
-               <xsd:documentation>
-                  how many days to keep message counter history
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="connection-ttl-override" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl.override"
-                            hq:field_name="DEFAULT_CONNECTION_TTL_OVERRIDE">
-               <xsd:documentation>
-                  if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1
-                  disables this setting.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="async-connection-execution-enabled" type="xsd:boolean" default="true" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl.async-connection-execution"
-                            hq:field_name="DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED">
-               <xsd:documentation>
-                  should certain incoming packets on the server be handed off to a thread from the thread pool for
-                  processing or should they be handled on the remoting thread?
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="transaction-timeout" type="xsd:long" default="300000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="transaction-config" hq:field_name="DEFAULT_TRANSACTION_TIMEOUT">
-               <xsd:documentation>
-                  how long (in ms) before a transaction can be removed from the resource manager after create time
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="transaction-timeout-scan-period" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="transaction-config" hq:field_name="DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD">
-               <xsd:documentation>
-                  how often (in ms) to scan for timeout transactions
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="message-expiry-scan-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.expiry.reaper" hq:field_name="DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD">
-               <xsd:documentation>
-                  how often (in ms) to scan for expired messages
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="message-expiry-thread-priority" type="xsd:int" default="3" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.expiry.reaper"
-                            hq:field_name="DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY">
-               <xsd:documentation>
-                  the priority of the thread expiring messages
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="id-cache-size" type="xsd:int" default="20000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="duplicate.id.cache" hq:field_name="DEFAULT_ID_CACHE_SIZE">
-               <xsd:documentation>
-                  the size of the cache for pre-creating message ID's
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="persist-id-cache" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="duplicate.id.cache" hq:field_name="DEFAULT_PERSIST_ID_CACHE">
-               <xsd:documentation>
-                  true means that ID's are persisted to the journal
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="remoting-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="intercepting-operations">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored. Any interceptor specified here
-                  will be considered an "incoming" interceptor. See &lt;remoting-incoming-interceptors&gt; and &lt;remoting-outgoing-interceptors&gt;.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="remoting-incoming-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="intercepting-operations">
-               <xsd:documentation>
-                  a list of &lt;class-name/&gt; elements with the names of classes to use for interceptor incoming
-                  remoting packets
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="remoting-outgoing-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="intercepting-operations">
-               <xsd:documentation>
-                  a list of &lt;class-name/&gt; elements with the names of classes to use for interceptor outcoming
-                  remoting packets
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="backup" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha" hq:field_name="DEFAULT_BACKUP">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. It indicates whether this server is a backup server
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="allow-failback" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha.allow-fail-back">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Whether a server will automatically stop when a another places a request to take over its place.
-                  The use case is when a regular server stops and its backup takes over its duties, later the main
-                  server restarts and requests the server (the former backup) to stop operating.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="backup-group-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. used for replication, if set, (remote) backup servers will only pair with live servers with
-                  matching backup-group-name
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="scale-down-group-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. used for scaling down, if set, a live server will only send messages to another live server with
-                  matching scale-down-group-name
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="failback-delay" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha.allow-fail-back">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. The delay to wait before fail-back occurs on (live's) restart.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="failover-on-shutdown" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha.allow-fail-back">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Will this backup server come live on a normal server shutdown.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="scale-down" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha.scale-down">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. Will this server send its messages to another live server in the
-                  cluster when shut-down cleanly.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="shared-store" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha.mode.shared" hq:field_name="DEFAULT_SHARED_STORE">
-               <xsd:documentation>
-                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
-                  used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share
-                  storage or if the data is replicated among them.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="persist-delivery-count-before-delivery" type="xsd:boolean" default="false" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.delivery.count.persistence"
-                            hq:field_name="DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY">
-               <xsd:documentation>
-                  True means that the delivery count is persisted before delivery. False means that this only happens
-                  after a message has been cancelled.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring-transports.connectors">
-               <xsd:documentation>
-                  a list of remoting connectors configurations to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="connector" maxOccurs="unbounded" minOccurs="0">
-                     <xsd:complexType>
-                        <xsd:sequence>
-                           <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    Name of the ConnectorFactory implementation
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                           <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    A key-value pair used to configure the connector. A connector can have many param's
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                        </xsd:sequence>
-                        <xsd:attribute name="name" type="xsd:ID" use="required">
-                           <xsd:annotation>
-                              <xsd:documentation>
-                                 Name of the connector
-                              </xsd:documentation>
-                           </xsd:annotation>
-                        </xsd:attribute>
-                     </xsd:complexType>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element maxOccurs="1" minOccurs="0" name="acceptors">
-            <xsd:annotation hq:linkend="configuring-transports.acceptors">
-               <xsd:documentation>
-                  a list of remoting acceptors to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="acceptor" maxOccurs="unbounded" minOccurs="1">
-                     <xsd:complexType>
-                        <xsd:sequence>
-                           <xsd:element name="factory-class" type="xsd:string" maxOccurs="1" minOccurs="1">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    Name of the AcceptorFactory implementation
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                           <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    A key-value pair used to configure the acceptor. An acceptor can have many param
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                        </xsd:sequence>
-                        <xsd:attribute name="name" type="xsd:string" use="optional">
-                           <xsd:annotation>
-                              <xsd:documentation>
-                                 Name of the acceptor
-                              </xsd:documentation>
-                           </xsd:annotation>
-                        </xsd:attribute>
-                     </xsd:complexType>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element maxOccurs="1" minOccurs="0" name="broadcast-groups">
-            <xsd:annotation hq:linkend="clusters">
-               <xsd:documentation>
-                  a list of broadcast groups to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element ref="broadcast-group" maxOccurs="unbounded" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element maxOccurs="1" minOccurs="0" name="discovery-groups">
-            <xsd:annotation hq:linkend="clusters">
-               <xsd:documentation>
-                  a list of discovery groups to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element maxOccurs="unbounded" minOccurs="0" ref="discovery-group">
-                     <xsd:annotation>
-                        <xsd:documentation>
-                           a discovery group specification element
-                        </xsd:documentation>
-                     </xsd:annotation>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="diverts">
-               <xsd:documentation>
-                  a list of diverts to use
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="divert" type="divertType" maxOccurs="unbounded" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-
-         <!-- QUEUES -->
-         <xsd:element name="queues" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="predefined.queues">
-               <xsd:documentation>
-                  a list of pre configured queues to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="queue" maxOccurs="unbounded" minOccurs="0">
-                     <xsd:complexType>
-                        <xsd:all>
-                           <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    address for the queue
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                           <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
-                           <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-                              <xsd:annotation>
-                                 <xsd:documentation>
-                                    whether the queue is durable (persistent)
-                                 </xsd:documentation>
-                              </xsd:annotation>
-                           </xsd:element>
-                        </xsd:all>
-                        <xsd:attribute name="name" type="xsd:ID" use="required">
-                           <xsd:annotation>
-                              <xsd:documentation>
-                                 unique name of this queue
-                              </xsd:documentation>
-                           </xsd:annotation>
-                        </xsd:attribute>
-                     </xsd:complexType>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="core-bridges">
-               <xsd:documentation>
-                  a list of bridges to create
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="bridge" type="bridgeType" maxOccurs="unbounded" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="ha-policy" type="haPolicyType" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="ha-policy">
-               <xsd:documentation>
-                  The HA policy of this server
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="cluster-connections" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="clusters">
-               <xsd:documentation>
-                  a list of cluster connections
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="cluster-connection" type="cluster-connectionType" maxOccurs="unbounded"
-                               minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="grouping-handler" type="groupingHandlerType" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="message-grouping">
-               <xsd:documentation>
-                  Message Group configuration
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="paging-directory" type="xsd:string" default="data/paging" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="paging.main.config" hq:field_name="DEFAULT_PAGING_DIR">
-               <xsd:documentation>
-                  the directory to store paged messages in
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="bindings-directory" type="xsd:string" default="data/bindings" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.bindings.journal"
-                            hq:field_name="DEFAULT_BINDINGS_DIRECTORY">
-               <xsd:documentation>
-                  the directory to store the persisted bindings to
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="create-bindings-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.bindings.journal"
-                            hq:field_name="DEFAULT_CREATE_BINDINGS_DIR">
-               <xsd:documentation>
-                  true means that the server will create the bindings directory on start up
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="page-max-concurrent-io" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="paging.mode" hq:field_name="DEFAULT_MAX_CONCURRENT_PAGE_IO">
-               <xsd:documentation>
-                  The max number of concurrent reads allowed on paging
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-directory" type="xsd:string" default="data/journal" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-directory"
-                            hq:field_name="DEFAULT_JOURNAL_DIR">
-               <xsd:documentation>
-                  the directory to store the journal files in
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="create-journal-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.create-journal-dir"
-                            hq:field_name="DEFAULT_CREATE_JOURNAL_DIR">
-               <xsd:documentation>
-                  true means that the journal directory will be created
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-type" default="ASYNCIO" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-type">
-               <xsd:documentation>
-                  the type of journal to use
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:simpleType>
-               <xsd:restriction base="xsd:string">
-                  <xsd:enumeration value="ASYNCIO"/>
-                  <xsd:enumeration value="NIO"/>
-               </xsd:restriction>
-            </xsd:simpleType>
-         </xsd:element>
-
-         <xsd:element name="journal-buffer-timeout" type="xsd:long" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-buffer-timeout">
-               <xsd:documentation>
-                  The timeout (in nanoseconds) used to flush internal buffers on the journal. The exact default value
-                  depend on whether the journal is ASYNCIO or NIO.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-buffer-size" type="xsd:long" default="501760" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-buffer-size"
-                            hq:default="(490 KiB)">
-               <xsd:documentation>
-                  The size of the internal buffer on the journal in KiB.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-sync-transactional" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-sync-transactional"
-                            hq:field_name="DEFAULT_JOURNAL_SYNC_TRANSACTIONAL">
-               <xsd:documentation>
-                  if true wait for transaction data to be synchronized to the journal before returning response to
-                  client
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-sync-non-transactional" type="xsd:boolean" default="true" maxOccurs="1"
-                      minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-sync-non-transactional"
-                            hq:field_name="DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL">
-               <xsd:documentation>
-                  if true wait for non transaction data to be synced to the journal before returning response to client.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="log-journal-write-rate" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_JOURNAL_LOG_WRITE_RATE">
-               <xsd:documentation>
-                  Whether to log messages about the journal write rate
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-file-size" default="10485760" type="xsd:int" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-file-size"
-                            hq:default="(10 * 1024 * 1024 - 10 MiB)"
-                            hq:field_name="DEFAULT_JOURNAL_FILE_SIZE">
-               <xsd:documentation>
-                  the size (in bytes) of each journal file
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-min-files" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-min-files"
-                            hq:field_name="DEFAULT_JOURNAL_MIN_FILES">
-               <xsd:documentation>
-                  how many journal files to pre-create
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-compact-percentage" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-compact-percentage"
-                            hq:field_name="DEFAULT_JOURNAL_COMPACT_PERCENTAGE">
-               <xsd:documentation>
-                  The percentage of live data on which we consider compacting the journal
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-compact-min-files" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-compact-min-files"
-                            hq:field_name="DEFAULT_JOURNAL_COMPACT_MIN_FILES">
-               <xsd:documentation>
-                  The minimal number of data files before we can start compacting
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="journal-max-io" type="xsd:int" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="configuring.message.journal.journal-max-io">
-               <xsd:documentation>
-                  the maximum number of write requests that can be in the AIO queue at any one time. Default is 500 for
-                  AIO and 1 for NIO.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="perf-blast-pages" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="XXX" hq:field_name="DEFAULT_JOURNAL_PERF_BLAST_PAGES">
-               <xsd:documentation>
-                  XXX Only meant to be used by project developers
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="run-sync-speed-test" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="XXX" hq:field_name="DEFAULT_RUN_SYNC_SPEED_TEST">
-               <xsd:documentation>
-                  XXX Only meant to be used by project developers
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="server-dump-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="XXX" hq:default="(ms)"
-                            hq:field_name="DEFAULT_SERVER_DUMP_INTERVAL">
-               <xsd:documentation>
-                  Interval to log server specific information (e.g. memory usage etc)
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="memory-warning-threshold" type="xsd:int" default="25" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="perf-tuning.memory"
-                            hq:field_name="DEFAULT_MEMORY_WARNING_THRESHOLD">
-               <xsd:documentation>
-                  Percentage of available memory which will trigger a warning log
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="memory-measure-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="perf-tuning.memory" hq:default="(ms)"
-                            hq:field_name="DEFAULT_MEMORY_MEASURE_INTERVAL">
-               <xsd:documentation>
-                  frequency to sample JVM memory in ms (or -1 to disable memory sampling)
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="large-messages-directory" type="xsd:string" default="data/largemessages"
-                      maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="large.message.configuring" hq:field_name="DEFAULT_LARGE_MESSAGES_DIR">
-               <xsd:documentation>
-                  the directory to store large messages
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="security-settings" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="security.settings.roles">
-               <xsd:documentation>
-                  a list of security settings
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="security-setting" maxOccurs="unbounded" minOccurs="0">
-                     <xsd:complexType>
-                        <xsd:annotation>
-                           <xsd:documentation>
-                              a permission to add to the matched addresses
-                           </xsd:documentation>
-                        </xsd:annotation>
-                        <xsd:sequence>
-                           <xsd:element name="permission" maxOccurs="unbounded" minOccurs="0">
-                              <xsd:complexType>
-                                 <xsd:attribute name="type" type="xsd:string" use="required">
-                                    <xsd:annotation>
-                                       <xsd:documentation>
-                                          the type of permission
-                                       </xsd:documentation>
-                                    </xsd:annotation>
-                                 </xsd:attribute>
-                                 <xsd:attribute name="roles" type="xsd:string" use="required">
-                                    <xsd:annotation>
-                                       <xsd:documentation>
-                                          a comma-separated list of roles to apply the permission to
-                                       </xsd:documentation>
-                                    </xsd:annotation>
-                                 </xsd:attribute>
-                              </xsd:complexType>
-                           </xsd:element>
-                        </xsd:sequence>
-                        <xsd:attribute name="match" type="xsd:string" use="required">
-                           <xsd:annotation>
-                              <xsd:documentation>
-                                 regular expression for matching security roles against addresses
-                              </xsd:documentation>
-                           </xsd:annotation>
-                        </xsd:attribute>
-                     </xsd:complexType>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="address-settings" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="queue-attributes.address-settings">
-               <xsd:documentation>
-                  a list of address settings
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element ref="address-setting" maxOccurs="unbounded" minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-
-         <xsd:element name="connector-services" maxOccurs="1" minOccurs="0">
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="connector-service" type="connector-serviceType" maxOccurs="unbounded"
-                               minOccurs="0"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-      </xsd:all>
-   </xsd:complexType>
-
-   <xsd:element name="local-bind-address" type="xsd:string">
-      <xsd:annotation hq:default="wildcard IP address chosen by the kernel">
-         <xsd:documentation>
-            local bind address that the datagram socket is bound to
-         </xsd:documentation>
-      </xsd:annotation>
-   </xsd:element>
-
-   <xsd:element name="local-bind-port" type="xsd:int" default="-1">
-      <xsd:annotation hq:default="(anonymous port)">
-         <xsd:documentation>
-            local port to which the datagram socket is bound to
-         </xsd:documentation>
-      </xsd:annotation>
-   </xsd:element>
-
-   <!-- BROADCAST GROUP CONFIGURATION -->
-   <xsd:element name="broadcast-group">
-      <xsd:complexType>
-         <xsd:sequence>
-            <!-- XXX these 2 local-* here...-->
-            <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
-            <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
-            <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation>
-                  <xsd:documentation>
-                     multicast address to which the data will be broadcast
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
-               <xsd:annotation>
-                  <xsd:documentation>
-                     UDP port number used for broadcasting
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="broadcast-period" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:default="(in milliseconds)" hq:field_name="DEFAULT_BROADCAST_PERIOD">
-                  <xsd:documentation>
-                     period in milliseconds between consecutive broadcasts
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:linkend="clusters.jgroups-file">
-                  <xsd:documentation>
-                     Name of JGroups configuration file. If specified, the server uses JGroups for broadcasting.
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:linkend="clusters.jgroups-example">
-                  <xsd:documentation>
-                     Name of JGroups Channel. If specified, the server uses the named channel for broadcasting.
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
-         </xsd:sequence>
-
-         <xsd:attribute name="name" type="xsd:ID" use="required">
-            <xsd:annotation>
-               <xsd:documentation>
-                  a unique name for the broadcast group
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="discovery-group">
-      <xsd:complexType>
-         <xsd:all>
-            <!-- XXX -->
-            <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation>
-                  <xsd:documentation>
-                     Multicast IP address of the group to listen on
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
-               <xsd:annotation>
-                  <xsd:documentation>
-                     UDP port number of the multi cast group
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:linkend="clusters.jgroups-file">
-                  <xsd:documentation>
-                     Name of a JGroups configuration file. If specified, the server uses JGroups for discovery.
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:linkend="clusters.jgroups-example">
-                  <xsd:documentation>
-                     Name of a JGroups Channel. If specified, the server uses the named channel for discovery.
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="refresh-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:linkend="configuration.discovery-group.refresh-timeout"
-                               hq:default="(in milliseconds)"
-                               hq:field_name="DEFAULT_BROADCAST_REFRESH_TIMEOUT">
-                  <xsd:documentation>
-                     Period the discovery group waits after receiving the last broadcast from a particular server before
-                     removing that servers connector pair entry from its list.
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
-            <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
-            <xsd:element name="initial-wait-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
-               <xsd:annotation hq:default="(milliseconds)" hq:linkend="XXX">
-                  <xsd:documentation>
-                     time to wait for an initial broadcast to give us at least one node in the cluster
-                  </xsd:documentation>
-               </xsd:annotation>
-            </xsd:element>
-         </xsd:all>
-
-         <xsd:attribute name="name" type="xsd:ID" use="required">
-            <xsd:annotation>
-               <xsd:documentation>
-                  a unique name for the discovery group
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="discovery-group-ref">
-      <xsd:complexType>
-         <xsd:attribute name="discovery-group-name" type="xsd:IDREF"/>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:complexType name="class-name-sequenceType">
-      <xsd:annotation>
-         <xsd:documentation>
-            unlimited sequence of &lt;class-name/&gt;
-         </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-         <xsd:element maxOccurs="unbounded" minOccurs="1" name="class-name" type="xsd:string">
-            <xsd:annotation>
-               <xsd:documentation>
-                  the fully qualified name of the interceptor class
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:sequence>
-   </xsd:complexType>
-
-   <xsd:complexType name="paramType">
-      <xsd:attribute name="key" type="xsd:string" use="required">
-         <xsd:annotation>
-            <xsd:documentation>
-               Key of a configuration parameter
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="value" type="xsd:string" use="required">
-         <xsd:annotation>
-            <xsd:documentation>
-               Value of a configuration parameter
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-   </xsd:complexType>
-
-   <!-- BRIDGE CONFIGURATION -->
-   <xsd:complexType name="bridgeType">
-      <xsd:sequence>
-         <xsd:element name="queue-name" type="xsd:IDREF" maxOccurs="1" minOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  name of queue that this bridge consumes from
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  address to forward to. If omitted original address is used
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="ha" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  whether this bridge supports fail-over
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
-
-         <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  optional name of transformer class
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="min-large-message-size" type="xsd:int" default="102400" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:default="(bytes)">
-               <xsd:documentation>
-                  Any message larger than this size is considered a large message (to be sent in
-                  chunks)
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl" hq:default="(ms)">
-               <xsd:documentation>
-                  The period (in milliseconds) a bridge's client will check if it failed to receive a ping from the
-                  server. -1 disables this check.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl" hq:default="(ms)" hq:field_name="DEFAULT_CONNECTION_TTL">
-               <xsd:documentation>
-                  how long to keep a connection alive in the absence of any data arriving from the client. This should
-                  be greater than the ping period.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:default="(in milliseconds)">
-               <xsd:documentation>
-                  period (in ms) between successive retries
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_RETRY_INTERVAL_MULTIPLIER">
-               <xsd:documentation>
-                  multiplier to apply to successive retry intervals
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_MAX_RETRY_INTERVAL">
-               <xsd:documentation>
-                  Limit to the retry-interval growth (due to retry-interval-multiplier)
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_BRIDGE_INITIAL_CONNECT_ATTEMPTS">
-               <xsd:documentation>
-                  maximum number of initial connection attempts, -1 means 'no limits'
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_BRIDGE_RECONNECT_ATTEMPTS">
-               <xsd:documentation>
-                  maximum number of retry attempts, -1 means 'no limits'
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="failover-on-server-shutdown" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  should failover be prompted if target server is cleanly shutdown?
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_BRIDGE_DUPLICATE_DETECTION">
-               <xsd:documentation>
-                  should duplicate detection headers be inserted in forwarded messages?
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="confirmation-window-size" type="xsd:int" maxOccurs="1" minOccurs="0" default="1048576">
-            <xsd:annotation hq:default="(bytes)" hq:field_name="DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE">
-               <xsd:documentation>
-                  Once the bridge has received this many bytes, it sends a confirmation
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="user" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  username, if unspecified the cluster-user is used
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="password" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  password, if unspecified the cluster-password is used
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="reconnect-attempts-same-node" default="10" type="xsd:int" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:default="(int, 10)" hq:field_name="DEFAULT_BRIDGE_CONNECT_SAME_NODE">
-               <xsd:documentation>
-                  Upon reconnection this configures the number of time the same node on the topology will be retried
-                  before reseting the server locator and using the initial connectors
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:choice>
-            <xsd:element name="static-connectors" maxOccurs="1" minOccurs="1">
-               <xsd:complexType>
-                  <xsd:sequence>
-                     <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
-                  </xsd:sequence>
-               </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="1">
-               <xsd:complexType>
-                  <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
-                     <xsd:annotation>
-                        <xsd:documentation>
-                           name of discovery group used by this bridge
-                        </xsd:documentation>
-                     </xsd:annotation>
-                  </xsd:attribute>
-               </xsd:complexType>
-            </xsd:element>
-         </xsd:choice>
-      </xsd:sequence>
-
-      <xsd:attribute name="name" type="xsd:ID" use="required">
-         <xsd:annotation>
-            <xsd:documentation>
-               unique name for this bridge
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-   </xsd:complexType>
-
-
-   <!-- CLUSTER CONNECTION CONFIGURATION -->
-
-   <xsd:complexType name="cluster-connectionType">
-      <xsd:sequence>
-         <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  name of the address this cluster connection applies to
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="connector-ref" type="xsd:string" maxOccurs="1" minOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Name of the connector reference to use.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl" hq:default="(ms)" hq:field_name="DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD">
-               <xsd:documentation>
-                  The period (in milliseconds) used to check if the cluster connection has failed to receive pings from
-                  another server
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="connection-ttl" hq:default="(ms)" hq:field_name="DEFAULT_CLUSTER_CONNECTION_TTL">
-               <xsd:documentation>
-                  how long to keep a connection alive in the absence of any data arriving from the client
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="min-large-message-size" type="xsd:int" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="large-messages" hq:default="(bytes)">
-               <xsd:documentation>
-                  Messages larger than this are considered large-messages
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="call-timeout" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:default="(ms)" hq:field_name="DEFAULT_CLUSTER_CALL_TIMEOUT">
-               <xsd:documentation>
-                  How long to wait for a reply
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="retry-interval" type="xsd:long" default="500" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_RETRY_INTERVAL">
-               <xsd:documentation>
-                  period (in ms) between successive retries
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER">
-               <xsd:documentation>
-                  multiplier to apply to the retry-interval
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_MAX_RETRY_INTERVAL">
-               <xsd:documentation>
-                  Maximum value for retry-interval
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_INITIAL_CONNECT_ATTEMPTS">
-               <xsd:documentation>
-                  How many attempts should be made to connect initially
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_RECONNECT_ATTEMPTS">
-               <xsd:documentation>
-                  How many attempts should be made to reconnect after failure
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_DUPLICATE_DETECTION">
-               <xsd:documentation>
-                  should duplicate detection headers be inserted in forwarded messages?
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="forward-when-no-consumers" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS">
-               <xsd:documentation>
-                  should messages be load balanced if there are no matching consumers on target?
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="max-hops" type="xsd:int" default="1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_MAX_HOPS">
-               <xsd:documentation>
-                  maximum number of hops cluster topology is propagated
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="confirmation-window-size" type="xsd:int" default="1048576" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_CONFIRMATION_WINDOW_SIZE" hq:linkend="client-reconnection">
-               <xsd:documentation>
-                  The size (in bytes) of the window used for confirming data from the server connected to.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="call-failover-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="clusters.cluster-connections" hq:default="(ms)" hq:field_name="DEFAULT_CLUSTER_CALL_FAILOVER_TIMEOUT">
-               <xsd:documentation>
-                  How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="notification-interval" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:default="(ms)" hq:field_name="DEFAULT_CLUSTER_NOTIFICATION_INTERVAL">
-               <xsd:documentation>
-                  how often the cluster connection will notify the cluster of its existence right after joining the
-                  cluster
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="notification-attempts" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_CLUSTER_NOTIFICATION_ATTEMPTS">
-               <xsd:documentation>
-                  how many times this cluster connection will notify the cluster of its existence right after joining
-                  the cluster
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="scale-down-connector" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The connector to use for scaling down or when as backup in SCALE_DOWN mode
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:choice>
-            <xsd:element name="static-connectors" maxOccurs="1" minOccurs="0">
-               <xsd:complexType>
-                  <xsd:sequence>
-                     <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
-                  </xsd:sequence>
-                  <xsd:attribute name="allow-direct-connections-only" default="false" type="xsd:boolean" use="optional">
-                     <xsd:annotation hq:field_name="DEFAULT_CLUSTER_ALLOW_DIRECT_CONNECTIONS">
-                        <xsd:documentation>
-                           restricts cluster connections to the listed connector-ref's
-                        </xsd:documentation>
-                     </xsd:annotation>
-                  </xsd:attribute>
-               </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="0">
-               <xsd:complexType>
-                  <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
-                     <xsd:annotation>
-                        <xsd:documentation>
-                           XXX -- this is a duplicate...
-                        </xsd:documentation>
-                     </xsd:annotation>
-                  </xsd:attribute>
-               </xsd:complexType>
-            </xsd:element>
-         </xsd:choice>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="xsd:ID" use="required">
-         <xsd:annotation>
-            <xsd:documentation>
-               unique name for this cluster connection
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-   </xsd:complexType>
-
-   <!-- DIVERT CONFIGURATION TYPE -->
-   <xsd:complexType name="divertType">
-      <xsd:all>
-         <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  an optional class name of a transformer
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="exclusive" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:field_name="DEFAULT_DIVERT_EXCLUSIVE">
-               <xsd:documentation>
-                  whether this is an exclusive divert
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="routing-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  the routing name for the divert
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  the address this divert will divert from
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  the forwarding address for the divert
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
-      </xsd:all>
-
-      <xsd:attribute name="name" type="xsd:ID" use="required">
-         <xsd:annotation>
-            <xsd:documentation>
-               a unique name for the divert
-            </xsd:documentation>
-         </xsd:annotation>
-      </xsd:attribute>
-
-   </xsd:complexType>
-   <xsd:complexType name="haPolicyType">
-      <xsd:choice>
-         <xsd:element name="live-only" type="haLiveOnlyPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A live only server with no HA capabilities apart from scale down.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="replication" type="haReplicationType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Configuration for a replicated server, either master, slave or colocated.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="shared-store" type="haSharedStoreType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Configuration for a shared store server, either master, slave or colocated.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:choice>
-   </xsd:complexType>
-
-   <xsd:complexType name="haReplicationType">
-      <xsd:choice>
-         <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A live server configured to replicate.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A backup server configured to replicate.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="colocated" type="haColocationReplicationType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  a replicated lives server that will allow requests to create colocated replicated backup servers.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:choice>
-   </xsd:complexType>
-
-   <xsd:complexType name="haColocationReplicationType">
-      <xsd:all>
-         <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
-            <xsd:annotation hq:field_name="DEFAULT_HAPOLICY_REQUEST_BACKUP">
-               <xsd:documentation>
-                  If true then the server will request a backup on another node
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
-            <xsd:annotation hq:field_name="DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRIES">
-               <xsd:documentation>
-                  How many times the live server will try to request a backup, -1 means for ever.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
-            <xsd:annotation hq:field_name="DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRY_INTERVAL">
-               <xsd:documentation>
-                  How long to wait for retries between attempts to request a backup server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
-            <xsd:annotation hq:field_name="DEFAULT_HAPOLICY_MAX_BACKUPS">
-               <xsd:documentation>
-                  Whether or not this live server will accept backup requests from other live servers.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
-            <xsd:annotation hq:field_name="DEFAULT_HAPOLICY_BACKUP_PORT_OFFSET">
-               <xsd:documentation>
-                  The offset to use for the Connectors and Acceptors when creating a new backup server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="excludes" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  the connectors that shouldn't have their ports offset, typically remote connectors or the
-                  connector used in the cluster connection if scalinmg down
-               </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-               <xsd:sequence>
-                  <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:element>
-         <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The configuration for the live replicated server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The configuration for any slaves created.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:all>
-   </xsd:complexType>
-
-   <xsd:complexType name="haColocationSharedStoreType">
-      <xsd:all>
-         <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
-            <xsd:annotation>
-               <xsd:documentation>
-                  If true then the server will request a backup on another node
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  How many times the live server will try to request a backup, -1 means for ever.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
-            <xsd:annotation>
-               <xsd:documentation>
-                  How long to wait for retries between attempts to request a backup server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Whether or not this live server will accept backup requests from other live servers.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The offset to use for the Connectors and Acceptors when creating a new backup server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The configuration for the live shared store server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The configuration for any shared store backups created.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:all>
-   </xsd:complexType>
-
-   <xsd:complexType name="haSharedStoreType">
-      <xsd:choice>
-         <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A shared store live server configuration.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A shared store backup server configuration.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="colocated" type="haColocationSharedStoreType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  A shared store colocated configuration
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:choice>
-   </xsd:complexType>
-
-   <xsd:complexType name="haLiveOnlyPolicyType">
-      <xsd:all>
-         <xsd:element name="scale-down" type="scaleDownType" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  The scale down configuration of this live server.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:all>
-   </xsd:complexType>
-   <xsd:complexType name="replicatedPolicyType">
-      <xsd:all>
-         <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
-            <xsd:annotation>
-               <xsd:documentation>
-                  used for replication, if set, (remote) backup servers will only pair with live servers with matching
-                  group-name
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation>
-                  Name of the cluster configuration to use for replication. This setting is only necessary in case you
-                  configure multiple cluster connections. It is used by a replicating backups and by live servers that
-                  may attempt fail-back.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="check-for-live-server" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-            <xsd:annotation hq:linkend="hq.check-for-live-server" hq:field_name="DEFAULT_CHECK_FOR_LIVE_SERVER">
-               <xsd:documentation>
-                  Whether to check the cluster for a (live) server using our own server ID when starting
-                  up. This option is only necessary for performing 'fail-back' on replicating
-                  servers. Strictly speaking this setting only applies to live servers and not to
-                  backups.
-               </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-      </xsd:all>
-   </xsd

<TRUNCATED>

[03/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index f2b2b3c..ada8eab 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 44fb274..6b1e936 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
index 7df240c..9633928 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
index 7df240c..9633928 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
index a3b0d36..3854c08 100644
--- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
+++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd ">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
index 8c3aecb..e449dbc 100644
--- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
+++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-jms.xsd ">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 22095c5..5922f99 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
index 0a4a4aa..b9281a2 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
index b6cfca4..5412a93 100644
--- a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
index bc4af35..3461588 100644
--- a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
+++ b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/jms-tests/src/test/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-configuration.xml b/tests/jms-tests/src/test/resources/hornetq-configuration.xml
index fa25c5c..af58701 100644
--- a/tests/jms-tests/src/test/resources/hornetq-configuration.xml
+++ b/tests/jms-tests/src/test/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/jms-tests/src/test/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-jms.xml b/tests/jms-tests/src/test/resources/hornetq-jms.xml
index 8026fad..244df19 100644
--- a/tests/jms-tests/src/test/resources/hornetq-jms.xml
+++ b/tests/jms-tests/src/test/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/jms-tests/src/test/resources/hornetq-queues.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-queues.xml b/tests/jms-tests/src/test/resources/hornetq-queues.xml
index 0a4bb14..e858db3 100644
--- a/tests/jms-tests/src/test/resources/hornetq-queues.xml
+++ b/tests/jms-tests/src/test/resources/hornetq-queues.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" 
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
             xsi:schemaLocation="urn:hornetq ../../../src/schemas/hornetq-configuration.xsd ">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/jms-tests/src/test/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/hornetq-users.xml b/tests/jms-tests/src/test/resources/hornetq-users.xml
index 9e733f5..775c104 100644
--- a/tests/jms-tests/src/test/resources/hornetq-users.xml
+++ b/tests/jms-tests/src/test/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">


[11/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/resources/schema/activemq-configuration.xsd
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/resources/schema/activemq-configuration.xsd b/activemq-server/src/main/resources/schema/activemq-configuration.xsd
new file mode 100644
index 0000000..dd0863c
--- /dev/null
+++ b/activemq-server/src/main/resources/schema/activemq-configuration.xsd
@@ -0,0 +1,2292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="urn:activemq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:amq="urn:org.apache.activemq"
+            xmlns:csd="http://www.w3.org/2001/XMLSchema"
+            attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:activemq"
+            version="1.0">
+
+   <xsd:element name="configuration" type="configurationType" amq:schema="activemq-configuration"/>
+
+   <xsd:complexType name="configurationType">
+      <xsd:all>
+         <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Node name. If set, it will be used in topology notifications.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="resolve-protocols" type="xsd:boolean" default="true" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="resolveProtocols">
+               <xsd:documentation>
+                  If true then the HornetQ Server will make use of any Protocol Managers that are in available on the
+                  classpath. If false then only the core protocol will be available, unless in Embedded mode where users
+                  can inject their own Protocol Managers.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="clustered" type="xsd:boolean" default="false" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated and its value will be ignored (HQ221038). A HornetQ server will
+                  be "clustered" when its configuration contain a cluster-configuration.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="check-for-live-server" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="hq.check-for-live-server">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Whether to check the cluster for a (live) server using our own server ID when starting up. This
+                  option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this
+                  setting only applies to live servers and not to backups.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="file-deployment-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="using-server.configuration">
+               <xsd:documentation>
+                  true means that the server will load configuration from the configuration files
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="persistence-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="persistence.enabled">
+               <xsd:documentation>
+                  true means that the server will use the file based journal for persistence.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="server.scheduled.thread.pool">
+               <xsd:documentation>
+                  Maximum number of threads to use for the scheduled thread pool
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="thread-pool-max-size" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="server.scheduled.thread.pool">
+               <xsd:documentation>
+                  Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="security-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="security">
+               <xsd:documentation>
+                  true means that security is enabled
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="security-invalidation-interval" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="security">
+               <xsd:documentation>
+                  how long (in ms) to wait before invalidating the security cache
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-lock-acquisition-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="using-server.configuration">
+               <xsd:documentation>
+                  how long (in ms) to wait to acquire a file lock on the journal
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="wild-card-routing-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="wildcard-routing">
+               <xsd:documentation>
+                  true means that the server supports wild card routing
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="management-address" type="xsd:string" default="jms.queue.hornetq.management" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="management.core.configuration"
+                            amq:type="SimpleString">
+               <xsd:documentation>
+                  the name of the management address to send management messages to. It is prefixed with "jms.queue" so
+                  that JMS clients can send messages to it.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="management-notification-address" type="xsd:string" default="hornetq.notifications"
+                      maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="management.notifications.core.configuration"
+                            amq:type="SimpleString">
+               <xsd:documentation>
+                  the name of the address that consumers bind to receive management notifications
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="cluster-user" type="xsd:string" default="HORNETQ.CLUSTER.ADMIN.USER" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  Cluster username. It applies to all cluster configurations.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="cluster-password" maxOccurs="1" minOccurs="0" type="xsd:string" default="CHANGE ME!!">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  Cluster password. It applies to all cluster configurations.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="replication-clustername" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Name of the cluster configuration to use for replication. This setting is only necessary in case
+                  you configure multiple cluster connections. It is used by a replicating backups and by live servers
+                  that may attempt fail-back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="scale-down-clustername" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Name of the cluster configuration to use for scaling down. This setting is only necessary in
+                  case you configure multiple cluster connections.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. This specifies how many times a replicated backup server can restart after moving its files on
+                  start. Once there are this number of backup journal files the server will stop permanently after if
+                  fails back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="password-codec" type="xsd:string"
+                      default="org.apache.activemq.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuration.masked-password">
+               <xsd:documentation>
+                  Class name and its parameters for the Decoder used to decode the masked password. Ignored if
+                  mask-password is false. The format of this property is a full qualified class name optionally followed
+                  by key/value pairs.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="mask-password" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuration.masked-password">
+               <xsd:documentation>
+                  This option controls whether passwords in server configuration need be masked. If set to "true" the
+                  passwords are masked.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="log-delegate-factory-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="XXX">
+               <xsd:documentation>
+                  XXX
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="jmx-management-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="management.jmx.configuration">
+               <xsd:documentation>
+                  true means that the management API is available via JMX
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="management.jmx.configuration">
+               <xsd:documentation>
+                  the JMX domain used to registered HornetQ MBeans in the MBeanServer
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="message-counter-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.counters">
+               <xsd:documentation>
+                  true means that message counters are enabled
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="message-counter-sample-period" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.counters">
+               <xsd:documentation>
+                  the sample period (in ms) to use for message counters
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="message-counter-max-day-history" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.counters" amq:default="(days)">
+               <xsd:documentation>
+                  how many days to keep message counter history
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="connection-ttl-override" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl.override">
+               <xsd:documentation>
+                  if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1
+                  disables this setting.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="async-connection-execution-enabled" type="xsd:boolean" default="true" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl.async-connection-execution">
+               <xsd:documentation>
+                  should certain incoming packets on the server be handed off to a thread from the thread pool for
+                  processing or should they be handled on the remoting thread?
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="transaction-timeout" type="xsd:long" default="300000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="transaction-config">
+               <xsd:documentation>
+                  how long (in ms) before a transaction can be removed from the resource manager after create time
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="transaction-timeout-scan-period" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="transaction-config">
+               <xsd:documentation>
+                  how often (in ms) to scan for timeout transactions
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="message-expiry-scan-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.expiry.reaper" >
+               <xsd:documentation>
+                  how often (in ms) to scan for expired messages
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="message-expiry-thread-priority" type="xsd:int" default="3" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.expiry.reaper">
+               <xsd:documentation>
+                  the priority of the thread expiring messages
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="id-cache-size" type="xsd:int" default="20000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="duplicate.id.cache">
+               <xsd:documentation>
+                  the size of the cache for pre-creating message ID's
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="persist-id-cache" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="duplicate.id.cache">
+               <xsd:documentation>
+                  true means that ID's are persisted to the journal
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="remoting-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="intercepting-operations">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored. Any interceptor specified here
+                  will be considered an "incoming" interceptor. See &lt;remoting-incoming-interceptors&gt; and &lt;remoting-outgoing-interceptors&gt;.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="remoting-incoming-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="intercepting-operations">
+               <xsd:documentation>
+                  a list of &lt;class-name/&gt; elements with the names of classes to use for interceptor incoming
+                  remoting packets
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="remoting-outgoing-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="intercepting-operations">
+               <xsd:documentation>
+                  a list of &lt;class-name/&gt; elements with the names of classes to use for interceptor outcoming
+                  remoting packets
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="backup" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. It indicates whether this server is a backup server
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="allow-failback" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.allow-fail-back">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Whether a server will automatically stop when a another places a request to take over its place.
+                  The use case is when a regular server stops and its backup takes over its duties, later the main
+                  server restarts and requests the server (the former backup) to stop operating.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="backup-group-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. used for replication, if set, (remote) backup servers will only pair with live servers with
+                  matching backup-group-name
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="scale-down-group-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. used for scaling down, if set, a live server will only send messages to another live server with
+                  matching scale-down-group-name
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="failback-delay" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.allow-fail-back">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. The delay to wait before fail-back occurs on (live's) restart.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="failover-on-shutdown" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.allow-fail-back">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Will this backup server come live on a normal server shutdown.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="scale-down" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.scale-down">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. Will this server send its messages to another live server in the
+                  cluster when shut-down cleanly.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="shared-store" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.mode.shared">
+               <xsd:documentation>
+                  DEPRECATED. This option is deprecated, but it will still be honored if &lt;ha-policy&gt; is not also
+                  used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share
+                  storage or if the data is replicated among them.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="persist-delivery-count-before-delivery" type="xsd:boolean" default="false" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.delivery.count.persistence">
+               <xsd:documentation>
+                  True means that the delivery count is persisted before delivery. False means that this only happens
+                  after a message has been cancelled.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring-transports.connectors">
+               <xsd:documentation>
+                  a list of remoting connectors configurations to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="connector" maxOccurs="unbounded" minOccurs="0">
+                     <xsd:complexType>
+                        <xsd:sequence>
+                           <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    Name of the ConnectorFactory implementation
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                           <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    A key-value pair used to configure the connector. A connector can have many param's
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute name="name" type="xsd:ID" use="required">
+                           <xsd:annotation>
+                              <xsd:documentation>
+                                 Name of the connector
+                              </xsd:documentation>
+                           </xsd:annotation>
+                        </xsd:attribute>
+                     </xsd:complexType>
+                  </xsd:element>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element maxOccurs="1" minOccurs="0" name="acceptors">
+            <xsd:annotation amq:linkend="configuring-transports.acceptors">
+               <xsd:documentation>
+                  a list of remoting acceptors to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="acceptor" maxOccurs="unbounded" minOccurs="1">
+                     <xsd:complexType>
+                        <xsd:sequence>
+                           <xsd:element name="factory-class" type="xsd:string" maxOccurs="1" minOccurs="1">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    Name of the AcceptorFactory implementation
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                           <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    A key-value pair used to configure the acceptor. An acceptor can have many param
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute name="name" type="xsd:string" use="optional">
+                           <xsd:annotation>
+                              <xsd:documentation>
+                                 Name of the acceptor
+                              </xsd:documentation>
+                           </xsd:annotation>
+                        </xsd:attribute>
+                     </xsd:complexType>
+                  </xsd:element>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element maxOccurs="1" minOccurs="0" name="broadcast-groups">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  a list of broadcast groups to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element ref="broadcast-group" maxOccurs="unbounded" minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element maxOccurs="1" minOccurs="0" name="discovery-groups">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  a list of discovery groups to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element maxOccurs="unbounded" minOccurs="0" ref="discovery-group">
+                     <xsd:annotation>
+                        <xsd:documentation>
+                           a discovery group specification element
+                        </xsd:documentation>
+                     </xsd:annotation>
+                  </xsd:element>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="diverts">
+               <xsd:documentation>
+                  a list of diverts to use
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="divert" type="divertType" maxOccurs="unbounded" minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+
+         <!-- QUEUES -->
+         <xsd:element name="queues" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="predefined.queues">
+               <xsd:documentation>
+                  a list of pre configured queues to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="queue" maxOccurs="unbounded" minOccurs="0">
+                     <xsd:complexType>
+                        <xsd:all>
+                           <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    address for the queue
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                           <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+                           <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+                              <xsd:annotation>
+                                 <xsd:documentation>
+                                    whether the queue is durable (persistent)
+                                 </xsd:documentation>
+                              </xsd:annotation>
+                           </xsd:element>
+                        </xsd:all>
+                        <xsd:attribute name="name" type="xsd:ID" use="required">
+                           <xsd:annotation>
+                              <xsd:documentation>
+                                 unique name of this queue
+                              </xsd:documentation>
+                           </xsd:annotation>
+                        </xsd:attribute>
+                     </xsd:complexType>
+                  </xsd:element>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="core-bridges">
+               <xsd:documentation>
+                  a list of bridges to create
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="bridge" type="bridgeType" maxOccurs="unbounded" minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="ha-policy" type="haPolicyType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha-policy">
+               <xsd:documentation>
+                  The HA policy of this server
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="cluster-connections" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="clusters">
+               <xsd:documentation>
+                  a list of cluster connections
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="cluster-connection" type="cluster-connectionType" maxOccurs="unbounded"
+                               minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="grouping-handler" type="groupingHandlerType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="message-grouping">
+               <xsd:documentation>
+                  Message Group configuration
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="paging-directory" type="xsd:string" default="data/paging" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="paging.main.config">
+               <xsd:documentation>
+                  the directory to store paged messages in
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="bindings-directory" type="xsd:string" default="data/bindings" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.bindings.journal">
+               <xsd:documentation>
+                  the directory to store the persisted bindings to
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="create-bindings-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.bindings.journal">
+               <xsd:documentation>
+                  true means that the server will create the bindings directory on start up
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="page-max-concurrent-io" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="paging.mode">
+               <xsd:documentation>
+                  The max number of concurrent reads allowed on paging
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-directory" type="xsd:string" default="data/journal" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-directory">
+               <xsd:documentation>
+                  the directory to store the journal files in
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="create-journal-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.create-journal-dir">
+               <xsd:documentation>
+                  true means that the journal directory will be created
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-type" default="ASYNCIO" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-type">
+               <xsd:documentation>
+                  the type of journal to use
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+               <xsd:restriction base="xsd:string">
+                  <xsd:enumeration value="ASYNCIO"/>
+                  <xsd:enumeration value="NIO"/>
+               </xsd:restriction>
+            </xsd:simpleType>
+         </xsd:element>
+
+         <xsd:element name="journal-buffer-timeout" type="xsd:long" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-buffer-timeout">
+               <xsd:documentation>
+                  The timeout (in nanoseconds) used to flush internal buffers on the journal. The exact default value
+                  depend on whether the journal is ASYNCIO or NIO.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-buffer-size" type="xsd:long" default="501760" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-buffer-size"
+                            amq:default="(490 KiB)">
+               <xsd:documentation>
+                  The size of the internal buffer on the journal in KiB.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-sync-transactional" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-sync-transactional">
+               <xsd:documentation>
+                  if true wait for transaction data to be synchronized to the journal before returning response to
+                  client
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-sync-non-transactional" type="xsd:boolean" default="true" maxOccurs="1"
+                      minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-sync-non-transactional">
+               <xsd:documentation>
+                  if true wait for non transaction data to be synced to the journal before returning response to client.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="log-journal-write-rate" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Whether to log messages about the journal write rate
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-file-size" default="10485760" type="xsd:int" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-file-size"
+                            amq:default="(10 * 1024 * 1024 - 10 MiB)">
+               <xsd:documentation>
+                  the size (in bytes) of each journal file
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-min-files" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-min-files">
+               <xsd:documentation>
+                  how many journal files to pre-create
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-compact-percentage" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-compact-percentage">
+               <xsd:documentation>
+                  The percentage of live data on which we consider compacting the journal
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-compact-min-files" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-compact-min-files">
+               <xsd:documentation>
+                  The minimal number of data files before we can start compacting
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="journal-max-io" type="xsd:int" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="configuring.message.journal.journal-max-io">
+               <xsd:documentation>
+                  the maximum number of write requests that can be in the AIO queue at any one time. Default is 500 for
+                  AIO and 1 for NIO.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="perf-blast-pages" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="XXX">
+               <xsd:documentation>
+                  XXX Only meant to be used by project developers
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="run-sync-speed-test" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="XXX">
+               <xsd:documentation>
+                  XXX Only meant to be used by project developers
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="server-dump-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="XXX" amq:default="(ms)">
+               <xsd:documentation>
+                  Interval to log server specific information (e.g. memory usage etc)
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="memory-warning-threshold" type="xsd:int" default="25" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="perf-tuning.memory">
+               <xsd:documentation>
+                  Percentage of available memory which will trigger a warning log
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="memory-measure-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="perf-tuning.memory" amq:default="(ms)">
+               <xsd:documentation>
+                  frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="large-messages-directory" type="xsd:string" default="data/largemessages"
+                      maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="large.message.configuring">
+               <xsd:documentation>
+                  the directory to store large messages
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="security-settings" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="security.settings.roles">
+               <xsd:documentation>
+                  a list of security settings
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="security-setting" maxOccurs="unbounded" minOccurs="0">
+                     <xsd:complexType>
+                        <xsd:annotation>
+                           <xsd:documentation>
+                              a permission to add to the matched addresses
+                           </xsd:documentation>
+                        </xsd:annotation>
+                        <xsd:sequence>
+                           <xsd:element name="permission" maxOccurs="unbounded" minOccurs="0">
+                              <xsd:complexType>
+                                 <xsd:attribute name="type" type="xsd:string" use="required">
+                                    <xsd:annotation>
+                                       <xsd:documentation>
+                                          the type of permission
+                                       </xsd:documentation>
+                                    </xsd:annotation>
+                                 </xsd:attribute>
+                                 <xsd:attribute name="roles" type="xsd:string" use="required">
+                                    <xsd:annotation>
+                                       <xsd:documentation>
+                                          a comma-separated list of roles to apply the permission to
+                                       </xsd:documentation>
+                                    </xsd:annotation>
+                                 </xsd:attribute>
+                              </xsd:complexType>
+                           </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute name="match" type="xsd:string" use="required">
+                           <xsd:annotation>
+                              <xsd:documentation>
+                                 regular expression for matching security roles against addresses
+                              </xsd:documentation>
+                           </xsd:annotation>
+                        </xsd:attribute>
+                     </xsd:complexType>
+                  </xsd:element>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="address-settings" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="queue-attributes.address-settings">
+               <xsd:documentation>
+                  a list of address settings
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element ref="address-setting" maxOccurs="unbounded" minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+
+         <xsd:element name="connector-services" maxOccurs="1" minOccurs="0">
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="connector-service" type="connector-serviceType" maxOccurs="unbounded"
+                               minOccurs="0"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+
+   <xsd:element name="local-bind-address" type="xsd:string">
+      <xsd:annotation amq:default="wildcard IP address chosen by the kernel">
+         <xsd:documentation>
+            local bind address that the datagram socket is bound to
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+
+   <xsd:element name="local-bind-port" type="xsd:int" default="-1">
+      <xsd:annotation amq:default="(anonymous port)">
+         <xsd:documentation>
+            local port to which the datagram socket is bound to
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+
+   <!-- BROADCAST GROUP CONFIGURATION -->
+   <xsd:element name="broadcast-group">
+      <xsd:complexType>
+         <xsd:sequence>
+            <!-- XXX these 2 local-* here...-->
+            <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
+            <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
+            <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation>
+                  <xsd:documentation>
+                     multicast address to which the data will be broadcast
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
+               <xsd:annotation>
+                  <xsd:documentation>
+                     UDP port number used for broadcasting
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="broadcast-period" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:default="(in milliseconds)">
+                  <xsd:documentation>
+                     period in milliseconds between consecutive broadcasts
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:linkend="clusters.jgroups-file">
+                  <xsd:documentation>
+                     Name of JGroups configuration file. If specified, the server uses JGroups for broadcasting.
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:linkend="clusters.jgroups-example">
+                  <xsd:documentation>
+                     Name of JGroups Channel. If specified, the server uses the named channel for broadcasting.
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+         </xsd:sequence>
+
+         <xsd:attribute name="name" type="xsd:ID" use="required">
+            <xsd:annotation>
+               <xsd:documentation>
+                  a unique name for the broadcast group
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:attribute>
+
+      </xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="discovery-group">
+      <xsd:complexType>
+         <xsd:all>
+            <!-- XXX -->
+            <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation>
+                  <xsd:documentation>
+                     Multicast IP address of the group to listen on
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
+               <xsd:annotation>
+                  <xsd:documentation>
+                     UDP port number of the multi cast group
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:linkend="clusters.jgroups-file">
+                  <xsd:documentation>
+                     Name of a JGroups configuration file. If specified, the server uses JGroups for discovery.
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:linkend="clusters.jgroups-example">
+                  <xsd:documentation>
+                     Name of a JGroups Channel. If specified, the server uses the named channel for discovery.
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="refresh-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:linkend="configuration.discovery-group.refresh-timeout"
+                               amq:default="(in milliseconds)">
+                  <xsd:documentation>
+                     Period the discovery group waits after receiving the last broadcast from a particular server before
+                     removing that servers connector pair entry from its list.
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
+            <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
+            <xsd:element name="initial-wait-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
+               <xsd:annotation amq:default="(milliseconds)" amq:linkend="XXX">
+                  <xsd:documentation>
+                     time to wait for an initial broadcast to give us at least one node in the cluster
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+         </xsd:all>
+
+         <xsd:attribute name="name" type="xsd:ID" use="required">
+            <xsd:annotation>
+               <xsd:documentation>
+                  a unique name for the discovery group
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:attribute>
+      </xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="discovery-group-ref">
+      <xsd:complexType>
+         <xsd:attribute name="discovery-group-name" type="xsd:IDREF"/>
+      </xsd:complexType>
+   </xsd:element>
+
+   <xsd:complexType name="class-name-sequenceType">
+      <xsd:annotation>
+         <xsd:documentation>
+            unlimited sequence of &lt;class-name/&gt;
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element maxOccurs="unbounded" minOccurs="1" name="class-name" type="xsd:string">
+            <xsd:annotation>
+               <xsd:documentation>
+                  the fully qualified name of the interceptor class
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <xsd:complexType name="paramType">
+      <xsd:attribute name="key" type="xsd:string" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               Key of a configuration parameter
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="value" type="xsd:string" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               Value of a configuration parameter
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+
+   <!-- BRIDGE CONFIGURATION -->
+   <xsd:complexType name="bridgeType">
+      <xsd:sequence>
+         <xsd:element name="queue-name" type="xsd:IDREF" maxOccurs="1" minOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  name of queue that this bridge consumes from
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  address to forward to. If omitted original address is used
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="ha" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  whether this bridge supports fail-over
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+
+         <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  optional name of transformer class
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="min-large-message-size" type="xsd:int" default="102400" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:default="(bytes)">
+               <xsd:documentation>
+                  Any message larger than this size is considered a large message (to be sent in
+                  chunks)
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl" amq:default="(ms)">
+               <xsd:documentation>
+                  The period (in milliseconds) a bridge's client will check if it failed to receive a ping from the
+                  server. -1 disables this check.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl" amq:default="(ms)">
+               <xsd:documentation>
+                  how long to keep a connection alive in the absence of any data arriving from the client. This should
+                  be greater than the ping period.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:default="(in milliseconds)">
+               <xsd:documentation>
+                  period (in ms) between successive retries
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  multiplier to apply to successive retry intervals
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Limit to the retry-interval growth (due to retry-interval-multiplier)
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  maximum number of initial connection attempts, -1 means 'no limits'
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  maximum number of retry attempts, -1 means 'no limits'
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="failover-on-server-shutdown" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  should failover be prompted if target server is cleanly shutdown?
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  should duplicate detection headers be inserted in forwarded messages?
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="confirmation-window-size" type="xsd:int" maxOccurs="1" minOccurs="0" default="1048576">
+            <xsd:annotation amq:default="(bytes)">
+               <xsd:documentation>
+                  Once the bridge has received this many bytes, it sends a confirmation
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="user" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  username, if unspecified the cluster-user is used
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="password" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  password, if unspecified the cluster-password is used
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="reconnect-attempts-same-node" default="10" type="xsd:int" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:default="(int, 10)">
+               <xsd:documentation>
+                  Upon reconnection this configures the number of time the same node on the topology will be retried
+                  before reseting the server locator and using the initial connectors
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:choice>
+            <xsd:element name="static-connectors" maxOccurs="1" minOccurs="1">
+               <xsd:complexType>
+                  <xsd:sequence>
+                     <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
+                  </xsd:sequence>
+               </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="1">
+               <xsd:complexType>
+                  <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
+                     <xsd:annotation>
+                        <xsd:documentation>
+                           name of discovery group used by this bridge
+                        </xsd:documentation>
+                     </xsd:annotation>
+                  </xsd:attribute>
+               </xsd:complexType>
+            </xsd:element>
+         </xsd:choice>
+      </xsd:sequence>
+
+      <xsd:attribute name="name" type="xsd:ID" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               unique name for this bridge
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+
+
+   <!-- CLUSTER CONNECTION CONFIGURATION -->
+
+   <xsd:complexType name="cluster-connectionType">
+      <xsd:sequence>
+         <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  name of the address this cluster connection applies to
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="connector-ref" type="xsd:string" maxOccurs="1" minOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Name of the connector reference to use.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl" amq:default="(ms)">
+               <xsd:documentation>
+                  The period (in milliseconds) used to check if the cluster connection has failed to receive pings from
+                  another server
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="connection-ttl" amq:default="(ms)">
+               <xsd:documentation>
+                  how long to keep a connection alive in the absence of any data arriving from the client
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="min-large-message-size" type="xsd:int" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="large-messages" amq:default="(bytes)">
+               <xsd:documentation>
+                  Messages larger than this are considered large-messages
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="call-timeout" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:default="(ms)">
+               <xsd:documentation>
+                  How long to wait for a reply
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="retry-interval" type="xsd:long" default="500" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  period (in ms) between successive retries
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  multiplier to apply to the retry-interval
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Maximum value for retry-interval
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How many attempts should be made to connect initially
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How many attempts should be made to reconnect after failure
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation >
+               <xsd:documentation>
+                  should duplicate detection headers be inserted in forwarded messages?
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="forward-when-no-consumers" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  should messages be load balanced if there are no matching consumers on target?
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="max-hops" type="xsd:int" default="1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  maximum number of hops cluster topology is propagated
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="confirmation-window-size" type="xsd:int" default="1048576" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="client-reconnection">
+               <xsd:documentation>
+                  The size (in bytes) of the window used for confirming data from the server connected to.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="call-failover-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="clusters.cluster-connections" amq:default="(ms)">
+               <xsd:documentation>
+                  How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="notification-interval" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:default="(ms)">
+               <xsd:documentation>
+                  how often the cluster connection will notify the cluster of its existence right after joining the
+                  cluster
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="notification-attempts" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  how many times this cluster connection will notify the cluster of its existence right after joining
+                  the cluster
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="scale-down-connector" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The connector to use for scaling down or when as backup in SCALE_DOWN mode
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:choice>
+            <xsd:element name="static-connectors" maxOccurs="1" minOccurs="0">
+               <xsd:complexType>
+                  <xsd:sequence>
+                     <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+                  </xsd:sequence>
+                  <xsd:attribute name="allow-direct-connections-only" default="false" type="xsd:boolean" use="optional">
+                     <xsd:annotation>
+                        <xsd:documentation>
+                           restricts cluster connections to the listed connector-ref's
+                        </xsd:documentation>
+                     </xsd:annotation>
+                  </xsd:attribute>
+               </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="0">
+               <xsd:complexType>
+                  <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
+                     <xsd:annotation>
+                        <xsd:documentation>
+                           XXX -- this is a duplicate...
+                        </xsd:documentation>
+                     </xsd:annotation>
+                  </xsd:attribute>
+               </xsd:complexType>
+            </xsd:element>
+         </xsd:choice>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:ID" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               unique name for this cluster connection
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+   </xsd:complexType>
+
+   <!-- DIVERT CONFIGURATION TYPE -->
+   <xsd:complexType name="divertType">
+      <xsd:all>
+         <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  an optional class name of a transformer
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="exclusive" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  whether this is an exclusive divert
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="routing-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  the routing name for the divert
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  the address this divert will divert from
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  the forwarding address for the divert
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+
+         <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+      </xsd:all>
+
+      <xsd:attribute name="name" type="xsd:ID" use="required">
+         <xsd:annotation>
+            <xsd:documentation>
+               a unique name for the divert
+            </xsd:documentation>
+         </xsd:annotation>
+      </xsd:attribute>
+
+   </xsd:complexType>
+   <xsd:complexType name="haPolicyType">
+      <xsd:choice>
+         <xsd:element name="live-only" type="haLiveOnlyPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A live only server with no HA capabilities apart from scale down.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="replication" type="haReplicationType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Configuration for a replicated server, either master, slave or colocated.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="shared-store" type="haSharedStoreType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Configuration for a shared store server, either master, slave or colocated.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:choice>
+   </xsd:complexType>
+
+   <xsd:complexType name="haReplicationType">
+      <xsd:choice>
+         <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A live server configured to replicate.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A backup server configured to replicate.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="colocated" type="haColocationReplicationType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  a replicated lives server that will allow requests to create colocated replicated backup servers.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:choice>
+   </xsd:complexType>
+
+   <xsd:complexType name="haColocationReplicationType">
+      <xsd:all>
+         <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+            <xsd:annotation>
+               <xsd:documentation>
+                  If true then the server will request a backup on another node
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How many times the live server will try to request a backup, -1 means for ever.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How long to wait for retries between attempts to request a backup server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Whether or not this live server will accept backup requests from other live servers.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The offset to use for the Connectors and Acceptors when creating a new backup server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="excludes" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  the connectors that shouldn't have their ports offset, typically remote connectors or the
+                  connector used in the cluster connection if scalinmg down
+               </xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
+               </xsd:sequence>
+            </xsd:complexType>
+         </xsd:element>
+         <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The configuration for the live replicated server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The configuration for any slaves created.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+
+   <xsd:complexType name="haColocationSharedStoreType">
+      <xsd:all>
+         <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+            <xsd:annotation>
+               <xsd:documentation>
+                  If true then the server will request a backup on another node
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How many times the live server will try to request a backup, -1 means for ever.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
+            <xsd:annotation>
+               <xsd:documentation>
+                  How long to wait for retries between attempts to request a backup server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Whether or not this live server will accept backup requests from other live servers.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The offset to use for the Connectors and Acceptors when creating a new backup server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The configuration for the live shared store server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The configuration for any shared store backups created.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+
+   <xsd:complexType name="haSharedStoreType">
+      <xsd:choice>
+         <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A shared store live server configuration.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A shared store backup server configuration.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="colocated" type="haColocationSharedStoreType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  A shared store colocated configuration
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:choice>
+   </xsd:complexType>
+
+   <xsd:complexType name="haLiveOnlyPolicyType">
+      <xsd:all>
+         <xsd:element name="scale-down" type="scaleDownType" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  The scale down configuration of this live server.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+   <xsd:complexType name="replicatedPolicyType">
+      <xsd:all>
+         <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  used for replication, if set, (remote) backup servers will only pair with live servers with matching
+                  group-name
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Name of the cluster configuration to use for replication. This setting is only necessary in case you
+                  configure multiple cluster connections. It is used by a replicating backups and by live servers that
+                  may attempt fail-back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="check-for-live-server" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="hq.check-for-live-server">
+               <xsd:documentation>
+                  Whether to check the cluster for a (live) server using our own server ID when starting
+                  up. This option is only necessary for performing 'fail-back' on replicating
+                  servers. Strictly speaking this setting only applies to live servers and not to
+                  backups.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+   <xsd:complexType name="replicaPolicyType">
+      <xsd:all>
+         <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  used for replication, if set, (remote) backup servers will only pair with live servers with matching
+                  group-name
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Name of the cluster configuration to use for replication. This setting is only necessary in case you
+                  configure multiple cluster connections. It is used by a replicating backups and by live servers that
+                  may attempt fail-back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  This specifies how many times a replicated backup server can restart after moving its files on start.
+                  Once there are this number of backup journal files the server will stop permanently after if fails
+                  back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="scale-down" type="scaleDownType" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  if provided then this backup will scale down rather than becoming live after fail over.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="restart-backup" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.restart-backup">
+               <xsd:documentation>
+                  Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="allow-failback" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.allow-fail-back">
+               <xsd:documentation>
+                  Whether a server will automatically stop when a another places a request to take over
+                  its place. The use case is when a regular server stops and its backup takes over its
+                  duties, later the main server restarts and requests the server (the former backup) to
+                  stop operating.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="failback-delay" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
+            <xsd:annotation amq:linkend="ha.allow-fail-back" amq:default="(in milliseconds)">
+               <xsd:documentation>
+                  if we have to start as a replicated server this is the delay to wait before fail-back occurs
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+      </xsd:all>
+   </xsd:complexType>
+   <xsd:complexType name="colocatedReplicaPolicyType">
+      <xsd:all>
+         <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+            <xsd:annotation>
+               <xsd:documentation>
+                  used for replication, if set, (remote) backup servers will only pair with live servers with matching
+                  group-name
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>
+                  Name of the cluster configuration to use for replication. This setting is only necessary in case you
+                  configure multiple cluster connections. It is used by a replicating backups and by live servers that
+                  may attempt fail-back.
+               </xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+            <xsd:annotation>
+     

<TRUNCATED>

[10/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/resources/schema/activemq-users.xsd
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/resources/schema/activemq-users.xsd b/activemq-server/src/main/resources/schema/activemq-users.xsd
new file mode 100644
index 0000000..272cde1
--- /dev/null
+++ b/activemq-server/src/main/resources/schema/activemq-users.xsd
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:activemq" xmlns="urn:activemq"
+            elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+
+   <xsd:element name="configuration">
+      <xsd:complexType>
+         <xsd:sequence>
+            <xsd:element name="mask-password" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
+            <xsd:element name="password-codec" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
+            <xsd:element name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element>
+            <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+         </xsd:sequence>
+      </xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="role">
+      <xsd:complexType>
+         <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+      </xsd:complexType>
+   </xsd:element>
+
+   <xsd:complexType name="userType">
+      <xsd:sequence>
+         <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+      <xsd:attribute name="password" type="xsd:string"></xsd:attribute>
+   </xsd:complexType>
+</xsd:schema>


[13/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor default configuration

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
index 8cffc7a..ddd7c18 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
@@ -11,6 +11,7 @@
  * permissions and limitations under the License.
  */
 package org.apache.activemq.core.config.impl;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
 import org.junit.Before;
 
@@ -23,7 +24,6 @@ import java.io.ObjectOutputStream;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.journal.impl.JournalConstants;
@@ -45,63 +45,63 @@ public class ConfigurationImplTest extends UnitTestCase
    @Test
    public void testDefaults()
    {
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
                           conf.getScheduledThreadPoolMaxSize());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
                           conf.getSecurityInvalidationInterval());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
       Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE, conf.getJournalType());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
                           conf.isJournalSyncNonTransactional());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
                           conf.getMessageExpiryThreadPriority()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
                           conf.getTransactionTimeoutScanPeriod()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(),
                           conf.getManagementNotificationAddress()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(),
                           conf.isPersistDeliveryCountBeforeDelivery());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(),
                           conf.isAsyncConnectionExecutionEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO());
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO());
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO());
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(),
                           conf.getMessageCounterMaxDayHistory());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold());
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval());
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
index ed6e70c..ae1e46a 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
@@ -12,6 +12,7 @@
  */
 package org.apache.activemq.core.config.impl;
 
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
 import org.junit.Test;
 
@@ -19,7 +20,6 @@ import java.util.Collections;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.journal.impl.JournalConstants;
 
@@ -38,23 +38,23 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest
    public void testDefaults()
    {
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
                           conf.getScheduledThreadPoolMaxSize());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
                           conf.getSecurityInvalidationInterval());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain());
 
       Assert.assertEquals(0, conf.getIncomingInterceptorClassNames().size());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
 
       Assert.assertEquals(0, conf.getAcceptorConfigurations().size());
 
@@ -72,70 +72,70 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest
 
       Assert.assertEquals(Collections.emptyList(), conf.getQueueConfigurations());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(),
                           conf.getManagementNotificationAddress());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
 
       Assert.assertEquals(getDefaultJournalType(), conf.getJournalType());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
                           conf.isJournalSyncNonTransactional());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
 
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO());
 
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
 
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO());
 
       Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
                           conf.getTransactionTimeoutScanPeriod());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod());
 
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
                           conf.getMessageExpiryThreadPriority());
 
       Assert.assertTrue(conf.getHAPolicyConfiguration() instanceof LiveOnlyPolicyConfiguration);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
index 1d567dd..7d98ad8 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
@@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
 import org.apache.activemq.tests.util.UnitTestCase;
@@ -82,7 +82,7 @@ public class FileConfigurationParserTest extends UnitTestCase
 
       String clusterPassword = config.getClusterPassword();
 
-      assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword);
+      assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword);
 
       //if we add cluster-password, it should be default plain text
       String clusterPasswordPart = "<cluster-password>helloworld</cluster-password>";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
index 89e62f4..4080873 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -60,9 +60,9 @@ public class JournalCrashTest extends ServiceTestBase
    protected void startServer() throws Exception
    {
       Configuration config = createDefaultConfig()
-         .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
-         .setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles())
-         .setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage())
+         .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
+         .setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles())
+         .setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage())
          .setJournalMinFiles(2);
 
       server = super.createServer(true, config);
@@ -222,7 +222,7 @@ public class JournalCrashTest extends ServiceTestBase
    private void printJournal() throws Exception
    {
       NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir());
-      JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(),
+      JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(),
                                             2,
                                             0,
                                             0,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
index bfcdad1..bf85791 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
@@ -18,7 +18,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.ActiveMQExceptionType;
 import org.apache.activemq.api.core.ActiveMQObjectClosedException;
@@ -155,7 +155,7 @@ public class SlowConsumerTest extends ServiceTestBase
 
       SimpleString notifQueue = RandomUtil.randomSimpleString();
 
-      session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
+      session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
 
       ClientConsumer notifConsumer = session.createConsumer(notifQueue.toString(), ManagementHelper.HDR_NOTIFICATION_TYPE + "='" + CoreNotificationType.CONSUMER_SLOW + "'");
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
index cb2f243..0ea4c13 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -27,7 +27,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.BroadcastGroupConfiguration;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
@@ -866,7 +866,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
 
    protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout)
    {
-      setUpGroupHandler(type, node, timeout, -1, HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod());
+      setUpGroupHandler(type, node, timeout, -1, ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod());
    }
 
    protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout, final long groupTimeout,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
index 190dbaa..eef65d0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientSessionFactory;
 import org.apache.activemq.api.core.client.HornetQClient;
@@ -310,10 +310,10 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
          .clearAcceptorConfigurations()
          .addAcceptorConfiguration(liveAcceptor)
          .addConnectorConfiguration(liveConnector.getName(), liveConnector)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + identity)
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + identity)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + identity)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + identity)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + identity)
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + identity)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + identity)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + identity)
          .addQueueConfiguration(new CoreQueueConfiguration()
                                    .setAddress("jms.queue.testQueue")
                                    .setName("jms.queue.testQueue"));

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
index 1ebbb12..20e114d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientSession;
 import org.apache.activemq.api.core.client.ServerLocator;
@@ -160,10 +160,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
          .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty())))
          .setSecurityEnabled(false)
          .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicaPolicyConfiguration())
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
 
       for (int node : otherBackupNodes)
       {
@@ -195,10 +195,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
          .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty())))
          .setSecurityEnabled(false)
          .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode)
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode)
          .addConnectorConfiguration(liveConnector.getName(), liveConnector);
 
       List<String> pairs = new ArrayList<String>();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
index 30e3d94..c67bc4f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientSession;
 import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
@@ -138,10 +138,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
          .setSecurityEnabled(false)
          .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicatedPolicyConfiguration())
          .addConnectorConfiguration(backupConnector.getName(), backupConnector)
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
 
       List<String> staticConnectors = new ArrayList<String>();
 
@@ -167,10 +167,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
          .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
          .addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName()))
          .addConnectorConfiguration(liveConnector.getName(), liveConnector)
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
 
       servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode)));
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
index 2017487..c67bb07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQObjectClosedException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -874,7 +874,7 @@ public class JMSServerControlTest extends ManagementTestBase
 
       control.destroyConnectionFactory("test");
 
-      ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(HornetQDefaultConfiguration.getDefaultJmxDomain());
+      ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
       assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
 
       stopServer();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
index 1be5728..2aa2d24 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -279,7 +279,7 @@ public class AddressControlTest extends ManagementTestBase
       session.createQueue(address, address, true);
 
       AddressControl addressControl = createManagementControl(address);
-      Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage());
+      Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage());
 
       session.close();
       server.stop();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
index 6a6d2a2..4d65c0c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.tests.integration.management;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.ClientRequestor;
 import org.apache.activemq.api.core.client.ClientSession;
@@ -48,7 +48,7 @@ public class CoreMessagingProxy
 
       this.resourceName = resourceName;
 
-      requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress());
+      requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
 
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
index 98f25a7..6debefe 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.management.ObjectNameBuilder;
 import org.apache.activemq.core.config.Configuration;
@@ -42,7 +42,7 @@ public class JMXDomainTest extends ManagementTestBase
       Configuration config_0 = createDefaultConfig()
          .setJMXManagementEnabled(true);
 
-      String jmxDomain_1 = HornetQDefaultConfiguration.getDefaultJmxDomain() + ".1";
+      String jmxDomain_1 = ActiveMQDefaultConfiguration.getDefaultJmxDomain() + ".1";
 
       Map<String, Object> params = new HashMap<String, Object>();
       params.put(TransportConstants.SERVER_ID_PROP_NAME, 1);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
index b46a580..379122f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
@@ -11,6 +11,7 @@
  * permissions and limitations under the License.
  */
 package org.apache.activemq.tests.integration.management;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
 import org.junit.Before;
 import org.junit.After;
@@ -28,7 +29,6 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientSession;
@@ -90,7 +90,7 @@ public class ManagementWithStompTest extends ManagementTestBase
       sendFrame(frame);
 
       // retrieve the address of the queue
-      frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
+      frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
             "reply-to:" + address + "\n" +
             "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" +
             "_HQ_Attribute: Address\n\n" +
@@ -133,7 +133,7 @@ public class ManagementWithStompTest extends ManagementTestBase
       sendFrame(frame);
 
       // count number of message with filter "color = 'blue'"
-      frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
+      frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
             "reply-to:" + address + "\n" +
             "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" +
             "_HQ_OperationName: countMessages\n\n" +

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
index a4ade5b..f854779 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.tests.integration.management;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -265,7 +265,7 @@ public class NotificationTest extends UnitTestCase
 
       notifQueue = RandomUtil.randomSimpleString();
 
-      session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
+      session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
 
       notifConsumer = session.createConsumer(notifQueue);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
index 0e18293..3469d68 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
@@ -11,12 +11,12 @@
  * permissions and limitations under the License.
  */
 package org.apache.activemq.tests.integration.management;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.ClientRequestor;
@@ -96,7 +96,7 @@ public abstract class SecurityManagementTestBase extends UnitTestCase
 
          session.start();
 
-         ClientRequestor requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress());
+         ClientRequestor requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
 
          ClientMessage mngmntMessage = session.createMessage(false);
          ManagementHelper.putAttribute(mngmntMessage, ResourceNames.CORE_SERVER, "started");

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
index db8f855..49a8de5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
@@ -12,11 +12,11 @@
  */
 package org.apache.activemq.tests.integration.management;
 
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@@ -60,7 +60,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
    @Test
    public void testSendManagementMessageWithClusterAdminUser() throws Exception
    {
-      doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true);
+      doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true);
    }
 
    @Test
@@ -102,9 +102,9 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
       securityManager.addRole(validAdminUser, "guest");
       securityManager.addRole(invalidAdminUser, "guest");
 
-      Set<Role> adminRole = securityRepository.getMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString());
+      Set<Role> adminRole = securityRepository.getMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString());
       adminRole.add(new Role("admin", true, true, true, true, true, true, true));
-      securityRepository.addMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole);
+      securityRepository.addMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole);
       Set<Role> guestRole = securityRepository.getMatch("*");
       guestRole.add(new Role("guest", true, true, true, true, true, true, false));
       securityRepository.addMatch("*", guestRole);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
index 663584c..279268a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
@@ -12,9 +12,9 @@
  */
 package org.apache.activemq.tests.integration.management;
 
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@@ -32,8 +32,8 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
    @Test
    public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception
    {
-      doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(),
-                              HornetQDefaultConfiguration.getDefaultClusterPassword(),
+      doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
+                              ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
                               true);
    }
 
@@ -57,7 +57,7 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
    protected HornetQServer setupAndStartHornetQServer() throws Exception
    {
       Configuration conf = createBasicConfig()
-         .setClusterPassword(HornetQDefaultConfiguration.getDefaultClusterPassword())
+         .setClusterPassword(ActiveMQDefaultConfiguration.getDefaultClusterPassword())
          .setSecurityEnabled(true)
          .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
       HornetQServer server = addServer(HornetQServers.newHornetQServer(conf, false));

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
index 34756b7..409d4a2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
@@ -12,9 +12,9 @@
  */
 package org.apache.activemq.tests.integration.management;
 
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.core.config.impl.ConfigurationImpl;
 import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@@ -44,14 +44,14 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
    @Test
    public void testSendManagementMessageWithModifiedClusterAdminUser() throws Exception
    {
-      doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true);
+      doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true);
    }
 
    @Test
    public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception
    {
-      doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(),
-                              HornetQDefaultConfiguration.getDefaultClusterPassword(),
+      doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
+                              ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
                               false);
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
index f87780e..d04c1b1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
@@ -25,7 +25,7 @@ import java.util.Set;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientConsumer;
@@ -166,7 +166,7 @@ public class SecurityNotificationTest extends UnitTestCase
       Role role = new Role("notif", true, true, true, true, true, true, true);
       Set<Role> roles = new HashSet<Role>();
       roles.add(role);
-      server.getSecurityRepository().addMatch(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(),
+      server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(),
                                               roles);
 
       securityManager.addRole("admin", "notif");
@@ -176,7 +176,7 @@ public class SecurityNotificationTest extends UnitTestCase
       adminSession = sf.createSession("admin", "admin", false, true, true, false, 1);
       adminSession.start();
 
-      adminSession.createTemporaryQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue);
+      adminSession.createTemporaryQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue);
 
       notifConsumer = adminSession.createConsumer(notifQueue);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
index fa54304..7c3420f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.ActiveMQBuffers;
 import org.apache.activemq.api.core.ActiveMQException;
@@ -123,10 +123,10 @@ public final class ReplicationTest extends ServiceTestBase
 
       Configuration backupConfig = createDefaultConfig()
          .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration())
-         .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
-         .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + suffix)
-         .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + suffix)
-         .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix)
+         .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
+         .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
+         .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
+         .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix)
          .setIncomingInterceptorClassNames(interceptors.length > 0 ? Arrays.asList(interceptors) : new ArrayList<String>());
 
       ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
index 54e5980..97380f2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.tests.integration.server;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -91,7 +91,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase
    @Test
    public void testBasicScaleDownWithDefaultReconnectAttempts() throws Exception
    {
-      testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false);
+      testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false);
    }
 
    @Test
@@ -103,7 +103,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase
    @Test
    public void testBasicScaleDownWithDefaultReconnectAttemptsAndLargeMessages() throws Exception
    {
-      testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true);
+      testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true);
    }
 
    private void testBasicScaleDownInternal(int reconnectAttempts, boolean large) throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java
index fa06938..3a9eda6 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java
@@ -20,7 +20,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.Hashtable;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.ClientRequestor;
@@ -85,14 +85,14 @@ public class HornetQAdmin implements Admin
    {
       serverLocator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName()));
       sf = serverLocator.createSessionFactory();
-      clientSession = sf.createSession(HornetQDefaultConfiguration.getDefaultClusterUser(),
-                                       HornetQDefaultConfiguration.getDefaultClusterPassword(),
+      clientSession = sf.createSession(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
+                                       ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
                                        false,
                                        true,
                                        true,
                                        false,
                                        1);
-      requestor = new ClientRequestor(clientSession, HornetQDefaultConfiguration.getDefaultManagementAddress());
+      requestor = new ClientRequestor(clientSession, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
       clientSession.start();
 
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
index cb12424..e04b233 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
@@ -12,6 +12,7 @@
  */
 package org.apache.activemq.tests.stress.journal;
 
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -19,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -417,7 +417,7 @@ public class CompactingStressTest extends ServiceTestBase
    {
       Configuration config = createDefaultConfig()
          .setJournalSyncNonTransactional(false)
-         .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
+         .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
          .setJournalType(journalType)
          .setJournalCompactMinFiles(10)
          .setJournalCompactPercentage(50);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
index 9d1ac43..5053a02 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.journal.PreparedTransactionInfo;
@@ -117,18 +117,18 @@ public class JournalCleanupCompactStressTest extends ServiceTestBase
       if (AsynchronousFileImpl.isLoaded())
       {
          factory = new AIOSequentialFileFactory(dir.getPath());
-         maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio();
+         maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio();
       }
       else
       {
          factory = new NIOSequentialFileFactory(dir.getPath(), true);
-         maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio();
+         maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio();
       }
 
       journal = new JournalImpl(50 * 1024,
                                 20,
                                 50,
-                                HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(),
+                                ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(),
                                 factory,
                                 "hornetq-data",
                                 "hq",

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
index 152cfc7..6a7a92d 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
 import org.apache.activemq.api.core.client.ClientProducer;
@@ -278,7 +278,7 @@ public class LargeJournalStressTest extends ServiceTestBase
    {
       Configuration config = createDefaultConfig()
          .setJournalSyncNonTransactional(false)
-         .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
+         .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
          .setJournalType(journalType)
          .setJournalCompactMinFiles(0)
          .setJournalCompactPercentage(50);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
index fe6049c..32e3912 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientConsumer;
 import org.apache.activemq.api.core.client.ClientMessage;
@@ -155,8 +155,8 @@ public class MultiThreadConsumerStressTest extends ServiceTestBase
    {
       Configuration config = createDefaultConfig(true)
          .setJournalType(journalType)
-         .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
-         .setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles())
+         .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
+         .setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles())
          .setJournalCompactMinFiles(2)
          .setJournalCompactPercentage(50);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
index d1adb29..988845f 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.client.ClientConsumer;
@@ -93,7 +93,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
          stopServer();
 
          NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir());
-         JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(),
+         JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(),
                                                2,
                                                0,
                                                0,
@@ -348,13 +348,13 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
       if (server == null)
       {
          Configuration config = createDefaultConfig(true)
-            .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
+            .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
             .setJournalType(journalType)
             .setJMXManagementEnabled(false)
-            .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
-            .setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles())
-            .setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles())
-            .setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage())
+            .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
+            .setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles())
+            .setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles())
+            .setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage())
             // This test is supposed to not sync.. All the ACKs are async, and it was supposed to not sync
             .setJournalSyncNonTransactional(false);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index 1261f8d..0284c15 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.config.Configuration;
@@ -95,7 +95,7 @@ public class DuplicateDetectionUnitTest extends ServiceTestBase
 
          PostOffice postOffice = new FakePostOffice();
 
-         ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
+         ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
 
          journal = new JournalStorageManager(configuration, factory, null);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
index b9df0a7..522e8a1 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
@@ -79,7 +79,7 @@ public class NettyAcceptorFactoryTest extends UnitTestCase
                                                  handler,
                                                  listener,
                                                  Executors.newCachedThreadPool(),
-                                                 Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()),
+                                                 Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()),
                                                  null);
 
       Assert.assertTrue(acceptor instanceof NettyAcceptor);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
index 0b3214e..15df3db 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
@@ -98,7 +98,7 @@ public class NettyAcceptorTest extends UnitTestCase
          {
          }
       };
-      pool2 = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
+      pool2 = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
       NettyAcceptor acceptor = new NettyAcceptor("netty",
                                                  null,
                                                  params,


[15/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor default configuration

Posted by ma...@apache.org.
ACTIVEMQ6-4 - refactor default configuration

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

Remove the auto generation of the default config and rename to ActiveMQ


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

Branch: refs/heads/master
Commit: d0d686b527ba045fc46662f8907ff1d0537160d6
Parents: f9bdb25
Author: Andy Taylor <an...@apache.org>
Authored: Mon Nov 17 11:00:52 2014 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Tue Nov 18 11:27:10 2014 +0000

----------------------------------------------------------------------
 activemq-core-client/pom.xml                    |   61 -
 .../config/ActiveMQDefaultConfiguration.java    | 1125 ++++++++++++++++++
 .../api/core/BroadcastGroupConfiguration.java   |    4 +-
 .../activemq/api/core/client/HornetQClient.java |   10 +-
 .../api/core/management/ObjectNameBuilder.java  |    6 +-
 .../remoting/impl/netty/NettyConnector.java     |   10 +-
 .../remoting/impl/netty/TransportConstants.java |   10 +-
 .../resources/HornetQDefaultConfiguration.txt   |  116 --
 .../src/main/resources/hqDefaults.xsl           |  128 --
 .../config/impl/JMSConfigurationImpl.java       |    4 +-
 .../server/impl/JMSServerConfigParserImpl.java  |    6 +-
 .../core/config/BridgeConfiguration.java        |   14 +-
 .../config/ClusterConnectionConfiguration.java  |   32 +-
 .../activemq/core/config/Configuration.java     |   88 +-
 .../core/config/DivertConfiguration.java        |    4 +-
 .../core/config/ScaleDownConfiguration.java     |    4 +-
 .../config/ha/ColocatedPolicyConfiguration.java |   14 +-
 .../config/ha/ReplicaPolicyConfiguration.java   |    8 +-
 .../ha/ReplicatedPolicyConfiguration.java       |    4 +-
 .../SharedStoreMasterPolicyConfiguration.java   |    6 +-
 .../ha/SharedStoreSlavePolicyConfiguration.java |   10 +-
 .../core/config/impl/ConfigurationImpl.java     |  112 +-
 .../deployers/impl/FileConfigurationParser.java |   66 +-
 .../impl/MessageCounterManagerImpl.java         |    6 +-
 .../remoting/impl/invm/TransportConstants.java  |   10 +-
 .../core/remoting/impl/netty/NettyAcceptor.java |   10 +-
 .../core/server/cluster/ha/BackupPolicy.java    |    4 +-
 .../core/server/cluster/ha/ColocatedPolicy.java |   12 +-
 .../core/server/cluster/ha/ReplicaPolicy.java   |    6 +-
 .../server/cluster/ha/ReplicatedPolicy.java     |    8 +-
 .../cluster/ha/SharedStoreMasterPolicy.java     |    6 +-
 .../cluster/ha/SharedStoreSlavePolicy.java      |    8 +-
 .../impl/GroupingHandlerConfiguration.java      |    8 +-
 .../core/server/impl/HornetQServerImpl.java     |    4 +-
 .../core/config/impl/ConfigurationImplTest.java |   88 +-
 .../impl/DefaultsFileConfigurationTest.java     |   68 +-
 .../impl/FileConfigurationParserTest.java       |    4 +-
 .../integration/client/JournalCrashTest.java    |   10 +-
 .../integration/client/SlowConsumerTest.java    |    4 +-
 .../cluster/distribution/ClusterTestBase.java   |    4 +-
 .../AutomaticColocatedQuorumVoteTest.java       |   10 +-
 ...ultipleLivesMultipleBackupsFailoverTest.java |   18 +-
 .../SingleLiveMultipleBackupsFailoverTest.java  |   18 +-
 .../server/management/JMSServerControlTest.java |    4 +-
 .../management/AddressControlTest.java          |    4 +-
 .../management/CoreMessagingProxy.java          |    4 +-
 .../integration/management/JMXDomainTest.java   |    4 +-
 .../management/ManagementWithStompTest.java     |    6 +-
 .../management/NotificationTest.java            |    4 +-
 .../management/SecurityManagementTestBase.java  |    4 +-
 ...tyManagementWithConfiguredAdminUserTest.java |    8 +-
 ...yManagementWithDefaultConfigurationTest.java |    8 +-
 ...ManagementWithModifiedConfigurationTest.java |    8 +-
 .../management/SecurityNotificationTest.java    |    6 +-
 .../replication/ReplicationTest.java            |   10 +-
 .../integration/server/ScaleDown3NodeTest.java  |    6 +-
 .../org/apache/activemq/jms/HornetQAdmin.java   |    8 +-
 .../stress/journal/CompactingStressTest.java    |    4 +-
 .../JournalCleanupCompactStressTest.java        |    8 +-
 .../stress/journal/LargeJournalStressTest.java  |    4 +-
 .../journal/MultiThreadConsumerStressTest.java  |    6 +-
 .../NIOMultiThreadCompactorStressTest.java      |   14 +-
 .../impl/DuplicateDetectionUnitTest.java        |    4 +-
 .../impl/netty/NettyAcceptorFactoryTest.java    |    4 +-
 .../remoting/impl/netty/NettyAcceptorTest.java  |    4 +-
 65 files changed, 1550 insertions(+), 730 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 8b29615..c362506 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -98,67 +98,6 @@
       </resources>
       <plugins>
          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <!-- Adds a directory to the list of source folders to be used in this project. This is
-                    here to let Maven know about:
-                    target/generated-sources/xslt/org.apache.activemq/api/config/HornetQDefaultConfiguration.java
-                    which is generated by ./src/main/resources/hqDefaults.xsl using the HornetQ
-                    configuration schema. -->
-               <execution>
-                  <id>add-source</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                     <goal>add-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>./target/generated-sources/xslt</source>
-                     </sources>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xml-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>transform</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory>
-               <transformationSets>
-                  <transformationSet>
-                     <!-- Generates target/generated-sources/xslt/.../HornetQDefaultConfiguration.java
-                          using this XSLT `./src/main/resources/hqDefaults.xsl`. -->
-                     <dir>../activemq-server/src/main/resources/schema</dir>
-                     <outputDir>${project.build.directory}/generated-sources/xslt</outputDir>
-                     <stylesheet>./src/main/resources/hqDefaults.xsl</stylesheet>
-                     <includes>
-                        <include>hornetq-configuration.xsd</include>
-                     </includes>
-                     <fileMappers>
-                        <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
-                           <targetName>./org/apache/activemq/api/config/HornetQDefaultConfiguration.java</targetName>
-                        </fileMapper>
-                     </fileMappers>
-                  </transformationSet>
-               </transformationSets>
-            </configuration>
-            <dependencies>
-               <dependency>
-                  <groupId>net.sf.saxon</groupId>
-                  <artifactId>saxon</artifactId>
-                  <version>8.7</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
new file mode 100644
index 0000000..59aa7a5
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
@@ -0,0 +1,1125 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.api.config;
+
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.journal.impl.JournalConstants;
+
+/**
+ * Default values of ActiveMQ configuration parameters.
+ */
+public final class ActiveMQDefaultConfiguration
+{
+   /*
+    * <p> In order to avoid compile time in-lining of constants, all access is done through methods
+    * and all fields are PRIVATE STATIC but not FINAL. This is done following the recommendation at
+    * <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9">13.4.9.
+    * final Fields and Constants</a>
+    * @see http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9
+    */
+
+   private ActiveMQDefaultConfiguration()
+   {
+      // Utility class
+   }
+
+   public static long getDefaultClientFailureCheckPeriod()
+   {
+      return DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
+   }
+
+   public static long getDefaultFileDeployerScanPeriod()
+   {
+      return DEFAULT_FILE_DEPLOYER_SCAN_PERIOD;
+   }
+
+   public static int getDefaultJournalMaxIoAio()
+   {
+      return DEFAULT_JOURNAL_MAX_IO_AIO;
+   }
+
+   public static int getDefaultJournalBufferTimeoutAio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
+   }
+
+   public static int getDefaultJournalBufferSizeAio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
+   }
+
+   public static int getDefaultJournalMaxIoNio()
+   {
+      return DEFAULT_JOURNAL_MAX_IO_NIO;
+   }
+
+   public static int getDefaultJournalBufferTimeoutNio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
+   }
+
+   public static int getDefaultJournalBufferSizeNio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
+   }
+
+   public static String getPropMaskPassword()
+   {
+      return PROP_MASK_PASSWORD;
+   }
+
+   public static String getPropPasswordCodec()
+   {
+      return PROP_PASSWORD_CODEC;
+   }
+
+   /**
+    * what kind of HA Policy should we use
+    */
+   public static String getDefaultHapolicyType()
+   {
+      return DEFAULT_HAPOLICY_TYPE;
+   }
+
+   /**
+    * The backup strategy to use if we are a backup or for any colocated backups.
+    */
+   public static String getDefaultHapolicyBackupStrategy()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_STRATEGY;
+   }
+
+   //shared by client and core/server
+   // XXX not on schema?
+   private static long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000;
+
+   // XXX not on schema?
+   private static long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000;
+
+   // These defaults are applied depending on whether the journal type
+   // is NIO or AIO.
+   private static int DEFAULT_JOURNAL_MAX_IO_AIO = 500;
+   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
+   private static int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
+   private static int DEFAULT_JOURNAL_MAX_IO_NIO = 1;
+   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
+   private static int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
+
+   // XXX not on schema.
+   //properties passed to acceptor/connectors.
+   private static String PROP_MASK_PASSWORD = "activemq.usemaskedpassword";
+   private static String PROP_PASSWORD_CODEC = "activemq.passwordcodec";
+
+
+   // what kind of HA Policy should we use
+   private static String DEFAULT_HAPOLICY_TYPE = "NONE";
+
+   // The backup strategy to use if we are a backup or for any colocated backups.
+   private static String DEFAULT_HAPOLICY_BACKUP_STRATEGY = "FULL";
+
+   // -------------------------------------------------------------------
+   // Following fields are generated from the activemq-schema.xsd annotations
+   // -------------------------------------------------------------------
+
+   // If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+   private static boolean DEFAULT_RESOLVE_PROTOCOLS = true;
+
+   // true means that the server will load configuration from the configuration files
+   private static boolean DEFAULT_FILE_DEPLOYMENT_ENABLED = false;
+
+   // true means that the server will use the file based journal for persistence.
+   private static boolean DEFAULT_PERSISTENCE_ENABLED = true;
+
+   // Maximum number of threads to use for the scheduled thread pool
+   private static int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5;
+
+   // Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+   private static int DEFAULT_THREAD_POOL_MAX_SIZE = 30;
+
+   // true means that security is enabled
+   private static boolean DEFAULT_SECURITY_ENABLED = true;
+
+   // how long (in ms) to wait before invalidating the security cache
+   private static long DEFAULT_SECURITY_INVALIDATION_INTERVAL = 10000;
+
+   // how long (in ms) to wait to acquire a file lock on the journal
+   private static long DEFAULT_JOURNAL_LOCK_ACQUISITION_TIMEOUT = -1;
+
+   // true means that the server supports wild card routing
+   private static boolean DEFAULT_WILDCARD_ROUTING_ENABLED = true;
+
+   // the name of the management address to send management messages to. It is prefixed with "jms.queue" so that JMS clients can send messages to it.
+   private static SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jms.queue.activemq.management");
+
+   // the name of the address that consumers bind to receive management notifications
+   private static SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("activemq.notifications");
+
+   // Cluster username. It applies to all cluster configurations.
+   private static String DEFAULT_CLUSTER_USER = "ACTIVEMQ.CLUSTER.ADMIN.USER";
+
+   // Cluster password. It applies to all cluster configurations.
+   private static String DEFAULT_CLUSTER_PASSWORD = "CHANGE ME!!";
+
+   // This option controls whether passwords in server configuration need be masked. If set to "true" the passwords are masked.
+   private static boolean DEFAULT_MASK_PASSWORD = false;
+
+   // true means that the management API is available via JMX
+   private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
+
+   // the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+   private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq";
+
+   // true means that message counters are enabled
+   private static boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false;
+
+   // the sample period (in ms) to use for message counters
+   private static long DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD = 10000;
+
+   // how many days to keep message counter history
+   private static int DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY = 10;
+
+   // if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1 disables this setting.
+   private static long DEFAULT_CONNECTION_TTL_OVERRIDE = -1;
+
+   // should certain incoming packets on the server be handed off to a thread from the thread pool for processing or should they be handled on the remoting thread?
+   private static boolean DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED = true;
+
+   // how long (in ms) before a transaction can be removed from the resource manager after create time
+   private static long DEFAULT_TRANSACTION_TIMEOUT = 300000;
+
+   // how often (in ms) to scan for timeout transactions
+   private static long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000;
+
+   // how often (in ms) to scan for expired messages
+   private static long DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD = 30000;
+
+   // the priority of the thread expiring messages
+   private static int DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY = 3;
+
+   // the size of the cache for pre-creating message ID's
+   private static int DEFAULT_ID_CACHE_SIZE = 20000;
+
+   // true means that ID's are persisted to the journal
+   private static boolean DEFAULT_PERSIST_ID_CACHE = true;
+
+   // DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. It indicates whether this server is a backup server
+   private static boolean DEFAULT_BACKUP = false;
+
+   // DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share storage or if the data is replicated among them.
+   private static boolean DEFAULT_SHARED_STORE = false;
+
+   // True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled.
+   private static boolean DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY = false;
+
+   // the directory to store paged messages in
+   private static String DEFAULT_PAGING_DIR = "data/paging";
+
+   // the directory to store the persisted bindings to
+   private static String DEFAULT_BINDINGS_DIRECTORY = "data/bindings";
+
+   // true means that the server will create the bindings directory on start up
+   private static boolean DEFAULT_CREATE_BINDINGS_DIR = true;
+
+   // The max number of concurrent reads allowed on paging
+   private static int DEFAULT_MAX_CONCURRENT_PAGE_IO = 5;
+
+   // the directory to store the journal files in
+   private static String DEFAULT_JOURNAL_DIR = "data/journal";
+
+   // true means that the journal directory will be created
+   private static boolean DEFAULT_CREATE_JOURNAL_DIR = true;
+
+   // if true wait for transaction data to be synchronized to the journal before returning response to client
+   private static boolean DEFAULT_JOURNAL_SYNC_TRANSACTIONAL = true;
+
+   // if true wait for non transaction data to be synced to the journal before returning response to client.
+   private static boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = true;
+
+   // Whether to log messages about the journal write rate
+   private static boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false;
+
+   // the size (in bytes) of each journal file
+   private static int DEFAULT_JOURNAL_FILE_SIZE = 10485760;
+
+   // how many journal files to pre-create
+   private static int DEFAULT_JOURNAL_MIN_FILES = 2;
+
+   // The percentage of live data on which we consider compacting the journal
+   private static int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30;
+
+   // The minimal number of data files before we can start compacting
+   private static int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10;
+
+   // XXX Only meant to be used by project developers
+   private static int DEFAULT_JOURNAL_PERF_BLAST_PAGES = -1;
+
+   // XXX Only meant to be used by project developers
+   private static boolean DEFAULT_RUN_SYNC_SPEED_TEST = false;
+
+   // Interval to log server specific information (e.g. memory usage etc)
+   private static long DEFAULT_SERVER_DUMP_INTERVAL = -1;
+
+   // Percentage of available memory which will trigger a warning log
+   private static int DEFAULT_MEMORY_WARNING_THRESHOLD = 25;
+
+   // frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+   private static long DEFAULT_MEMORY_MEASURE_INTERVAL = -1;
+
+   // the directory to store large messages
+   private static String DEFAULT_LARGE_MESSAGES_DIR = "data/largemessages";
+
+   // period in milliseconds between consecutive broadcasts
+   private static long DEFAULT_BROADCAST_PERIOD = 2000;
+
+   // Period the discovery group waits after receiving the last broadcast from a particular server before removing that servers connector pair entry from its list.
+   private static int DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000;
+
+   // how long to keep a connection alive in the absence of any data arriving from the client. This should be greater than the ping period.
+   private static long DEFAULT_CONNECTION_TTL = 60000;
+
+   // multiplier to apply to successive retry intervals
+   private static double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1;
+
+   // Limit to the retry-interval growth (due to retry-interval-multiplier)
+   private static long DEFAULT_MAX_RETRY_INTERVAL = 2000;
+
+   // maximum number of initial connection attempts, -1 means 'no limits'
+   private static int DEFAULT_BRIDGE_INITIAL_CONNECT_ATTEMPTS = -1;
+
+   // maximum number of retry attempts, -1 means 'no limits'
+   private static int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1;
+
+   // should duplicate detection headers be inserted in forwarded messages?
+   private static boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true;
+
+   // Once the bridge has received this many bytes, it sends a confirmation
+   private static int DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE = 1048576;
+
+   // Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
+   private static int DEFAULT_BRIDGE_CONNECT_SAME_NODE = 10;
+
+   // The period (in milliseconds) used to check if the cluster connection has failed to receive pings from another server
+   private static long DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD = 30000;
+
+   // how long to keep a connection alive in the absence of any data arriving from the client
+   private static long DEFAULT_CLUSTER_CONNECTION_TTL = 60000;
+
+   // How long to wait for a reply
+   private static long DEFAULT_CLUSTER_CALL_TIMEOUT = 30000;
+
+   // period (in ms) between successive retries
+   private static long DEFAULT_CLUSTER_RETRY_INTERVAL = 500;
+
+   // multiplier to apply to the retry-interval
+   private static double DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER = 1;
+
+   // Maximum value for retry-interval
+   private static long DEFAULT_CLUSTER_MAX_RETRY_INTERVAL = 2000;
+
+   // How many attempts should be made to connect initially
+   private static int DEFAULT_CLUSTER_INITIAL_CONNECT_ATTEMPTS = -1;
+
+   // How many attempts should be made to reconnect after failure
+   private static int DEFAULT_CLUSTER_RECONNECT_ATTEMPTS = -1;
+
+   // should duplicate detection headers be inserted in forwarded messages?
+   private static boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true;
+
+   // should messages be load balanced if there are no matching consumers on target?
+   private static boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false;
+
+   // maximum number of hops cluster topology is propagated
+   private static int DEFAULT_CLUSTER_MAX_HOPS = 1;
+
+   // The size (in bytes) of the window used for confirming data from the server connected to.
+   private static int DEFAULT_CLUSTER_CONFIRMATION_WINDOW_SIZE = 1048576;
+
+   // How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+   private static long DEFAULT_CLUSTER_CALL_FAILOVER_TIMEOUT = -1;
+
+   // how often the cluster connection will notify the cluster of its existence right after joining the cluster
+   private static long DEFAULT_CLUSTER_NOTIFICATION_INTERVAL = 1000;
+
+   // how many times this cluster connection will notify the cluster of its existence right after joining the cluster
+   private static int DEFAULT_CLUSTER_NOTIFICATION_ATTEMPTS = 2;
+
+   // whether this is an exclusive divert
+   private static boolean DEFAULT_DIVERT_EXCLUSIVE = false;
+
+   // If true then the server will request a backup on another node
+   private static boolean DEFAULT_HAPOLICY_REQUEST_BACKUP = false;
+
+   // How many times the live server will try to request a backup, -1 means for ever.
+   private static int DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRIES = -1;
+
+   // How long to wait for retries between attempts to request a backup server.
+   private static long DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRY_INTERVAL = 5000;
+
+   // Whether or not this live server will accept backup requests from other live servers.
+   private static int DEFAULT_HAPOLICY_MAX_BACKUPS = 1;
+
+   // The offset to use for the Connectors and Acceptors when creating a new backup server.
+   private static int DEFAULT_HAPOLICY_BACKUP_PORT_OFFSET = 100;
+
+   // Whether to check the cluster for a (live) server using our own server ID when starting up. This option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this setting only applies to live servers and not to backups.
+   private static boolean DEFAULT_CHECK_FOR_LIVE_SERVER = false;
+
+   // This specifies how many times a replicated backup server can restart after moving its files on start. Once there are this number of backup journal files the server will stop permanently after if fails back.
+   private static int DEFAULT_MAX_SAVED_REPLICATED_JOURNALS_SIZE = 2;
+
+   // Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+   private static boolean DEFAULT_RESTART_BACKUP = false;
+
+   // Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating.
+   private static boolean DEFAULT_ALLOW_AUTO_FAILBACK = true;
+
+   // if we have to start as a replicated server this is the delay to wait before fail-back occurs
+   private static long DEFAULT_FAILBACK_DELAY = 5000;
+
+   // Will this backup server come live on a normal server shutdown
+   private static boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false;
+
+   // its possible that you only want a server to partake in scale down as a receiver, via a group. In this case set scale-down to false
+   private static boolean DEFAULT_SCALE_DOWN_ENABLED = true;
+
+   // How long to wait for a decision
+   private static int DEFAULT_GROUPING_HANDLER_TIMEOUT = 5000;
+
+   // How long a group binding will be used, -1 means for ever. Bindings are removed after this wait elapses. On the remote node this is used to determine how often you should re-query the main coordinator in order to update the last time used accordingly.
+   private static int DEFAULT_GROUPING_HANDLER_GROUP_TIMEOUT = -1;
+
+   // How often the reaper will be run to check for timed out group bindings. Only valid for LOCAL handlers
+   private static long DEFAULT_GROUPING_HANDLER_REAPER_PERIOD = 30000;
+
+
+   /**
+    * If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+    */
+   public static boolean isDefaultResolveProtocols()
+   {
+      return DEFAULT_RESOLVE_PROTOCOLS;
+   }
+
+   /**
+    * true means that the server will load configuration from the configuration files
+    */
+   public static boolean isDefaultFileDeploymentEnabled()
+   {
+      return DEFAULT_FILE_DEPLOYMENT_ENABLED;
+   }
+
+   /**
+    * true means that the server will use the file based journal for persistence.
+    */
+   public static boolean isDefaultPersistenceEnabled()
+   {
+      return DEFAULT_PERSISTENCE_ENABLED;
+   }
+
+   /**
+    * Maximum number of threads to use for the scheduled thread pool
+    */
+   public static int getDefaultScheduledThreadPoolMaxSize()
+   {
+      return DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
+   }
+
+   /**
+    * Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+    */
+   public static int getDefaultThreadPoolMaxSize()
+   {
+      return DEFAULT_THREAD_POOL_MAX_SIZE;
+   }
+
+   /**
+    * true means that security is enabled
+    */
+   public static boolean isDefaultSecurityEnabled()
+   {
+      return DEFAULT_SECURITY_ENABLED;
+   }
+
+   /**
+    * how long (in ms) to wait before invalidating the security cache
+    */
+   public static long getDefaultSecurityInvalidationInterval()
+   {
+      return DEFAULT_SECURITY_INVALIDATION_INTERVAL;
+   }
+
+   /**
+    * how long (in ms) to wait to acquire a file lock on the journal
+    */
+   public static long getDefaultJournalLockAcquisitionTimeout()
+   {
+      return DEFAULT_JOURNAL_LOCK_ACQUISITION_TIMEOUT;
+   }
+
+   /**
+    * true means that the server supports wild card routing
+    */
+   public static boolean isDefaultWildcardRoutingEnabled()
+   {
+      return DEFAULT_WILDCARD_ROUTING_ENABLED;
+   }
+
+   /**
+    * the name of the management address to send management messages to. It is prefixed with "jms.queue" so that JMS clients can send messages to it.
+    */
+   public static SimpleString getDefaultManagementAddress()
+   {
+      return DEFAULT_MANAGEMENT_ADDRESS;
+   }
+
+   /**
+    * the name of the address that consumers bind to receive management notifications
+    */
+   public static SimpleString getDefaultManagementNotificationAddress()
+   {
+      return DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS;
+   }
+
+   /**
+    * Cluster username. It applies to all cluster configurations.
+    */
+   public static String getDefaultClusterUser()
+   {
+      return DEFAULT_CLUSTER_USER;
+   }
+
+   /**
+    * Cluster password. It applies to all cluster configurations.
+    */
+   public static String getDefaultClusterPassword()
+   {
+      return DEFAULT_CLUSTER_PASSWORD;
+   }
+
+   /**
+    * This option controls whether passwords in server configuration need be masked. If set to "true" the passwords are masked.
+    */
+   public static boolean isDefaultMaskPassword()
+   {
+      return DEFAULT_MASK_PASSWORD;
+   }
+
+   /**
+    * true means that the management API is available via JMX
+    */
+   public static boolean isDefaultJmxManagementEnabled()
+   {
+      return DEFAULT_JMX_MANAGEMENT_ENABLED;
+   }
+
+   /**
+    * the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+    */
+   public static String getDefaultJmxDomain()
+   {
+      return DEFAULT_JMX_DOMAIN;
+   }
+
+   /**
+    * true means that message counters are enabled
+    */
+   public static boolean isDefaultMessageCounterEnabled()
+   {
+      return DEFAULT_MESSAGE_COUNTER_ENABLED;
+   }
+
+   /**
+    * the sample period (in ms) to use for message counters
+    */
+   public static long getDefaultMessageCounterSamplePeriod()
+   {
+      return DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD;
+   }
+
+   /**
+    * how many days to keep message counter history
+    */
+   public static int getDefaultMessageCounterMaxDayHistory()
+   {
+      return DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY;
+   }
+
+   /**
+    * if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1 disables this setting.
+    */
+   public static long getDefaultConnectionTtlOverride()
+   {
+      return DEFAULT_CONNECTION_TTL_OVERRIDE;
+   }
+
+   /**
+    * should certain incoming packets on the server be handed off to a thread from the thread pool for processing or should they be handled on the remoting thread?
+    */
+   public static boolean isDefaultAsyncConnectionExecutionEnabled()
+   {
+      return DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED;
+   }
+
+   /**
+    * how long (in ms) before a transaction can be removed from the resource manager after create time
+    */
+   public static long getDefaultTransactionTimeout()
+   {
+      return DEFAULT_TRANSACTION_TIMEOUT;
+   }
+
+   /**
+    * how often (in ms) to scan for timeout transactions
+    */
+   public static long getDefaultTransactionTimeoutScanPeriod()
+   {
+      return DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD;
+   }
+
+   /**
+    * how often (in ms) to scan for expired messages
+    */
+   public static long getDefaultMessageExpiryScanPeriod()
+   {
+      return DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD;
+   }
+
+   /**
+    * the priority of the thread expiring messages
+    */
+   public static int getDefaultMessageExpiryThreadPriority()
+   {
+      return DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY;
+   }
+
+   /**
+    * the size of the cache for pre-creating message ID's
+    */
+   public static int getDefaultIdCacheSize()
+   {
+      return DEFAULT_ID_CACHE_SIZE;
+   }
+
+   /**
+    * true means that ID's are persisted to the journal
+    */
+   public static boolean isDefaultPersistIdCache()
+   {
+      return DEFAULT_PERSIST_ID_CACHE;
+   }
+
+   /**
+    * DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. It indicates whether this server is a backup server
+    */
+   public static boolean isDefaultBackup()
+   {
+      return DEFAULT_BACKUP;
+   }
+
+   /**
+    * DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share storage or if the data is replicated among them.
+    */
+   public static boolean isDefaultSharedStore()
+   {
+      return DEFAULT_SHARED_STORE;
+   }
+
+   /**
+    * True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled.
+    */
+   public static boolean isDefaultPersistDeliveryCountBeforeDelivery()
+   {
+      return DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY;
+   }
+
+   /**
+    * the directory to store paged messages in
+    */
+   public static String getDefaultPagingDir()
+   {
+      return DEFAULT_PAGING_DIR;
+   }
+
+   /**
+    * the directory to store the persisted bindings to
+    */
+   public static String getDefaultBindingsDirectory()
+   {
+      return DEFAULT_BINDINGS_DIRECTORY;
+   }
+
+   /**
+    * true means that the server will create the bindings directory on start up
+    */
+   public static boolean isDefaultCreateBindingsDir()
+   {
+      return DEFAULT_CREATE_BINDINGS_DIR;
+   }
+
+   /**
+    * The max number of concurrent reads allowed on paging
+    */
+   public static int getDefaultMaxConcurrentPageIo()
+   {
+      return DEFAULT_MAX_CONCURRENT_PAGE_IO;
+   }
+
+   /**
+    * the directory to store the journal files in
+    */
+   public static String getDefaultJournalDir()
+   {
+      return DEFAULT_JOURNAL_DIR;
+   }
+
+   /**
+    * true means that the journal directory will be created
+    */
+   public static boolean isDefaultCreateJournalDir()
+   {
+      return DEFAULT_CREATE_JOURNAL_DIR;
+   }
+
+   /**
+    * if true wait for transaction data to be synchronized to the journal before returning response to client
+    */
+   public static boolean isDefaultJournalSyncTransactional()
+   {
+      return DEFAULT_JOURNAL_SYNC_TRANSACTIONAL;
+   }
+
+   /**
+    * if true wait for non transaction data to be synced to the journal before returning response to client.
+    */
+   public static boolean isDefaultJournalSyncNonTransactional()
+   {
+      return DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL;
+   }
+
+   /**
+    * Whether to log messages about the journal write rate
+    */
+   public static boolean isDefaultJournalLogWriteRate()
+   {
+      return DEFAULT_JOURNAL_LOG_WRITE_RATE;
+   }
+
+   /**
+    * the size (in bytes) of each journal file
+    */
+   public static int getDefaultJournalFileSize()
+   {
+      return DEFAULT_JOURNAL_FILE_SIZE;
+   }
+
+   /**
+    * how many journal files to pre-create
+    */
+   public static int getDefaultJournalMinFiles()
+   {
+      return DEFAULT_JOURNAL_MIN_FILES;
+   }
+
+   /**
+    * The percentage of live data on which we consider compacting the journal
+    */
+   public static int getDefaultJournalCompactPercentage()
+   {
+      return DEFAULT_JOURNAL_COMPACT_PERCENTAGE;
+   }
+
+   /**
+    * The minimal number of data files before we can start compacting
+    */
+   public static int getDefaultJournalCompactMinFiles()
+   {
+      return DEFAULT_JOURNAL_COMPACT_MIN_FILES;
+   }
+
+   /**
+    * XXX Only meant to be used by project developers
+    */
+   public static int getDefaultJournalPerfBlastPages()
+   {
+      return DEFAULT_JOURNAL_PERF_BLAST_PAGES;
+   }
+
+   /**
+    * XXX Only meant to be used by project developers
+    */
+   public static boolean isDefaultRunSyncSpeedTest()
+   {
+      return DEFAULT_RUN_SYNC_SPEED_TEST;
+   }
+
+   /**
+    * Interval to log server specific information (e.g. memory usage etc)
+    */
+   public static long getDefaultServerDumpInterval()
+   {
+      return DEFAULT_SERVER_DUMP_INTERVAL;
+   }
+
+   /**
+    * Percentage of available memory which will trigger a warning log
+    */
+   public static int getDefaultMemoryWarningThreshold()
+   {
+      return DEFAULT_MEMORY_WARNING_THRESHOLD;
+   }
+
+   /**
+    * frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+    */
+   public static long getDefaultMemoryMeasureInterval()
+   {
+      return DEFAULT_MEMORY_MEASURE_INTERVAL;
+   }
+
+   /**
+    * the directory to store large messages
+    */
+   public static String getDefaultLargeMessagesDir()
+   {
+      return DEFAULT_LARGE_MESSAGES_DIR;
+   }
+
+   /**
+    * period in milliseconds between consecutive broadcasts
+    */
+   public static long getDefaultBroadcastPeriod()
+   {
+      return DEFAULT_BROADCAST_PERIOD;
+   }
+
+   /**
+    * Period the discovery group waits after receiving the last broadcast from a particular server before removing that servers connector pair entry from its list.
+    */
+   public static int getDefaultBroadcastRefreshTimeout()
+   {
+      return DEFAULT_BROADCAST_REFRESH_TIMEOUT;
+   }
+
+   /**
+    * how long to keep a connection alive in the absence of any data arriving from the client. This should be greater than the ping period.
+    */
+   public static long getDefaultConnectionTtl()
+   {
+      return DEFAULT_CONNECTION_TTL;
+   }
+
+   /**
+    * multiplier to apply to successive retry intervals
+    */
+   public static double getDefaultRetryIntervalMultiplier()
+   {
+      return DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+   }
+
+   /**
+    * Limit to the retry-interval growth (due to retry-interval-multiplier)
+    */
+   public static long getDefaultMaxRetryInterval()
+   {
+      return DEFAULT_MAX_RETRY_INTERVAL;
+   }
+
+   /**
+    * maximum number of initial connection attempts, -1 means 'no limits'
+    */
+   public static int getDefaultBridgeInitialConnectAttempts()
+   {
+      return DEFAULT_BRIDGE_INITIAL_CONNECT_ATTEMPTS;
+   }
+
+   /**
+    * maximum number of retry attempts, -1 means 'no limits'
+    */
+   public static int getDefaultBridgeReconnectAttempts()
+   {
+      return DEFAULT_BRIDGE_RECONNECT_ATTEMPTS;
+   }
+
+   /**
+    * should duplicate detection headers be inserted in forwarded messages?
+    */
+   public static boolean isDefaultBridgeDuplicateDetection()
+   {
+      return DEFAULT_BRIDGE_DUPLICATE_DETECTION;
+   }
+
+   /**
+    * Once the bridge has received this many bytes, it sends a confirmation
+    */
+   public static int getDefaultBridgeConfirmationWindowSize()
+   {
+      return DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE;
+   }
+
+   /**
+    * Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
+    */
+   public static int getDefaultBridgeConnectSameNode()
+   {
+      return DEFAULT_BRIDGE_CONNECT_SAME_NODE;
+   }
+
+   /**
+    * The period (in milliseconds) used to check if the cluster connection has failed to receive pings from another server
+    */
+   public static long getDefaultClusterFailureCheckPeriod()
+   {
+      return DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD;
+   }
+
+   /**
+    * how long to keep a connection alive in the absence of any data arriving from the client
+    */
+   public static long getDefaultClusterConnectionTtl()
+   {
+      return DEFAULT_CLUSTER_CONNECTION_TTL;
+   }
+
+   /**
+    * How long to wait for a reply
+    */
+   public static long getDefaultClusterCallTimeout()
+   {
+      return DEFAULT_CLUSTER_CALL_TIMEOUT;
+   }
+
+   /**
+    * period (in ms) between successive retries
+    */
+   public static long getDefaultClusterRetryInterval()
+   {
+      return DEFAULT_CLUSTER_RETRY_INTERVAL;
+   }
+
+   /**
+    * multiplier to apply to the retry-interval
+    */
+   public static double getDefaultClusterRetryIntervalMultiplier()
+   {
+      return DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER;
+   }
+
+   /**
+    * Maximum value for retry-interval
+    */
+   public static long getDefaultClusterMaxRetryInterval()
+   {
+      return DEFAULT_CLUSTER_MAX_RETRY_INTERVAL;
+   }
+
+   /**
+    * How many attempts should be made to connect initially
+    */
+   public static int getDefaultClusterInitialConnectAttempts()
+   {
+      return DEFAULT_CLUSTER_INITIAL_CONNECT_ATTEMPTS;
+   }
+
+   /**
+    * How many attempts should be made to reconnect after failure
+    */
+   public static int getDefaultClusterReconnectAttempts()
+   {
+      return DEFAULT_CLUSTER_RECONNECT_ATTEMPTS;
+   }
+
+   /**
+    * should duplicate detection headers be inserted in forwarded messages?
+    */
+   public static boolean isDefaultClusterDuplicateDetection()
+   {
+      return DEFAULT_CLUSTER_DUPLICATE_DETECTION;
+   }
+
+   /**
+    * should messages be load balanced if there are no matching consumers on target?
+    */
+   public static boolean isDefaultClusterForwardWhenNoConsumers()
+   {
+      return DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS;
+   }
+
+   /**
+    * maximum number of hops cluster topology is propagated
+    */
+   public static int getDefaultClusterMaxHops()
+   {
+      return DEFAULT_CLUSTER_MAX_HOPS;
+   }
+
+   /**
+    * The size (in bytes) of the window used for confirming data from the server connected to.
+    */
+   public static int getDefaultClusterConfirmationWindowSize()
+   {
+      return DEFAULT_CLUSTER_CONFIRMATION_WINDOW_SIZE;
+   }
+
+   /**
+    * How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+    */
+   public static long getDefaultClusterCallFailoverTimeout()
+   {
+      return DEFAULT_CLUSTER_CALL_FAILOVER_TIMEOUT;
+   }
+
+   /**
+    * how often the cluster connection will notify the cluster of its existence right after joining the cluster
+    */
+   public static long getDefaultClusterNotificationInterval()
+   {
+      return DEFAULT_CLUSTER_NOTIFICATION_INTERVAL;
+   }
+
+   /**
+    * how many times this cluster connection will notify the cluster of its existence right after joining the cluster
+    */
+   public static int getDefaultClusterNotificationAttempts()
+   {
+      return DEFAULT_CLUSTER_NOTIFICATION_ATTEMPTS;
+   }
+
+   /**
+    * whether this is an exclusive divert
+    */
+   public static boolean isDefaultDivertExclusive()
+   {
+      return DEFAULT_DIVERT_EXCLUSIVE;
+   }
+
+   /**
+    * If true then the server will request a backup on another node
+    */
+   public static boolean isDefaultHapolicyRequestBackup()
+   {
+      return DEFAULT_HAPOLICY_REQUEST_BACKUP;
+   }
+
+   /**
+    * How many times the live server will try to request a backup, -1 means for ever.
+    */
+   public static int getDefaultHapolicyBackupRequestRetries()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRIES;
+   }
+
+   /**
+    * How long to wait for retries between attempts to request a backup server.
+    */
+   public static long getDefaultHapolicyBackupRequestRetryInterval()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRY_INTERVAL;
+   }
+
+   /**
+    * Whether or not this live server will accept backup requests from other live servers.
+    */
+   public static int getDefaultHapolicyMaxBackups()
+   {
+      return DEFAULT_HAPOLICY_MAX_BACKUPS;
+   }
+
+   /**
+    * The offset to use for the Connectors and Acceptors when creating a new backup server.
+    */
+   public static int getDefaultHapolicyBackupPortOffset()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_PORT_OFFSET;
+   }
+
+   /**
+    * Whether to check the cluster for a (live) server using our own server ID when starting up. This option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this setting only applies to live servers and not to backups.
+    */
+   public static boolean isDefaultCheckForLiveServer()
+   {
+      return DEFAULT_CHECK_FOR_LIVE_SERVER;
+   }
+
+   /**
+    * This specifies how many times a replicated backup server can restart after moving its files on start. Once there are this number of backup journal files the server will stop permanently after if fails back.
+    */
+   public static int getDefaultMaxSavedReplicatedJournalsSize()
+   {
+      return DEFAULT_MAX_SAVED_REPLICATED_JOURNALS_SIZE;
+   }
+
+   /**
+    * Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+    */
+   public static boolean isDefaultRestartBackup()
+   {
+      return DEFAULT_RESTART_BACKUP;
+   }
+
+   /**
+    * Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating.
+    */
+   public static boolean isDefaultAllowAutoFailback()
+   {
+      return DEFAULT_ALLOW_AUTO_FAILBACK;
+   }
+
+   /**
+    * if we have to start as a replicated server this is the delay to wait before fail-back occurs
+    */
+   public static long getDefaultFailbackDelay()
+   {
+      return DEFAULT_FAILBACK_DELAY;
+   }
+
+   /**
+    * Will this backup server come live on a normal server shutdown
+    */
+   public static boolean isDefaultFailoverOnServerShutdown()
+   {
+      return DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
+   }
+
+   /**
+    * its possible that you only want a server to partake in scale down as a receiver, via a group. In this case set scale-down to false
+    */
+   public static boolean isDefaultScaleDownEnabled()
+   {
+      return DEFAULT_SCALE_DOWN_ENABLED;
+   }
+
+   /**
+    * How long to wait for a decision
+    */
+   public static int getDefaultGroupingHandlerTimeout()
+   {
+      return DEFAULT_GROUPING_HANDLER_TIMEOUT;
+   }
+
+   /**
+    * How long a group binding will be used, -1 means for ever. Bindings are removed after this wait elapses. On the remote node this is used to determine how often you should re-query the main coordinator in order to update the last time used accordingly.
+    */
+   public static int getDefaultGroupingHandlerGroupTimeout()
+   {
+      return DEFAULT_GROUPING_HANDLER_GROUP_TIMEOUT;
+   }
+
+   /**
+    * How often the reaper will be run to check for timed out group bindings. Only valid for LOCAL handlers
+    */
+   public static long getDefaultGroupingHandlerReaperPeriod()
+   {
+      return DEFAULT_GROUPING_HANDLER_REAPER_PERIOD;
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
index 97f4faf..7df97be 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
@@ -15,7 +15,7 @@ package org.apache.activemq.api.core;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 
 /**
@@ -32,7 +32,7 @@ public final class BroadcastGroupConfiguration implements Serializable
 
    private String name = null;
 
-   private long broadcastPeriod = HornetQDefaultConfiguration.getDefaultBroadcastPeriod();
+   private long broadcastPeriod = ActiveMQDefaultConfiguration.getDefaultBroadcastPeriod();
 
    private BroadcastEndpointFactoryConfiguration endpointFactoryConfiguration = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
index edafea2..1eef77f 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.api.core.client;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
@@ -30,13 +30,13 @@ public final class HornetQClient
 {
    public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName();
 
-   public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = HornetQDefaultConfiguration.getDefaultClientFailureCheckPeriod();
+   public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = ActiveMQDefaultConfiguration.getDefaultClientFailureCheckPeriod();
 
    public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD_INVM = -1;
 
    // 1 minute - this should be higher than ping period
 
-   public static final long DEFAULT_CONNECTION_TTL = HornetQDefaultConfiguration.getDefaultConnectionTtl();
+   public static final long DEFAULT_CONNECTION_TTL = ActiveMQDefaultConfiguration.getDefaultConnectionTtl();
 
    public static final long DEFAULT_CONNECTION_TTL_INVM = -1;
 
@@ -80,9 +80,9 @@ public final class HornetQClient
 
    public static final long DEFAULT_RETRY_INTERVAL = 2000;
 
-   public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = HornetQDefaultConfiguration.getDefaultRetryIntervalMultiplier();
+   public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = ActiveMQDefaultConfiguration.getDefaultRetryIntervalMultiplier();
 
-   public static final long DEFAULT_MAX_RETRY_INTERVAL = HornetQDefaultConfiguration.getDefaultMaxRetryInterval();
+   public static final long DEFAULT_MAX_RETRY_INTERVAL = ActiveMQDefaultConfiguration.getDefaultMaxRetryInterval();
 
    public static final int DEFAULT_RECONNECT_ATTEMPTS = 0;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
index 26cca91..0f53d16 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
@@ -14,7 +14,7 @@ package org.apache.activemq.api.core.management;
 
 import javax.management.ObjectName;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 
 /**
@@ -29,7 +29,7 @@ public final class ObjectNameBuilder
    /**
     * Default JMX domain for HornetQ resources.
     */
-   public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(HornetQDefaultConfiguration.getDefaultJmxDomain());
+   public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
 
    static final String JMS_MODULE = "JMS";
 
@@ -45,7 +45,7 @@ public final class ObjectNameBuilder
    {
       if (domain == null)
       {
-         return new ObjectNameBuilder(HornetQDefaultConfiguration.getDefaultJmxDomain());
+         return new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
index 76ab107..f6defe9 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
@@ -95,8 +95,8 @@ import io.netty.util.AttributeKey;
 import io.netty.util.ResourceLeakDetector;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GlobalEventExecutor;
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.client.HornetQClientLogger;
 import org.apache.activemq.core.client.HornetQClientMessageBundle;
 import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
@@ -354,8 +354,8 @@ public class NettyConnector extends AbstractConnector
          keyStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME,
                                                                     TransportConstants.DEFAULT_KEYSTORE_PASSWORD,
                                                                     configuration,
-                                                                    HornetQDefaultConfiguration.getPropMaskPassword(),
-                                                                    HornetQDefaultConfiguration.getPropMaskPassword());
+                                                                    ActiveMQDefaultConfiguration.getPropMaskPassword(),
+                                                                    ActiveMQDefaultConfiguration.getPropMaskPassword());
 
          trustStoreProvider = ConfigurationHelper.getStringProperty(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME,
                                                                     TransportConstants.DEFAULT_TRUSTSTORE_PROVIDER,
@@ -368,8 +368,8 @@ public class NettyConnector extends AbstractConnector
          trustStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME,
                                                                       TransportConstants.DEFAULT_TRUSTSTORE_PASSWORD,
                                                                       configuration,
-                                                                      HornetQDefaultConfiguration.getPropMaskPassword(),
-                                                                      HornetQDefaultConfiguration.getPropMaskPassword());
+                                                                      ActiveMQDefaultConfiguration.getPropMaskPassword(),
+                                                                      ActiveMQDefaultConfiguration.getPropMaskPassword());
 
          enabledCipherSuites = ConfigurationHelper.getStringProperty(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME,
                                                                      TransportConstants.DEFAULT_ENABLED_CIPHER_SUITES,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
index c81db4d..172ce8c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
@@ -17,7 +17,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import io.netty.util.Version;
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 /**
  * A TransportConstants
@@ -225,8 +225,8 @@ public class TransportConstants
       allowableAcceptorKeys.add(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE);
       allowableAcceptorKeys.add(TransportConstants.CONNECTION_TTL);
       allowableAcceptorKeys.add(TransportConstants.STOMP_ENABLE_MESSAGE_ID);
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
 
       ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys);
 
@@ -259,8 +259,8 @@ public class TransportConstants
       allowableConnectorKeys.add(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME);
       allowableConnectorKeys.add(TransportConstants.NIO_REMOTING_THREADS_PROPNAME);
       allowableConnectorKeys.add(TransportConstants.BATCH_DELAY);
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
       allowableConnectorKeys.add(TransportConstants.NETTY_CONNECT_TIMEOUT);
 
       ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt b/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
deleted file mode 100644
index c31a87e..0000000
--- a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.apache.activemq.api.config;
-
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.impl.JournalConstants;
-
-/**
- * Default values of HornetQ configuration parameters.
- */
-public final class HornetQDefaultConfiguration
-{
-   /*
-    * <p> In order to avoid compile time in-lining of constants, all access is done through methods
-    * and all fields are PRIVATE STATIC but not FINAL. This is done following the recommendation at
-    * <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9">13.4.9.
-    * final Fields and Constants</a>
-    * @see http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9
-    */
-
-   private HornetQDefaultConfiguration()
-   {
-      // Utility class
-   }
-
-   public static long getDefaultClientFailureCheckPeriod()
-   {
-      return DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
-   }
-
-   public static long getDefaultFileDeployerScanPeriod()
-   {
-      return DEFAULT_FILE_DEPLOYER_SCAN_PERIOD;
-   }
-
-   public static int getDefaultJournalMaxIoAio()
-   {
-      return DEFAULT_JOURNAL_MAX_IO_AIO;
-   }
-
-   public static int getDefaultJournalBufferTimeoutAio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
-   }
-
-   public static int getDefaultJournalBufferSizeAio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
-   }
-
-   public static int getDefaultJournalMaxIoNio()
-   {
-      return DEFAULT_JOURNAL_MAX_IO_NIO;
-   }
-
-   public static int getDefaultJournalBufferTimeoutNio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
-   }
-
-   public static int getDefaultJournalBufferSizeNio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
-   }
-
-   public static String getPropMaskPassword()
-   {
-      return PROP_MASK_PASSWORD;
-   }
-
-   public static String getPropPasswordCodec()
-   {
-      return PROP_PASSWORD_CODEC;
-   }
-
-   /**
-    * what kind of HA Policy should we use
-    */
-   public static String getDefaultHapolicyType()
-   {
-     return DEFAULT_HAPOLICY_TYPE;
-   }
-
-   /**
-    * The backup strategy to use if we are a backup or for any colocated backups.
-    */
-   public static String getDefaultHapolicyBackupStrategy()
-   {
-     return DEFAULT_HAPOLICY_BACKUP_STRATEGY;
-   }
-
-   //shared by client and core/server
-   // XXX not on schema?
-   private static long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000;
-
-   // XXX not on schema?
-   private static long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000;
-
-   // These defaults are applied depending on whether the journal type
-   // is NIO or AIO.
-   private static int DEFAULT_JOURNAL_MAX_IO_AIO = 500;
-   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
-   private static int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
-   private static int DEFAULT_JOURNAL_MAX_IO_NIO = 1;
-   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
-   private static int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
-
-   // XXX not on schema.
-   //properties passed to acceptor/connectors.
-   private static String PROP_MASK_PASSWORD = "hornetq.usemaskedpassword";
-   private static String PROP_PASSWORD_CODEC = "hornetq.passwordcodec";
-
-
-   // what kind of HA Policy should we use
-   private static String DEFAULT_HAPOLICY_TYPE = "NONE";
-
-   // The backup strategy to use if we are a backup or for any colocated backups.
-   private static String DEFAULT_HAPOLICY_BACKUP_STRATEGY = "FULL";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/resources/hqDefaults.xsl
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/hqDefaults.xsl b/activemq-core-client/src/main/resources/hqDefaults.xsl
deleted file mode 100644
index 6f67fff..0000000
--- a/activemq-core-client/src/main/resources/hqDefaults.xsl
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<xsl:stylesheet version="2.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:hq="urn:org.apache.activemq"
-                xmlns:fn="http://www.w3.org/2005/xpath-functions">
-
-  <!-- This XSLT creates the class HornetQDefaultsConfiguration.java.
-
-  It makes use of a text file with the first part of the class' body, and creates fields and methods
-  using information encoded in the hornetq-configuration.xsd.
-
-  Any element in the hornetq-configuration.xsd with an attribute 'hq:field_name' will trigger the
-  creation of a field using also its 'type' to determine the correct Java type. -->
-
-  <xsl:output method="text" indent="yes"/>
-  <!-- 16.2 Reading Text Files -->
-  <xsl:template match="/">
-    <xsl:text>/*
-    * THIS IS A GENERATED FILE! DO NOT EDIT IT DIRECTLY!
-
-      To see how this file is generated, please refer to
-      hornetq-core-client/src/main/resources/hqDefaults.xsl
-
-      To add new entries either document them in the hornetq-configuration.xsd by adding:
-
-      1. a default value to the schema element (using the standard way of adding a default)
-      2. adding a hq:field_name attribute to a xsd:annotation element of the element in question.
-
-      It is probably easier to just go to the hornetq-configuration.xsd and see how this is done for
-      other values, and then copy it.
-
-      The advantage of adding the default to the schema is that:
-
-      a. the schema will inform users of it (for users that check such things through the schema,
-      think of XML editors as users...);
-
-      b. the manual gets an entry for it automatically;
-
-      c. the Java code gets the same value;
-
-      d. all 3 sources of defaults will match since they take the value from the same place
-      (i.e. the schema).
-
-    */
-</xsl:text>
-/*
-      XSLT Version = <xsl:copy-of select="system-property('xsl:version')"/>
-      XSLT Vendor = <xsl:copy-of select="system-property('xsl:vendor')"/>
-      XSLT Vendor URL = <xsl:copy-of select="system-property('xsl:vendor-url')"/>
-*/
-    <xsl:value-of select="unparsed-text('./HornetQDefaultConfiguration.txt', 'iso-8859-1')" disable-output-escaping="yes"/>
-
-<xsl:text>&#xa;    // -------------------------------------------------------------------
-    // Following fields are generated from the hornetq-schema.xsd annotations
-    // -------------------------------------------------------------------&#xa;</xsl:text>
-
-        <xsl:for-each select="xsd:schema//xsd:complexType//xsd:element[ xsd:annotation/@hq:field_name ]">
-   // <xsl:value-of select="normalize-space(xsd:annotation/xsd:documentation)"/>
-   private static <xsl:call-template name="determine-type"/><xsl:text> </xsl:text><xsl:value-of select="xsd:annotation/@hq:field_name"/> = <xsl:call-template name="quote-default-value"/>;
-</xsl:for-each>
-
-<xsl:text>&#xa;&#xa;</xsl:text>
-
-        <xsl:for-each select="xsd:schema//xsd:complexType//xsd:element[ xsd:annotation/@hq:field_name ]">
-
-<xsl:text>   /**&#xa;    * </xsl:text>
-<xsl:value-of select="normalize-space(xsd:annotation/xsd:documentation)"/>
-<xsl:text>&#xa;    */</xsl:text>
-   public static <xsl:call-template name="determine-type"/> <xsl:call-template name="method-prefix-verb"/><xsl:for-each select="fn:tokenize(xsd:annotation/@hq:field_name,'_')">
-  <xsl:value-of select=
-                "concat(upper-case(substring(.,1,1)),
-                 lower-case(substring(., 2)),
-                 ' '[not(last())]
-                 )
-                 "/>
-</xsl:for-each>()
-   <xsl:text>&#123;&#xa;     return </xsl:text>
-  <xsl:value-of select="xsd:annotation/@hq:field_name" />
-    <xsl:text>;
-   &#125;&#xa;</xsl:text>
-        </xsl:for-each>
-    <xsl:text>
-&#125;&#xa;</xsl:text>
-  </xsl:template>
-
-<xsl:template name="method-prefix-verb">
-  <xsl:choose>
-    <xsl:when test="@type='xsd:boolean'">
-      <xsl:text> is</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>      <xsl:text> get</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="quote-default-value">
-  <xsl:choose>
-    <xsl:when test="xsd:annotation/@hq:type='SimpleString'">
-      <xsl:value-of select="concat( 'new SimpleString(&#34;', @default, '&#34;)')"/>
-    </xsl:when>
-    <xsl:when test="@type='xsd:string'">
-      <xsl:value-of select="concat( '&#34;', @default, '&#34;')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@default"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="determine-type">
-  <xsl:choose>
-    <xsl:when test="xsd:annotation/@hq:type">
-      <xsl:value-of select="xsd:annotation/@hq:type"/>
-    </xsl:when>
-    <xsl:when test="@type = 'xsd:string'">
-      <xsl:text>String</xsl:text>
-    </xsl:when>
-    <xsl:when test="fn:starts-with(@type,'xsd:')">
-      <xsl:value-of select="fn:substring-after(@type,':')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@type"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-</xsl:stylesheet>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
index 3561d44..ed97183 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.naming.Context;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 import org.apache.activemq.jms.server.config.JMSConfiguration;
 import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
@@ -36,7 +36,7 @@ public class JMSConfigurationImpl implements JMSConfiguration
 
    private List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>();
 
-   private String domain = HornetQDefaultConfiguration.getDefaultJmxDomain();
+   private String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
    private Context context = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 6293fe4..0c9d47f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -18,7 +18,7 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.client.HornetQClient;
 import org.apache.activemq.api.jms.JMSFactoryType;
@@ -74,7 +74,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
       ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>();
       ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>();
       ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>();
-      String domain = HornetQDefaultConfiguration.getDefaultJmxDomain();
+      String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
       Element e = (Element) rootnode;
 
@@ -111,7 +111,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
          }
       }
 
-      domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, HornetQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK);
+      domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, ActiveMQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK);
 
 
       JMSConfiguration value = newConfig(queues, topics, cfs, domain);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
index 8ad1e54..6b60332 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
@@ -15,7 +15,7 @@ package org.apache.activemq.core.config;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.HornetQClient;
 
 /**
@@ -46,21 +46,21 @@ public final class BridgeConfiguration implements Serializable
 
    private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
 
-   private int initialConnectAttempts = HornetQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts();
+   private int initialConnectAttempts = ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts();
 
-   private int reconnectAttempts = HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts();
+   private int reconnectAttempts = ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts();
 
-   private int reconnectAttemptsOnSameNode = HornetQDefaultConfiguration.getDefaultBridgeConnectSameNode();
+   private int reconnectAttemptsOnSameNode = ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode();
 
-   private boolean useDuplicateDetection = HornetQDefaultConfiguration.isDefaultBridgeDuplicateDetection();
+   private boolean useDuplicateDetection = ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection();
 
    private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE;
 
    private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
 
-   private String user = HornetQDefaultConfiguration.getDefaultClusterUser();
+   private String user = ActiveMQDefaultConfiguration.getDefaultClusterUser();
 
-   private String password = HornetQDefaultConfiguration.getDefaultClusterPassword();
+   private String password = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
 
    private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
index 2375893..7cfd8a2 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.HornetQClient;
 
 /**
@@ -34,43 +34,43 @@ public final class ClusterConnectionConfiguration implements Serializable
 
    private String connectorName;
 
-   private long clientFailureCheckPeriod = HornetQDefaultConfiguration.getDefaultClusterFailureCheckPeriod();
+   private long clientFailureCheckPeriod = ActiveMQDefaultConfiguration.getDefaultClusterFailureCheckPeriod();
 
-   private long connectionTTL = HornetQDefaultConfiguration.getDefaultClusterConnectionTtl();
+   private long connectionTTL = ActiveMQDefaultConfiguration.getDefaultClusterConnectionTtl();
 
-   private long retryInterval = HornetQDefaultConfiguration.getDefaultClusterRetryInterval();
+   private long retryInterval = ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval();
 
-   private double retryIntervalMultiplier = HornetQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier();
+   private double retryIntervalMultiplier = ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier();
 
-   private long maxRetryInterval = HornetQDefaultConfiguration.getDefaultClusterMaxRetryInterval();
+   private long maxRetryInterval = ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval();
 
-   private int initialConnectAttempts = HornetQDefaultConfiguration.getDefaultClusterInitialConnectAttempts();
+   private int initialConnectAttempts = ActiveMQDefaultConfiguration.getDefaultClusterInitialConnectAttempts();
 
-   private int reconnectAttempts = HornetQDefaultConfiguration.getDefaultClusterReconnectAttempts();
+   private int reconnectAttempts = ActiveMQDefaultConfiguration.getDefaultClusterReconnectAttempts();
 
-   private long callTimeout = HornetQDefaultConfiguration.getDefaultClusterCallTimeout();
+   private long callTimeout = ActiveMQDefaultConfiguration.getDefaultClusterCallTimeout();
 
-   private long callFailoverTimeout = HornetQDefaultConfiguration.getDefaultClusterCallFailoverTimeout();
+   private long callFailoverTimeout = ActiveMQDefaultConfiguration.getDefaultClusterCallFailoverTimeout();
 
-   private boolean duplicateDetection = HornetQDefaultConfiguration.isDefaultClusterDuplicateDetection();
+   private boolean duplicateDetection = ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection();
 
-   private boolean forwardWhenNoConsumers = HornetQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers();
+   private boolean forwardWhenNoConsumers = ActiveMQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers();
 
    private List<String> staticConnectors = Collections.emptyList();
 
    private String discoveryGroupName = null;
 
-   private int maxHops = HornetQDefaultConfiguration.getDefaultClusterMaxHops();
+   private int maxHops = ActiveMQDefaultConfiguration.getDefaultClusterMaxHops();
 
-   private int confirmationWindowSize = HornetQDefaultConfiguration.getDefaultClusterConfirmationWindowSize();
+   private int confirmationWindowSize = ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize();
 
    private boolean allowDirectConnectionsOnly = false;
 
    private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
 
-   private long clusterNotificationInterval = HornetQDefaultConfiguration.getDefaultClusterNotificationInterval();
+   private long clusterNotificationInterval = ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval();
 
-   private int clusterNotificationAttempts = HornetQDefaultConfiguration.getDefaultClusterNotificationAttempts();
+   private int clusterNotificationAttempts = ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts();
 
    public ClusterConnectionConfiguration()
    {


[12/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
ACTIVEMQ6-4 - refactor schemas

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

Refactor all the schemas to use an activemq namespace and rename schema files


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

Branch: refs/heads/master
Commit: 574c8fe997eb8d866fb62b1984dd45ef3e8838e1
Parents: d0d686b
Author: Andy Taylor <an...@apache.org>
Authored: Mon Nov 17 13:54:11 2014 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Tue Nov 18 11:27:10 2014 +0000

----------------------------------------------------------------------
 .../server/impl/JMSServerConfigParserImpl.java  |    2 +-
 .../src/main/resources/schema/activemq-jms.xsd  |  267 ++
 .../src/main/resources/schema/hornetq-jms.xsd   |  267 --
 .../src/main/resources/schema/hornetq-rest.xsd  |    2 +-
 .../test/resources/hornetq-configuration.xml    |    2 +-
 .../src/test/resources/hornetq-jms.xml          |    2 +-
 .../src/test/resources/hornetq-users.xml        |    2 +-
 .../deployers/impl/AddressSettingsDeployer.java |    2 +-
 .../impl/BasicUserCredentialsDeployer.java      |    2 +-
 .../deployers/impl/FileConfigurationParser.java |    2 +-
 .../core/deployers/impl/QueueDeployer.java      |    2 +-
 .../core/deployers/impl/SecurityDeployer.java   |    2 +-
 .../resources/schema/activemq-configuration.xsd | 2292 +++++++++++++++++
 .../main/resources/schema/activemq-users.xsd    |   29 +
 .../resources/schema/hornetq-configuration.xsd  | 2319 ------------------
 .../src/main/resources/schema/hornetq-users.xsd |   29 -
 .../resources/ConfigurationTest-defaults.xml    |    2 +-
 .../resources/ConfigurationTest-full-config.xml |    2 +-
 .../resources/InvalidConfigurationTest0.xml     |    2 +-
 .../resources/InvalidConfigurationTest1.xml     |    2 +-
 .../resources/InvalidConfigurationTest2.xml     |    2 +-
 .../resources/InvalidConfigurationTest3.xml     |    2 +-
 .../resources/InvalidConfigurationTest4.xml     |    2 +-
 .../resources/InvalidConfigurationTest5.xml     |    2 +-
 .../resources/colocated-hapolicy-config.xml     |    2 +-
 .../resources/colocated-hapolicy-config2.xml    |    2 +-
 .../resources/divertRoutingNameNotRequired.xml  |    2 +-
 .../resources/live-only-hapolicy-config.xml     |    2 +-
 .../resources/live-only-hapolicy-config2.xml    |    2 +-
 .../resources/live-only-hapolicy-config3.xml    |    2 +-
 .../resources/live-only-hapolicy-config4.xml    |    2 +-
 .../resources/live-only-hapolicy-config5.xml    |    2 +-
 .../test/resources/replica-hapolicy-config.xml  |    2 +-
 .../test/resources/replica-hapolicy-config2.xml |    2 +-
 .../test/resources/replica-hapolicy-config3.xml |    2 +-
 .../resources/replicated-hapolicy-config.xml    |    2 +-
 .../shared-store-master-hapolicy-config.xml     |    2 +-
 .../shared-store-slave-hapolicy-config.xml      |    2 +-
 .../shared-store-slave-hapolicy-config2.xml     |    2 +-
 .../shared-store-slave-hapolicy-config3.xml     |    2 +-
 distribution/activemq/pom.xml                   |   48 +-
 .../config/clustered/activemq-configuration.xml |    2 +-
 .../resources/config/clustered/activemq-jms.xml |    2 +-
 .../config/clustered/activemq-users.xml         |    2 +-
 .../non-clustered/activemq-configuration.xml    |    2 +-
 .../config/non-clustered/activemq-jms.xml       |    2 +-
 .../config/non-clustered/activemq-users.xml     |    2 +-
 .../replicated/activemq-configuration.xml       |    2 +-
 .../config/replicated/activemq-jms.xml          |    2 +-
 .../config/replicated/activemq-users.xml        |    2 +-
 .../shared-store/activemq-configuration.xml     |    2 +-
 .../config/shared-store/activemq-jms.xml        |    2 +-
 .../config/shared-store/activemq-users.xml      |    2 +-
 docs/eap-manual/en/clusters.xml                 |    2 +-
 docs/user-manual/en/configuration-index.xml     |    2 +-
 docs/user-manual/en/large-messages.xml          |    2 +-
 docs/user-manual/en/paging.xml                  |    2 +-
 docs/user-manual/en/security.xml                |    2 +-
 docs/user-manual/en/spring-integration.xml      |    2 +-
 docs/user-manual/en/using-jms.xml               |    4 +-
 docs/user-manual/pom.xml                        |    6 +-
 .../src/main/resources/schemaToTable.xsl        |   42 +-
 docs/user-manual/zh/large-messages.xml          |    2 +-
 docs/user-manual/zh/paging.xml                  |    2 +-
 docs/user-manual/zh/security.xml                |    2 +-
 docs/user-manual/zh/using-jms.xml               |    4 +-
 .../hornetq-configuration-messaging-lab.xml     |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 .../resources/server0/hornetq-configuration.xml |    2 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq-configuration-messaging-lab.xml     |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../src/main/resources/hornetq-client.xml       |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../dup-send/src/main/resources/hornetq-jms.xml |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../src/main/resources/hornetq-client.xml       |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../push/src/main/resources/hornetq-client.xml  |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../push/src/main/resources/hornetq-jms.xml     |    2 +-
 .../push/src/main/resources/hornetq-users.xml   |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../main/resources/hornetq-configuration.xml    |    2 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 .../hornetq/server4/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server4/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server4/hornetq-users.xml |    2 +-
 .../hornetq/server5/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server5/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server5/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../normal/server0/hornetq-configuration.xml    |    2 +-
 examples/soak/normal/server0/hornetq-jms.xml    |    2 +-
 .../config/server-start-stop-backup-config1.xml |    2 +-
 .../server-start-stop-backup-jms-config1.xml    |    2 +-
 tests/config/server-start-stop-live-config1.xml |    2 +-
 .../server-start-stop-live-jms-config1.xml      |    2 +-
 .../colocated-server-start-stop-config1.xml     |    2 +-
 .../colocated-server-start-stop-config2.xml     |    2 +-
 .../colocated-server-start-stop-jms-config1.xml |    2 +-
 .../colocated-server-start-stop-jms-config2.xml |    2 +-
 .../hornetq-jms-for-JMSServerDeployerTest.xml   |    2 +-
 .../hornetq-jms-for-JMSServerDeployerTest2.xml  |    2 +-
 .../resources/server-start-stop-config1.xml     |    2 +-
 .../resources/server-start-stop-jms-config1.xml |    2 +-
 .../test/resources/spring-hornetq-config.xml    |    2 +-
 .../src/test/resources/spring-hornetq-jms.xml   |    2 +-
 .../test/resources/hornetq-configuration.xml    |    2 +-
 .../src/test/resources/hornetq-jms.xml          |    2 +-
 .../src/test/resources/hornetq-queues.xml       |    2 +-
 .../src/test/resources/hornetq-users.xml        |    2 +-
 507 files changed, 3136 insertions(+), 3163 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 0c9d47f..0ecb5de 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -78,7 +78,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
 
       Element e = (Element) rootnode;
 
-      org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/hornetq-jms.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/activemq-jms.xsd");
 
       String[] elements = new String[]{JMSServerDeployer.QUEUE_NODE_NAME,
          JMSServerDeployer.TOPIC_NODE_NAME,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
new file mode 100644
index 0000000..a7864eb
--- /dev/null
+++ b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
@@ -0,0 +1,267 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="urn:activemq"
+            xmlns="urn:activemq"
+            xmlns:amq="urn:org.apache.activemq"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified"
+            version="1.0">
+
+   <xsd:element name="configuration" amq:schema="hornetq-jms-configuration">
+   	<xsd:complexType>
+   	  <xsd:sequence>
+            <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
+                         minOccurs="0" maxOccurs="1"/>
+   	    <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/>
+   	    <xsd:choice maxOccurs="unbounded" minOccurs="0">
+   	      <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
+              <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
+            </xsd:choice>
+          </xsd:sequence>
+   	</xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="connection-factory">
+        <xsd:annotation amq:linkend="using-jms.server.configuration">
+          <xsd:documentation>a list of connection factories to create and add to
+          JNDI</xsd:documentation>
+        </xsd:annotation>
+   	<xsd:complexType>
+          <xsd:all>
+            <xsd:element name="xa" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:linkend="using-jms.configure.factory.types"
+                              amq:id="configuration.connection-factory.signature.xa">
+                <xsd:documentation>Whether this is an XA connection factory</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0">
+            </xsd:element>
+
+            <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:linkend="clusters">
+                <xsd:documentation>A sequence of connectors used by the connection factory
+                </xsd:documentation>
+              </xsd:annotation>
+            <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="connector-ref" maxOccurs="unbounded" minOccurs="1">
+                    <xsd:annotation>
+                      <xsd:documentation>A connector reference
+                      </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                      <xsd:attribute name="connector-name" type="xsd:string" use="required">
+                        <xsd:annotation>
+                          <xsd:documentation>Name of the connector to connect to the live server
+                          </xsd:documentation>
+                        </xsd:annotation>
+                      </xsd:attribute>
+                    </xsd:complexType>
+                  </xsd:element>
+                </xsd:sequence>
+              </xsd:complexType>
+              </xsd:element>
+
+            <xsd:element name="entries" maxOccurs="1" minOccurs="0">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1">
+                  </xsd:element>
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+
+            <xsd:element name="client-failure-check-period" type="xsd:long" default="30000"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.client-failure-check-period"
+                              amq:linkend="dead.connections" amq:default="(ms)">
+                <xsd:documentation>
+                  the period (in ms) after which the client will consider the connection failed
+                  after not receiving packets from the server. -1 disables this setting.
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="connection-ttl" type="xsd:long" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.connection-ttl"
+                              amq:linkend="dead.connections">
+                <xsd:documentation>the time to live (in ms) for connections
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="call-timeout" type="xsd:long" default="30000"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.call-timeout">
+                <xsd:documentation>
+                  the timeout (in ms) for remote calls
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+   			 <xsd:element name="call-failover-timeout" type="xsd:long"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="consumer-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="consumer-max-rate" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="confirmation-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="producer-window-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="producer-max-rate" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="cache-large-message-client" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="min-large-message-size" type="xsd:long"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="compress-large-messages" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+
+            <xsd:element name="client-id" type="xsd:string" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.client-id"
+                              amq:linkend="using-jms.clientid">
+                <xsd:documentation>
+                  the pre-configured client ID for the connection factory
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="dups-ok-batch-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="transaction-batch-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+         <xsd:element name="block-on-acknowledge" type="xsd:boolean" default="false"
+                      maxOccurs="1" minOccurs="0">
+           <xsd:annotation amq:linkend="send-guarantees.nontrans.acks"
+                           amq:id="configuration.connection-factory.block-on-acknowledge">
+             <xsd:documentation>
+               whether or not messages are acknowledged synchronously
+             </xsd:documentation>
+           </xsd:annotation>
+         </xsd:element>
+         <xsd:element name="block-on-non-durable-send" type="xsd:boolean" default="false"
+                      maxOccurs="1" minOccurs="0">
+           <xsd:annotation amq:id="configuration.connection-factory.block-on-non-durable-send"
+                           amq:linkend="non-transactional-sends">
+             <xsd:documentation>
+               whether or not non-durable messages are sent synchronously
+             </xsd:documentation>
+           </xsd:annotation>
+         </xsd:element>
+            <xsd:element name="block-on-durable-send" type="xsd:boolean" default="true"
+                         maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.block-on-durable-send"
+                              amq:linkend="non-transactional-sends">
+                <xsd:documentation>
+                  whether or not durable messages are sent synchronously
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="auto-group" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+              <xsd:annotation amq:id="configuration.connection-factory.auto-group"
+                              amq:linkend="message-grouping.jmsconfigure">
+                <xsd:documentation>whether or not message grouping is automatically used
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="pre-acknowledge" type="xsd:boolean"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+            <xsd:element name="retry-interval" type="xsd:long"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+   			<xsd:element name="retry-interval-multiplier" type="xsd:float"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+   			<xsd:element name="max-retry-interval" type="xsd:long"
+   				maxOccurs="1" minOccurs="0">
+   			</xsd:element>
+            <xsd:element name="reconnect-attempts" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="failover-on-initial-connection" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="use-global-pools" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="thread-pool-max-size" type="xsd:int"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="group-id" type="xsd:string"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+            <xsd:element name="ha" type="xsd:boolean"
+                maxOccurs="1" minOccurs="0">
+            </xsd:element>
+   		</xsd:all>
+   		<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
+   		<xsd:attribute name="signature" type="xsd:string">
+                  <xsd:annotation amq:id="configuration.connection-factory.signature"
+                                  amq:linkend="using-jms.configure.factory.types"
+                                  amq:default="generic"> <!-- XXX -->
+                    <xsd:documentation>Type of connection factory</xsd:documentation>
+                  </xsd:annotation>
+                </xsd:attribute>
+   	</xsd:complexType>
+   </xsd:element>
+
+    <xsd:complexType name="entryType">
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="discovery-group-refType">
+    	<xsd:attribute name="discovery-group-name" type="xsd:string" use="required">
+          <xsd:annotation>
+          <xsd:documentation>
+            Name of discovery group used by this connection factory
+          </xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="queue" type="queueType"></xsd:element>
+
+    <xsd:element name="topic" type="topicType"></xsd:element>
+
+   <xsd:complexType name="queueType">
+    	<xsd:sequence>
+    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+          <xsd:element name="selector" maxOccurs="1" minOccurs="0">
+                <xsd:complexType>
+                   <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
+    	</xsd:sequence>
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="topicType">
+    	<xsd:sequence>
+    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+    	</xsd:sequence>
+    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd b/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
deleted file mode 100644
index c12a257..0000000
--- a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:hornetq"
-            xmlns="urn:hornetq"
-            xmlns:hq="urn:org.apache.activemq"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.0">
-
-   <xsd:element name="configuration" hq:schema="hornetq-jms-configuration">
-   	<xsd:complexType>
-   	  <xsd:sequence>
-            <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
-                         minOccurs="0" maxOccurs="1"/>
-   	    <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/>
-   	    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-   	      <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
-              <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
-            </xsd:choice>
-          </xsd:sequence>
-   	</xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="connection-factory">
-        <xsd:annotation hq:linkend="using-jms.server.configuration">
-          <xsd:documentation>a list of connection factories to create and add to
-          JNDI</xsd:documentation>
-        </xsd:annotation>
-   	<xsd:complexType>
-          <xsd:all>
-            <xsd:element name="xa" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:linkend="using-jms.configure.factory.types"
-                              hq:id="configuration.connection-factory.signature.xa">
-                <xsd:documentation>Whether this is an XA connection factory</xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0">
-            </xsd:element>
-
-            <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:linkend="clusters">
-                <xsd:documentation>A sequence of connectors used by the connection factory
-                </xsd:documentation>
-              </xsd:annotation>
-            <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="connector-ref" maxOccurs="unbounded" minOccurs="1">
-                    <xsd:annotation>
-                      <xsd:documentation>A connector reference
-                      </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                      <xsd:attribute name="connector-name" type="xsd:string" use="required">
-                        <xsd:annotation>
-                          <xsd:documentation>Name of the connector to connect to the live server
-                          </xsd:documentation>
-                        </xsd:annotation>
-                      </xsd:attribute>
-                    </xsd:complexType>
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-              </xsd:element>
-
-            <xsd:element name="entries" maxOccurs="1" minOccurs="0">
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1">
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="client-failure-check-period" type="xsd:long" default="30000"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.client-failure-check-period"
-                              hq:linkend="dead.connections" hq:default="(ms)">
-                <xsd:documentation>
-                  the period (in ms) after which the client will consider the connection failed
-                  after not receiving packets from the server. -1 disables this setting.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="connection-ttl" type="xsd:long" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.connection-ttl"
-                              hq:linkend="dead.connections">
-                <xsd:documentation>the time to live (in ms) for connections
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="call-timeout" type="xsd:long" default="30000"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.call-timeout">
-                <xsd:documentation>
-                  the timeout (in ms) for remote calls
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-   			 <xsd:element name="call-failover-timeout" type="xsd:long"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="consumer-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="consumer-max-rate" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="confirmation-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="producer-window-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="producer-max-rate" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="cache-large-message-client" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="min-large-message-size" type="xsd:long"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="compress-large-messages" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-
-            <xsd:element name="client-id" type="xsd:string" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.client-id"
-                              hq:linkend="using-jms.clientid">
-                <xsd:documentation>
-                  the pre-configured client ID for the connection factory
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="dups-ok-batch-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="transaction-batch-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-         <xsd:element name="block-on-acknowledge" type="xsd:boolean" default="false"
-                      maxOccurs="1" minOccurs="0">
-           <xsd:annotation hq:linkend="send-guarantees.nontrans.acks"
-                           hq:id="configuration.connection-factory.block-on-acknowledge">
-             <xsd:documentation>
-               whether or not messages are acknowledged synchronously
-             </xsd:documentation>
-           </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="block-on-non-durable-send" type="xsd:boolean" default="false"
-                      maxOccurs="1" minOccurs="0">
-           <xsd:annotation hq:id="configuration.connection-factory.block-on-non-durable-send"
-                           hq:linkend="non-transactional-sends">
-             <xsd:documentation>
-               whether or not non-durable messages are sent synchronously
-             </xsd:documentation>
-           </xsd:annotation>
-         </xsd:element>
-            <xsd:element name="block-on-durable-send" type="xsd:boolean" default="true"
-                         maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.block-on-durable-send"
-                              hq:linkend="non-transactional-sends">
-                <xsd:documentation>
-                  whether or not durable messages are sent synchronously
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="auto-group" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
-              <xsd:annotation hq:id="configuration.connection-factory.auto-group"
-                              hq:linkend="message-grouping.jmsconfigure">
-                <xsd:documentation>whether or not message grouping is automatically used
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="pre-acknowledge" type="xsd:boolean"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-            <xsd:element name="retry-interval" type="xsd:long"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-   			<xsd:element name="retry-interval-multiplier" type="xsd:float"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-   			<xsd:element name="max-retry-interval" type="xsd:long"
-   				maxOccurs="1" minOccurs="0">
-   			</xsd:element>
-            <xsd:element name="reconnect-attempts" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="failover-on-initial-connection" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="failover-on-server-shutdown" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="use-global-pools" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="thread-pool-max-size" type="xsd:int"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="group-id" type="xsd:string"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-            <xsd:element name="ha" type="xsd:boolean"
-                maxOccurs="1" minOccurs="0">
-            </xsd:element>
-   		</xsd:all>
-   		<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-   		<xsd:attribute name="signature" type="xsd:string">
-                  <xsd:annotation hq:id="configuration.connection-factory.signature"
-                                  hq:linkend="using-jms.configure.factory.types"
-                                  hq:default="generic"> <!-- XXX -->
-                    <xsd:documentation>Type of connection factory</xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-   	</xsd:complexType>
-   </xsd:element>
-
-    <xsd:complexType name="entryType">
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="discovery-group-refType">
-    	<xsd:attribute name="discovery-group-name" type="xsd:string" use="required">
-          <xsd:annotation>
-          <xsd:documentation>
-            Name of discovery group used by this connection factory
-          </xsd:documentation>
-          </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:element name="queue" type="queueType"></xsd:element>
-
-    <xsd:element name="topic" type="topicType"></xsd:element>
-
-   <xsd:complexType name="queueType">
-    	<xsd:sequence>
-    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-          <xsd:element name="selector" maxOccurs="1" minOccurs="0">
-                <xsd:complexType>
-                   <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-    	</xsd:sequence>
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="topicType">
-    	<xsd:sequence>
-    		<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-    	</xsd:sequence>
-    	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
index b2f20c3..063e71c 100644
--- a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
+++ b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="urn:hornetq" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xsd:schema xmlns="urn:activemq" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq">
 
     <xsd:element name="rest-messaging">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-rest/src/test/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-configuration.xml b/activemq-rest/src/test/resources/hornetq-configuration.xml
index 2a78da0..9178580 100644
--- a/activemq-rest/src/test/resources/hornetq-configuration.xml
+++ b/activemq-rest/src/test/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-rest/src/test/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-jms.xml b/activemq-rest/src/test/resources/hornetq-jms.xml
index bc4af35..3461588 100644
--- a/activemq-rest/src/test/resources/hornetq-jms.xml
+++ b/activemq-rest/src/test/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-rest/src/test/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/resources/hornetq-users.xml b/activemq-rest/src/test/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/activemq-rest/src/test/resources/hornetq-users.xml
+++ b/activemq-rest/src/test/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
index 8ea5e3f..4e3d2ff 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java
@@ -50,7 +50,7 @@ public class AddressSettingsDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
index 3acc995..c1acd0a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java
@@ -63,7 +63,7 @@ public class BasicUserCredentialsDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-users.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-users.xsd");
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
index 7b3744d..b6fecba 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
@@ -80,7 +80,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
    // Constants -----------------------------------------------------
 
-   private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd";
+   private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd";
 
    // Security Parsing
    public static final String SECURITY_ELEMENT_NAME = "security-setting";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
index 9005085..cc21cc5 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java
@@ -52,7 +52,7 @@ public class QueueDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
index 6c1fb70..dece93a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java
@@ -60,7 +60,7 @@ public class SecurityDeployer extends XmlDeployer
    @Override
    public void validate(final Node rootNode) throws Exception
    {
-      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd");
+      org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd");
    }
 
    /**


[02/17] activemq-6 git commit: ACTIVEMQ6-4 - more refactoring

Posted by ma...@apache.org.
ACTIVEMQ6-4 - more refactoring

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

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


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

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

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


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
new file mode 100644
index 0000000..4b1c439
--- /dev/null
+++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.cli;
+
+import io.airlift.command.Cli;
+import io.airlift.command.ParseArgumentsUnexpectedException;
+import org.apache.activemq.cli.commands.Action;
+import org.apache.activemq.cli.commands.ActionContext;
+import org.apache.activemq.cli.commands.HelpAction;
+import org.apache.activemq.cli.commands.Run;
+import org.apache.activemq.cli.commands.Stop;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class ActiveMQ
+{
+
+   public static void main(String[] args) throws Exception
+   {
+      Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq")
+               .withDefaultCommand(HelpAction.class)
+               .withCommand(Run.class)
+               .withCommand(Stop.class)
+               .withCommand(HelpAction.class)
+               .withDescription("ActiveMQ Command Line");
+
+      Cli<Action> parser = builder.build();
+
+      try
+      {
+         parser.parse(args).execute(ActionContext.system());
+      }
+      catch (ParseArgumentsUnexpectedException e)
+      {
+         System.err.println(e.getMessage());
+         System.out.println();
+         parser.parse("help").execute(ActionContext.system());
+      }
+      catch (ConfigurationException configException)
+      {
+         System.err.println(configException.getMessage());
+         System.out.println();
+         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'");
+      }
+
+   }
+
+   public static void printBanner() throws Exception
+   {
+      copy(ActiveMQ.class.getResourceAsStream("banner.txt"), System.out);
+   }
+
+   private static long copy(InputStream in, OutputStream out) throws Exception
+   {
+      byte[] buffer = new byte[1024];
+      int len = in.read(buffer);
+      while (len != -1)
+      {
+         out.write(buffer, 0, len);
+         len = in.read(buffer);
+      }
+      return len;
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
deleted file mode 100644
index 6f53eb5..0000000
--- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.cli;
-
-import io.airlift.command.Cli;
-import io.airlift.command.ParseArgumentsUnexpectedException;
-import org.apache.activemq.cli.commands.Action;
-import org.apache.activemq.cli.commands.ActionContext;
-import org.apache.activemq.cli.commands.HelpAction;
-import org.apache.activemq.cli.commands.Run;
-import org.apache.activemq.cli.commands.Stop;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class HornetQ
-{
-
-   public static void main(String[] args) throws Exception
-   {
-      Cli.CliBuilder<Action> builder = Cli.<Action>builder("hornetq")
-               .withDefaultCommand(HelpAction.class)
-               .withCommand(Run.class)
-               .withCommand(Stop.class)
-               .withCommand(HelpAction.class)
-               .withDescription("HornetQ Command Line");
-
-      Cli<Action> parser = builder.build();
-
-      try
-      {
-         parser.parse(args).execute(ActionContext.system());
-      }
-      catch (ParseArgumentsUnexpectedException e)
-      {
-         System.err.println(e.getMessage());
-         System.out.println();
-         parser.parse("help").execute(ActionContext.system());
-      }
-      catch (ConfigurationException configException)
-      {
-         System.err.println(configException.getMessage());
-         System.out.println();
-         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'");
-      }
-
-   }
-
-   public static void printBanner() throws Exception
-   {
-      copy(HornetQ.class.getResourceAsStream("banner.txt"), System.out);
-   }
-
-   private static long copy(InputStream in, OutputStream out) throws Exception
-   {
-      byte[] buffer = new byte[1024];
-      int len = in.read(buffer);
-      while (len != -1)
-      {
-         out.write(buffer, 0, len);
-         len = in.read(buffer);
-      }
-      return len;
-   }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


[07/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b3d7d41..59bf194 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml
index 227e0f1..67ef63b 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml
index c9b9d76..6570114 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml
index 227e0f1..67ef63b 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml
index d78acb2..0e755a3 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml
index 227e0f1..67ef63b 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7591606..7811ade 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml
index b6b8774..b01bcd5 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 79b585c..84f4f66 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 6a1136d..c7bb164 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml
index bead65d..1aff319 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 42c2500..48c8027 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 08ec4fa..2518564 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index dfe394e..3995d3f 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 4aafb11..8001d71 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 2254265..0710944 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml
index 3223b68..5adfbee 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 536f293..0041537 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml
index 3223b68..5adfbee 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 667e374..91074bb 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml
index 3223b68..5adfbee 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b2401e3..8063eed 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml
index 6156e3c..7f4500b 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 90b6027..e594c63 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml
index 6156e3c..7f4500b 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 2ce1382..2894094 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml
index abd44d8..dc32b3f 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
index c929b19..fc3d687 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml
index abd44d8..dc32b3f 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 3f7fcca..f087894 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml
index 6156e3c..7f4500b 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
index b137aa3..90422db 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml
index 6156e3c..7f4500b 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 86fcff2..3754474 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml
index abd44d8..dc32b3f 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -11,7 +11,7 @@
   ~  permissions and limitations under the License.
   -->
 
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 29f46b6..e91313e 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
index c98a3ce..3b92bae 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
index a80e564..3aa0e25 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
index eb6d69d..72e3188 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d749796..0d360d7 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 0b5025c..5bb01b7 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 4097556..320154a 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
index a841d0b..189dbe7 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7699e92..56721dd 100644
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml
index 48c28df..b33e218 100644
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7e2c2a6..4392eb0 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml
index 48c28df..b33e218 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">


[16/17] activemq-6 git commit: ACTIVEMQ6-4 - fix examples

Posted by ma...@apache.org.
ACTIVEMQ6-4 - fix examples

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

some of the examples were broken after the last refactoring.


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

Branch: refs/heads/master
Commit: 07eac1057f4de62ea751247bec8e5fd7711d0403
Parents: 574c8fe
Author: Andy Taylor <an...@apache.org>
Authored: Tue Nov 18 09:15:53 2014 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Tue Nov 18 11:27:10 2014 +0000

----------------------------------------------------------------------
 .../apache/activemq/common/example/DummyXid.java  |  4 ++--
 .../activemq/common/example/HornetQExample.java   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/07eac105/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
index dd4f38e..09e6704 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
+++ b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.common.example;
+package org.apache.activemq.common.example;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq6.utils.Base64;
+import org.apache.activemq.utils.Base64;
 
 /**
  * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/07eac105/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java
index 681229f..a7f1703 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java
+++ b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/HornetQExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.common.example;
+package org.apache.activemq.common.example;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Properties;
@@ -20,14 +20,14 @@ import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.jms.HornetQJMSClient;
-import org.apache.activemq6.api.jms.JMSFactoryType;
-import org.apache.activemq6.core.client.impl.DelegatingSession;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq6.jms.client.HornetQConnection;
-import org.apache.activemq6.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.jms.HornetQJMSClient;
+import org.apache.activemq.api.jms.JMSFactoryType;
+import org.apache.activemq.core.client.impl.DelegatingSession;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.jms.client.HornetQConnection;
+import org.apache.activemq.jms.client.HornetQConnectionFactory;
 
 /**
  * Base class for HornetQ examples.


[08/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/main/resources/schema/hornetq-users.xsd
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/resources/schema/hornetq-users.xsd b/activemq-server/src/main/resources/schema/hornetq-users.xsd
deleted file mode 100644
index 16495e3..0000000
--- a/activemq-server/src/main/resources/schema/hornetq-users.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:hornetq" xmlns="urn:hornetq"
-            elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
-
-   <xsd:element name="configuration">
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element name="mask-password" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-            <xsd:element name="password-codec" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
-            <xsd:element name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element>
-            <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:element name="role">
-      <xsd:complexType>
-         <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-      </xsd:complexType>
-   </xsd:element>
-
-   <xsd:complexType name="userType">
-      <xsd:sequence>
-         <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
-      <xsd:attribute name="password" type="xsd:string"></xsd:attribute>
-   </xsd:complexType>
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
index a445da8..02454d6 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq" 
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/schemas/hornetq-configuration.xsd ">
    <!-- just use the defaults -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
index 5d6faef..d48240b 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
index cce37ed..9a857de 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
index 13c68b1..f9ccd7d 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
index fe76cf5..27b9c2b 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
index 2b3dec2..be9633b 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
index 5399be6..61d8200 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
index 90d7771..d524a96 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
@@ -1,5 +1,5 @@
 <configuration
-   xmlns="urn:hornetq"
+   xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/hornetq-configuration.xsd">
       <name>SomeNameForUseOnTheApplicationServer</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/colocated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml
index ad1adc5..df2be09 100644
--- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
index f970461..9a6cf5a 100644
--- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
index 7504205..3e2fd17 100644
--- a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
+++ b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/live-only-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
index 6cc3aa4..ff71149 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
index 7ae2389..3fdc398 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
index 2239c78..9c9bdba 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
index 1ae6dd4..8e58f95 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
index 0037115..e70a938 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/replica-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml
index 1a2c70d..814116f 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/replica-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
index 373c8e0..bd625fa 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/replica-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
index 3b6bc23..8908956 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/replicated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
index 82537cb..eecfd68 100644
--- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
index 68a52d7..6ac07f1 100644
--- a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
index 21a86a6..4a2f5dd 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
index fdf037a..afdb8ed 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
index 5709cfc..12b01ed 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
@@ -1,5 +1,5 @@
 <configuration
-      xmlns="urn:hornetq"
+      xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
    <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index b6b13bd..4d0c947 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -230,86 +230,86 @@
                <validationSets>
                   <validationSet>
                      <dir>${configLocation}/clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-configuration.xsd</systemId>
                      <includes>
-                        <include>hornetq-configuration.xml</include>
+                        <include>activemq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/non-clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-configuration.xsd</systemId>
                      <includes>
-                        <include>hornetq-configuration.xml</include>
+                        <include>activemq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/replicated</dir>
-                     <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-configuration.xsd</systemId>
                      <includes>
-                        <include>hornetq-configuration.xml</include>
+                        <include>activemq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/shared-store</dir>
-                     <systemId>${schemaLocation}/hornetq-configuration.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-configuration.xsd</systemId>
                      <includes>
-                        <include>hornetq-configuration.xml</include>
+                        <include>activemq-configuration.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-jms.xsd</systemId>
                      <includes>
-                        <include>hornetq-jms.xml</include>
+                        <include>activemq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/non-clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-jms.xsd</systemId>
                      <includes>
-                        <include>hornetq-jms.xml</include>
+                        <include>activemq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/replicated</dir>
-                     <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-jms.xsd</systemId>
                      <includes>
-                        <include>hornetq-jms.xml</include>
+                        <include>activemq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/shared-store</dir>
-                     <systemId>${schemaLocation}/hornetq-jms.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-jms.xsd</systemId>
                      <includes>
-                        <include>hornetq-jms.xml</include>
+                        <include>activemq-jms.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-users.xsd</systemId>
                      <includes>
-                        <include>hornetq-users.xml</include>
+                        <include>activemq-users.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/non-clustered</dir>
-                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-users.xsd</systemId>
                      <includes>
-                        <include>hornetq-users.xml</include>
+                        <include>activemq-users.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/replicated</dir>
-                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-users.xsd</systemId>
                      <includes>
-                        <include>hornetq-users.xml</include>
+                        <include>activemq-users.xml</include>
                      </includes>
                   </validationSet>
                   <validationSet>
                      <dir>${configLocation}/shared-store</dir>
-                     <systemId>${schemaLocation}/hornetq-users.xsd</systemId>
+                     <systemId>${schemaLocation}/activemq-users.xsd</systemId>
                      <includes>
-                        <include>hornetq-users.xml</include>
+                        <include>activemq-users.xml</include>
                      </includes>
                   </validationSet>
                </validationSets>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
index 4c924b5..41bf59c 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
index 044d7e8..d2d1359 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
index 934306c..dcaf980 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
index 3bb9be5..2c4246d 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
index 044d7e8..d2d1359 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
index 934306c..dcaf980 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index 4c92c67..5071c04 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
index 044d7e8..d2d1359 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
index 934306c..dcaf980 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index 4caa289..c43c5e3 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
index 044d7e8..d2d1359 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
index 934306c..dcaf980 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/eap-manual/en/clusters.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml
index d8ccce2..4b082fe 100644
--- a/docs/eap-manual/en/clusters.xml
+++ b/docs/eap-manual/en/clusters.xml
@@ -284,7 +284,7 @@
                   and configure it like so:
                </para>
                <programlisting>
-   &lt;configuration xmlns="urn:hornetq"
+   &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/configuration-index.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuration-index.xml b/docs/user-manual/en/configuration-index.xml
index 3d1a9ad..9e6cf84 100644
--- a/docs/user-manual/en/configuration-index.xml
+++ b/docs/user-manual/en/configuration-index.xml
@@ -48,7 +48,7 @@
                     <!-- The options reference is generated from the schema.  If something is wrong
                          in the reference, it must be fixed in the annotations present in the
                          schema. -->
-                      <xi:include href="../target/generated-resources/xml/xslt/hornetq-configuration.xml"
+                      <xi:include href="../target/generated-resources/xml/xslt/activemq-configuration.xml"
                                   xmlns:xi="http://www.w3.org/2001/XInclude"/>
                 </tgroup>
             </table>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/large-messages.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/large-messages.xml b/docs/user-manual/en/large-messages.xml
index 5346c41..8c2623d 100644
--- a/docs/user-manual/en/large-messages.xml
+++ b/docs/user-manual/en/large-messages.xml
@@ -45,7 +45,7 @@
         <para>The configuration property <literal>large-messages-directory</literal> specifies where
             large messages are stored.</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq"
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 ...

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/paging.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/paging.xml b/docs/user-manual/en/paging.xml
index 4a69037..b152a01 100644
--- a/docs/user-manual/en/paging.xml
+++ b/docs/user-manual/en/paging.xml
@@ -48,7 +48,7 @@
         <para>Global paging parameters are specified on the main configuration file (<literal
                 >hornetq-configuration.xml</literal>).</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq"
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 ...

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/security.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.xml b/docs/user-manual/en/security.xml
index 4680c3c..b6c1ab5 100644
--- a/docs/user-manual/en/security.xml
+++ b/docs/user-manual/en/security.xml
@@ -149,7 +149,7 @@
             be added into this file.</para>
         <para>Let's take a look at an example file:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd ">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/spring-integration.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/spring-integration.xml b/docs/user-manual/en/spring-integration.xml
index 900c975..97e72e1 100644
--- a/docs/user-manual/en/spring-integration.xml
+++ b/docs/user-manual/en/spring-integration.xml
@@ -38,7 +38,7 @@
   context. Let's take this <literal>hornetq-jms.xml</literal> file for
   instance: </para>
     <programlisting>
-&lt;configuration xmlns="urn:hornetq"
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    &lt;!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/en/using-jms.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.xml b/docs/user-manual/en/using-jms.xml
index b7414fb..05ce1c3 100644
--- a/docs/user-manual/en/using-jms.xml
+++ b/docs/user-manual/en/using-jms.xml
@@ -63,7 +63,7 @@
             Connection Factory instances you can deploy from the file. Here's our
             configuration:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
     
@@ -149,7 +149,7 @@
             </table>
             <para>As an example, the following configures an XAQueueConnectionFactory:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/pom.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/pom.xml b/docs/user-manual/pom.xml
index 070ab32..1ba86e8 100644
--- a/docs/user-manual/pom.xml
+++ b/docs/user-manual/pom.xml
@@ -278,7 +278,7 @@
                   <dir>../../activemq-server/src/main/resources/schema</dir>
                   <stylesheet>./src/main/resources/schemaToTable.xsl</stylesheet>
                   <includes>
-                    <include>hornetq-configuration.xsd</include>
+                    <include>activemq-configuration.xsd</include>
                   </includes>
                   <fileMappers>
                     <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
@@ -287,10 +287,10 @@
                   </fileMappers>
                 </transformationSet>
                 <transformationSet>
-                  <dir>../../hornetq-jms-server/src/main/resources/schema</dir>
+                  <dir>../../activemq-jms-server/src/main/resources/schema</dir>
                   <stylesheet>./src/main/resources/schemaToTable.xsl</stylesheet>
                   <includes>
-                    <include>hornetq-jms.xsd</include>
+                    <include>activemq-jms.xsd</include>
                   </includes>
                   <fileMappers>
                     <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/src/main/resources/schemaToTable.xsl
----------------------------------------------------------------------
diff --git a/docs/user-manual/src/main/resources/schemaToTable.xsl b/docs/user-manual/src/main/resources/schemaToTable.xsl
index a49cfb3..85398c5 100644
--- a/docs/user-manual/src/main/resources/schemaToTable.xsl
+++ b/docs/user-manual/src/main/resources/schemaToTable.xsl
@@ -3,11 +3,11 @@
 <xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:hq="urn:org.apache.activemq"
+                xmlns:amq="urn:org.apache.activemq"
                 xmlns:fn="http://www.w3.org/2005/xpath-functions">
 
    <!--
-    XSL to transform HornetQ schemas into DocBook tables to be used in our user manual reference.
+    XSL to transform ActiveMQ schemas into DocBook tables to be used in our user manual reference.
 
     For each option element defined in the schema, it tries to create something like
 
@@ -26,7 +26,7 @@
 
    <xsl:output method="xml" indent="yes"/>
 
-   <xsl:function name="hq:name-or-ref">
+   <xsl:function name="amq:name-or-ref">
       <xsl:param name="ename"/>
       <xsl:param name="eref"/>
       <xsl:choose>
@@ -45,8 +45,8 @@
          <xsl:comment>
             THIS IS A GENERATED FILE. DO NOT EDIT IT DIRECTLY!
 
-            HornetQ options reference table generated from:
-            <xsl:copy-of select="concat('hornetq-', substring-after(base-uri(), 'hornetq-'))"/>
+            ActiveMQ options reference table generated from:
+            <xsl:copy-of select="concat('activemq-', substring-after(base-uri(), 'activemq-'))"/>
 
             =======================================================================
 
@@ -60,9 +60,9 @@
          <xsl:text>&#xa;</xsl:text>
          <xsl:text>&#xa;</xsl:text>
 
-         <!-- main 'for-each' for "hornetq-configuration.xsd". Notice the attribute matching at the
-              select which ensures this only matches "hornetq-configuration.xsd". -->
-         <xsl:for-each-group select="xsd:schema/xsd:element[@hq:schema='hornetq-configuration']"
+         <!-- main 'for-each' for "activemq-configuration.xsd". Notice the attribute matching at the
+              select which ensures this only matches "activemq-configuration.xsd". -->
+         <xsl:for-each-group select="xsd:schema/xsd:element[@amq:schema='activemq-configuration']"
                              group-by="@name">
             <!-- the manual reference should list options in sorted order.
                  Notice that this is only OK because the first level of options is "xsd:all".
@@ -72,15 +72,15 @@
             -->
             <xsl:sort select="@name" data-type="text" />
 
-            <!-- <xsl:if test="not(./xsd:annotation/@hq:linkend)"> -->
+            <!-- <xsl:if test="not(./xsd:annotation/@amq:linkend)"> -->
             <!--   <xsl:message terminate="yes"> -->
-            <!--     Error: Lacks proper Docbook link: xsd:annotation/@hq:linkend -->
+            <!--     Error: Lacks proper Docbook link: xsd:annotation/@amq:linkend -->
             <!--     <xsl:copy-of select="."/> -->
             <!--   </xsl:message> -->
             <!-- </xsl:if> -->
             <xsl:call-template name="xsd_element">
                <xsl:with-param name="prefix"/>
-               <xsl:with-param name="parentLinkend" select="xsd:annotation/@hq:linkend"/>
+               <xsl:with-param name="parentLinkend" select="xsd:annotation/@amq:linkend"/>
             </xsl:call-template>
 
             <!-- Add 2 new lines between each option -->
@@ -88,13 +88,13 @@
             <xsl:text>&#xa;</xsl:text>
          </xsl:for-each-group>
 
-         <!-- JMS: main 'for-each' for "hornetq-jms.xsd". Notice the attribute matching at the
-              select which ensures this only matches "hornetq-jms.xsd". -->
-         <xsl:for-each select="xsd:schema/xsd:element[@hq:schema='hornetq-jms-configuration']/xsd:complexType/xsd:sequence/xsd:element">
+         <!-- JMS: main 'for-each' for "activemq-jms.xsd". Notice the attribute matching at the
+              select which ensures this only matches "activemq-jms.xsd". -->
+         <xsl:for-each select="xsd:schema/xsd:element[@amq:schema='activemq-jms-configuration']/xsd:complexType/xsd:sequence/xsd:element">
 
             <xsl:call-template name="xsd_element">
                <xsl:with-param name="prefix"/>
-               <xsl:with-param name="parentLinkend" select="xsd:annotation/@hq:linkend"/>
+               <xsl:with-param name="parentLinkend" select="xsd:annotation/@amq:linkend"/>
             </xsl:call-template>
 
             <!-- Add 2 new lines between each option -->
@@ -128,7 +128,7 @@
 
    <xsl:template name="entry-for-default-value">
       <entry>
-         <xsl:value-of select="string-join((@default,xsd:annotation/@hq:default), ' ')"/>
+         <xsl:value-of select="string-join((@default,xsd:annotation/@amq:default), ' ')"/>
       </entry>
    </xsl:template>
 
@@ -149,7 +149,7 @@
          <xsl:choose>
             <xsl:when test="count(xsd:complexType/xsd:sequence/xsd:element)=1">
                <xsl:value-of
-                       select="concat('Sequence of &lt;', xsd:complexType/xsd:sequence/xsd:element/( hq:name-or-ref(@name,@ref) ), '/&gt;')"/>
+                       select="concat('Sequence of &lt;', xsd:complexType/xsd:sequence/xsd:element/( amq:name-or-ref(@name,@ref) ), '/&gt;')"/>
             </xsl:when>
             <xsl:otherwise>
                <xsl:text>Complex element</xsl:text>
@@ -164,8 +164,8 @@
 
       <xsl:variable name="linkend">
          <xsl:choose>
-            <xsl:when test="xsd:annotation/@hq:linkend">
-               <xsl:value-of select="xsd:annotation/@hq:linkend"/>
+            <xsl:when test="xsd:annotation/@amq:linkend">
+               <xsl:value-of select="xsd:annotation/@amq:linkend"/>
             </xsl:when>
             <xsl:otherwise>
                <xsl:value-of select="$parentLinkend"/>
@@ -218,8 +218,8 @@
 
       <xsl:variable name="linkend">
          <xsl:choose>
-            <xsl:when test="xsd:annotation/@hq:linkend">
-               <xsl:value-of select="xsd:annotation/@hq:linkend"/>
+            <xsl:when test="xsd:annotation/@amq:linkend">
+               <xsl:value-of select="xsd:annotation/@amq:linkend"/>
             </xsl:when>
             <xsl:otherwise>
                <xsl:value-of select="$parentLinkend"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/zh/large-messages.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml
index 890958f..f6d52b5 100644
--- a/docs/user-manual/zh/large-messages.xml
+++ b/docs/user-manual/zh/large-messages.xml
@@ -31,7 +31,7 @@
         <title>服务器端的配置</title>
         <para>大消息在服务器端是直接保存在磁盘目录中。这一目录可以在HornetQ的配置文件中定义。</para>
         <para>这个参数的名字是<literal>large-messages-directory</literal>:</para>
-        <programlisting>&lt;configuration xmlns="urn:hornetq"
+        <programlisting>&lt;configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/zh/paging.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/paging.xml b/docs/user-manual/zh/paging.xml
index db3e945..436f35b 100644
--- a/docs/user-manual/zh/paging.xml
+++ b/docs/user-manual/zh/paging.xml
@@ -36,7 +36,7 @@
         <para>你可以配置分页转存文件夹的位置。</para>
         <para>在主配置文件<literal>hornetq-configuration.xml</literal>)中
             可以定义全局的分页转发参数。</para>
-        <programlisting>&lt;configuration xmlns="urn:hornetq"
+        <programlisting>&lt;configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/zh/security.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml
index 4b82ce6..3dc17a7 100644
--- a/docs/user-manual/zh/security.xml
+++ b/docs/user-manual/zh/security.xml
@@ -112,7 +112,7 @@
         <para>如果你要使用这个安全管理器,就将用户名,密码,角色等信息加入到这个文件中。</para>
         <para>让我们看一个例子:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd "&gt;
     

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/docs/user-manual/zh/using-jms.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml
index 254a787..7b4c3bb 100644
--- a/docs/user-manual/zh/using-jms.xml
+++ b/docs/user-manual/zh/using-jms.xml
@@ -44,7 +44,7 @@
         <para>这里我们将要在服务器端部署一个JMS队列和一个JMS ConnectionFactory (连接工厂)。当然完全可以部署多个JMS对象。
               下面给出了具体的配置内容:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "&gt;
     
@@ -127,7 +127,7 @@
             </table>
             <para>下面的例子配置了一个XAQueueConnectionFactory:</para>
         <programlisting>
-&lt;configuration xmlns="urn:hornetq" 
+&lt;configuration xmlns="urn:activemq"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "&gt;
     

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index 51c6c9a..7fc797f 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
index cca3025..b8addc4 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
index 5f53c8f..863c73f 100644
--- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
+++ b/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
+++ b/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
+++ b/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
index 406e78e..ae4ed83 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 87fd23c..2e5ee6c 100644
--- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
index cde44e7..aad3f72 100644
--- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 1a76d37..cf8faad 100644
--- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f829fed..7f4388b 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index dc3012c..a24cbb3 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 5e77aa5..db3f6d7 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
index 8f77abe..19319d9 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
index a5381d0..cbba610 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
index 23fb370..088d479 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 73d313b..e4ecf12 100644
--- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 860bedf..dba0591 100644
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml
index b0e4f89..2b8be73 100644
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 20ab28e..d63e0b7 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 5628d43..4d72c82 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->


[14/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor default configuration

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
index 25df619..8ab206f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
@@ -83,7 +83,7 @@ public interface Configuration extends Serializable
    /**
     * Returns whether delivery count is persisted before messages are delivered to the consumers. <br>
     * Default value is
-    * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}.
+    * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}.
     */
    boolean isPersistDeliveryCountBeforeDelivery();
 
@@ -95,7 +95,7 @@ public interface Configuration extends Serializable
    /**
     * Returns {@code true} if this server is a backup, {@code false} if it is a live server. <br>
     * If a backup server has been activated, returns {@code false}. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BACKUP}.
     *
     * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isBackup()}
     */
@@ -112,7 +112,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether this server shares its data store with a corresponding live or backup server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SHARED_STORE}.
     *
     * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isSharedStore()}
     */
@@ -129,7 +129,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether this server will use files to configure and deploy its resources. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}.
     */
    boolean isFileDeploymentEnabled();
 
@@ -140,7 +140,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether this server is using persistence and store data. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}.
     */
    boolean isPersistenceEnabled();
 
@@ -151,7 +151,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the period (in milliseconds) to scan configuration files used by deployment. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}.
     */
    long getFileDeployerScanPeriod();
 
@@ -162,7 +162,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the maximum number of threads in the thread pool of this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}.
     */
    int getThreadPoolMaxSize();
 
@@ -173,7 +173,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the maximum number of threads in the <em>scheduled</em> thread pool of this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
     */
    int getScheduledThreadPoolMaxSize();
 
@@ -184,7 +184,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the interval time (in milliseconds) to invalidate security credentials. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}.
     */
    long getSecurityInvalidationInterval();
 
@@ -195,7 +195,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether security is enabled for this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}.
     */
    boolean isSecurityEnabled();
 
@@ -206,19 +206,19 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether this server is manageable using JMX or not. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
     */
    boolean isJMXManagementEnabled();
 
    /**
     * Sets whether this server is manageable using JMX or not. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
     */
    Configuration setJMXManagementEnabled(boolean enabled);
 
    /**
     * Returns the domain used by JMX MBeans (provided JMX management is enabled). <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_DOMAIN}.
     */
    String getJMXDomain();
 
@@ -287,7 +287,7 @@ public interface Configuration extends Serializable
    /**
     * Returns the connection time to live. <br>
     * This value overrides the connection time to live <em>sent by the client</em>. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
     */
    long getConnectionTTLOverride();
 
@@ -299,7 +299,7 @@ public interface Configuration extends Serializable
    /**
     * Returns whether code coming from connection is executed asynchronously or not. <br>
     * Default value is
-    * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
+    * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
     */
    boolean isAsyncConnectionExecutionEnabled();
 
@@ -420,7 +420,7 @@ public interface Configuration extends Serializable
    /**
     * Returns the management address of this server. <br>
     * Clients can send management messages to this address to manage this server. <br>
-    * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
+    * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
     */
    SimpleString getManagementAddress();
 
@@ -433,7 +433,7 @@ public interface Configuration extends Serializable
     * Returns the management notification address of this server. <br>
     * Clients can bind queues to this address to receive management notifications emitted by this
     * server. <br>
-    * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}.
+    * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}.
     */
    SimpleString getManagementNotificationAddress();
 
@@ -444,7 +444,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the cluster user for this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
     */
    String getClusterUser();
 
@@ -455,7 +455,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the cluster password for this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
     */
    String getClusterPassword();
 
@@ -490,7 +490,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the size of the cache for pre-creating message IDs. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
     */
    int getIDCacheSize();
 
@@ -501,7 +501,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether message ID cache is persisted. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
     */
    boolean isPersistIDCache();
 
@@ -514,7 +514,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the file system directory used to store bindings. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
     */
    String getBindingsDirectory();
 
@@ -526,7 +526,7 @@ public interface Configuration extends Serializable
    /**
     * The max number of concurrent reads allowed on paging.
     * <p/>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}.
     */
    int getPageMaxConcurrentIO();
 
@@ -539,7 +539,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the file system directory used to store journal log. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
     */
    String getJournalDirectory();
 
@@ -562,7 +562,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether the journal is synchronized when receiving transactional data. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
     */
    boolean isJournalSyncTransactional();
 
@@ -573,7 +573,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether the journal is synchronized when receiving non-transactional data. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
     */
    boolean isJournalSyncNonTransactional();
 
@@ -584,7 +584,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the size (in bytes) of each journal files. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
     */
    int getJournalFileSize();
 
@@ -595,7 +595,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the minimal number of journal files before compacting. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
     */
    int getJournalCompactMinFiles();
 
@@ -606,7 +606,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the percentage of live data before compacting the journal. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
     */
    int getJournalCompactPercentage();
 
@@ -617,7 +617,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the number of journal files to pre-create. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
     */
    int getJournalMinFiles();
 
@@ -630,7 +630,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the maximum number of write requests that can be in the AIO queue at any given time. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
     */
    int getJournalMaxIO_AIO();
 
@@ -665,7 +665,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the maximum number of write requests for NIO journal. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
     */
    int getJournalMaxIO_NIO();
 
@@ -700,7 +700,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether the bindings directory is created on this server startup. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
     */
    boolean isCreateBindingsDir();
 
@@ -711,7 +711,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether the journal directory is created on this server startup. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
     */
    boolean isCreateJournalDir();
 
@@ -750,7 +750,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the file system directory used to store paging files. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}.
     */
    String getPagingDirectory();
 
@@ -763,7 +763,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the file system directory used to store large messages. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
     */
    String getLargeMessagesDirectory();
 
@@ -776,7 +776,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether wildcard routing is supported by this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
     */
    boolean isWildcardRoutingEnabled();
 
@@ -788,7 +788,7 @@ public interface Configuration extends Serializable
    /**
     * Returns the timeout (in milliseconds) after which transactions is removed from the resource
     * manager after it was created. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
     */
    long getTransactionTimeout();
 
@@ -800,7 +800,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns whether message counter is enabled for this server. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
     */
    boolean isMessageCounterEnabled();
 
@@ -811,7 +811,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the sample period (in milliseconds) to take message counter snapshot. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
     */
    long getMessageCounterSamplePeriod();
 
@@ -824,7 +824,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the maximum number of days kept in memory for message counter. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
     */
    int getMessageCounterMaxDayHistory();
 
@@ -838,7 +838,7 @@ public interface Configuration extends Serializable
    /**
     * Returns the frequency (in milliseconds) to scan transactions to detect which transactions have
     * timed out. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
     */
    long getTransactionTimeoutScanPeriod();
 
@@ -851,7 +851,7 @@ public interface Configuration extends Serializable
    /**
     * Returns the frequency (in milliseconds) to scan messages to detect which messages have
     * expired. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
     */
    long getMessageExpiryScanPeriod();
 
@@ -863,7 +863,7 @@ public interface Configuration extends Serializable
 
    /**
     * Returns the priority of the thread used to scan message expiration. <br>
-    * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
+    * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
     */
    int getMessageExpiryThreadPriority();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
index d337a6d..906589a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
@@ -14,7 +14,7 @@ package org.apache.activemq.core.config;
 
 import java.io.Serializable;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.utils.UUIDGenerator;
 
 /**
@@ -34,7 +34,7 @@ public class DivertConfiguration implements Serializable
 
    private String forwardingAddress = null;
 
-   private boolean exclusive = HornetQDefaultConfiguration.isDefaultDivertExclusive();
+   private boolean exclusive = ActiveMQDefaultConfiguration.isDefaultDivertExclusive();
 
    private String filterString = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
index 1fc089f..98dc679 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.config;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ public class ScaleDownConfiguration implements Serializable
 
    private String clusterName = null;
 
-   private boolean enabled = HornetQDefaultConfiguration.isDefaultScaleDownEnabled();
+   private boolean enabled = ActiveMQDefaultConfiguration.isDefaultScaleDownEnabled();
 
    public List<String> getConnectors()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
index d7d838d..c71dc74 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.config.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.HAPolicyConfiguration;
 
 import java.util.ArrayList;
@@ -20,19 +20,19 @@ import java.util.List;
 
 public class ColocatedPolicyConfiguration implements HAPolicyConfiguration
 {
-   private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup();
+   private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup();
 
-   private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
+   private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
 
-   private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
+   private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
 
-   private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups();
+   private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups();
 
-   private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
+   private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
 
    private List<String> excludedConnectors = new ArrayList<>();
 
-   private int portOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
+   private int portOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
 
    private HAPolicyConfiguration liveConfig;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
index b27d852..aff113d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.config.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.HAPolicyConfiguration;
 import org.apache.activemq.core.config.ScaleDownConfiguration;
 
@@ -20,11 +20,11 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration
 {
    private String clusterName = null;
 
-   private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
+   private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
 
    private String groupName = null;
 
-   private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
+   private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
 
    private ScaleDownConfiguration scaleDownConfiguration;
 
@@ -33,7 +33,7 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration
    * */
    private boolean allowFailBack = false;
 
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
    public ReplicaPolicyConfiguration()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
index 67ff663..96c1dc9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
@@ -12,12 +12,12 @@
  */
 package org.apache.activemq.core.config.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.HAPolicyConfiguration;
 
 public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration
 {
-   private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer();
+   private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer();
 
    private String groupName = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java
index a3a9d2f..7d58c8b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java
@@ -12,14 +12,14 @@
  */
 package org.apache.activemq.core.config.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.HAPolicyConfiguration;
 
 public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration
 {
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
-   private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
+   private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
 
    public SharedStoreMasterPolicyConfiguration()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java
index d3a6377..fa9acb7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java
@@ -12,19 +12,19 @@
  */
 package org.apache.activemq.core.config.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.config.HAPolicyConfiguration;
 import org.apache.activemq.core.config.ScaleDownConfiguration;
 
 public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration
 {
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
-   private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
+   private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
 
-   private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
+   private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
 
-   private boolean allowFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
+   private boolean allowFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
 
    private ScaleDownConfiguration scaleDownConfiguration;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
index 96d914a..adb971f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.BroadcastGroupConfiguration;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
 import org.apache.activemq.api.core.SimpleString;
@@ -61,38 +61,38 @@ public class ConfigurationImpl implements Configuration
 
    private String name = "ConfigurationImpl::" + System.identityHashCode(this);
 
-   protected boolean fileDeploymentEnabled = HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled();
+   protected boolean fileDeploymentEnabled = ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled();
 
-   private boolean persistenceEnabled = HornetQDefaultConfiguration.isDefaultPersistenceEnabled();
+   private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled();
 
-   protected long fileDeploymentScanPeriod = HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod();
+   protected long fileDeploymentScanPeriod = ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod();
 
    private boolean persistDeliveryCountBeforeDelivery =
-            HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery();
+            ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery();
 
-   private int scheduledThreadPoolMaxSize = HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize();
+   private int scheduledThreadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize();
 
-   private int threadPoolMaxSize = HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize();
+   private int threadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize();
 
-   private long securityInvalidationInterval = HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval();
+   private long securityInvalidationInterval = ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval();
 
-   private boolean securityEnabled = HornetQDefaultConfiguration.isDefaultSecurityEnabled();
+   private boolean securityEnabled = ActiveMQDefaultConfiguration.isDefaultSecurityEnabled();
 
-   protected boolean jmxManagementEnabled = HornetQDefaultConfiguration.isDefaultJmxManagementEnabled();
+   protected boolean jmxManagementEnabled = ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled();
 
-   protected String jmxDomain = HornetQDefaultConfiguration.getDefaultJmxDomain();
+   protected String jmxDomain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
-   protected long connectionTTLOverride = HornetQDefaultConfiguration.getDefaultConnectionTtlOverride();
+   protected long connectionTTLOverride = ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride();
 
-   protected boolean asyncConnectionExecutionEnabled = HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled();
+   protected boolean asyncConnectionExecutionEnabled = ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled();
 
-   private long messageExpiryScanPeriod = HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod();
+   private long messageExpiryScanPeriod = ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod();
 
-   private int messageExpiryThreadPriority = HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority();
+   private int messageExpiryThreadPriority = ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority();
 
-   protected int idCacheSize = HornetQDefaultConfiguration.getDefaultIdCacheSize();
+   protected int idCacheSize = ActiveMQDefaultConfiguration.getDefaultIdCacheSize();
 
-   private boolean persistIDCache = HornetQDefaultConfiguration.isDefaultPersistIdCache();
+   private boolean persistIDCache = ActiveMQDefaultConfiguration.isDefaultPersistIdCache();
 
    private List<String> incomingInterceptorClassNames = new ArrayList<String>();
 
@@ -116,84 +116,84 @@ public class ConfigurationImpl implements Configuration
 
    // Paging related attributes ------------------------------------------------------------
 
-   private String pagingDirectory = HornetQDefaultConfiguration.getDefaultPagingDir();
+   private String pagingDirectory = ActiveMQDefaultConfiguration.getDefaultPagingDir();
 
    // File related attributes -----------------------------------------------------------
 
-   private int maxConcurrentPageIO = HornetQDefaultConfiguration.getDefaultMaxConcurrentPageIo();
+   private int maxConcurrentPageIO = ActiveMQDefaultConfiguration.getDefaultMaxConcurrentPageIo();
 
-   protected String largeMessagesDirectory = HornetQDefaultConfiguration.getDefaultLargeMessagesDir();
+   protected String largeMessagesDirectory = ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir();
 
-   protected String bindingsDirectory = HornetQDefaultConfiguration.getDefaultBindingsDirectory();
+   protected String bindingsDirectory = ActiveMQDefaultConfiguration.getDefaultBindingsDirectory();
 
-   protected boolean createBindingsDir = HornetQDefaultConfiguration.isDefaultCreateBindingsDir();
+   protected boolean createBindingsDir = ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir();
 
-   protected String journalDirectory = HornetQDefaultConfiguration.getDefaultJournalDir();
+   protected String journalDirectory = ActiveMQDefaultConfiguration.getDefaultJournalDir();
 
-   protected boolean createJournalDir = HornetQDefaultConfiguration.isDefaultCreateJournalDir();
+   protected boolean createJournalDir = ActiveMQDefaultConfiguration.isDefaultCreateJournalDir();
 
    public JournalType journalType = ConfigurationImpl.DEFAULT_JOURNAL_TYPE;
 
-   protected boolean journalSyncTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncTransactional();
+   protected boolean journalSyncTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional();
 
-   protected boolean journalSyncNonTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional();
+   protected boolean journalSyncNonTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional();
 
-   protected int journalCompactMinFiles = HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles();
+   protected int journalCompactMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles();
 
-   protected int journalCompactPercentage = HornetQDefaultConfiguration.getDefaultJournalCompactPercentage();
+   protected int journalCompactPercentage = ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage();
 
-   protected int journalFileSize = HornetQDefaultConfiguration.getDefaultJournalFileSize();
+   protected int journalFileSize = ActiveMQDefaultConfiguration.getDefaultJournalFileSize();
 
-   protected int journalMinFiles = HornetQDefaultConfiguration.getDefaultJournalMinFiles();
+   protected int journalMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalMinFiles();
 
    // AIO and NIO need different values for these attributes
 
-   protected int journalMaxIO_AIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio();
+   protected int journalMaxIO_AIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio();
 
-   protected int journalBufferTimeout_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutAio();
+   protected int journalBufferTimeout_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutAio();
 
-   protected int journalBufferSize_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeAio();
+   protected int journalBufferSize_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeAio();
 
-   protected int journalMaxIO_NIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio();
+   protected int journalMaxIO_NIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio();
 
-   protected int journalBufferTimeout_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutNio();
+   protected int journalBufferTimeout_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutNio();
 
-   protected int journalBufferSize_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeNio();
+   protected int journalBufferSize_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeNio();
 
-   protected boolean logJournalWriteRate = HornetQDefaultConfiguration.isDefaultJournalLogWriteRate();
+   protected boolean logJournalWriteRate = ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate();
 
-   protected int journalPerfBlastPages = HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages();
+   protected int journalPerfBlastPages = ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages();
 
-   protected boolean runSyncSpeedTest = HornetQDefaultConfiguration.isDefaultRunSyncSpeedTest();
+   protected boolean runSyncSpeedTest = ActiveMQDefaultConfiguration.isDefaultRunSyncSpeedTest();
 
-   private boolean wildcardRoutingEnabled = HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled();
+   private boolean wildcardRoutingEnabled = ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled();
 
-   private boolean messageCounterEnabled = HornetQDefaultConfiguration.isDefaultMessageCounterEnabled();
+   private boolean messageCounterEnabled = ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled();
 
-   private long messageCounterSamplePeriod = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
+   private long messageCounterSamplePeriod = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
 
-   private int messageCounterMaxDayHistory = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
+   private int messageCounterMaxDayHistory = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
 
-   private long transactionTimeout = HornetQDefaultConfiguration.getDefaultTransactionTimeout();
+   private long transactionTimeout = ActiveMQDefaultConfiguration.getDefaultTransactionTimeout();
 
-   private long transactionTimeoutScanPeriod = HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod();
+   private long transactionTimeoutScanPeriod = ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod();
 
-   private SimpleString managementAddress = HornetQDefaultConfiguration.getDefaultManagementAddress();
+   private SimpleString managementAddress = ActiveMQDefaultConfiguration.getDefaultManagementAddress();
 
-   private SimpleString managementNotificationAddress = HornetQDefaultConfiguration.getDefaultManagementNotificationAddress();
+   private SimpleString managementNotificationAddress = ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress();
 
-   protected String clusterUser = HornetQDefaultConfiguration.getDefaultClusterUser();
+   protected String clusterUser = ActiveMQDefaultConfiguration.getDefaultClusterUser();
 
-   protected String clusterPassword = HornetQDefaultConfiguration.getDefaultClusterPassword();
+   protected String clusterPassword = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
 
-   private long serverDumpInterval = HornetQDefaultConfiguration.getDefaultServerDumpInterval();
+   private long serverDumpInterval = ActiveMQDefaultConfiguration.getDefaultServerDumpInterval();
 
-   protected boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
+   protected boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
 
    // percentage of free memory which triggers warning from the memory manager
-   private int memoryWarningThreshold = HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold();
+   private int memoryWarningThreshold = ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold();
 
-   private long memoryMeasureInterval = HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval();
+   private long memoryMeasureInterval = ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval();
 
    protected GroupingHandlerConfiguration groupingHandlerConfiguration;
 
@@ -203,13 +203,13 @@ public class ConfigurationImpl implements Configuration
 
    protected List<ConnectorServiceConfiguration> connectorServiceConfigurations = new ArrayList<ConnectorServiceConfiguration>();
 
-   private boolean maskPassword = HornetQDefaultConfiguration.isDefaultMaskPassword();
+   private boolean maskPassword = ActiveMQDefaultConfiguration.isDefaultMaskPassword();
 
    private transient String passwordCodec;
 
-   private boolean resolveProtocols = HornetQDefaultConfiguration.isDefaultResolveProtocols();
+   private boolean resolveProtocols = ActiveMQDefaultConfiguration.isDefaultResolveProtocols();
 
-   private long journalLockAcquisitionTimeout = HornetQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout();
+   private long journalLockAcquisitionTimeout = ActiveMQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout();
 
    private HAPolicyConfiguration haPolicyConfiguration;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
index 8c02868..7b3744d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration;
 import org.apache.activemq.api.core.BroadcastGroupConfiguration;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
@@ -790,8 +790,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       int journalMaxIO = getInteger(e,
                                     "journal-max-io",
-                                    config.getJournalType() == JournalType.ASYNCIO ? HornetQDefaultConfiguration.getDefaultJournalMaxIoAio()
-                                       : HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(),
+                                    config.getJournalType() == JournalType.ASYNCIO ? ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio()
+                                       : ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(),
                                     Validators.GT_ZERO);
 
       if (config.getJournalType() == JournalType.ASYNCIO)
@@ -819,11 +819,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       config.setLogJournalWriteRate(getBoolean(e,
                                                "log-journal-write-rate",
-                                               HornetQDefaultConfiguration.isDefaultJournalLogWriteRate()));
+                                               ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate()));
 
       config.setJournalPerfBlastPages(getInteger(e,
                                                  "perf-blast-pages",
-                                                 HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(),
+                                                 ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(),
                                                  Validators.MINUS_ONE_OR_GT_ZERO));
 
       config.setRunSyncSpeedTest(getBoolean(e, "run-sync-speed-test", config.isRunSyncSpeedTest()));
@@ -1185,11 +1185,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       if (mainConfig.isMaskPassword())
       {
-         params.put(HornetQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
+         params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
 
          if (mainConfig.getPasswordCodec() != null)
          {
-            params.put(HornetQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());
+            params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());
          }
       }
 
@@ -1482,7 +1482,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       }
 
       long broadcastPeriod =
-         getLong(e, "broadcast-period", HornetQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO);
+         getLong(e, "broadcast-period", ActiveMQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO);
 
       String localAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK);
 
@@ -1532,7 +1532,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
                  Validators.GT_ZERO);
 
       long refreshTimeout =
-         getLong(e, "refresh-timeout", HornetQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(),
+         getLong(e, "refresh-timeout", ActiveMQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(),
                  Validators.GT_ZERO);
 
       String localBindAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK);
@@ -1589,27 +1589,27 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       String connectorName = getString(e, "connector-ref", null, Validators.NOT_NULL_OR_EMPTY);
 
       boolean duplicateDetection =
-         getBoolean(e, "use-duplicate-detection", HornetQDefaultConfiguration.isDefaultClusterDuplicateDetection());
+         getBoolean(e, "use-duplicate-detection", ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection());
 
       boolean forwardWhenNoConsumers =
          getBoolean(e, "forward-when-no-consumers",
-                    HornetQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers());
+                    ActiveMQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers());
 
       int maxHops = getInteger(e, "max-hops",
-                               HornetQDefaultConfiguration.getDefaultClusterMaxHops(),
+                               ActiveMQDefaultConfiguration.getDefaultClusterMaxHops(),
                                Validators.GE_ZERO);
 
       long clientFailureCheckPeriod =
-         getLong(e, "check-period", HornetQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(),
+         getLong(e, "check-period", ActiveMQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(),
                  Validators.GT_ZERO);
 
       long connectionTTL =
-         getLong(e, "connection-ttl", HornetQDefaultConfiguration.getDefaultClusterConnectionTtl(),
+         getLong(e, "connection-ttl", ActiveMQDefaultConfiguration.getDefaultClusterConnectionTtl(),
                  Validators.GT_ZERO);
 
 
       long retryInterval =
-         getLong(e, "retry-interval", HornetQDefaultConfiguration.getDefaultClusterRetryInterval(),
+         getLong(e, "retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval(),
                  Validators.GT_ZERO);
 
       long callTimeout = getLong(e, "call-timeout", HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GT_ZERO);
@@ -1617,24 +1617,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       long callFailoverTimeout = getLong(e, "call-failover-timeout", HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, Validators.MINUS_ONE_OR_GT_ZERO);
 
       double retryIntervalMultiplier = getDouble(e, "retry-interval-multiplier",
-                                                 HornetQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO);
+                                                 ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO);
 
       int minLargeMessageSize = getInteger(e, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO);
 
-      long maxRetryInterval = getLong(e, "max-retry-interval", HornetQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO);
+      long maxRetryInterval = getLong(e, "max-retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO);
 
-      int initialConnectAttempts = getInteger(e, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
+      int initialConnectAttempts = getInteger(e, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
 
-      int reconnectAttempts = getInteger(e, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
+      int reconnectAttempts = getInteger(e, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
 
 
       int confirmationWindowSize =
-         getInteger(e, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(),
+         getInteger(e, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(),
                     Validators.GT_ZERO);
 
-      long clusterNotificationInterval = getLong(e, "notification-interval", HornetQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO);
+      long clusterNotificationInterval = getLong(e, "notification-interval", ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO);
 
-      int clusterNotificationAttempts = getInteger(e, "notification-attempts", HornetQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO);
+      int clusterNotificationAttempts = getInteger(e, "notification-attempts", ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO);
 
       String scaleDownConnector = e.getAttribute("scale-down-connector");
 
@@ -1704,9 +1704,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       String name = node.getAttribute("name");
       String type = getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY);
       String address = getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY);
-      Integer timeout = getInteger(node, "timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO);
-      Long groupTimeout = getLong(node, "group-timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO);
-      Long reaperPeriod = getLong(node, "reaper-period", HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO);
+      Integer timeout = getInteger(node, "timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO);
+      Long groupTimeout = getLong(node, "group-timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO);
+      Long reaperPeriod = getLong(node, "reaper-period", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO);
       mainConfiguration.setGroupingHandlerConfiguration(new GroupingHandlerConfiguration()
                                                            .setName(new SimpleString(name))
                                                            .setType(
@@ -1731,7 +1731,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       // Default bridge conf
       int confirmationWindowSize =
-         getInteger(brNode, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(),
+         getInteger(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(),
                     Validators.GT_ZERO);
 
       long retryInterval = getLong(brNode, "retry-interval", HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO);
@@ -1753,24 +1753,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
                    Validators.GT_ZERO);
 
       int initialConnectAttempts =
-         getInteger(brNode, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(),
+         getInteger(brNode, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(),
                     Validators.MINUS_ONE_OR_GE_ZERO);
 
       int reconnectAttempts =
-         getInteger(brNode, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(),
+         getInteger(brNode, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(),
                     Validators.MINUS_ONE_OR_GE_ZERO);
 
       int reconnectAttemptsSameNode =
-         getInteger(brNode, "reconnect-attempts-same-node", HornetQDefaultConfiguration.getDefaultBridgeConnectSameNode(),
+         getInteger(brNode, "reconnect-attempts-same-node", ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode(),
                     Validators.MINUS_ONE_OR_GE_ZERO);
 
       boolean useDuplicateDetection = getBoolean(brNode,
                                                  "use-duplicate-detection",
-                                                 HornetQDefaultConfiguration.isDefaultBridgeDuplicateDetection());
+                                                 ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection());
 
       String user = getString(brNode,
                               "user",
-                              HornetQDefaultConfiguration.getDefaultClusterUser(),
+                              ActiveMQDefaultConfiguration.getDefaultClusterUser(),
                               Validators.NO_CHECK);
 
       NodeList clusterPassNodes = brNode.getElementsByTagName("password");
@@ -1795,7 +1795,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
       }
       else
       {
-         password = HornetQDefaultConfiguration.getDefaultClusterPassword();
+         password = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
       }
 
       boolean ha = getBoolean(brNode, "ha", false);
@@ -1883,7 +1883,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
 
       String forwardingAddress = getString(e, "forwarding-address", null, Validators.NOT_NULL_OR_EMPTY);
 
-      boolean exclusive = getBoolean(e, "exclusive", HornetQDefaultConfiguration.isDefaultDivertExclusive());
+      boolean exclusive = getBoolean(e, "exclusive", ActiveMQDefaultConfiguration.isDefaultDivertExclusive());
 
       String transformerClassName = getString(e, "transformer-class-name", null, Validators.NO_CHECK);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java
index 2415ff4..67c039c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.messagecounter.MessageCounter;
 import org.apache.activemq.core.messagecounter.MessageCounterManager;
 
@@ -39,11 +39,11 @@ import org.apache.activemq.core.messagecounter.MessageCounterManager;
 public class MessageCounterManagerImpl implements MessageCounterManager
 {
 
-   public static final long DEFAULT_SAMPLE_PERIOD = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
+   public static final long DEFAULT_SAMPLE_PERIOD = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
 
    public static final long MIN_SAMPLE_PERIOD = 1000;
 
-   public static final int DEFAULT_MAX_DAY_COUNT = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
+   public static final int DEFAULT_MAX_DAY_COUNT = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
 
    private final Map<String, MessageCounter> messageCounters;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
index 597597e..003ee4e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 /**
  * A TransportConstants
@@ -40,15 +40,15 @@ public final class TransportConstants
       Set<String> allowableAcceptorKeys = new HashSet<String>();
       allowableAcceptorKeys.add(TransportConstants.SERVER_ID_PROP_NAME);
       allowableAcceptorKeys.add(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
 
       ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys);
 
       Set<String> allowableConnectorKeys = new HashSet<String>();
       allowableConnectorKeys.add(TransportConstants.SERVER_ID_PROP_NAME);
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
 
       ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys);
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
index be36072..b490ce1 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
@@ -50,7 +50,7 @@ import io.netty.util.ResourceLeakDetector;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.GlobalEventExecutor;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.api.core.TransportConfiguration;
@@ -221,8 +221,8 @@ public class NettyAcceptor implements Acceptor
          keyStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME,
                                                                     TransportConstants.DEFAULT_KEYSTORE_PASSWORD,
                                                                     configuration,
-                                                                    HornetQDefaultConfiguration.getPropMaskPassword(),
-                                                                    HornetQDefaultConfiguration.getPropMaskPassword());
+                                                                    ActiveMQDefaultConfiguration.getPropMaskPassword(),
+                                                                    ActiveMQDefaultConfiguration.getPropMaskPassword());
 
          trustStoreProvider = ConfigurationHelper.getStringProperty(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME,
                                                                     TransportConstants.DEFAULT_TRUSTSTORE_PROVIDER,
@@ -235,8 +235,8 @@ public class NettyAcceptor implements Acceptor
          trustStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME,
                                                                       TransportConstants.DEFAULT_TRUSTSTORE_PASSWORD,
                                                                       configuration,
-                                                                      HornetQDefaultConfiguration.getPropMaskPassword(),
-                                                                      HornetQDefaultConfiguration.getPropMaskPassword());
+                                                                      ActiveMQDefaultConfiguration.getPropMaskPassword(),
+                                                                      ActiveMQDefaultConfiguration.getPropMaskPassword());
 
          enabledCipherSuites = ConfigurationHelper.getStringProperty(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME,
                                                                      TransportConstants.DEFAULT_ENABLED_CIPHER_SUITES,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java
index 8e9013f..1f0d779 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java
@@ -12,13 +12,13 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.Activation;
 
 public abstract class BackupPolicy implements HAPolicy<Activation>
 {
    protected ScaleDownPolicy scaleDownPolicy;
-   protected boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
+   protected boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
 
    public ScaleDownPolicy getScaleDownPolicy()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java
index a781527..bd897a4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.ColocatedActivation;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.core.server.impl.LiveActivation;
@@ -25,15 +25,15 @@ public class ColocatedPolicy implements HAPolicy<LiveActivation>
 {
 
    /*live stuff*/
-   private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup();
+   private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup();
 
-   private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
+   private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
 
-   private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
+   private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
 
-   private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups();
+   private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups();
 
-   private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
+   private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
 
    /*backup stuff*/
    private List<String> excludedConnectors = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java
index 6b8923a..f0c623d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.Activation;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
@@ -23,11 +23,11 @@ public class ReplicaPolicy extends BackupPolicy
 {
    private String clusterName;
 
-   private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
+   private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
 
    private String groupName = null;
 
-   private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
+   private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
 
    private ReplicatedPolicy replicatedPolicy;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java
index da28fd5..e528d37 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.core.server.impl.LiveActivation;
 import org.apache.activemq.core.server.impl.SharedNothingLiveActivation;
@@ -21,7 +21,7 @@ import java.util.Map;
 
 public class ReplicatedPolicy implements HAPolicy<LiveActivation>
 {
-   private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer();
+   private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer();
 
    private String groupName = null;
 
@@ -31,9 +31,9 @@ public class ReplicatedPolicy implements HAPolicy<LiveActivation>
    * these are only set by the ReplicaPolicy after failover to decide if the live server can failback, these should not
    * be exposed in configuration.
    * */
-   private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
+   private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
 
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
    /*
    * this is used as the policy when the server is started after a failover

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java
index 2384d91..4f625c3 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.core.server.impl.LiveActivation;
 import org.apache.activemq.core.server.impl.SharedStoreLiveActivation;
@@ -21,9 +21,9 @@ import java.util.Map;
 
 public class SharedStoreMasterPolicy implements HAPolicy<LiveActivation>
 {
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
-   private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
+   private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
 
    private SharedStoreSlavePolicy sharedStoreSlavePolicy;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java
index 7fdad9d..51ad6e9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.core.server.cluster.ha;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.server.impl.Activation;
 import org.apache.activemq.core.server.impl.HornetQServerImpl;
 import org.apache.activemq.core.server.impl.SharedStoreBackupActivation;
@@ -21,11 +21,11 @@ import java.util.Map;
 
 public class SharedStoreSlavePolicy extends BackupPolicy
 {
-   private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
+   private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
 
-   private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
+   private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
 
-   private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
+   private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
 
    //this is how we act once we have failed over
    private SharedStoreMasterPolicy sharedStoreMasterPolicy;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
index c1aae65..2f2696e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
@@ -14,7 +14,7 @@ package org.apache.activemq.core.server.group.impl;
 
 import java.io.Serializable;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 
 /**
@@ -36,11 +36,11 @@ public final class GroupingHandlerConfiguration implements Serializable
 
    private SimpleString address = null;
 
-   private long timeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout();
+   private long timeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout();
 
-   private long groupTimeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout();
+   private long groupTimeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout();
 
-   private long reaperPeriod = HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod();
+   private long reaperPeriod = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod();
 
    public GroupingHandlerConfiguration()
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
index 485bb2e..ada5c0e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
@@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
@@ -1631,7 +1631,7 @@ public class HornetQServerImpl implements HornetQServer
 
       storageManager = createStorageManager();
 
-      if (HornetQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && HornetQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword()))
+      if (ActiveMQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && ActiveMQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword()))
       {
          HornetQServerLogger.LOGGER.clusterSecurityRisk();
       }


[06/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 9a1cc53..50b7199 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml
index 0694025..dedb230 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 146d45b..28bc41b 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml
index 9b1bf55..25b6027 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 97ddf38..329e331 100644
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
index a4438a9..9e5ab97 100644
--- a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml b/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml
index bc4af35..3461588 100644
--- a/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml b/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml
+++ b/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
index a8275a7..f6f2b3c 100644
--- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml
index 417a5a2..9d4b206 100644
--- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f345521..586f1ed 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml
index 50eb136..d224e45 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 2dd7383..058ea90 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml
index 50eb136..d224e45 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 90a75a6..2863354 100644
--- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
index efb74f7..b42f50b 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml
index 1802d08..cf68d6a 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b074077..0c1cc53 100644
--- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 1d86776..0f5789d 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d886c1d..ef2174f 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
- <configuration xmlns="urn:hornetq"
+ <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
index 06c380c..a2629c9 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
index a3c2a6b..7b68744 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
- <configuration xmlns="urn:hornetq"
+ <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
index fed9ab1..e46b4c2 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
index e6e472f..0e75771 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
index 65f9976..17cc336 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
index dcd653f..d98fc4d 100644
--- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
index 7e0dfde..8d0d6d7 100644
--- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6e666cc..1031cd8 100644
--- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
index 7624e1c..8bf378d 100644
--- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 2ff38cf..603965a 100644
--- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
index 8f42f36..0ee1ba9 100644
--- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6aa356f..501d835 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../../../src/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4a90f5e..ef6a40f 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml
index 4603d49..39fc734 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../schema/hornetq-security.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 9a4a393..10b6e54 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml
index 602099c..3b13994 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d4642b1..1806169 100644
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../../../src/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml
index 3ebbbc0..07dcf79 100644
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6e666cc..1031cd8 100644
--- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6e666cc..1031cd8 100644
--- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml
index 51c84c1..0b14ff0 100644
--- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6e666cc..1031cd8 100644
--- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 20ab28e..d63e0b7 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 7055264..4a04f8e 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 2dd4833..78c8af2 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml
index e45679c..6f124f5 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 9dd4894..1e9ad32 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 4a340ec..23e89f0 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
index d2af9c7..2e79beb 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
index e45679c..6f124f5 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml
index 0b0d175..bf453f3 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">


[17/17] activemq-6 git commit: Merged PR #8

Posted by ma...@apache.org.
Merged PR #8


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

Branch: refs/heads/master
Commit: 571fb7a236953d96f7b65bcdae685681baaf9811
Parents: 14352d9 07eac10
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Nov 18 12:23:52 2014 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 18 12:23:52 2014 +0000

----------------------------------------------------------------------
 README.md                                       |   85 +-
 activemq-bootstrap/pom.xml                      |   68 +
 .../org/apache/activemq/cli/banner.txt          |    8 +
 .../java/org/apache/activemq/cli/ActiveMQ.java  |   76 +
 .../activemq/cli/ConfigurationException.java    |   21 +
 .../apache/activemq/cli/commands/Action.java    |   20 +
 .../activemq/cli/commands/ActionContext.java    |   37 +
 .../activemq/cli/commands/HelpAction.java       |   26 +
 .../org/apache/activemq/cli/commands/Run.java   |  148 +
 .../org/apache/activemq/cli/commands/Stop.java  |   45 +
 .../apache/activemq/factory/BrokerFactory.java  |   52 +
 .../activemq/factory/BrokerFactoryHandler.java  |   22 +
 .../apache/activemq/factory/CoreFactory.java    |   47 +
 .../activemq/factory/CoreFactoryHandler.java    |   22 +
 .../factory/FileCoreFactoryHandler.java         |   29 +
 .../activemq/factory/FileJmsFactoryHandler.java |   32 +
 .../org/apache/activemq/factory/JmsFactory.java |   46 +
 .../activemq/factory/JmsFactoryHandler.java     |   22 +
 .../factory/SecurityManagerFactory.java         |   38 +
 .../factory/XmlBrokerFactoryHandler.java        |   34 +
 .../bootstrap/HornetQBootstrapBundle.java       |   31 +
 .../bootstrap/HornetQBootstrapLogger.java       |   71 +
 .../org/apache/activemq/broker/core/file        |   13 +
 .../org/apache/activemq/broker/jms/file         |   13 +
 .../services/org/apache/activemq/broker/xml     |   13 +
 activemq-commons/pom.xml                        |   39 +
 .../core/ActiveMQAddressExistsException.java    |   35 +
 .../api/core/ActiveMQAddressFullException.java  |   35 +
 .../ActiveMQAlreadyReplicatingException.java    |   35 +
 .../activemq/api/core/ActiveMQBuffer.java       | 1084 +++
 .../activemq/api/core/ActiveMQBuffers.java      |   96 +
 .../core/ActiveMQClusterSecurityException.java  |   32 +
 .../ActiveMQConnectionTimedOutException.java    |   35 +
 .../api/core/ActiveMQDisconnectedException.java |   35 +
 .../api/core/ActiveMQDuplicateIdException.java  |   35 +
 .../ActiveMQDuplicateMetaDataException.java     |   35 +
 .../activemq/api/core/ActiveMQException.java    |   76 +
 .../api/core/ActiveMQExceptionType.java         |  298 +
 .../api/core/ActiveMQIOErrorException.java      |   40 +
 .../api/core/ActiveMQIllegalStateException.java |   36 +
 ...tiveMQIncompatibleClientServerException.java |   37 +
 ...iveMQInterceptorRejectedPacketException.java |   37 +
 .../core/ActiveMQInternalErrorException.java    |   45 +
 .../api/core/ActiveMQInterruptedException.java  |   27 +
 ...ctiveMQInvalidFilterExpressionException.java |   35 +
 ...tiveMQInvalidTransientQueueUseException.java |   35 +
 .../api/core/ActiveMQLargeMessageException.java |   35 +
 ...ctiveMQLargeMessageInterruptedException.java |   36 +
 .../api/core/ActiveMQNativeIOError.java         |   35 +
 .../core/ActiveMQNonExistentQueueException.java |   35 +
 .../api/core/ActiveMQNotConnectedException.java |   35 +
 .../api/core/ActiveMQObjectClosedException.java |   36 +
 .../ActiveMQPropertyConversionException.java    |   30 +
 .../api/core/ActiveMQQueueExistsException.java  |   35 +
 .../api/core/ActiveMQSecurityException.java     |   35 +
 .../core/ActiveMQSessionCreationException.java  |   36 +
 ...iveMQTransactionOutcomeUnknownException.java |   35 +
 .../ActiveMQTransactionRolledBackException.java |   35 +
 .../api/core/ActiveMQUnBlockedException.java    |   35 +
 .../ActiveMQUnsupportedPacketException.java     |   35 +
 .../java/org/apache/activemq/api/core/Pair.java |  105 +
 .../apache/activemq/api/core/SimpleString.java  |  452 ++
 .../core/buffers/impl/ChannelBufferWrapper.java |  623 ++
 .../activemq/core/server/HornetQComponent.java  |   31 +
 .../java/org/apache/activemq/utils/Base64.java  | 2375 +++++++
 .../org/apache/activemq/utils/ByteUtil.java     |   82 +
 .../apache/activemq/utils/ClassloadingUtil.java |  129 +
 .../activemq/utils/ConcurrentHashSet.java       |   90 +
 .../apache/activemq/utils/ConcurrentSet.java    |   28 +
 .../apache/activemq/utils/DataConstants.java    |   67 +
 .../utils/DefaultSensitiveStringCodec.java      |  107 +
 .../apache/activemq/utils/FactoryFinder.java    |  166 +
 .../activemq/utils/HornetQThreadFactory.java    |   68 +
 .../activemq/utils/HornetQUtilBundle.java       |   48 +
 .../activemq/utils/HornetQUtilLogger.java       |   50 +
 .../activemq/utils/PasswordMaskingUtil.java     |   92 +
 .../apache/activemq/utils/ReferenceCounter.java |   24 +
 .../activemq/utils/ReferenceCounterUtil.java    |   67 +
 .../apache/activemq/utils/ReusableLatch.java    |  155 +
 .../activemq/utils/SensitiveDataCodec.java      |   33 +
 .../apache/activemq/utils/TypedProperties.java  | 1212 ++++
 .../org/apache/activemq/utils/UTF8Util.java     |  273 +
 .../java/org/apache/activemq/utils/UUID.java    |  270 +
 .../apache/activemq/utils/UUIDGenerator.java    |  371 ++
 .../org/apache/activemq/utils/UUIDTimer.java    |  324 +
 .../org/apache/activemq/utils/ByteUtilTest.java |   52 +
 .../org/apache/activemq/utils/PairTest.java     |   32 +
 .../activemq/utils/ReferenceCounterTest.java    |  132 +
 activemq-core-client/pom.xml                    |  115 +
 .../config/ActiveMQDefaultConfiguration.java    | 1125 ++++
 .../activemq/api/core/BroadcastEndpoint.java    |   95 +
 .../api/core/BroadcastEndpointFactory.java      |   21 +
 .../BroadcastEndpointFactoryConfiguration.java  |   25 +
 .../api/core/BroadcastGroupConfiguration.java   |  136 +
 .../api/core/DiscoveryGroupConfiguration.java   |  198 +
 ...ryGroupConfigurationCompatibilityHelper.java |   42 +
 .../activemq/api/core/FilterConstants.java      |   71 +
 .../apache/activemq/api/core/Interceptor.java   |   40 +
 .../JGroupsBroadcastGroupConfiguration.java     |  400 ++
 .../org/apache/activemq/api/core/Message.java   |  549 ++
 .../api/core/TransportConfiguration.java        |  414 ++
 .../api/core/TransportConfigurationHelper.java  |   26 +
 .../core/UDPBroadcastGroupConfiguration.java    |  335 +
 .../api/core/client/ClientConsumer.java         |  123 +
 .../activemq/api/core/client/ClientMessage.java |  232 +
 .../api/core/client/ClientProducer.java         |  149 +
 .../api/core/client/ClientRequestor.java        |  110 +
 .../activemq/api/core/client/ClientSession.java |  671 ++
 .../api/core/client/ClientSessionFactory.java   |  183 +
 .../core/client/ClusterTopologyListener.java    |   40 +
 .../api/core/client/FailoverEventListener.java  |   30 +
 .../api/core/client/FailoverEventType.java      |   20 +
 .../activemq/api/core/client/HornetQClient.java |  209 +
 .../api/core/client/MessageHandler.java         |   31 +
 .../core/client/SendAcknowledgementHandler.java |   41 +
 .../activemq/api/core/client/ServerLocator.java |  790 +++
 .../api/core/client/SessionFailureListener.java |   33 +
 .../api/core/client/TopologyMember.java         |   96 +
 .../ConnectionLoadBalancingPolicy.java          |   28 +
 ...rstElementConnectionLoadBalancingPolicy.java |   33 +
 .../RandomConnectionLoadBalancingPolicy.java    |   35 +
 ...ndomStickyConnectionLoadBalancingPolicy.java |   41 +
 ...RoundRobinConnectionLoadBalancingPolicy.java |   63 +
 .../core/client/loadbalance/package-info.java   |   21 +
 .../activemq/api/core/client/package-info.java  |   19 +
 .../api/core/management/AcceptorControl.java    |   43 +
 .../api/core/management/AddressControl.java     |   77 +
 .../core/management/AddressSettingsInfo.java    |  206 +
 .../api/core/management/BridgeControl.java      |   83 +
 .../core/management/BroadcastGroupControl.java  |   58 +
 .../management/ClusterConnectionControl.java    |   85 +
 .../core/management/CoreNotificationType.java   |   54 +
 .../api/core/management/DayCounterInfo.java     |  102 +
 .../api/core/management/DivertControl.java      |   59 +
 .../management/HornetQComponentControl.java     |   36 +
 .../core/management/HornetQServerControl.java   |  621 ++
 .../api/core/management/ManagementHelper.java   |  459 ++
 .../api/core/management/NotificationType.java   |   30 +
 .../api/core/management/ObjectNameBuilder.java  |  203 +
 .../activemq/api/core/management/Operation.java |   39 +
 .../activemq/api/core/management/Parameter.java |   35 +
 .../api/core/management/QueueControl.java       |  379 ++
 .../api/core/management/ResourceNames.java      |   56 +
 .../activemq/api/core/management/RoleInfo.java  |  148 +
 .../api/core/management/package-info.java       |   20 +
 .../apache/activemq/api/core/package-info.java  |   20 +
 .../impl/ResetLimitWrappedHornetQBuffer.java    |  392 ++
 .../core/client/HornetQClientLogger.java        |  415 ++
 .../core/client/HornetQClientMessageBundle.java |  247 +
 .../core/client/impl/AddressQueryImpl.java      |   44 +
 .../impl/AfterConnectInternalListener.java      |   27 +
 .../core/client/impl/ClientConsumerImpl.java    | 1239 ++++
 .../client/impl/ClientConsumerInternal.java     |   72 +
 .../client/impl/ClientLargeMessageImpl.java     |  225 +
 .../client/impl/ClientLargeMessageInternal.java |   31 +
 .../core/client/impl/ClientMessageImpl.java     |  413 ++
 .../core/client/impl/ClientMessageInternal.java |   46 +
 .../impl/ClientProducerCreditManager.java       |   42 +
 .../impl/ClientProducerCreditManagerImpl.java   |  233 +
 .../core/client/impl/ClientProducerCredits.java |   46 +
 .../client/impl/ClientProducerCreditsImpl.java  |  228 +
 .../core/client/impl/ClientProducerImpl.java    |  607 ++
 .../client/impl/ClientProducerInternal.java     |   29 +
 .../client/impl/ClientSessionFactoryImpl.java   | 1609 +++++
 .../impl/ClientSessionFactoryInternal.java      |   63 +
 .../core/client/impl/ClientSessionImpl.java     | 1959 ++++++
 .../core/client/impl/ClientSessionInternal.java |  121 +
 .../CompressedLargeMessageControllerImpl.java   |  769 +++
 .../core/client/impl/DelegatingSession.java     |  655 ++
 .../core/client/impl/HornetQXAResource.java     |   20 +
 .../client/impl/LargeMessageController.java     |   66 +
 .../client/impl/LargeMessageControllerImpl.java | 1499 +++++
 .../core/client/impl/QueueQueryImpl.java        |   99 +
 .../core/client/impl/ServerLocatorImpl.java     | 2126 ++++++
 .../core/client/impl/ServerLocatorInternal.java |   86 +
 .../activemq/core/client/impl/Topology.java     |  546 ++
 .../core/client/impl/TopologyMemberImpl.java    |  138 +
 .../activemq/core/cluster/DiscoveryEntry.java   |   58 +
 .../activemq/core/cluster/DiscoveryGroup.java   |  432 ++
 .../core/cluster/DiscoveryListener.java         |   30 +
 .../core/exception/HornetQXAException.java      |   39 +
 .../activemq/core/message/BodyEncoder.java      |   54 +
 .../activemq/core/message/impl/MessageImpl.java | 1126 ++++
 .../core/message/impl/MessageInternal.java      |   64 +
 .../core/protocol/ClientPacketDecoder.java      |   71 +
 .../activemq/core/protocol/core/Channel.java    |  202 +
 .../core/protocol/core/ChannelHandler.java      |   30 +
 .../core/CommandConfirmationHandler.java        |   31 +
 .../protocol/core/CoreRemotingConnection.java   |  104 +
 .../activemq/core/protocol/core/Packet.java     |   86 +
 .../core/protocol/core/impl/ChannelImpl.java    |  705 ++
 .../core/impl/HornetQClientProtocolManager.java |  613 ++
 .../HornetQClientProtocolManagerFactory.java    |   42 +
 .../core/impl/HornetQConsumerContext.java       |   54 +
 .../core/impl/HornetQSessionContext.java        |  940 +++
 .../core/protocol/core/impl/PacketDecoder.java  |  474 ++
 .../core/protocol/core/impl/PacketImpl.java     |  379 ++
 .../core/impl/RemotingConnectionImpl.java       |  470 ++
 .../impl/wireformat/CheckFailoverMessage.java   |   49 +
 .../wireformat/CheckFailoverReplyMessage.java   |   56 +
 .../ClusterTopologyChangeMessage.java           |  217 +
 .../ClusterTopologyChangeMessage_V2.java        |  192 +
 .../ClusterTopologyChangeMessage_V3.java        |  108 +
 .../impl/wireformat/CreateQueueMessage.java     |  205 +
 .../impl/wireformat/CreateSessionMessage.java   |  272 +
 .../CreateSessionResponseMessage.java           |   91 +
 .../wireformat/CreateSharedQueueMessage.java    |  180 +
 .../wireformat/DisconnectConsumerMessage.java   |   50 +
 .../core/impl/wireformat/DisconnectMessage.java |  120 +
 .../impl/wireformat/DisconnectMessage_V2.java   |  105 +
 .../wireformat/HornetQExceptionMessage.java     |  118 +
 .../core/impl/wireformat/MessagePacket.java     |   42 +
 .../impl/wireformat/NullResponseMessage.java    |   33 +
 .../wireformat/PacketsConfirmedMessage.java     |  105 +
 .../protocol/core/impl/wireformat/Ping.java     |  103 +
 .../impl/wireformat/ReattachSessionMessage.java |  106 +
 .../ReattachSessionResponseMessage.java         |  109 +
 .../core/impl/wireformat/RollbackMessage.java   |   97 +
 .../wireformat/SessionAcknowledgeMessage.java   |  111 +
 .../wireformat/SessionAddMetaDataMessage.java   |  111 +
 .../wireformat/SessionAddMetaDataMessageV2.java |  140 +
 .../wireformat/SessionBindingQueryMessage.java  |   87 +
 .../SessionBindingQueryResponseMessage.java     |  119 +
 .../impl/wireformat/SessionCloseMessage.java    |   54 +
 .../impl/wireformat/SessionCommitMessage.java   |   34 +
 .../wireformat/SessionConsumerCloseMessage.java |   86 +
 .../SessionConsumerFlowCreditMessage.java       |   98 +
 .../wireformat/SessionContinuationMessage.java  |  121 +
 .../SessionCreateConsumerMessage.java           |  170 +
 .../wireformat/SessionDeleteQueueMessage.java   |   93 +
 .../impl/wireformat/SessionExpireMessage.java   |  103 +
 .../SessionForceConsumerDelivery.java           |  104 +
 .../SessionIndividualAcknowledgeMessage.java    |  119 +
 .../SessionProducerCreditsFailMessage.java      |   98 +
 .../SessionProducerCreditsMessage.java          |   98 +
 .../wireformat/SessionQueueQueryMessage.java    |   87 +
 .../SessionQueueQueryResponseMessage.java       |  231 +
 .../SessionReceiveClientLargeMessage.java       |   38 +
 .../SessionReceiveContinuationMessage.java      |  135 +
 .../wireformat/SessionReceiveLargeMessage.java  |  139 +
 .../impl/wireformat/SessionReceiveMessage.java  |  134 +
 .../SessionRequestProducerCreditsMessage.java   |  106 +
 .../SessionSendContinuationMessage.java         |  157 +
 .../wireformat/SessionSendLargeMessage.java     |   91 +
 .../impl/wireformat/SessionSendMessage.java     |  134 +
 .../SessionUniqueAddMetaDataMessage.java        |   55 +
 .../wireformat/SessionXAAfterFailedMessage.java |   99 +
 .../impl/wireformat/SessionXACommitMessage.java |  111 +
 .../impl/wireformat/SessionXAEndMessage.java    |  105 +
 .../impl/wireformat/SessionXAForgetMessage.java |   86 +
 .../SessionXAGetInDoubtXidsResponseMessage.java |  106 +
 .../SessionXAGetTimeoutResponseMessage.java     |   84 +
 .../impl/wireformat/SessionXAJoinMessage.java   |   86 +
 .../wireformat/SessionXAPrepareMessage.java     |   94 +
 .../wireformat/SessionXAResponseMessage.java    |  118 +
 .../impl/wireformat/SessionXAResumeMessage.java |   88 +
 .../wireformat/SessionXARollbackMessage.java    |   95 +
 .../wireformat/SessionXASetTimeoutMessage.java  |   80 +
 .../SessionXASetTimeoutResponseMessage.java     |   86 +
 .../impl/wireformat/SessionXAStartMessage.java  |   98 +
 .../SubscribeClusterTopologyUpdatesMessage.java |  102 +
 ...ubscribeClusterTopologyUpdatesMessageV2.java |   87 +
 .../activemq/core/remoting/CloseListener.java   |   28 +
 .../activemq/core/remoting/FailureListener.java |   41 +
 .../impl/TransportConfigurationUtil.java        |   92 +
 .../impl/netty/HornetQAMQPFrameDecoder.java     |   41 +
 .../impl/netty/HornetQChannelHandler.java       |  122 +
 .../impl/netty/HornetQFrameDecoder2.java        |   39 +
 .../remoting/impl/netty/NettyConnection.java    |  448 ++
 .../remoting/impl/netty/NettyConnector.java     | 1266 ++++
 .../impl/netty/NettyConnectorFactory.java       |   61 +
 .../netty/PartialPooledByteBufAllocator.java    |  152 +
 .../impl/netty/SharedNioEventLoopGroup.java     |  150 +
 .../remoting/impl/netty/TransportConstants.java |  281 +
 .../core/remoting/impl/ssl/SSLSupport.java      |  188 +
 .../activemq/core/remoting/package-info.java    |   19 +
 .../core/security/HornetQPrincipal.java         |   41 +
 .../org/apache/activemq/core/security/Role.java |  199 +
 .../activemq/core/server/QueueQueryResult.java  |  124 +
 .../core/server/management/Notification.java    |   59 +
 .../server/management/NotificationListener.java |   28 +
 .../server/management/NotificationService.java  |   41 +
 .../settings/impl/AddressFullMessagePolicy.java |   25 +
 .../activemq/core/transaction/impl/XidImpl.java |  218 +
 .../apache/activemq/core/version/Version.java   |   39 +
 .../activemq/core/version/impl/VersionImpl.java |  202 +
 .../activemq/reader/BytesMessageUtil.java       |  233 +
 .../apache/activemq/reader/MapMessageUtil.java  |   59 +
 .../org/apache/activemq/reader/MessageUtil.java |  201 +
 .../activemq/reader/StreamMessageUtil.java      |  300 +
 .../apache/activemq/reader/TextMessageUtil.java |   47 +
 .../apache/activemq/reader/package-info.java    |   21 +
 .../protocol/AbstractRemotingConnection.java    |  219 +
 .../spi/core/protocol/ConnectionEntry.java      |   50 +
 .../spi/core/protocol/RemotingConnection.java   |  181 +
 .../spi/core/remoting/AbstractConnector.java    |   30 +
 .../spi/core/remoting/BufferDecoder.java        |   34 +
 .../spi/core/remoting/BufferHandler.java        |   33 +
 .../core/remoting/ClientProtocolManager.java    |   78 +
 .../remoting/ClientProtocolManagerFactory.java  |   24 +
 .../activemq/spi/core/remoting/Connection.java  |  117 +
 .../remoting/ConnectionLifeCycleListener.java   |   56 +
 .../activemq/spi/core/remoting/Connector.java   |   61 +
 .../spi/core/remoting/ConnectorFactory.java     |   66 +
 .../spi/core/remoting/ConsumerContext.java      |   22 +
 .../spi/core/remoting/ReadyListener.java        |   26 +
 .../spi/core/remoting/SessionContext.java       |  268 +
 .../core/remoting/TopologyResponseHandler.java  |   37 +
 .../spi/core/remoting/package-info.java         |   20 +
 .../org/apache/activemq/utils/BufferHelper.java |  193 +
 .../activemq/utils/ConfigurationHelper.java     |  250 +
 .../utils/ConfirmationWindowWarning.java        |   36 +
 .../apache/activemq/utils/DeflaterReader.java   |  138 +
 .../apache/activemq/utils/ExecutorFactory.java  |   27 +
 .../org/apache/activemq/utils/FutureLatch.java  |   61 +
 .../utils/HornetQBufferInputStream.java         |  181 +
 .../org/apache/activemq/utils/IDGenerator.java  |   31 +
 .../apache/activemq/utils/InflaterReader.java   |  139 +
 .../apache/activemq/utils/InflaterWriter.java   |  110 +
 .../org/apache/activemq/utils/JNDIUtil.java     |  122 +
 .../org/apache/activemq/utils/LinkedList.java   |   35 +
 .../apache/activemq/utils/LinkedListImpl.java   |  456 ++
 .../activemq/utils/LinkedListIterator.java      |   32 +
 .../org/apache/activemq/utils/MemorySize.java   |  140 +
 .../utils/ObjectInputStreamWithClassLoader.java |  195 +
 .../activemq/utils/OrderedExecutorFactory.java  |  143 +
 .../activemq/utils/PriorityLinkedList.java      |   38 +
 .../activemq/utils/PriorityLinkedListImpl.java  |  277 +
 .../java/org/apache/activemq/utils/Random.java  |   46 +
 .../activemq/utils/SecurityFormatter.java       |   73 +
 .../activemq/utils/SimpleIDGenerator.java       |   54 +
 .../activemq/utils/SizeFormatterUtil.java       |   70 +
 .../apache/activemq/utils/SoftValueHashMap.java |  434 ++
 .../utils/TimeAndCounterIDGenerator.java        |  167 +
 .../activemq/utils/TokenBucketLimiter.java      |   34 +
 .../activemq/utils/TokenBucketLimiterImpl.java  |  119 +
 .../apache/activemq/utils/VersionLoader.java    |  252 +
 .../java/org/apache/activemq/utils/XMLUtil.java |  523 ++
 .../apache/activemq/utils/XidCodecSupport.java  |   70 +
 .../apache/activemq/utils/json/JSONArray.java   | 1034 +++
 .../activemq/utils/json/JSONException.java      |   73 +
 .../apache/activemq/utils/json/JSONObject.java  | 1751 +++++
 .../apache/activemq/utils/json/JSONString.java  |   56 +
 .../apache/activemq/utils/json/JSONTokener.java |  476 ++
 .../org/apache/activemq/utils/package-info.java |   19 +
 .../main/resources/hornetq-version.properties   |    9 +
 .../apache/activemq/tests/CoreUnitTestCase.java |   85 +
 .../apache/activemq/tests/util/RandomUtil.java  |  169 +
 .../activemq/tests/util/SilentTestCase.java     |   55 +
 .../activemq/util/CompressionUtilTest.java      |  201 +
 .../activemq/util/ConcurrentHashSetTest.java    |  157 +
 .../util/TimeAndCounterIDGeneratorTest.java     |  201 +
 .../util/TypedPropertiesConversionTest.java     |  372 ++
 .../activemq/util/TypedPropertiesTest.java      |  248 +
 .../org/apache/activemq/util/XMLUtilTest.java   |  276 +
 activemq-dto/pom.xml                            |  147 +
 .../apache/activemq/dto/BasicSecurityDTO.java   |   23 +
 .../java/org/apache/activemq/dto/BrokerDTO.java |   40 +
 .../java/org/apache/activemq/dto/CoreDTO.java   |   28 +
 .../java/org/apache/activemq/dto/JmsDTO.java    |   29 +
 .../java/org/apache/activemq/dto/NamingDTO.java |   35 +
 .../org/apache/activemq/dto/SecurityDTO.java    |   26 +
 .../java/org/apache/activemq/dto/XmlUtil.java   |  106 +
 .../org/apache/activemq/dto/package-info.java   |   19 +
 .../org/apache/activemq/dto/jaxb.index          |   19 +
 activemq-jms-client/pom.xml                     |   76 +
 .../activemq/api/jms/HornetQJMSClient.java      |  234 +
 .../activemq/api/jms/HornetQJMSConstants.java   |   38 +
 .../apache/activemq/api/jms/JMSFactoryType.java |   83 +
 .../management/ConnectionFactoryControl.java    |  389 ++
 .../api/jms/management/DestinationControl.java  |   71 +
 .../api/jms/management/JMSConnectionInfo.java   |  102 +
 .../api/jms/management/JMSConsumerInfo.java     |  134 +
 .../api/jms/management/JMSManagementHelper.java |  168 +
 .../api/jms/management/JMSQueueControl.java     |  288 +
 .../api/jms/management/JMSServerControl.java    |  367 +
 .../api/jms/management/JMSSessionInfo.java      |   62 +
 .../api/jms/management/SubscriptionInfo.java    |  142 +
 .../api/jms/management/TopicControl.java        |  149 +
 .../api/jms/management/package-info.java        |   20 +
 .../apache/activemq/api/jms/package-info.java   |   21 +
 .../jms/client/HornetQBytesMessage.java         |  436 ++
 .../activemq/jms/client/HornetQConnection.java  |  862 +++
 .../jms/client/HornetQConnectionFactory.java    |  821 +++
 .../jms/client/HornetQConnectionForContext.java |   34 +
 .../client/HornetQConnectionForContextImpl.java |   91 +
 .../jms/client/HornetQConnectionMetaData.java   |   97 +
 .../activemq/jms/client/HornetQDestination.java |  376 ++
 .../jms/client/HornetQJMSClientBundle.java      |   97 +
 .../jms/client/HornetQJMSClientLogger.java      |   79 +
 .../jms/client/HornetQJMSConnectionFactory.java |   67 +
 .../activemq/jms/client/HornetQJMSConsumer.java |  198 +
 .../activemq/jms/client/HornetQJMSContext.java  |  769 +++
 .../activemq/jms/client/HornetQJMSProducer.java |  800 +++
 .../activemq/jms/client/HornetQMapMessage.java  |  450 ++
 .../activemq/jms/client/HornetQMessage.java     | 1089 +++
 .../jms/client/HornetQMessageConsumer.java      |  253 +
 .../jms/client/HornetQMessageProducer.java      |  601 ++
 .../jms/client/HornetQObjectMessage.java        |  202 +
 .../activemq/jms/client/HornetQQueue.java       |   90 +
 .../jms/client/HornetQQueueBrowser.java         |  169 +
 .../client/HornetQQueueConnectionFactory.java   |   69 +
 .../activemq/jms/client/HornetQSession.java     | 1276 ++++
 .../jms/client/HornetQStreamMessage.java        |  466 ++
 .../jms/client/HornetQTemporaryQueue.java       |   67 +
 .../jms/client/HornetQTemporaryTopic.java       |   53 +
 .../activemq/jms/client/HornetQTextMessage.java |  146 +
 .../activemq/jms/client/HornetQTopic.java       |   85 +
 .../client/HornetQTopicConnectionFactory.java   |   70 +
 .../jms/client/HornetQXAConnection.java         |   70 +
 .../jms/client/HornetQXAConnectionFactory.java  |   76 +
 .../jms/client/HornetQXAJMSContext.java         |   23 +
 .../client/HornetQXAQueueConnectionFactory.java |   71 +
 .../activemq/jms/client/HornetQXASession.java   |   47 +
 .../client/HornetQXATopicConnectionFactory.java |   69 +
 .../activemq/jms/client/JMSExceptionHelper.java |   91 +
 .../jms/client/JMSMessageListenerWrapper.java   |  152 +
 .../activemq/jms/client/JmsExceptionUtils.java  |  100 +
 .../activemq/jms/client/SelectorTranslator.java |  149 +
 .../activemq/jms/client/ThreadAwareContext.java |  152 +
 .../activemq/jms/client/package-info.java       |   22 +
 .../ConnectionFactoryObjectFactory.java         |   43 +
 .../referenceable/DestinationObjectFactory.java |   43 +
 .../SerializableObjectRefAddr.java              |   79 +
 activemq-jms-server/pom.xml                     |   99 +
 .../jms/bridge/ConnectionFactoryFactory.java    |   25 +
 .../activemq/jms/bridge/DestinationFactory.java |   27 +
 .../jms/bridge/HornetQJMSBridgeLogger.java      |  101 +
 .../apache/activemq/jms/bridge/JMSBridge.java   |  115 +
 .../activemq/jms/bridge/JMSBridgeControl.java   |   93 +
 .../jms/bridge/QualityOfServiceMode.java        |  100 +
 .../jms/bridge/impl/JMSBridgeControlImpl.java   |  256 +
 .../activemq/jms/bridge/impl/JMSBridgeImpl.java | 2438 +++++++
 .../impl/JNDIConnectionFactoryFactory.java      |   40 +
 .../jms/bridge/impl/JNDIDestinationFactory.java |   40 +
 .../jms/bridge/impl/JNDIFactorySupport.java     |   67 +
 .../impl/JMSConnectionFactoryControlImpl.java   |  471 ++
 .../management/impl/JMSQueueControlImpl.java    |  389 ++
 .../management/impl/JMSServerControlImpl.java   | 1049 +++
 .../management/impl/JMSTopicControlImpl.java    |  417 ++
 .../jms/persistence/JMSStorageManager.java      |   54 +
 .../config/PersistedConnectionFactory.java      |  111 +
 .../config/PersistedDestination.java            |  128 +
 .../jms/persistence/config/PersistedJNDI.java   |  167 +
 .../jms/persistence/config/PersistedType.java   |   53 +
 .../journal/JMSJournalStorageManagerImpl.java   |  362 +
 .../impl/nullpm/NullJMSStorageManagerImpl.java  |  108 +
 .../jms/server/HornetQJMSServerBundle.java      |   62 +
 .../jms/server/HornetQJMSServerLogger.java      |  115 +
 .../jms/server/JMSServerConfigParser.java       |   65 +
 .../activemq/jms/server/JMSServerManager.java   |  319 +
 .../config/ConnectionFactoryConfiguration.java  |  172 +
 .../jms/server/config/JMSConfiguration.java     |   47 +
 .../server/config/JMSQueueConfiguration.java    |   39 +
 .../jms/server/config/TopicConfiguration.java   |   29 +
 .../ConnectionFactoryConfigurationImpl.java     |  847 +++
 .../config/impl/JMSConfigurationImpl.java       |  103 +
 .../config/impl/JMSQueueConfigurationImpl.java  |  104 +
 .../config/impl/TopicConfigurationImpl.java     |   78 +
 .../TransportConfigurationEncodingSupport.java  |  153 +
 .../jms/server/embedded/EmbeddedJMS.java        |  124 +
 .../server/impl/JMSServerConfigParserImpl.java  |  518 ++
 .../jms/server/impl/JMSServerDeployer.java      |  185 +
 .../jms/server/impl/JMSServerManagerImpl.java   | 1971 ++++++
 .../jms/server/impl/StandaloneNamingServer.java |  167 +
 .../server/management/JMSManagementService.java |   47 +
 .../server/management/JMSNotificationType.java  |   41 +
 .../impl/JMSManagementServiceImpl.java          |  163 +
 .../recovery/HornetQRecoveryRegistry.java       |  250 +
 .../server/recovery/HornetQRegistryBase.java    |   71 +
 .../recovery/HornetQXAResourceRecovery.java     |  231 +
 .../recovery/HornetQXAResourceWrapper.java      |  531 ++
 .../jms/server/recovery/RecoveryDiscovery.java  |  232 +
 .../jms/server/recovery/XARecoveryConfig.java   |  167 +
 .../jms/server/recovery/package-info.java       |   22 +
 .../jms/transaction/JMSTransactionDetail.java   |   78 +
 .../src/main/resources/schema/activemq-jms.xsd  |  267 +
 activemq-journal/pom.xml                        |   92 +
 .../activemq/core/asyncio/AIOCallback.java      |   31 +
 .../activemq/core/asyncio/AsynchronousFile.java |   59 +
 .../activemq/core/asyncio/BufferCallback.java   |   27 +
 .../core/asyncio/IOExceptionListener.java       |   25 +
 .../core/asyncio/impl/AsynchronousFileImpl.java |  819 +++
 .../core/asyncio/impl/HornetQFileLock.java      |   47 +
 .../activemq/core/journal/EncodingSupport.java  |   33 +
 .../activemq/core/journal/IOAsyncTask.java      |   27 +
 .../activemq/core/journal/IOCompletion.java     |   25 +
 .../core/journal/IOCriticalErrorListener.java   |   25 +
 .../apache/activemq/core/journal/Journal.java   |  227 +
 .../core/journal/JournalLoadInformation.java    |  116 +
 .../activemq/core/journal/LoaderCallback.java   |   29 +
 .../core/journal/PreparedTransactionInfo.java   |   42 +
 .../activemq/core/journal/RecordInfo.java       |   86 +
 .../activemq/core/journal/SequentialFile.java   |  131 +
 .../core/journal/SequentialFileFactory.java     |   88 +
 .../activemq/core/journal/TestableJournal.java  |   70 +
 .../journal/TransactionFailureCallback.java     |   31 +
 .../core/journal/impl/AIOSequentialFile.java    |  329 +
 .../journal/impl/AIOSequentialFileFactory.java  |  358 +
 .../journal/impl/AbstractJournalUpdateTask.java |  253 +
 .../journal/impl/AbstractSequentialFile.java    |  408 ++
 .../impl/AbstractSequentialFileFactory.java     |  220 +
 .../core/journal/impl/CompactJournal.java       |   66 +
 .../core/journal/impl/DummyCallback.java        |   51 +
 .../core/journal/impl/ExportJournal.java        |  206 +
 .../core/journal/impl/FileWrapperJournal.java   |  337 +
 .../core/journal/impl/ImportJournal.java        |  388 ++
 .../activemq/core/journal/impl/JournalBase.java |  217 +
 .../core/journal/impl/JournalCompactor.java     |  639 ++
 .../core/journal/impl/JournalConstants.java     |   23 +
 .../activemq/core/journal/impl/JournalFile.java |   67 +
 .../core/journal/impl/JournalFileImpl.java      |  206 +
 .../journal/impl/JournalFilesRepository.java    |  767 +++
 .../activemq/core/journal/impl/JournalImpl.java | 3252 +++++++++
 .../journal/impl/JournalReaderCallback.java     |   79 +
 .../impl/JournalReaderCallbackAbstract.java     |   67 +
 .../core/journal/impl/JournalRecord.java        |   96 +
 .../journal/impl/JournalRecordProvider.java     |   33 +
 .../core/journal/impl/JournalTransaction.java   |  456 ++
 .../core/journal/impl/NIOSequentialFile.java    |  415 ++
 .../journal/impl/NIOSequentialFileFactory.java  |  171 +
 .../activemq/core/journal/impl/Reclaimer.java   |  118 +
 .../core/journal/impl/SimpleWaitIOCallback.java |   92 +
 .../core/journal/impl/SyncIOCompletion.java     |   47 +
 .../core/journal/impl/SyncSpeedTest.java        |  354 +
 .../activemq/core/journal/impl/TimedBuffer.java |  560 ++
 .../core/journal/impl/TimedBufferObserver.java  |   55 +
 .../core/journal/impl/TransactionCallback.java  |  116 +
 .../impl/dataformat/ByteArrayEncoding.java      |   51 +
 .../impl/dataformat/JournalAddRecord.java       |   85 +
 .../impl/dataformat/JournalAddRecordTX.java     |   96 +
 .../dataformat/JournalCompleteRecordTX.java     |  114 +
 .../impl/dataformat/JournalDeleteRecord.java    |   56 +
 .../impl/dataformat/JournalDeleteRecordTX.java  |   77 +
 .../impl/dataformat/JournalInternalRecord.java  |   73 +
 .../dataformat/JournalRollbackRecordTX.java     |   50 +
 .../activemq/journal/HornetQJournalBundle.java  |   48 +
 .../activemq/journal/HornetQJournalLogger.java  |  271 +
 .../asyncio/LibaioDependencyCheckTest.java      |   57 +
 activemq-native/README                          |   46 +
 activemq-native/bin/libactivemqAIO64.so         |  Bin 0 -> 51692 bytes
 activemq-native/compile-native.sh               |    1 +
 activemq-native/pom.xml                         |  126 +
 activemq-native/src/main/c/AIOController.cpp    |   59 +
 activemq-native/src/main/c/AIOController.h      |   47 +
 activemq-native/src/main/c/AIOException.h       |   71 +
 activemq-native/src/main/c/AsyncFile.cpp        |  344 +
 activemq-native/src/main/c/AsyncFile.h          |   89 +
 activemq-native/src/main/c/CallbackAdapter.h    |   38 +
 activemq-native/src/main/c/JAIODatatypes.h      |   24 +
 .../src/main/c/JNICallbackAdapter.cpp           |   58 +
 activemq-native/src/main/c/JNICallbackAdapter.h |   62 +
 .../src/main/c/JNI_AsynchronousFileImpl.cpp     |  373 ++
 activemq-native/src/main/c/JavaUtilities.cpp    |   58 +
 activemq-native/src/main/c/JavaUtilities.h      |   22 +
 activemq-native/src/main/c/LockClass.h          |   35 +
 activemq-native/src/main/c/Version.h            |    8 +
 .../org/apache/activemq/core/libaio/Native.java |   74 +
 .../activemq-amqp-protocol/pom.xml              |   76 +
 .../proton/HornetQProtonRemotingConnection.java |  146 +
 .../protocol/proton/ProtonProtocolManager.java  |  122 +
 .../proton/ProtonProtocolManagerFactory.java    |   43 +
 .../proton/converter/HornetQJMSVendor.java      |  155 +
 .../converter/ProtonMessageConverter.java       |   78 +
 .../converter/jms/ServerJMSBytesMessage.java    |  239 +
 .../converter/jms/ServerJMSMapMessage.java      |  326 +
 .../proton/converter/jms/ServerJMSMessage.java  |  435 ++
 .../converter/jms/ServerJMSStreamMessage.java   |  417 ++
 .../converter/jms/ServerJMSTextMessage.java     |  112 +
 .../proton/converter/jms/package-info.java      |   21 +
 .../plug/HornetQProtonConnectionCallback.java   |  125 +
 .../plug/ProtonSessionIntegrationCallback.java  |  341 +
 .../core/protocol/proton/plug/package-info.java |   18 +
 .../protocol/proton/sasl/HornetQPlainSASL.java  |   50 +
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 +
 .../core/protocol/proton/TestConversions.java   |  841 +++
 .../activemq-openwire-protocol/pom.xml          |   49 +
 .../protocol/openwire/AMQConnectorImpl.java     |  121 +
 .../protocol/openwire/AMQTransactionImpl.java   |   74 +
 .../core/protocol/openwire/BrokerState.java     |   23 +
 .../protocol/openwire/DataInputWrapper.java     |  257 +
 .../openwire/NotEnoughBytesException.java       |   21 +
 .../protocol/openwire/OpenWireConnection.java   | 1765 +++++
 .../openwire/OpenWireMessageConverter.java      |  787 +++
 .../openwire/OpenWireProtocolManager.java       |  756 +++
 .../OpenWireProtocolManagerFactory.java         |   46 +
 .../core/protocol/openwire/OpenWireUtil.java    |   57 +
 .../core/protocol/openwire/SendingResult.java   |   63 +
 .../amq/AMQAbstractDeadLetterStrategy.java      |  107 +
 .../openwire/amq/AMQBrokerStoppedException.java |   41 +
 .../openwire/amq/AMQConnectionContext.java      |  393 ++
 .../protocol/openwire/amq/AMQConnector.java     |   70 +
 .../openwire/amq/AMQConnectorStatistics.java    |  116 +
 .../core/protocol/openwire/amq/AMQConsumer.java |  390 ++
 .../openwire/amq/AMQConsumerBrokerExchange.java |   89 +
 .../openwire/amq/AMQDeadLetterStrategy.java     |   65 +
 .../protocol/openwire/amq/AMQDestination.java   |  240 +
 .../openwire/amq/AMQDestinationStatistics.java  |  228 +
 .../AMQMapTransportConnectionStateRegister.java |  147 +
 .../amq/AMQMessageAuthorizationPolicy.java      |   28 +
 .../protocol/openwire/amq/AMQMessageStore.java  |   18 +
 .../openwire/amq/AMQPersistenceAdapter.java     |   58 +
 .../core/protocol/openwire/amq/AMQProducer.java |   33 +
 .../openwire/amq/AMQProducerBrokerExchange.java |  264 +
 .../openwire/amq/AMQSecurityContext.java        |   91 +
 .../openwire/amq/AMQServerConsumer.java         |  183 +
 .../protocol/openwire/amq/AMQServerSession.java |  451 ++
 .../openwire/amq/AMQServerSessionFactory.java   |   50 +
 .../core/protocol/openwire/amq/AMQSession.java  |  590 ++
 .../amq/AMQSharedDeadLetterStrategy.java        |   55 +
 ...QSingleTransportConnectionStateRegister.java |  183 +
 .../openwire/amq/AMQSlowConsumerStrategy.java   |   39 +
 .../protocol/openwire/amq/AMQSubscription.java  |  241 +
 .../openwire/amq/AMQSubscriptionRecovery.java   |   42 +
 .../protocol/openwire/amq/AMQTransaction.java   |  249 +
 .../openwire/amq/AMQTransactionFactory.java     |   29 +
 .../amq/AMQTransportConnectionState.java        |   86 +
 .../AMQTransportConnectionStateRegister.java    |   58 +
 .../protocol/openwire/amq/BrowserListener.java  |   18 +
 .../core/protocol/openwire/amq/MessageInfo.java |   47 +
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 +
 activemq-protocols/activemq-proton-plug/pom.xml |   80 +
 .../plug/AMQPClientConnectionContext.java       |   34 +
 .../proton/plug/AMQPClientReceiverContext.java  |   29 +
 .../proton/plug/AMQPClientSenderContext.java    |   25 +
 .../proton/plug/AMQPClientSessionContext.java   |   27 +
 .../org/proton/plug/AMQPConnectionCallback.java |   41 +
 .../org/proton/plug/AMQPConnectionContext.java  |   68 +
 .../plug/AMQPConnectionContextFactory.java      |   26 +
 .../plug/AMQPServerConnectionContext.java       |   22 +
 .../org/proton/plug/AMQPSessionCallback.java    |   85 +
 .../org/proton/plug/AMQPSessionContext.java     |   35 +
 .../main/java/org/proton/plug/ClientSASL.java   |   24 +
 .../main/java/org/proton/plug/SASLResult.java   |   25 +
 .../main/java/org/proton/plug/ServerSASL.java   |   25 +
 .../plug/context/AbstractConnectionContext.java |  282 +
 .../context/AbstractProtonContextSender.java    |  154 +
 .../context/AbstractProtonReceiverContext.java  |   67 +
 .../context/AbstractProtonSessionContext.java   |  189 +
 .../plug/context/ProtonDeliveryHandler.java     |   31 +
 .../plug/context/ProtonInitializable.java       |   83 +
 .../proton/plug/context/ProtonPlugSender.java   |   27 +
 .../plug/context/ProtonTransactionHandler.java  |  134 +
 .../client/ProtonClientConnectionContext.java   |   97 +
 .../ProtonClientConnectionContextFactory.java   |   39 +
 .../context/client/ProtonClientContext.java     |   82 +
 .../client/ProtonClientReceiverContext.java     |   89 +
 .../client/ProtonClientSessionContext.java      |   91 +
 .../server/ProtonServerConnectionContext.java   |   76 +
 .../ProtonServerConnectionContextFactory.java   |   38 +
 .../server/ProtonServerReceiverContext.java     |  159 +
 .../server/ProtonServerSenderContext.java       |  283 +
 .../server/ProtonServerSessionContext.java      |  124 +
 .../plug/exceptions/HornetQAMQPException.java   |   45 +
 .../HornetQAMQPIllegalStateException.java       |   28 +
 .../HornetQAMQPInternalErrorException.java      |   33 +
 .../HornetQAMQPInvalidFieldException.java       |   28 +
 .../HornetQAMQPNotImplementedException.java     |   28 +
 .../exceptions/HornetQAMQPTimeoutException.java |   29 +
 .../org/proton/plug/handler/EventHandler.java   |   80 +
 .../java/org/proton/plug/handler/Events.java    |  109 +
 .../org/proton/plug/handler/ProtonHandler.java  |  134 +
 .../plug/handler/impl/DefaultEventHandler.java  |  167 +
 .../plug/handler/impl/ProtonHandlerImpl.java    |  423 ++
 .../HornetQAMQPProtocolMessageBundle.java       |   83 +
 .../proton/plug/sasl/AnonymousServerSASL.java   |   41 +
 .../org/proton/plug/sasl/ClientSASLPlain.java   |   62 +
 .../org/proton/plug/sasl/PlainSASLResult.java   |   51 +
 .../org/proton/plug/sasl/ServerSASLPlain.java   |   75 +
 .../java/org/proton/plug/util/ByteUtil.java     |  152 +
 .../java/org/proton/plug/util/CodecCache.java   |   56 +
 .../org/proton/plug/util/CreditsSemaphore.java  |  134 +
 .../java/org/proton/plug/util/DebugInfo.java    |   23 +
 .../java/org/proton/plug/util/DeliveryUtil.java |   49 +
 .../org/proton/plug/util/FutureRunnable.java    |   70 +
 .../org/proton/plug/util/NettyWritable.java     |  120 +
 .../proton/plug/util/ProtonServerMessage.java   |  596 ++
 .../org/proton/plug/util/ReusableLatch.java     |  156 +
 .../org/proton/plug/test/AbstractJMSTest.java   |  135 +
 .../java/org/proton/plug/test/Constants.java    |   23 +
 .../java/org/proton/plug/test/ProtonTest.java   |  372 ++
 .../plug/test/invm/InVMTestConnector.java       |   38 +
 .../proton/plug/test/invm/ProtonINVMSPI.java    |  209 +
 .../plug/test/minimalclient/AMQPClientSPI.java  |  121 +
 .../plug/test/minimalclient/Connector.java      |   27 +
 .../test/minimalclient/SimpleAMQPConnector.java |   84 +
 .../plug/test/minimalserver/DumbServer.java     |   59 +
 .../minimalserver/MinimalConnectionSPI.java     |  151 +
 .../plug/test/minimalserver/MinimalServer.java  |  184 +
 .../test/minimalserver/MinimalSessionSPI.java   |  219 +
 .../SimpleServerThreadFactory.java              |   90 +
 .../proton/plug/test/sasl/PlainSASLTest.java    |   39 +
 .../plug/test/util/CreditsSemaphoreTest.java    |  149 +
 .../plug/test/util/ReusableLatchTest.java       |  335 +
 .../test/util/SimpleServerAbstractTest.java     |   79 +
 .../activemq-stomp-protocol/pom.xml             |   36 +
 .../core/protocol/stomp/FrameEventListener.java |   26 +
 .../protocol/stomp/HornetQStompException.java   |  134 +
 .../stomp/HornetQStompProtocolLogger.java       |   54 +
 .../HornetQStompProtocolMessageBundle.java      |  152 +
 .../core/protocol/stomp/SimpleBytes.java        |   56 +
 .../activemq/core/protocol/stomp/Stomp.java     |  208 +
 .../core/protocol/stomp/StompCommands.java      |   46 +
 .../core/protocol/stomp/StompConnection.java    |  823 +++
 .../core/protocol/stomp/StompDecoder.java       |  723 ++
 .../core/protocol/stomp/StompFrame.java         |  280 +
 .../protocol/stomp/StompProtocolManager.java    |  499 ++
 .../stomp/StompProtocolManagerFactory.java      |   46 +
 .../core/protocol/stomp/StompSession.java       |  407 ++
 .../core/protocol/stomp/StompSubscription.java  |   68 +
 .../core/protocol/stomp/StompUtils.java         |  140 +
 .../core/protocol/stomp/StompVersions.java      |   37 +
 .../stomp/VersionedStompFrameHandler.java       |  409 ++
 .../stomp/v10/StompFrameHandlerV10.java         |  181 +
 .../core/protocol/stomp/v10/StompFrameV10.java  |   28 +
 .../stomp/v11/StompFrameHandlerV11.java         |  907 +++
 .../core/protocol/stomp/v11/StompFrameV11.java  |  101 +
 .../stomp/v12/StompFrameHandlerV12.java         |  368 +
 .../core/protocol/stomp/v12/StompFrameV12.java  |  107 +
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 +
 activemq-protocols/pom.xml                      |   26 +
 activemq-ra/pom.xml                             |   72 +
 .../ra/ConnectionFactoryProperties.java         |  841 +++
 .../org/apache/activemq/ra/HornetQRABundle.java |   70 +
 .../activemq/ra/HornetQRABytesMessage.java      |  455 ++
 .../activemq/ra/HornetQRAConnectionFactory.java |   65 +
 .../ra/HornetQRAConnectionFactoryImpl.java      |  570 ++
 .../activemq/ra/HornetQRAConnectionManager.java |   90 +
 .../ra/HornetQRAConnectionMetaData.java         |  153 +
 .../ra/HornetQRAConnectionRequestInfo.java      |  306 +
 .../apache/activemq/ra/HornetQRACredential.java |  241 +
 .../apache/activemq/ra/HornetQRAJMSContext.java |   57 +
 .../activemq/ra/HornetQRALocalTransaction.java  |  121 +
 .../org/apache/activemq/ra/HornetQRALogger.java |  122 +
 .../activemq/ra/HornetQRAMCFProperties.java     |  204 +
 .../activemq/ra/HornetQRAManagedConnection.java |  921 +++
 .../ra/HornetQRAManagedConnectionFactory.java   |  805 +++
 .../apache/activemq/ra/HornetQRAMapMessage.java |  452 ++
 .../apache/activemq/ra/HornetQRAMessage.java    |  897 +++
 .../activemq/ra/HornetQRAMessageConsumer.java   |  334 +
 .../activemq/ra/HornetQRAMessageListener.java   |   65 +
 .../activemq/ra/HornetQRAMessageProducer.java   |  473 ++
 .../apache/activemq/ra/HornetQRAMetaData.java   |  107 +
 .../activemq/ra/HornetQRAObjectMessage.java     |   76 +
 .../apache/activemq/ra/HornetQRAProperties.java |  358 +
 .../activemq/ra/HornetQRAQueueReceiver.java     |   61 +
 .../activemq/ra/HornetQRAQueueSender.java       |  138 +
 .../apache/activemq/ra/HornetQRAService.java    |   82 +
 .../apache/activemq/ra/HornetQRASession.java    | 1903 ++++++
 .../activemq/ra/HornetQRASessionFactory.java    |   51 +
 .../ra/HornetQRASessionFactoryImpl.java         | 1046 +++
 .../activemq/ra/HornetQRAStreamMessage.java     |  408 ++
 .../activemq/ra/HornetQRATextMessage.java       |   74 +
 .../activemq/ra/HornetQRATopicPublisher.java    |  211 +
 .../activemq/ra/HornetQRATopicSubscriber.java   |   77 +
 .../activemq/ra/HornetQRAXAJMSContext.java      |   26 +
 .../apache/activemq/ra/HornetQRAXAResource.java |  257 +
 .../org/apache/activemq/ra/HornetQRaUtils.java  |  354 +
 .../activemq/ra/HornetQResourceAdapter.java     | 2411 +++++++
 .../activemq/ra/HornetQXAResourceWrapper.java   |  143 +
 .../activemq/ra/inflow/HornetQActivation.java   |  831 +++
 .../ra/inflow/HornetQActivationSpec.java        |  945 +++
 .../ra/inflow/HornetQMessageHandler.java        |  430 ++
 .../java/org/apache/activemq/ra/package.html    |   24 +
 .../activemq/ra/recovery/RecoveryManager.java   |  134 +
 activemq-rest/pom.xml                           |  109 +
 .../apache/activemq/rest/HornetQRestBundle.java |   31 +
 .../apache/activemq/rest/HornetQRestLogger.java |   85 +
 .../java/org/apache/activemq/rest/Hornetq.java  |  191 +
 .../activemq/rest/HttpHeaderProperty.java       |   44 +
 .../main/java/org/apache/activemq/rest/Jms.java |  197 +
 .../rest/MessageServiceConfiguration.java       |  157 +
 .../activemq/rest/MessageServiceManager.java    |  221 +
 .../apache/activemq/rest/UnknownMediaType.java  |   27 +
 .../activemq/rest/UnmarshalException.java       |   32 +
 .../rest/integration/EmbeddedRestHornetQ.java   |   92 +
 .../integration/EmbeddedRestHornetQJMS.java     |   36 +
 .../integration/HornetqBootstrapListener.java   |   55 +
 .../RestMessagingBootstrapListener.java         |   63 +
 .../ServletContextBindingRegistry.java          |   61 +
 .../rest/queue/AcknowledgedQueueConsumer.java   |  276 +
 .../activemq/rest/queue/Acknowledgement.java    |   66 +
 .../rest/queue/ConsumedHttpMessage.java         |   51 +
 .../activemq/rest/queue/ConsumedMessage.java    |   74 +
 .../rest/queue/ConsumedObjectMessage.java       |   61 +
 .../activemq/rest/queue/ConsumersResource.java  |  327 +
 .../rest/queue/DestinationResource.java         |   54 +
 .../rest/queue/DestinationServiceManager.java   |  185 +
 .../rest/queue/DestinationSettings.java         |   63 +
 .../apache/activemq/rest/queue/PostMessage.java |  300 +
 .../activemq/rest/queue/PostMessageDupsOk.java  |  101 +
 .../activemq/rest/queue/PostMessageNoDups.java  |   41 +
 .../activemq/rest/queue/QueueConsumer.java      |  288 +
 .../activemq/rest/queue/QueueDeployment.java    |   43 +
 .../rest/queue/QueueDestinationsResource.java   |  207 +
 .../activemq/rest/queue/QueueResource.java      |  209 +
 .../rest/queue/QueueServiceManager.java         |  119 +
 .../activemq/rest/queue/push/FilePushStore.java |  120 +
 .../rest/queue/push/HornetQPushStrategy.java    |   87 +
 .../activemq/rest/queue/push/PushConsumer.java  |  161 +
 .../queue/push/PushConsumerMessageHandler.java  |   81 +
 .../rest/queue/push/PushConsumerResource.java   |  163 +
 .../activemq/rest/queue/push/PushStore.java     |   34 +
 .../activemq/rest/queue/push/PushStrategy.java  |   39 +
 .../activemq/rest/queue/push/UriStrategy.java   |  239 +
 .../rest/queue/push/UriTemplateStrategy.java    |   29 +
 .../rest/queue/push/xml/Authentication.java     |   51 +
 .../rest/queue/push/xml/AuthenticationType.java |   26 +
 .../activemq/rest/queue/push/xml/BasicAuth.java |   58 +
 .../rest/queue/push/xml/DigestAuth.java         |   25 +
 .../rest/queue/push/xml/PushRegistration.java   |  211 +
 .../rest/queue/push/xml/XmlHttpHeader.java      |   65 +
 .../activemq/rest/queue/push/xml/XmlLink.java   |  103 +
 .../topic/AcknowledgedSubscriptionResource.java |   66 +
 .../activemq/rest/topic/FileTopicPushStore.java |   46 +
 .../activemq/rest/topic/PushSubscription.java   |   67 +
 .../rest/topic/PushSubscriptionsResource.java   |  257 +
 .../rest/topic/PushTopicRegistration.java       |   45 +
 .../activemq/rest/topic/Subscription.java       |   32 +
 .../rest/topic/SubscriptionResource.java        |   66 +
 .../rest/topic/SubscriptionsResource.java       |  519 ++
 .../activemq/rest/topic/TopicDeployment.java    |   44 +
 .../rest/topic/TopicDestinationsResource.java   |  201 +
 .../activemq/rest/topic/TopicPushStore.java     |   26 +
 .../activemq/rest/topic/TopicResource.java      |  214 +
 .../rest/topic/TopicServiceManager.java         |  122 +
 .../apache/activemq/rest/util/Constants.java    |   23 +
 .../rest/util/CustomHeaderLinkStrategy.java     |   45 +
 .../activemq/rest/util/HttpMessageHelper.java   |  173 +
 .../rest/util/LinkHeaderLinkStrategy.java       |   56 +
 .../apache/activemq/rest/util/LinkStrategy.java |   24 +
 .../apache/activemq/rest/util/TimeoutTask.java  |  198 +
 .../src/main/resources/schema/hornetq-rest.xsd  |  103 +
 .../activemq/rest/test/AutoAckQueueTest.java    |   86 +
 .../activemq/rest/test/AutoAckTopicTest.java    |  230 +
 .../activemq/rest/test/ClientAckQueueTest.java  |  387 ++
 .../activemq/rest/test/ClientAckTopicTest.java  |  338 +
 .../rest/test/CreateDestinationTest.java        |  186 +
 .../apache/activemq/rest/test/DupQueueTest.java |  155 +
 .../org/apache/activemq/rest/test/Embedded.java |  104 +
 .../apache/activemq/rest/test/EmbeddedTest.java |  154 +
 .../activemq/rest/test/FindDestinationTest.java |  126 +
 .../org/apache/activemq/rest/test/JMSTest.java  |  298 +
 .../activemq/rest/test/MessageTestBase.java     |   89 +
 .../test/PersistentPushQueueConsumerTest.java   |  213 +
 .../test/PersistentPushTopicConsumerTest.java   |  257 +
 .../rest/test/PushQueueConsumerTest.java        |  375 ++
 .../rest/test/PushTopicConsumerTest.java        |  372 ++
 .../apache/activemq/rest/test/RawAckTest.java   |  161 +
 .../activemq/rest/test/RepostingQueueTest.java  |  575 ++
 .../activemq/rest/test/RepostingTopicTest.java  |  712 ++
 .../activemq/rest/test/RoundtripTimeTest.java   |   72 +
 .../apache/activemq/rest/test/SelectorTest.java |  334 +
 .../apache/activemq/rest/test/SessionTest.java  |  313 +
 .../activemq/rest/test/TransformTest.java       |  264 +
 .../org/apache/activemq/rest/test/Util.java     |   49 +
 .../org/apache/activemq/rest/test/XmlTest.java  |   46 +
 .../test/resources/hornetq-configuration.xml    |   34 +
 .../src/test/resources/hornetq-jms.xml          |   19 +
 .../src/test/resources/hornetq-rest.xml         |    3 +
 .../src/test/resources/hornetq-users.xml        |    7 +
 activemq-selector/pom.xml                       |   96 +
 .../org/apache/activemq/selector/LRUCache.java  |  100 +
 .../activemq/selector/SelectorParser.java       |  123 +
 .../selector/filter/ArithmeticExpression.java   |  258 +
 .../selector/filter/BinaryExpression.java       |  125 +
 .../selector/filter/BooleanExpression.java      |   36 +
 .../selector/filter/ComparisonExpression.java   |  651 ++
 .../selector/filter/ConstantExpression.java     |  194 +
 .../activemq/selector/filter/Expression.java    |   34 +
 .../selector/filter/FilterException.java        |   45 +
 .../activemq/selector/filter/Filterable.java    |   54 +
 .../selector/filter/LogicExpression.java        |  102 +
 .../selector/filter/PropertyExpression.java     |   75 +
 .../selector/filter/UnaryExpression.java        |  334 +
 .../selector/filter/XPathExpression.java        |   90 +
 .../selector/filter/XQueryExpression.java       |   54 +
 .../selector/filter/XalanXPathEvaluator.java    |   86 +
 .../activemq/selector/filter/package.html       |   27 +
 .../src/main/javacc/HyphenatedParser.jj         |  563 ++
 .../src/main/javacc/StrictParser.jj             |  563 ++
 .../activemq/selector/SelectorParserTest.java   |   83 +
 .../apache/activemq/selector/SelectorTest.java  |  555 ++
 activemq-server/pom.xml                         |  123 +
 .../api/core/management/MessageCounterInfo.java |  190 +
 .../activemq/core/config/BackupStrategy.java    |   20 +
 .../core/config/BridgeConfiguration.java        |  514 ++
 .../config/ClusterConnectionConfiguration.java  |  495 ++
 .../activemq/core/config/Configuration.java     | 1036 +++
 .../core/config/ConfigurationUtils.java         |  142 +
 .../config/ConnectorServiceConfiguration.java   |  102 +
 .../core/config/CoreQueueConfiguration.java     |  140 +
 .../core/config/DivertConfiguration.java        |  216 +
 .../core/config/HAPolicyConfiguration.java      |   30 +
 .../core/config/ScaleDownConfiguration.java     |   93 +
 .../config/ha/ColocatedPolicyConfiguration.java |  149 +
 .../config/ha/LiveOnlyPolicyConfiguration.java  |   46 +
 .../config/ha/ReplicaPolicyConfiguration.java   |  124 +
 .../ha/ReplicatedPolicyConfiguration.java       |   68 +
 .../SharedStoreMasterPolicyConfiguration.java   |   55 +
 .../ha/SharedStoreSlavePolicyConfiguration.java |   96 +
 .../core/config/impl/ConfigurationImpl.java     | 1734 +++++
 .../core/config/impl/FileConfiguration.java     |  104 +
 .../activemq/core/config/impl/Validators.java   |  183 +
 .../activemq/core/deployers/Deployer.java       |   53 +
 .../core/deployers/DeploymentManager.java       |   37 +
 .../deployers/impl/AddressSettingsDeployer.java |  102 +
 .../impl/BasicUserCredentialsDeployer.java      |  145 +
 .../deployers/impl/FileConfigurationParser.java | 1948 ++++++
 .../deployers/impl/FileDeploymentManager.java   |  333 +
 .../core/deployers/impl/QueueDeployer.java      |   93 +
 .../core/deployers/impl/SecurityDeployer.java   |  113 +
 .../core/deployers/impl/XmlDeployer.java        |  330 +
 .../org/apache/activemq/core/filter/Filter.java |   30 +
 .../activemq/core/filter/impl/FilterImpl.java   |  246 +
 .../core/management/impl/AbstractControl.java   |   99 +
 .../management/impl/AcceptorControlImpl.java    |  151 +
 .../management/impl/AddressControlImpl.java     |  281 +
 .../core/management/impl/BridgeControlImpl.java |  267 +
 .../impl/BroadcastGroupControlImpl.java         |  232 +
 .../impl/ClusterConnectionControlImpl.java      |  294 +
 .../core/management/impl/DivertControlImpl.java |  163 +
 .../impl/HornetQServerControlImpl.java          | 2187 ++++++
 .../core/management/impl/MBeanInfoHelper.java   |  156 +
 .../core/management/impl/QueueControlImpl.java  | 1053 +++
 .../core/messagecounter/MessageCounter.java     |  602 ++
 .../messagecounter/MessageCounterManager.java   |   44 +
 .../impl/MessageCounterHelper.java              |  227 +
 .../impl/MessageCounterManagerImpl.java         |  230 +
 .../core/paging/PageTransactionInfo.java        |   66 +
 .../activemq/core/paging/PagedMessage.java      |   36 +
 .../activemq/core/paging/PagingManager.java     |   87 +
 .../activemq/core/paging/PagingStore.java       |  174 +
 .../core/paging/PagingStoreFactory.java         |   40 +
 .../core/paging/cursor/LivePageCache.java       |   28 +
 .../activemq/core/paging/cursor/PageCache.java  |   60 +
 .../core/paging/cursor/PageCursorProvider.java  |   78 +
 .../core/paging/cursor/PagePosition.java        |   41 +
 .../core/paging/cursor/PageSubscription.java    |  158 +
 .../paging/cursor/PageSubscriptionCounter.java  |   59 +
 .../core/paging/cursor/PagedReference.java      |   28 +
 .../core/paging/cursor/PagedReferenceImpl.java  |  265 +
 .../paging/cursor/impl/LivePageCacheImpl.java   |  124 +
 .../core/paging/cursor/impl/PageCacheImpl.java  |  128 +
 .../cursor/impl/PageCursorProviderImpl.java     |  677 ++
 .../paging/cursor/impl/PagePositionImpl.java    |  162 +
 .../impl/PageSubscriptionCounterImpl.java       |  421 ++
 .../cursor/impl/PageSubscriptionImpl.java       | 1479 +++++
 .../apache/activemq/core/paging/impl/Page.java  |  422 ++
 .../core/paging/impl/PageSyncTimer.java         |  114 +
 .../paging/impl/PageTransactionInfoImpl.java    |  352 +
 .../core/paging/impl/PagedMessageImpl.java      |  160 +
 .../core/paging/impl/PagingManagerImpl.java     |  330 +
 .../core/paging/impl/PagingStoreFactoryNIO.java |  213 +
 .../core/paging/impl/PagingStoreImpl.java       | 1243 ++++
 .../activemq/core/persistence/GroupingInfo.java |   28 +
 .../core/persistence/OperationContext.java      |   46 +
 .../core/persistence/QueueBindingInfo.java      |   42 +
 .../core/persistence/StorageManager.java        |  411 ++
 .../config/PersistedAddressSetting.java         |  130 +
 .../core/persistence/config/PersistedRoles.java |  335 +
 .../core/persistence/impl/PageCountPending.java |   25 +
 .../impl/journal/AddMessageRecord.java          |   44 +
 .../impl/journal/BatchingIDGenerator.java       |  149 +
 .../impl/journal/DescribeJournal.java           |  725 ++
 .../impl/journal/JournalRecordIds.java          |   81 +
 .../impl/journal/JournalStorageManager.java     | 3861 +++++++++++
 .../impl/journal/LargeServerMessageImpl.java    |  531 ++
 .../impl/journal/LargeServerMessageInSync.java  |  161 +
 .../impl/journal/OperationContextImpl.java      |  369 ++
 .../nullpm/NullStorageLargeServerMessage.java   |  108 +
 .../impl/nullpm/NullStorageManager.java         |  630 ++
 .../activemq/core/postoffice/Address.java       |   38 +
 .../core/postoffice/AddressManager.java         |   49 +
 .../activemq/core/postoffice/Binding.java       |   68 +
 .../activemq/core/postoffice/BindingType.java   |   56 +
 .../activemq/core/postoffice/Bindings.java      |   42 +
 .../core/postoffice/BindingsFactory.java        |   25 +
 .../core/postoffice/DuplicateIDCache.java       |   44 +
 .../activemq/core/postoffice/PostOffice.java    |   94 +
 .../activemq/core/postoffice/QueueBinding.java  |   31 +
 .../activemq/core/postoffice/QueueInfo.java     |  177 +
 .../core/postoffice/impl/AddressImpl.java       |  176 +
 .../core/postoffice/impl/BindingsImpl.java      |  703 ++
 .../core/postoffice/impl/DivertBinding.java     |  166 +
 .../postoffice/impl/DuplicateIDCacheImpl.java   |  367 +
 .../core/postoffice/impl/LocalQueueBinding.java |  171 +
 .../core/postoffice/impl/PostOfficeImpl.java    | 1537 +++++
 .../postoffice/impl/SimpleAddressManager.java   |  211 +
 .../postoffice/impl/WildcardAddressManager.java |  257 +
 .../activemq/core/protocol/ProtocolHandler.java |  226 +
 .../core/protocol/ServerPacketDecoder.java      |  236 +
 .../core/ServerSessionPacketHandler.java        |  695 ++
 .../protocol/core/impl/CoreProtocolManager.java |  355 +
 .../core/impl/CoreProtocolManagerFactory.java   |   44 +
 .../protocol/core/impl/CoreSessionCallback.java |  136 +
 .../core/impl/HornetQPacketHandler.java         |  298 +
 .../wireformat/BackupRegistrationMessage.java   |  136 +
 .../BackupReplicationStartFailedMessage.java    |  113 +
 .../impl/wireformat/BackupRequestMessage.java   |  105 +
 .../impl/wireformat/BackupResponseMessage.java  |   63 +
 .../impl/wireformat/ClusterConnectMessage.java  |   61 +
 .../wireformat/ClusterConnectReplyMessage.java  |   63 +
 .../impl/wireformat/NodeAnnounceMessage.java    |  251 +
 .../core/impl/wireformat/QuorumVoteMessage.java |   71 +
 .../impl/wireformat/QuorumVoteReplyMessage.java |   75 +
 .../impl/wireformat/ReplicationAddMessage.java  |  163 +
 .../wireformat/ReplicationAddTXMessage.java     |  182 +
 .../wireformat/ReplicationCommitMessage.java    |  117 +
 .../wireformat/ReplicationDeleteMessage.java    |   97 +
 .../wireformat/ReplicationDeleteTXMessage.java  |  149 +
 .../ReplicationLargeMessageBeginMessage.java    |   84 +
 .../ReplicationLargeMessageEndMessage.java      |   84 +
 .../ReplicationLargeMessageWriteMessage.java    |  108 +
 .../ReplicationLiveIsStoppingMessage.java       |   93 +
 .../wireformat/ReplicationPageEventMessage.java |  129 +
 .../wireformat/ReplicationPageWriteMessage.java |  112 +
 .../wireformat/ReplicationPrepareMessage.java   |  145 +
 .../wireformat/ReplicationResponseMessage.java  |   27 +
 .../wireformat/ReplicationStartSyncMessage.java |  224 +
 .../wireformat/ReplicationSyncFileMessage.java  |  280 +
 .../wireformat/ScaleDownAnnounceMessage.java    |   59 +
 .../protocol/stomp/WebSocketServerHandler.java  |  185 +
 .../core/registry/JndiBindingRegistry.java      |  149 +
 .../core/registry/MapBindingRegistry.java       |   57 +
 .../core/remoting/impl/invm/InVMAcceptor.java   |  302 +
 .../remoting/impl/invm/InVMAcceptorFactory.java |   52 +
 .../core/remoting/impl/invm/InVMConnection.java |  298 +
 .../core/remoting/impl/invm/InVMConnector.java  |  259 +
 .../impl/invm/InVMConnectorFactory.java         |   64 +
 .../core/remoting/impl/invm/InVMRegistry.java   |   62 +
 .../remoting/impl/invm/TransportConstants.java  |   60 +
 .../remoting/impl/netty/ConnectionCreator.java  |   21 +
 .../impl/netty/HttpAcceptorHandler.java         |  252 +
 .../impl/netty/HttpKeepAliveRunnable.java       |   75 +
 .../core/remoting/impl/netty/NettyAcceptor.java |  789 +++
 .../impl/netty/NettyAcceptorFactory.java        |   50 +
 .../impl/netty/NettyServerConnection.java       |   37 +
 .../core/remoting/server/RemotingService.java   |   81 +
 .../server/impl/RemotingServiceImpl.java        |  795 +++
 .../core/replication/ReplicatedJournal.java     |  559 ++
 .../replication/ReplicatedLargeMessage.java     |   54 +
 .../core/replication/ReplicationEndpoint.java   |  954 +++
 .../core/replication/ReplicationManager.java    |  675 ++
 .../activemq/core/security/CheckType.java       |   82 +
 .../activemq/core/security/SecurityStore.java   |   32 +
 .../core/security/impl/SecurityStoreImpl.java   |  252 +
 .../activemq/core/server/ActivateCallback.java  |   44 +
 .../activemq/core/server/ActivationParams.java  |   18 +
 .../apache/activemq/core/server/Bindable.java   |   29 +
 .../core/server/BindingQueryResult.java         |   48 +
 .../activemq/core/server/ConnectorService.java  |   22 +
 .../core/server/ConnectorServiceFactory.java    |   36 +
 .../apache/activemq/core/server/Consumer.java   |   73 +
 .../org/apache/activemq/core/server/Divert.java |   36 +
 .../activemq/core/server/HandleStatus.java      |   31 +
 .../core/server/HornetQMessageBundle.java       |  371 ++
 .../activemq/core/server/HornetQServer.java     |  249 +
 .../core/server/HornetQServerLogger.java        | 1366 ++++
 .../activemq/core/server/HornetQServers.java    |  123 +
 .../activemq/core/server/JournalType.java       |   25 +
 .../core/server/LargeServerMessage.java         |   53 +
 .../activemq/core/server/LiveNodeLocator.java   |   93 +
 .../activemq/core/server/MemoryManager.java     |  157 +
 .../activemq/core/server/MessageReference.java  |   75 +
 .../activemq/core/server/NodeManager.java       |  269 +
 .../org/apache/activemq/core/server/Queue.java  |  232 +
 .../activemq/core/server/QueueFactory.java      |   45 +
 .../activemq/core/server/RouteContextList.java  |   38 +
 .../activemq/core/server/RoutingContext.java    |   52 +
 .../core/server/ScheduledDeliveryHandler.java   |   33 +
 .../activemq/core/server/ServerConsumer.java    |   83 +
 .../activemq/core/server/ServerMessage.java     |   77 +
 .../activemq/core/server/ServerSession.java     |  157 +
 .../core/server/ServerSessionFactory.java       |   41 +
 .../core/server/TransientQueueManager.java      |   25 +
 .../core/server/cluster/BackupManager.java      |  415 ++
 .../activemq/core/server/cluster/Bridge.java    |   57 +
 .../core/server/cluster/BroadcastGroup.java     |   42 +
 .../cluster/ClusterConfigurationUtil.java       |   93 +
 .../core/server/cluster/ClusterConnection.java  |   78 +
 .../core/server/cluster/ClusterControl.java     |  214 +
 .../core/server/cluster/ClusterController.java  |  455 ++
 .../core/server/cluster/ClusterManager.java     |  895 +++
 ...HornetQServerSideProtocolManagerFactory.java |   55 +
 .../core/server/cluster/MessageFlowRecord.java  |   43 +
 .../core/server/cluster/RemoteQueueBinding.java |   40 +
 .../core/server/cluster/Transformer.java        |   29 +
 .../core/server/cluster/ha/BackupPolicy.java    |   61 +
 .../server/cluster/ha/ColocatedHAManager.java   |  313 +
 .../core/server/cluster/ha/ColocatedPolicy.java |  187 +
 .../core/server/cluster/ha/HAManager.java       |   31 +
 .../core/server/cluster/ha/HAPolicy.java        |   47 +
 .../core/server/cluster/ha/LiveOnlyPolicy.java  |   85 +
 .../core/server/cluster/ha/ReplicaPolicy.java   |  136 +
 .../server/cluster/ha/ReplicatedPolicy.java     |  167 +
 .../core/server/cluster/ha/ScaleDownPolicy.java |  164 +
 .../cluster/ha/SharedStoreMasterPolicy.java     |  111 +
 .../cluster/ha/SharedStoreSlavePolicy.java      |  110 +
 .../server/cluster/ha/StandaloneHAManager.java  |   56 +
 .../core/server/cluster/impl/BridgeImpl.java    | 1285 ++++
 .../server/cluster/impl/BroadcastGroupImpl.java |  245 +
 .../cluster/impl/ClusterConnectionBridge.java   |  413 ++
 .../cluster/impl/ClusterConnectionImpl.java     | 1738 +++++
 .../core/server/cluster/impl/Redistributor.java |  309 +
 .../cluster/impl/RemoteQueueBindingImpl.java    |  383 ++
 .../core/server/cluster/qourum/BooleanVote.java |   60 +
 .../core/server/cluster/qourum/Quorum.java      |   47 +
 .../server/cluster/qourum/QuorumManager.java    |  372 ++
 .../core/server/cluster/qourum/QuorumVote.java  |   77 +
 .../cluster/qourum/QuorumVoteHandler.java       |   37 +
 .../cluster/qourum/QuorumVoteServerConnect.java |  138 +
 .../qourum/SharedNothingBackupQuorum.java       |  301 +
 .../core/server/cluster/qourum/Vote.java        |   47 +
 .../core/server/embedded/EmbeddedHornetQ.java   |  118 +
 .../core/server/group/GroupingHandler.java      |   57 +
 .../core/server/group/UnproposalListener.java   |   25 +
 .../core/server/group/impl/GroupBinding.java    |   83 +
 .../group/impl/GroupHandlingAbstract.java       |  125 +
 .../impl/GroupingHandlerConfiguration.java      |  174 +
 .../server/group/impl/LocalGroupingHandler.java |  535 ++
 .../core/server/group/impl/Proposal.java        |   49 +
 .../group/impl/RemoteGroupingHandler.java       |  333 +
 .../core/server/group/impl/Response.java        |   93 +
 .../server/impl/AIOFileLockNodeManager.java     |  127 +
 .../activemq/core/server/impl/Activation.java   |  118 +
 .../impl/AnyLiveNodeLocatorForReplication.java  |  183 +
 .../impl/AnyLiveNodeLocatorForScaleDown.java    |  182 +
 .../impl/BackupRecoveryJournalLoader.java       |  104 +
 .../server/impl/BackupTopologyListener.java     |   59 +
 .../core/server/impl/ColocatedActivation.java   |  331 +
 .../core/server/impl/ConnectorsService.java     |  154 +
 .../activemq/core/server/impl/DivertImpl.java   |  165 +
 .../core/server/impl/FileLockNodeManager.java   |  353 +
 .../core/server/impl/HornetQServerImpl.java     | 2345 +++++++
 .../core/server/impl/InVMNodeManager.java       |  164 +
 .../core/server/impl/JournalLoader.java         |   54 +
 .../core/server/impl/LastValueQueue.java        |  351 +
 .../core/server/impl/LiveActivation.java        |   17 +
 .../core/server/impl/LiveOnlyActivation.java    |  197 +
 .../core/server/impl/MessageReferenceImpl.java  |  239 +
 .../NamedLiveNodeLocatorForReplication.java     |  140 +
 .../impl/NamedLiveNodeLocatorForScaleDown.java  |  186 +
 .../server/impl/NamedNodeIdNodeLocator.java     |   70 +
 .../server/impl/PostOfficeJournalLoader.java    |  506 ++
 .../core/server/impl/QueueFactoryImpl.java      |  112 +
 .../activemq/core/server/impl/QueueImpl.java    | 3327 ++++++++++
 .../core/server/impl/RefsOperation.java         |  218 +
 .../core/server/impl/ReplicationError.java      |   82 +
 .../core/server/impl/RoutingContextImpl.java    |  171 +
 .../core/server/impl/ScaleDownHandler.java      |  563 ++
 .../impl/ScheduledDeliveryHandlerImpl.java      |  352 +
 .../core/server/impl/ServerConsumerImpl.java    | 1300 ++++
 .../activemq/core/server/impl/ServerInfo.java   |   90 +
 .../core/server/impl/ServerMessageImpl.java     |  369 ++
 .../core/server/impl/ServerSessionImpl.java     | 1895 ++++++
 .../core/server/impl/ServiceRegistry.java       |  128 +
 .../impl/SharedNothingBackupActivation.java     |  498 ++
 .../impl/SharedNothingLiveActivation.java       |  486 ++
 .../impl/SharedStoreBackupActivation.java       |  276 +
 .../server/impl/SharedStoreLiveActivation.java  |  100 +
 .../server/impl/TransientQueueManagerImpl.java  |   85 +
 .../server/management/ManagementService.java    |  130 +
 .../management/impl/ManagementServiceImpl.java  |  847 +++
 .../core/settings/HierarchicalRepository.java   |   90 +
 .../HierarchicalRepositoryChangeListener.java   |   21 +
 .../activemq/core/settings/Mergeable.java       |   23 +
 .../core/settings/impl/AddressSettings.java     |  752 +++
 .../impl/HierarchicalObjectRepository.java      |  459 ++
 .../activemq/core/settings/impl/Match.java      |  135 +
 .../core/settings/impl/SlowConsumerPolicy.java  |   24 +
 .../core/transaction/ResourceManager.java       |   51 +
 .../activemq/core/transaction/Transaction.java  |   77 +
 .../core/transaction/TransactionDetail.java     |  123 +
 .../core/transaction/TransactionFactory.java    |   25 +
 .../core/transaction/TransactionOperation.java  |   59 +
 .../TransactionOperationAbstract.java           |   86 +
 .../transaction/TransactionPropertyIndexes.java |   42 +
 .../impl/BindingsTransactionImpl.java           |   58 +
 .../transaction/impl/CoreTransactionDetail.java |   66 +
 .../transaction/impl/ResourceManagerImpl.java   |  267 +
 .../core/transaction/impl/TransactionImpl.java  |  539 ++
 .../spi/core/naming/BindingRegistry.java        |   41 +
 .../spi/core/protocol/MessageConverter.java     |   27 +
 .../spi/core/protocol/ProtocolManager.java      |   46 +
 .../core/protocol/ProtocolManagerFactory.java   |   32 +
 .../spi/core/protocol/SessionCallback.java      |   49 +
 .../activemq/spi/core/remoting/Acceptor.java    |   59 +
 .../spi/core/remoting/AcceptorFactory.java      |   63 +
 .../ServerConnectionLifeCycleListener.java      |   30 +
 .../core/security/HornetQSecurityManager.java   |   78 +
 .../security/HornetQSecurityManagerImpl.java    |  212 +
 .../spi/core/security/JAASSecurityManager.java  |  304 +
 .../spi/core/security/package-info.java         |   21 +
 .../activemq/utils/XMLConfigurationUtil.java    |  139 +
 .../org/apache/activemq/security/basic-security |   13 +
 .../resources/schema/activemq-configuration.xsd | 2292 +++++++
 .../main/resources/schema/activemq-users.xsd    |   29 +
 .../core/config/impl/ConfigurationImplTest.java |  539 ++
 .../impl/DefaultsFileConfigurationTest.java     |  155 +
 .../impl/FileConfigurationParserTest.java       |  200 +
 .../core/config/impl/FileConfigurationTest.java |  372 ++
 .../config/impl/HAPolicyConfigurationTest.java  |  434 ++
 .../core/config/impl/ValidatorsTest.java        |  138 +
 .../WrongRoleFileConfigurationParserTest.java   |  130 +
 .../activemq/core/filter/impl/FilterTest.java   |  764 +++
 .../core/list/PriorityLinkedListTest.java       |  914 +++
 .../core/message/impl/MessagePropertyTest.java  |  119 +
 .../apache/activemq/core/security/RoleTest.java |  114 +
 .../group/impl/ClusteredResetMockTest.java      |  423 ++
 .../core/server/impl/EmbeddedServerTest.java    |   78 +
 .../impl/ScheduledDeliveryHandlerTest.java      | 1511 +++++
 .../core/settings/AddressSettingsTest.java      |  146 +
 .../activemq/core/settings/RepositoryTest.java  |  281 +
 .../core/version/impl/VersionImplTest.java      |  106 +
 .../tests/logging/AssertionLoggerHandler.java   |  152 +
 .../tests/util/ColocatedHornetQServer.java      |   96 +
 .../util/CountDownSessionFailureListener.java   |   68 +
 .../tests/util/InVMNodeManagerServer.java       |   72 +
 .../activemq/tests/util/ServiceTestBase.java    | 1230 ++++
 .../activemq/tests/util/SimpleStringTest.java   |  458 ++
 .../tests/util/SingleServerTestBase.java        |   65 +
 .../activemq/tests/util/UnitTestCase.java       | 2120 ++++++
 .../resources/ConfigurationTest-defaults.xml    |    6 +
 .../resources/ConfigurationTest-full-config.xml |  277 +
 .../resources/InvalidConfigurationTest0.xml     |  235 +
 .../resources/InvalidConfigurationTest1.xml     |  235 +
 .../resources/InvalidConfigurationTest2.xml     |  235 +
 .../resources/InvalidConfigurationTest3.xml     |  236 +
 .../resources/InvalidConfigurationTest4.xml     |  234 +
 .../resources/InvalidConfigurationTest5.xml     |  237 +
 .../resources/colocated-hapolicy-config.xml     |   34 +
 .../resources/colocated-hapolicy-config2.xml    |   28 +
 .../resources/divertRoutingNameNotRequired.xml  |   94 +
 .../resources/live-only-hapolicy-config.xml     |   16 +
 .../resources/live-only-hapolicy-config2.xml    |   22 +
 .../resources/live-only-hapolicy-config3.xml    |   11 +
 .../resources/live-only-hapolicy-config4.xml    |    7 +
 .../resources/live-only-hapolicy-config5.xml    |    6 +
 .../src/test/resources/logging.properties       |   61 +
 .../test/resources/replica-hapolicy-config.xml  |   24 +
 .../test/resources/replica-hapolicy-config2.xml |   25 +
 .../test/resources/replica-hapolicy-config3.xml |   16 +
 .../resources/replicated-hapolicy-config.xml    |   15 +
 .../shared-store-master-hapolicy-config.xml     |   14 +
 .../shared-store-slave-hapolicy-config.xml      |   22 +
 .../shared-store-slave-hapolicy-config2.xml     |   24 +
 .../shared-store-slave-hapolicy-config3.xml     |   15 +
 activemq-service-sar/pom.xml                    |   49 +
 .../HornetQFileConfigurationService.java        |   50 +
 .../HornetQFileConfigurationServiceMBean.java   |   32 +
 .../service/HornetQJMSStarterService.java       |   46 +
 .../service/HornetQJMSStarterServiceMBean.java  |   27 +
 .../activemq/service/HornetQServiceBundle.java  |   31 +
 .../activemq/service/HornetQServiceLogger.java  |   38 +
 .../activemq/service/HornetQStarterService.java |  118 +
 .../service/HornetQStarterServiceMBean.java     |   36 +
 .../service/JBossASSecurityManagerService.java  |   35 +
 .../JBossASSecurityManagerServiceMBean.java     |   26 +
 activemq-tools/pom.xml                          |   73 +
 .../org/apache/activemq/tools/DataTool.java     |  232 +
 .../activemq/tools/HornetQToolsLogger.java      |   42 +
 .../java/org/apache/activemq/tools/Main.java    |  112 +
 .../org/apache/activemq/tools/PrintData.java    |   82 +
 .../org/apache/activemq/tools/PrintPages.java   |  313 +
 .../apache/activemq/tools/TransferQueue.java    |  243 +
 .../apache/activemq/tools/XmlDataConstants.java |  122 +
 .../apache/activemq/tools/XmlDataExporter.java  | 1121 ++++
 .../apache/activemq/tools/XmlDataImporter.java  | 1074 +++
 distribution/activemq/pom.xml                   |  321 +
 distribution/activemq/src/main/assembly/dep.xml |  127 +
 .../activemq/src/main/resources/bin/activemq    |   87 +
 .../src/main/resources/bin/activemq-service     |  138 +
 .../src/main/resources/bin/activemq.cmd         |   58 +
 .../activemq/src/main/resources/bin/run.bat     |    1 +
 .../activemq/src/main/resources/bin/run.sh      |    3 +
 .../activemq/src/main/resources/bin/stop.bat    |    1 +
 .../activemq/src/main/resources/bin/stop.sh     |    3 +
 .../config/clustered/activemq-configuration.xml |   94 +
 .../resources/config/clustered/activemq-jms.xml |   53 +
 .../config/clustered/activemq-users.xml         |    7 +
 .../resources/config/clustered/bootstrap.xml    |   25 +
 .../resources/config/clustered/jndi.properties  |    2 +
 .../main/resources/config/logging.properties    |   56 +
 .../non-clustered/activemq-configuration.xml    |   67 +
 .../config/non-clustered/activemq-jms.xml       |   53 +
 .../config/non-clustered/activemq-users.xml     |    7 +
 .../config/non-clustered/bootstrap.xml          |   25 +
 .../config/non-clustered/jndi.properties        |    2 +
 .../replicated/activemq-configuration.xml       |  104 +
 .../config/replicated/activemq-jms.xml          |   53 +
 .../config/replicated/activemq-users.xml        |    7 +
 .../resources/config/replicated/bootstrap.xml   |   25 +
 .../resources/config/replicated/jndi.properties |    2 +
 .../shared-store/activemq-configuration.xml     |  104 +
 .../config/shared-store/activemq-jms.xml        |   53 +
 .../config/shared-store/activemq-users.xml      |    7 +
 .../resources/config/shared-store/bootstrap.xml |   25 +
 .../config/shared-store/jndi.properties         |    2 +
 .../src/main/resources/licenses/LGPL.txt        |  503 ++
 .../src/main/resources/licenses/LICENSE.txt     |  202 +
 .../resources/licenses/LICENSE_twitter4j.txt    |   26 +
 .../src/main/resources/licenses/base64.txt      |   10 +
 .../src/main/resources/licenses/json.txt        |   23 +
 distribution/hornetq/pom.xml                    |  321 -
 distribution/hornetq/src/main/assembly/dep.xml  |  127 -
 .../hornetq/src/main/resources/bin/hornetq      |   87 -
 .../src/main/resources/bin/hornetq-service      |  138 -
 .../hornetq/src/main/resources/bin/hornetq.cmd  |   58 -
 .../hornetq/src/main/resources/bin/run.bat      |    1 -
 .../hornetq/src/main/resources/bin/run.sh       |    3 -
 .../hornetq/src/main/resources/bin/stop.bat     |    1 -
 .../hornetq/src/main/resources/bin/stop.sh      |    3 -
 .../resources/config/clustered/bootstrap.xml    |   25 -
 .../config/clustered/hornetq-configuration.xml  |   94 -
 .../resources/config/clustered/hornetq-jms.xml  |   53 -
 .../config/clustered/hornetq-users.xml          |    7 -
 .../resources/config/clustered/jndi.properties  |    2 -
 .../main/resources/config/logging.properties    |   56 -
 .../config/non-clustered/bootstrap.xml          |   25 -
 .../non-clustered/hornetq-configuration.xml     |   67 -
 .../config/non-clustered/hornetq-jms.xml        |   53 -
 .../config/non-clustered/hornetq-users.xml      |    7 -
 .../config/non-clustered/jndi.properties        |    2 -
 .../resources/config/replicated/bootstrap.xml   |   25 -
 .../config/replicated/hornetq-configuration.xml |  104 -
 .../resources/config/replicated/hornetq-jms.xml |   53 -
 .../config/replicated/hornetq-users.xml         |    7 -
 .../resources/config/replicated/jndi.properties |    2 -
 .../resources/config/shared-store/bootstrap.xml |   25 -
 .../shared-store/hornetq-configuration.xml      |  104 -
 .../config/shared-store/hornetq-jms.xml         |   53 -
 .../config/shared-store/hornetq-users.xml       |    7 -
 .../config/shared-store/jndi.properties         |    2 -
 .../src/main/resources/licenses/LGPL.txt        |  503 --
 .../src/main/resources/licenses/LICENSE.txt     |  202 -
 .../resources/licenses/LICENSE_twitter4j.txt    |   26 -
 .../src/main/resources/licenses/base64.txt      |   10 -
 .../src/main/resources/licenses/json.txt        |   23 -
 distribution/jnp-client/pom.xml                 |    6 +-
 distribution/pom.xml                            |   12 +-
 docs/eap-manual/en/clusters.xml                 |   22 +-
 docs/pom.xml                                    |   12 +-
 docs/quickstart-guide/en/examples.xml           |   66 +-
 docs/quickstart-guide/en/running.xml            |   34 +-
 docs/quickstart-guide/pom.xml                   |    8 +-
 docs/quickstart-guide/zh/examples.xml           |   24 +-
 docs/user-manual/en/aerogear-integration.xml    |    2 +-
 docs/user-manual/en/appserver-integration.xml   |   66 +-
 docs/user-manual/en/clusters.xml                |   14 +-
 docs/user-manual/en/configuration-index.xml     |   12 +-
 docs/user-manual/en/configuring-transports.xml  |   22 +-
 docs/user-manual/en/connection-ttl.xml          |   18 +-
 docs/user-manual/en/core-bridges.xml            |    4 +-
 docs/user-manual/en/diverts.xml                 |    2 +-
 docs/user-manual/en/duplicate-detection.xml     |    4 +-
 docs/user-manual/en/embedding-hornetq.xml       |   18 +-
 docs/user-manual/en/ha.xml                      |   12 +-
 docs/user-manual/en/intercepting-operations.xml |   16 +-
 docs/user-manual/en/interoperability.xml        |   14 +-
 docs/user-manual/en/jms-bridge.xml              |   16 +-
 docs/user-manual/en/large-messages.xml          |    4 +-
 docs/user-manual/en/logging.xml                 |   20 +-
 docs/user-manual/en/management.xml              |   62 +-
 docs/user-manual/en/paging.xml                  |    2 +-
 docs/user-manual/en/persistence.xml             |    4 +-
 docs/user-manual/en/project-info.xml            |    2 +-
 docs/user-manual/en/queue-attributes.xml        |    2 +-
 docs/user-manual/en/rest.xml                    |   24 +-
 docs/user-manual/en/security.xml                |   14 +-
 docs/user-manual/en/send-guarantees.xml         |    2 +-
 docs/user-manual/en/spring-integration.xml      |    8 +-
 docs/user-manual/en/using-jms.xml               |    6 +-
 docs/user-manual/en/using-server.xml            |    2 +-
 docs/user-manual/en/vertx-integration.xml       |    8 +-
 docs/user-manual/pom.xml                        |   16 +-
 .../src/main/resources/schemaToTable.xsl        |   42 +-
 docs/user-manual/zh/appserver-integration.xml   |   42 +-
 docs/user-manual/zh/clusters.xml                |    6 +-
 docs/user-manual/zh/configuration-index.xml     |    4 +-
 docs/user-manual/zh/configuring-transports.xml  |   24 +-
 docs/user-manual/zh/connection-ttl.xml          |    6 +-
 docs/user-manual/zh/core-bridges.xml            |    4 +-
 docs/user-manual/zh/diverts.xml                 |    2 +-
 docs/user-manual/zh/duplicate-detection.xml     |    4 +-
 docs/user-manual/zh/embedding-hornetq.xml       |   18 +-
 docs/user-manual/zh/ha.xml                      |   16 +-
 docs/user-manual/zh/intercepting-operations.xml |    8 +-
 docs/user-manual/zh/interoperability.xml        |    4 +-
 docs/user-manual/zh/jms-bridge.xml              |   16 +-
 docs/user-manual/zh/large-messages.xml          |    4 +-
 docs/user-manual/zh/logging.xml                 |   12 +-
 docs/user-manual/zh/management.xml              |   60 +-
 docs/user-manual/zh/paging.xml                  |    2 +-
 docs/user-manual/zh/persistence.xml             |    4 +-
 docs/user-manual/zh/project-info.xml            |    2 +-
 docs/user-manual/zh/queue-attributes.xml        |    2 +-
 docs/user-manual/zh/security.xml                |   14 +-
 docs/user-manual/zh/send-guarantees.xml         |    2 +-
 docs/user-manual/zh/using-jms.xml               |    4 +-
 docs/user-manual/zh/using-server.xml            |   32 +-
 etc/findbugs-exclude.xml                        |   42 +-
 examples/core/embedded-remote/pom.xml           |   32 +-
 .../core/example/EmbeddedRemoteExample.java     |  111 +
 .../activemq/core/example/EmbeddedServer.java   |   69 +
 .../core/example/EmbeddedRemoteExample.java     |  111 -
 .../hornetq/core/example/EmbeddedServer.java    |   69 -
 examples/core/embedded/pom.xml                  |   22 +-
 .../activemq/core/example/EmbeddedExample.java  |  119 +
 .../hornetq/core/example/EmbeddedExample.java   |  119 -
 examples/core/perf/pom.xml                      |   48 +-
 .../apache/activemq/core/example/PerfBase.java  |  550 ++
 .../activemq/core/example/PerfListener.java     |   55 +
 .../activemq/core/example/PerfParams.java       |  299 +
 .../activemq/core/example/PerfSender.java       |   55 +
 .../java/org/hornetq/core/example/PerfBase.java |  550 --
 .../org/hornetq/core/example/PerfListener.java  |   55 -
 .../org/hornetq/core/example/PerfParams.java    |  299 -
 .../org/hornetq/core/example/PerfSender.java    |   55 -
 .../hornetq-configuration-messaging-lab.xml     |    4 +-
 .../resources/server0/hornetq-configuration.xml |    4 +-
 examples/core/pom.xml                           |   10 +-
 examples/core/twitter-connector/pom.xml         |   50 +-
 examples/core/twitter-connector/readme.html     |    2 +-
 .../core/example/TwitterConnectorExample.java   |  117 +
 .../core/example/TwitterConnectorExample.java   |  117 -
 .../resources/server0/hornetq-configuration.xml |   10 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 examples/core/vertx-connector/pom.xml           |   50 +-
 examples/core/vertx-connector/readme.html       |    2 +-
 .../activemq/core/example/ExampleVerticle.java  |   55 +
 .../core/example/VertxConnectorExample.java     |  114 +
 .../hornetq/core/example/ExampleVerticle.java   |   55 -
 .../core/example/VertxConnectorExample.java     |  114 -
 .../resources/server0/hornetq-configuration.xml |   10 +-
 .../src/main/resources/server0/hornetq-jms.xml  |    2 +-
 .../main/resources/server0/hornetq-users.xml    |    2 +-
 examples/javaee/ejb-jms-transaction/pom.xml     |    8 +-
 examples/javaee/ejb-jms-transaction/readme.html |    2 +-
 .../javaee/example/EJBClientExample.java        |   94 +
 .../javaee/example/server/SendMessageBean.java  |  142 +
 .../example/server/SendMessageService.java      |   26 +
 .../javaee/example/EJBClientExample.java        |   94 -
 .../javaee/example/server/SendMessageBean.java  |  142 -
 .../example/server/SendMessageService.java      |   26 -
 .../examples/MDBEJBTXRequiredRunnerTest.java    |   53 +
 .../examples/MDBEJBTXRequiredRunnerTest.java    |   53 -
 examples/javaee/jca-config/pom.xml              |    8 +-
 examples/javaee/jca-config/readme.html          |    2 +-
 .../javaee/example/MDBRemoteClientExample.java  |   64 +
 .../javaee/example/server/MDBQueueA.java        |   51 +
 .../javaee/example/server2/MDBQueueB.java       |   55 +
 .../javaee/example/server2/StatelessSender.java |   55 +
 .../example/server2/StatelessSenderService.java |   28 +
 .../javaee/example/MDBRemoteClientExample.java  |   64 -
 .../javaee/example/server/MDBQueueA.java        |   51 -
 .../javaee/example/server2/MDBQueueB.java       |   55 -
 .../javaee/example/server2/StatelessSender.java |   55 -
 .../example/server2/StatelessSenderService.java |   28 -
 .../example/server/ExampleRunner2Test.java      |  103 +
 .../example/server/ExampleRunner2Test.java      |  103 -
 .../resources/jboss-deployment-structure.xml    |    2 +-
 examples/javaee/jca-remote/pom.xml              |    8 +-
 .../example/MDBRemoteServerClientExample.java   |   99 +
 .../javaee/example/server/MDBQueue.java         |   75 +
 .../example/MDBRemoteServerClientExample.java   |   99 -
 .../hornetq/javaee/example/server/MDBQueue.java |   75 -
 .../javaee/examples/JCARemoteRunnerTest.java    |   86 +
 .../javaee/examples/JCARemoteRunnerTest.java    |   86 -
 .../resources/jboss-deployment-structure.xml    |    2 +-
 examples/javaee/jms-bridge/pom.xml              |    8 +-
 .../javaee/example/JMSBridgeExample.java        |  112 +
 .../javaee/example/JMSBridgeExample.java        |  112 -
 .../javaee/examples/JMSBridgeRunnerTest.java    |   35 +
 .../javaee/examples/JMSBridgeRunnerTest.java    |   35 -
 examples/javaee/jms-context-injection/pom.xml   |    8 +-
 .../JmsContextInjectionClientExample.java       |   83 +
 .../server/JmsContextInjectionExample.java      |   76 +
 .../JmsContextInjectionClientExample.java       |   83 -
 .../server/JmsContextInjectionExample.java      |   76 -
 .../examples/JmsContextInjectionRunnerTest.java |   59 +
 .../examples/JmsContextInjectionRunnerTest.java |   59 -
 examples/javaee/mdb-bmt/pom.xml                 |    8 +-
 .../javaee/example/MDB_BMTClientExample.java    |   82 +
 .../javaee/example/server/MDB_BMTExample.java   |   73 +
 .../javaee/example/MDB_BMTClientExample.java    |   82 -
 .../javaee/example/server/MDB_BMTExample.java   |   73 -
 .../example/server/ExampleRunnerTest.java       |   50 +
 .../example/server/ExampleRunnerTest.java       |   50 -
 .../mdb-cmt-setrollbackonly-with-dlq/pom.xml    |    8 +-
 ...CMT_SetRollbackOnlyWithDLQClientExample.java |   99 +
 .../MDB_CMT_SetRollbackOnlyWithDLQExample.java  |   66 +
 ...CMT_SetRollbackOnlyWithDLQClientExample.java |   99 -
 .../MDB_CMT_SetRollbackOnlyWithDLQExample.java  |   66 -
 .../MDBCMTSetRollbackOnlyWithDLQRunnerTest.java |   48 +
 .../MDBCMTSetRollbackOnlyWithDLQRunnerTest.java |   48 -
 examples/javaee/mdb-cmt-setrollbackonly/pom.xml |    8 +-
 .../MDB_CMT_SetRollbackOnlyClientExample.java   |   83 +
 .../server/MDB_CMT_SetRollbackOnlyExample.java  |   72 +
 .../MDB_CMT_SetRollbackOnlyClientExample.java   |   83 -
 .../server/MDB_CMT_SetRollbackOnlyExample.java  |   72 -
 .../MDBCMTSetRollbackOnlyRunnerTest.java        |   50 +
 .../MDBCMTSetRollbackOnlyRunnerTest.java        |   50 -
 examples/javaee/mdb-cmt-tx-local/pom.xml        |    8 +-
 .../example/MDB_CMT_TxLocalClientExample.java   |   83 +
 .../example/server/MDB_CMT_TxLocalExample.java  |   92 +
 .../example/MDB_CMT_TxLocalClientExample.java   |   83 -
 .../example/server/MDB_CMT_TxLocalExample.java  |   92 -
 .../example/MDBCMTSetLocalTXRunnerTest.java     |   51 +
 .../example/MDBCMTSetLocalTXRunnerTest.java     |   51 -
 .../javaee/mdb-cmt-tx-not-supported/pom.xml     |    8 +-
 .../MDB_CMT_TxNotSupportedClientExample.java    |   82 +
 .../example/server/MDB_CMT_TxNotSupported.java  |   75 +
 .../MDB_CMT_TxNotSupportedClientExample.java    |   82 -
 .../example/server/MDB_CMT_TxNotSupported.java  |   75 -
 .../MDBCMTSetTXNotSupportedRunnerTest.java      |   51 +
 .../MDBCMTSetTXNotSupportedRunnerTest.java      |   51 -
 examples/javaee/mdb-cmt-tx-required/pom.xml     |    8 +-
 .../MDB_CMT_TxRequiredClientExample.java        |   88 +
 .../server/MDB_CMT_TxRequiredExample.java       |   56 +
 .../MDB_CMT_TxRequiredClientExample.java        |   88 -
 .../server/MDB_CMT_TxRequiredExample.java       |   56 -
 .../examples/MDBCMTSetTXRequiredRunnerTest.java |   54 +
 .../examples/MDBCMTSetTXRequiredRunnerTest.java |   54 -
 examples/javaee/mdb-message-selector/pom.xml    |    8 +-
 .../MDBMessageSelectorClientExample.java        |   94 +
 .../server/MDBMessageSelectorExample.java       |   60 +
 .../MDBMessageSelectorClientExample.java        |   94 -
 .../server/MDBMessageSelectorExample.java       |   60 -
 .../MDBCMTSetMessageSelectorRunnerTest.java     |   50 +
 .../MDBCMTSetMessageSelectorRunnerTest.java     |   50 -
 .../javaee/mdb-remote-failover-static/pom.xml   |    8 +-
 .../MDBRemoteFailoverStaticClientExample.java   |  126 +
 .../server/MDBRemoteFailoverStaticExample.java  |   86 +
 .../javaee/example/server/ServerKiller.java     |   21 +
 .../MDBRemoteFailoverStaticClientExample.java   |  126 -
 .../server/MDBRemoteFailoverStaticExample.java  |   86 -
 .../javaee/example/server/ServerKiller.java     |   21 -
 .../examples/FailoverStaticRunnerTest.java      |   98 +
 .../examples/FailoverStaticRunnerTest.java      |   98 -
 .../resources/jboss-deployment-structure.xml    |    2 +-
 examples/javaee/mdb-remote-failover/pom.xml     |    8 +-
 .../example/MDBRemoteFailoverClientExample.java |  118 +
 .../server/MDBRemoteFailoverExample.java        |   94 +
 .../javaee/example/server/ServerKiller.java     |   21 +
 .../example/MDBRemoteFailoverClientExample.java |  118 -
 .../server/MDBRemoteFailoverExample.java        |   94 -
 .../javaee/example/server/ServerKiller.java     |   21 -
 .../javaee/examples/FailoverRunnerTest.java     |   94 +
 .../javaee/examples/FailoverRunnerTest.java     |   94 -
 .../resources/jboss-deployment-structure.xml    |    2 +-
 examples/javaee/mdb-tx-send/pom.xml             |    8 +-
 .../example/MDBMessageSendTxClientExample.java  |   97 +
 .../example/server/MDBMessageSendTxExample.java |   95 +
 .../example/MDBMessageSendTxClientExample.java  |   97 -
 .../example/server/MDBMessageSendTxExample.java |   95 -
 .../javaee/examples/MDBCMTTxSendRunnerTest.java |   54 +
 .../javaee/examples/MDBCMTTxSendRunnerTest.java |   54 -
 .../resources/jboss-deployment-structure.xml    |    2 +-
 examples/javaee/pom.xml                         |   22 +-
 examples/javaee/xarecovery/pom.xml              |    8 +-
 examples/javaee/xarecovery/readme.html          |    2 +-
 .../example/XARecoveryExampleStepOne.java       |   77 +
 .../example/XARecoveryExampleStepTwo.java       |  101 +
 .../example/server/XARecoveryExampleBean.java   |  171 +
 .../server/XARecoveryExampleService.java        |   23 +
 .../example/XARecoveryExampleStepOne.java       |   77 -
 .../example/XARecoveryExampleStepTwo.java       |  101 -
 .../example/server/XARecoveryExampleBean.java   |  171 -
 .../server/XARecoveryExampleService.java        |   23 -
 .../javaee/examples/XARecoveryRunnerTest.java   |   97 +
 .../javaee/examples/XARecoveryRunnerTest.java   |   97 -
 .../jms/activemq-jms-examples-common/common.css |   29 +
 .../config/logging.properties                   |   35 +
 .../config/server.properties                    |    1 +
 .../images/hornetQ-banner_final.png             |  Bin 0 -> 109633 bytes
 .../jms/activemq-jms-examples-common/pom.xml    |   37 +
 .../activemq-jms-examples-common/prettify.css   |    1 +
 .../activemq-jms-examples-common/prettify.js    |   23 +
 .../activemq/common/example/DummyXid.java       |  207 +
 .../activemq/common/example/HornetQExample.java |  234 +
 examples/jms/activemq-ra-rar/pom.xml            |   82 +
 .../activemq-ra-rar/src/main/resources/ra.xml   |  304 +
 examples/jms/aerogear/pom.xml                   |   42 +-
 examples/jms/aerogear/readme.html               |    4 +-
 .../activemq/jms/example/AerogearExample.java   |   92 +
 .../hornetq/jms/example/AerogearExample.java    |   92 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/applet/applet.html                 |    2 +-
 examples/jms/applet/pom.xml                     |   38 +-
 .../activemq/jms/example/AppletExample.java     |  290 +
 .../jms/example/HttpStaticFileServer.java       |   77 +
 .../example/HttpStaticFileServerHandler.java    |  185 +
 .../HttpStaticFileServerPipelineFactory.java    |   64 +
 .../org/hornetq/jms/example/AppletExample.java  |  290 -
 .../jms/example/HttpStaticFileServer.java       |   77 -
 .../example/HttpStaticFileServerHandler.java    |  185 -
 .../HttpStaticFileServerPipelineFactory.java    |   64 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/application-layer-failover/pom.xml |   38 +-
 .../ApplicationLayerFailoverExample.java        |  237 +
 .../ApplicationLayerFailoverExample.java        |  237 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/bridge/pom.xml                     |   42 +-
 examples/jms/bridge/readme.html                 |    2 +-
 .../activemq/jms/example/BridgeExample.java     |  184 +
 .../jms/example/HatColourChangeTransformer.java |   42 +
 .../org/hornetq/jms/example/BridgeExample.java  |  184 -
 .../jms/example/HatColourChangeTransformer.java |   42 -
 .../hornetq/server0/hornetq-configuration.xml   |   10 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/browser/pom.xml                    |   38 +-
 .../jms/example/QueueBrowserExample.java        |  119 +
 .../jms/example/QueueBrowserExample.java        |  119 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/client-kickoff/pom.xml             |   42 +-
 examples/jms/client-kickoff/readme.html         |    6 +-
 .../jms/example/ClientKickoffExample.java       |  126 +
 .../jms/example/ClientKickoffExample.java       |  126 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../jms/client-side-failoverlistener/pom.xml    |   38 +-
 .../ClientSideFailoverListerExample.java        |  135 +
 .../ClientSideFailoverListerExample.java        |  135 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/client-side-load-balancing/pom.xml |   38 +-
 .../example/ClientSideLoadBalancingExample.java |  157 +
 .../example/ClientSideLoadBalancingExample.java |  157 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../jms/clustered-durable-subscription/pom.xml  |   38 +-
 .../ClusteredDurableSubscriptionExample.java    |  165 +
 .../ClusteredDurableSubscriptionExample.java    |  165 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/clustered-grouping/pom.xml         |   38 +-
 .../jms/example/ClusteredGroupingExample.java   |  200 +
 .../jms/example/ClusteredGroupingExample.java   |  200 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 examples/jms/clustered-jgroups/pom.xml          |   34 +-
 .../jms/example/ClusteredJgroupsExample.java    |  151 +
 .../jms/example/ClusteredJgroupsExample.java    |  151 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/clustered-queue/pom.xml            |   34 +-
 .../jms/example/ClusteredQueueExample.java      |  151 +
 .../jms/example/ClusteredQueueExample.java      |  151 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/clustered-standalone/pom.xml       |   38 +-
 .../jms/example/ClusteredStandaloneExample.java |  197 +
 .../jms/example/ClusteredStandaloneExample.java |  197 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 examples/jms/clustered-static-discovery/pom.xml |   38 +-
 .../example/StaticClusteredQueueExample.java    |  201 +
 .../example/StaticClusteredQueueExample.java    |  201 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 examples/jms/clustered-static-oneway/pom.xml    |   38 +-
 .../jms/example/ClusterStaticOnewayExample.java |  186 +
 .../jms/example/ClusterStaticOnewayExample.java |  186 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 examples/jms/clustered-topic/pom.xml            |   38 +-
 .../jms/example/ClusteredTopicExample.java      |  149 +
 .../jms/example/ClusteredTopicExample.java      |  149 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../jms/colocated-failover-scale-down/pom.xml   |   34 +-
 .../ColocatedFailoverScaleDownExample.java      |  134 +
 .../ColocatedFailoverScaleDownExample.java      |  134 -
 .../hornetq/server0/hornetq-configuration.xml   |   10 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |   10 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/colocated-failover/pom.xml         |   34 +-
 .../jms/example/ColocatedFailoverExample.java   |  142 +
 .../jms/example/ColocatedFailoverExample.java   |  142 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/consumer-rate-limit/pom.xml        |   38 +-
 .../jms/example/ConsumerRateLimitExample.java   |  132 +
 .../jms/example/ConsumerRateLimitExample.java   |  132 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/dead-letter/pom.xml                |   38 +-
 .../activemq/jms/example/DeadLetterExample.java |  151 +
 .../hornetq/jms/example/DeadLetterExample.java  |  151 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/delayed-redelivery/pom.xml         |   38 +-
 .../jms/example/DelayedRedeliveryExample.java   |  142 +
 .../jms/example/DelayedRedeliveryExample.java   |  142 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/divert/pom.xml                     |   42 +-
 examples/jms/divert/readme.html                 |    2 +-
 .../example/AddForwardingTimeTransformer.java   |   35 +
 .../activemq/jms/example/DivertExample.java     |  246 +
 .../example/AddForwardingTimeTransformer.java   |   35 -
 .../org/hornetq/jms/example/DivertExample.java  |  246 -
 .../hornetq/server0/hornetq-configuration.xml   |   10 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/durable-subscription/pom.xml       |   38 +-
 .../jms/example/DurableSubscriptionExample.java |  129 +
 .../jms/example/DurableSubscriptionExample.java |  129 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/embedded-simple/pom.xml            |   46 +-
 .../activemq/jms/example/EmbeddedExample.java   |   88 +
 .../hornetq/jms/example/EmbeddedExample.java    |   88 -
 .../main/resources/hornetq-configuration.xml    |    6 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 examples/jms/embedded/pom.xml                   |   46 +-
 .../activemq/jms/example/EmbeddedExample.java   |  132 +
 .../hornetq/jms/example/EmbeddedExample.java    |  132 -
 examples/jms/expiry/pom.xml                     |   38 +-
 .../activemq/jms/example/ExpiryExample.java     |  135 +
 .../org/hornetq/jms/example/ExpiryExample.java  |  135 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/ha-policy-autobackup/pom.xml       |   34 +-
 .../jms/example/HAPolicyAutoBackupExample.java  |  173 +
 .../jms/example/HAPolicyAutoBackupExample.java  |  173 -
 .../hornetq/server0/hornetq-configuration.xml   |   12 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |   12 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../jms/hornetq-jms-examples-common/common.css  |   29 -
 .../config/logging.properties                   |   35 -
 .../config/server.properties                    |    1 -
 .../images/hornetQ-banner_final.png             |  Bin 109633 -> 0 bytes
 .../jms/hornetq-jms-examples-common/pom.xml     |   37 -
 .../hornetq-jms-examples-common/prettify.css    |    1 -
 .../jms/hornetq-jms-examples-common/prettify.js |   23 -
 .../org/hornetq/common/example/DummyXid.java    |  207 -
 .../hornetq/common/example/HornetQExample.java  |  234 -
 examples/jms/hornetq-ra-rar/pom.xml             |   82 -
 .../hornetq-ra-rar/src/main/resources/ra.xml    |  304 -
 examples/jms/http-transport/pom.xml             |   38 +-
 examples/jms/http-transport/readme.html         |    4 +-
 .../jms/example/HttpTransportExample.java       |  102 +
 .../jms/example/HttpTransportExample.java       |  102 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../jms/instantiate-connection-factory/pom.xml  |   46 +-
 .../InstantiateConnectionFactoryExample.java    |  110 +
 .../InstantiateConnectionFactoryExample.java    |  110 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/interceptor/pom.xml                |   42 +-
 examples/jms/interceptor/readme.html            |    6 +-
 .../jms/example/InterceptorExample.java         |  102 +
 .../activemq/jms/example/SimpleInterceptor.java |   49 +
 .../hornetq/jms/example/InterceptorExample.java |  102 -
 .../hornetq/jms/example/SimpleInterceptor.java  |   49 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/jaas/pom.xml                       |   56 +-
 examples/jms/jaas/readme.html                   |   10 +-
 .../jms/example/ExampleCallbackHandler.java     |   34 +
 .../jms/example/ExampleConfiguration.java       |   54 +
 .../jms/example/ExampleLoginModule.java         |  138 +
 .../activemq/jms/example/JAASExample.java       |   99 +
 .../jms/example/ExampleCallbackHandler.java     |   34 -
 .../jms/example/ExampleConfiguration.java       |   54 -
 .../hornetq/jms/example/ExampleLoginModule.java |  138 -
 .../org/hornetq/jms/example/JAASExample.java    |   99 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 examples/jms/jms-auto-closeable/pom.xml         |   38 +-
 .../jms/example/JMSAutoCloseableExample.java    |   78 +
 .../jms/example/JMSAutoCloseableExample.java    |   78 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/jms-bridge/pom.xml                 |   46 +-
 examples/jms/jms-bridge/readme.html             |    2 +-
 .../activemq/jms/example/JMSBridgeExample.java  |  171 +
 .../hornetq/jms/example/JMSBridgeExample.java   |  171 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/jms-completion-listener/pom.xml    |   38 +-
 .../example/JMSCompletionListenerExample.java   |  100 +
 .../example/JMSCompletionListenerExample.java   |  100 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/jms-context/pom.xml                |   38 +-
 .../activemq/jms/example/JMSContextExample.java |   77 +
 .../hornetq/jms/example/JMSContextExample.java  |   77 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/jms-shared-consumer/pom.xml        |   38 +-
 .../jms/example/JMSSharedConsumerExample.java   |  107 +
 .../jms/example/JMSSharedConsumerExample.java   |  107 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/jmx/pom.xml                        |   46 +-
 .../apache/activemq/jms/example/JMXExample.java |  137 +
 .../org/hornetq/jms/example/JMXExample.java     |  137 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/large-message/pom.xml              |   38 +-
 .../jms/example/LargeMessageExample.java        |  213 +
 .../jms/example/LargeMessageExample.java        |  213 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/last-value-queue/pom.xml           |   38 +-
 .../jms/example/LastValueQueueExample.java      |  127 +
 .../jms/example/LastValueQueueExample.java      |  127 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/management-notifications/pom.xml   |   38 +-
 .../example/ManagementNotificationExample.java  |  129 +
 .../example/ManagementNotificationExample.java  |  129 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/management/pom.xml                 |   38 +-
 .../activemq/jms/example/ManagementExample.java |  148 +
 .../hornetq/jms/example/ManagementExample.java  |  148 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/message-counters/pom.xml           |   42 +-
 .../jms/example/MessageCounterExample.java      |  156 +
 .../jms/example/MessageCounterExample.java      |  156 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/message-group/pom.xml              |   38 +-
 .../jms/example/MessageGroupExample.java        |  149 +
 .../jms/example/MessageGroupExample.java        |  149 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/message-group2/pom.xml             |   38 +-
 .../jms/example/MessageGroup2Example.java       |  160 +
 .../jms/example/MessageGroup2Example.java       |  160 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/message-priority/pom.xml           |   38 +-
 .../jms/example/MessagePriorityExample.java     |  153 +
 .../jms/example/MessagePriorityExample.java     |  153 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/multiple-failover-failback/pom.xml |   38 +-
 .../MultipleFailoverFailbackExample.java        |  157 +
 .../MultipleFailoverFailbackExample.java        |  157 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 examples/jms/multiple-failover/pom.xml          |   38 +-
 .../jms/example/MultipleFailoverExample.java    |  158 +
 .../jms/example/MultipleFailoverExample.java    |  158 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 examples/jms/no-consumer-buffering/pom.xml      |   38 +-
 .../jms/example/NoConsumerBufferingExample.java |  133 +
 .../jms/example/NoConsumerBufferingExample.java |  133 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/non-transaction-failover/pom.xml   |   34 +-
 .../example/NonTransactionFailoverExample.java  |  137 +
 .../example/NonTransactionFailoverExample.java  |  137 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/openwire/pom.xml                   |   42 +-
 .../activemq/jms/example/OpenWireExample.java   |   96 +
 .../hornetq/jms/example/OpenWireExample.java    |   96 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/paging/pom.xml                     |   38 +-
 .../activemq/jms/example/PagingExample.java     |  155 +
 .../org/hornetq/jms/example/PagingExample.java  |  155 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/perf/pom.xml                       |   48 +-
 .../apache/activemq/jms/example/PerfBase.java   |  524 ++
 .../activemq/jms/example/PerfListener.java      |   60 +
 .../apache/activemq/jms/example/PerfParams.java |  183 +
 .../apache/activemq/jms/example/PerfSender.java |   60 +
 .../java/org/hornetq/jms/example/PerfBase.java  |  524 --
 .../org/hornetq/jms/example/PerfListener.java   |   60 -
 .../org/hornetq/jms/example/PerfParams.java     |  183 -
 .../org/hornetq/jms/example/PerfSender.java     |   60 -
 .../hornetq-configuration-messaging-lab.xml     |    4 +-
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 examples/jms/pom.xml                            |   16 +-
 examples/jms/pre-acknowledge/pom.xml            |   38 +-
 .../jms/example/PreacknowledgeExample.java      |  148 +
 .../jms/example/PreacknowledgeExample.java      |  148 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/producer-rate-limit/pom.xml        |   38 +-
 .../jms/example/ProducerRateLimitExample.java   |  128 +
 .../jms/example/ProducerRateLimitExample.java   |  128 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/proton-cpp/pom.xml                 |   44 +-
 examples/jms/proton-cpp/readme.html             |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    4 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/proton-j/pom.xml                   |   42 +-
 examples/jms/proton-j/readme.html               |    2 +-
 .../activemq/jms/example/ProtonJExample.java    |   73 +
 .../org/hornetq/jms/example/ProtonJExample.java |   73 -
 .../hornetq/server0/hornetq-configuration.xml   |    4 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/proton-ruby/pom.xml                |   40 +-
 examples/jms/proton-ruby/readme.html            |    2 +-
 .../hornetq/server0/hornetq-configuration.xml   |    4 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../jms/queue-message-redistribution/pom.xml    |   38 +-
 .../QueueMessageRedistributionExample.java      |  180 +
 .../QueueMessageRedistributionExample.java      |  180 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/queue-requestor/pom.xml            |   38 +-
 .../jms/example/QueueRequestorExample.java      |  111 +
 .../jms/example/TextReverserService.java        |  123 +
 .../jms/example/QueueRequestorExample.java      |  111 -
 .../jms/example/TextReverserService.java        |  123 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/queue-selector/pom.xml             |   38 +-
 .../jms/example/QueueSelectorExample.java       |  156 +
 .../jms/example/QueueSelectorExample.java       |  156 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/queue/pom.xml                      |   38 +-
 .../activemq/jms/example/QueueExample.java      |   97 +
 .../org/hornetq/jms/example/QueueExample.java   |   97 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/reattach-node/pom.xml              |   38 +-
 .../activemq/jms/example/ReattachExample.java   |  167 +
 .../hornetq/jms/example/ReattachExample.java    |  167 -
 .../hornetq/server0/hornetq-configuration.xml   |   10 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/replicated-failback-static/pom.xml |   38 +-
 .../ReplicatedFailbackStaticExample.java        |  162 +
 .../ReplicatedFailbackStaticExample.java        |  162 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/replicated-failback/pom.xml        |   38 +-
 .../jms/example/ReplicatedFailbackExample.java  |  162 +
 .../jms/example/ReplicatedFailbackExample.java  |  162 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../jms/replicated-multiple-failover/pom.xml    |   38 +-
 .../ReplicatedMultipleFailoverExample.java      |  158 +
 .../ReplicatedMultipleFailoverExample.java      |  158 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../jms/replicated-transaction-failover/pom.xml |   38 +-
 .../ReplicatedTransactionFailoverExample.java   |  176 +
 .../ReplicatedTransactionFailoverExample.java   |  176 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/request-reply/pom.xml              |   38 +-
 .../jms/example/RequestReplyExample.java        |  222 +
 .../jms/example/RequestReplyExample.java        |  222 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/rest/dup-send/pom.xml              |   26 +-
 .../rest/dup-send/src/main/java/PostOrder.java  |    2 +-
 .../src/main/resources/hornetq-client.xml       |    4 +-
 .../main/resources/hornetq-configuration.xml    |    8 +-
 .../dup-send/src/main/resources/hornetq-jms.xml |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../dup-send/src/main/webapp/WEB-INF/web.xml    |    4 +-
 examples/jms/rest/javascript-chat/pom.xml       |   26 +-
 .../main/resources/hornetq-configuration.xml    |    6 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 .../messaging/test/AutoAckTopicTest.java        |    2 +-
 examples/jms/rest/jms-to-rest/pom.xml           |   26 +-
 .../jms-to-rest/src/main/java/JmsHelper.java    |   16 +-
 .../jms-to-rest/src/main/java/JmsReceive.java   |    4 +-
 .../rest/jms-to-rest/src/main/java/JmsSend.java |    2 +-
 .../src/main/resources/hornetq-client.xml       |    4 +-
 .../main/resources/hornetq-configuration.xml    |    8 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../jms-to-rest/src/main/webapp/WEB-INF/web.xml |    4 +-
 examples/jms/rest/pom.xml                       |   10 +-
 examples/jms/rest/push/pom.xml                  |   26 +-
 .../jms/rest/push/src/main/java/JmsHelper.java  |   14 +-
 .../jms/rest/push/src/main/java/PostOrder.java  |    2 +-
 .../jms/rest/push/src/main/java/PushReg.java    |    8 +-
 .../push/src/main/java/ReceiveShipping.java     |    4 +-
 .../push/src/main/resources/hornetq-client.xml  |    4 +-
 .../main/resources/hornetq-configuration.xml    |    8 +-
 .../push/src/main/resources/hornetq-jms.xml     |    2 +-
 .../push/src/main/resources/hornetq-users.xml   |    2 +-
 .../rest/push/src/main/webapp/WEB-INF/web.xml   |    4 +-
 examples/jms/scale-down/pom.xml                 |   34 +-
 .../activemq/jms/example/ScaleDownExample.java  |  131 +
 .../hornetq/jms/example/ScaleDownExample.java   |  131 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/scheduled-message/pom.xml          |   38 +-
 .../jms/example/ScheduledMessageExample.java    |  110 +
 .../jms/example/ScheduledMessageExample.java    |  110 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/security/pom.xml                   |   38 +-
 .../activemq/jms/example/SecurityExample.java   |  320 +
 .../hornetq/jms/example/SecurityExample.java    |  320 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/send-acknowledgements/pom.xml      |   38 +-
 .../example/SendAcknowledgementsExample.java    |  121 +
 .../example/SendAcknowledgementsExample.java    |  121 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/spring-integration/pom.xml         |   42 +-
 .../activemq/jms/example/ExampleListener.java   |   40 +
 .../activemq/jms/example/MessageSender.java     |   66 +
 .../activemq/jms/example/SpringExample.java     |   33 +
 .../hornetq/jms/example/ExampleListener.java    |   40 -
 .../org/hornetq/jms/example/MessageSender.java  |   66 -
 .../org/hornetq/jms/example/SpringExample.java  |   33 -
 .../main/resources/hornetq-configuration.xml    |    6 +-
 .../src/main/resources/hornetq-jms.xml          |    2 +-
 .../src/main/resources/hornetq-users.xml        |    2 +-
 .../src/main/resources/spring-jms-beans.xml     |    6 +-
 examples/jms/ssl-enabled/pom.xml                |   38 +-
 examples/jms/ssl-enabled/readme.html            |    4 +-
 .../apache/activemq/jms/example/SSLExample.java |  100 +
 .../org/hornetq/jms/example/SSLExample.java     |  100 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/static-selector-jms/pom.xml        |   38 +-
 .../jms/example/StaticSelectorJMSExample.java   |  150 +
 .../jms/example/StaticSelectorJMSExample.java   |  150 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/static-selector/pom.xml            |   38 +-
 .../jms/example/StaticSelectorExample.java      |  150 +
 .../jms/example/StaticSelectorExample.java      |  150 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/stomp-websockets/pom.xml           |   42 +-
 examples/jms/stomp-websockets/readme.html       |    2 +-
 .../jms/example/StompWebSocketExample.java      |   87 +
 .../jms/example/StompWebSocketExample.java      |   87 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/stomp/pom.xml                      |   42 +-
 .../activemq/jms/example/StompExample.java      |  132 +
 .../org/hornetq/jms/example/StompExample.java   |  132 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/stomp1.1/pom.xml                   |   42 +-
 .../activemq/jms/example/StompExample.java      |  153 +
 .../org/hornetq/jms/example/StompExample.java   |  153 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/stomp1.2/pom.xml                   |   42 +-
 .../activemq/jms/example/StompExample.java      |  152 +
 .../org/hornetq/jms/example/StompExample.java   |  152 -
 .../hornetq/server0/hornetq-configuration.xml   |    8 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/stop-server-failover/pom.xml       |   38 +-
 .../jms/example/StopServerFailoverExample.java  |  138 +
 .../jms/example/StopServerFailoverExample.java  |  138 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/symmetric-cluster/pom.xml          |   38 +-
 .../jms/example/SymmetricClusterExample.java    |  239 +
 .../jms/example/SymmetricClusterExample.java    |  239 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 .../hornetq/server2/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server2/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server2/hornetq-users.xml |    2 +-
 .../hornetq/server3/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server3/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server3/hornetq-users.xml |    2 +-
 .../hornetq/server4/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server4/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server4/hornetq-users.xml |    2 +-
 .../hornetq/server5/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server5/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server5/hornetq-users.xml |    2 +-
 examples/jms/temp-queue/pom.xml                 |   38 +-
 .../jms/example/TemporaryQueueExample.java      |  133 +
 .../jms/example/TemporaryQueueExample.java      |  133 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/topic-hierarchies/pom.xml          |   38 +-
 .../jms/example/TopicHierarchyExample.java      |  135 +
 .../jms/example/TopicHierarchyExample.java      |  135 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/topic-selector-example1/pom.xml    |   38 +-
 .../jms/example/TopicSelectorExample1.java      |  167 +
 .../jms/example/TopicSelectorExample1.java      |  167 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/topic-selector-example2/pom.xml    |   38 +-
 .../jms/example/TopicSelectorExample2.java      |  157 +
 .../jms/example/TopicSelectorExample2.java      |  157 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/topic/pom.xml                      |   38 +-
 .../activemq/jms/example/TopicExample.java      |  107 +
 .../org/hornetq/jms/example/TopicExample.java   |  107 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/transaction-failover/pom.xml       |   38 +-
 .../jms/example/TransactionFailoverExample.java |  176 +
 .../jms/example/TransactionFailoverExample.java |  176 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 .../hornetq/server1/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server1/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server1/hornetq-users.xml |    2 +-
 examples/jms/transactional/pom.xml              |   38 +-
 .../jms/example/TransactionalExample.java       |  141 +
 .../jms/example/TransactionalExample.java       |  141 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/xa-heuristic/pom.xml               |   38 +-
 .../jms/example/XAHeuristicExample.java         |  252 +
 .../hornetq/jms/example/XAHeuristicExample.java |  252 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/xa-receive/pom.xml                 |   38 +-
 .../activemq/jms/example/XAReceiveExample.java  |  169 +
 .../hornetq/jms/example/XAReceiveExample.java   |  169 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/xa-send/pom.xml                    |   38 +-
 .../activemq/jms/example/XASendExample.java     |  211 +
 .../org/hornetq/jms/example/XASendExample.java  |  211 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/jms/xa-with-jta/pom.xml                |   38 +-
 .../activemq/jms/example/XAwithJTAExample.java  |  218 +
 .../hornetq/jms/example/XAwithJTAExample.java   |  218 -
 .../hornetq/server0/hornetq-configuration.xml   |    6 +-
 .../resources/hornetq/server0/hornetq-jms.xml   |    2 +-
 .../resources/hornetq/server0/hornetq-users.xml |    2 +-
 examples/pom.xml                                |   12 +-
 examples/soak/normal/pom.xml                    |   48 +-
 .../normal/server0/hornetq-configuration.xml    |    6 +-
 examples/soak/normal/server0/hornetq-jms.xml    |    2 +-
 .../activemq/jms/soak/example/SoakBase.java     |  129 +
 .../activemq/jms/soak/example/SoakParams.java   |  183 +
 .../activemq/jms/soak/example/SoakReceiver.java |  244 +
 .../activemq/jms/soak/example/SoakSender.java   |  245 +
 .../org/hornetq/jms/soak/example/SoakBase.java  |  129 -
 .../hornetq/jms/soak/example/SoakParams.java    |  183 -
 .../hornetq/jms/soak/example/SoakReceiver.java  |  244 -
 .../hornetq/jms/soak/example/SoakSender.java    |  245 -
 examples/soak/pom.xml                           |   10 +-
 hornetq-bootstrap/pom.xml                       |   68 -
 .../org/hornetq/cli/banner.txt                  |    8 -
 .../org/hornetq/cli/ConfigurationException.java |   21 -
 .../src/main/java/org/hornetq/cli/HornetQ.java  |   76 -
 .../java/org/hornetq/cli/commands/Action.java   |   20 -
 .../org/hornetq/cli/commands/ActionContext.java |   37 -
 .../org/hornetq/cli/commands/HelpAction.java    |   26 -
 .../main/java/org/hornetq/cli/commands/Run.java |  148 -
 .../java/org/hornetq/cli/commands/Stop.java     |   45 -
 .../java/org/hornetq/factory/BrokerFactory.java |   52 -
 .../hornetq/factory/BrokerFactoryHandler.java   |   22 -
 .../java/org/hornetq/factory/CoreFactory.java   |   47 -
 .../org/hornetq/factory/CoreFactoryHandler.java |   22 -
 .../hornetq/factory/FileCoreFactoryHandler.java |   29 -
 .../hornetq/factory/FileJmsFactoryHandler.java  |   32 -
 .../java/org/hornetq/factory/JmsFactory.java    |   46 -
 .../org/hornetq/factory/JmsFactoryHandler.java  |   22 -
 .../hornetq/factory/SecurityManagerFactory.java |   38 -
 .../factory/XmlBrokerFactoryHandler.java        |   34 -
 .../bootstrap/HornetQBootstrapBundle.java       |   31 -
 .../bootstrap/HornetQBootstrapLogger.java       |   71 -
 .../services/org/hornetq/broker/core/file       |   13 -
 .../services/org/hornetq/broker/jms/file        |   13 -
 .../META-INF/services/org/hornetq/broker/xml    |   13 -
 hornetq-commons/pom.xml                         |   39 -
 .../api/core/HornetQAddressExistsException.java |   35 -
 .../api/core/HornetQAddressFullException.java   |   35 -
 .../HornetQAlreadyReplicatingException.java     |   35 -
 .../org/hornetq/api/core/HornetQBuffer.java     | 1084 ---
 .../org/hornetq/api/core/HornetQBuffers.java    |   96 -
 .../core/HornetQClusterSecurityException.java   |   32 -
 .../HornetQConnectionTimedOutException.java     |   35 -
 .../api/core/HornetQDisconnectedException.java  |   35 -
 .../api/core/HornetQDuplicateIdException.java   |   35 -
 .../core/HornetQDuplicateMetaDataException.java |   35 -
 .../org/hornetq/api/core/HornetQException.java  |   76 -
 .../hornetq/api/core/HornetQExceptionType.java  |  298 -
 .../api/core/HornetQIOErrorException.java       |   40 -
 .../api/core/HornetQIllegalStateException.java  |   36 -
 ...ornetQIncompatibleClientServerException.java |   37 -
 ...rnetQInterceptorRejectedPacketException.java |   37 -
 .../api/core/HornetQInternalErrorException.java |   45 -
 .../api/core/HornetQInterruptedException.java   |   27 -
 ...HornetQInvalidFilterExpressionException.java |   35 -
 ...ornetQInvalidTransientQueueUseException.java |   35 -
 .../api/core/HornetQLargeMessageException.java  |   35 -
 ...HornetQLargeMessageInterruptedException.java |   36 -
 .../hornetq/api/core/HornetQNativeIOError.java  |   35 -
 .../core/HornetQNonExistentQueueException.java  |   35 -
 .../api/core/HornetQNotConnectedException.java  |   35 -
 .../api/core/HornetQObjectClosedException.java  |   36 -
 .../HornetQPropertyConversionException.java     |   30 -
 .../api/core/HornetQQueueExistsException.java   |   35 -
 .../api/core/HornetQSecurityException.java      |   35 -
 .../core/HornetQSessionCreationException.java   |   36 -
 ...rnetQTransactionOutcomeUnknownException.java |   35 -
 .../HornetQTransactionRolledBackException.java  |   35 -
 .../api/core/HornetQUnBlockedException.java     |   35 -
 .../core/HornetQUnsupportedPacketException.java |   35 -
 .../main/java/org/hornetq/api/core/Pair.java    |  105 -
 .../java/org/hornetq/api/core/SimpleString.java |  452 --
 .../core/buffers/impl/ChannelBufferWrapper.java |  623 --
 .../hornetq/core/server/HornetQComponent.java   |   31 -
 .../src/main/java/org/hornetq/utils/Base64.java | 2375 -------
 .../main/java/org/hornetq/utils/ByteUtil.java   |   82 -
 .../org/hornetq/utils/ClassloadingUtil.java     |  129 -
 .../org/hornetq/utils/ConcurrentHashSet.java    |   90 -
 .../java/org/hornetq/utils/ConcurrentSet.java   |   28 -
 .../java/org/hornetq/utils/DataConstants.java   |   67 -
 .../utils/DefaultSensitiveStringCodec.java      |  107 -
 .../java/org/hornetq/utils/FactoryFinder.java   |  166 -
 .../org/hornetq/utils/HornetQThreadFactory.java |   68 -
 .../org/hornetq/utils/HornetQUtilBundle.java    |   48 -
 .../org/hornetq/utils/HornetQUtilLogger.java    |   50 -
 .../org/hornetq/utils/PasswordMaskingUtil.java  |   92 -
 .../org/hornetq/utils/ReferenceCounter.java     |   24 -
 .../org/hornetq/utils/ReferenceCounterUtil.java |   67 -
 .../java/org/hornetq/utils/ReusableLatch.java   |  155 -
 .../org/hornetq/utils/SensitiveDataCodec.java   |   33 -
 .../java/org/hornetq/utils/TypedProperties.java | 1212 ----
 .../main/java/org/hornetq/utils/UTF8Util.java   |  273 -
 .../src/main/java/org/hornetq/utils/UUID.java   |  270 -
 .../java/org/hornetq/utils/UUIDGenerator.java   |  371 --
 .../main/java/org/hornetq/utils/UUIDTimer.java  |  324 -
 .../java/org/hornetq/utils/ByteUtilTest.java    |   52 -
 .../test/java/org/hornetq/utils/PairTest.java   |   32 -
 .../org/hornetq/utils/ReferenceCounterTest.java |  132 -
 hornetq-core-client/pom.xml                     |  176 -
 .../org/hornetq/api/core/BroadcastEndpoint.java |   95 -
 .../api/core/BroadcastEndpointFactory.java      |   21 -
 .../BroadcastEndpointFactoryConfiguration.java  |   25 -
 .../api/core/BroadcastGroupConfiguration.java   |  136 -
 .../api/core/DiscoveryGroupConfiguration.java   |  198 -
 ...ryGroupConfigurationCompatibilityHelper.java |   42 -
 .../org/hornetq/api/core/FilterConstants.java   |   71 -
 .../java/org/hornetq/api/core/Interceptor.java  |   40 -
 .../JGroupsBroadcastGroupConfiguration.java     |  400 --
 .../main/java/org/hornetq/api/core/Message.java |  549 --
 .../api/core/TransportConfiguration.java        |  414 --
 .../api/core/TransportConfigurationHelper.java  |   26 -
 .../core/UDPBroadcastGroupConfiguration.java    |  335 -
 .../hornetq/api/core/client/ClientConsumer.java |  123 -
 .../hornetq/api/core/client/ClientMessage.java  |  232 -
 .../hornetq/api/core/client/ClientProducer.java |  149 -
 .../api/core/client/ClientRequestor.java        |  110 -
 .../hornetq/api/core/client/ClientSession.java  |  671 --
 .../api/core/client/ClientSessionFactory.java   |  183 -
 .../core/client/ClusterTopologyListener.java    |   40 -
 .../api/core/client/FailoverEventListener.java  |   30 -
 .../api/core/client/FailoverEventType.java      |   20 -
 .../hornetq/api/core/client/HornetQClient.java  |  209 -
 .../hornetq/api/core/client/MessageHandler.java |   31 -
 .../core/client/SendAcknowledgementHandler.java |   41 -
 .../hornetq/api/core/client/ServerLocator.java  |  790 ---
 .../api/core/client/SessionFailureListener.java |   33 -
 .../hornetq/api/core/client/TopologyMember.java |   96 -
 .../ConnectionLoadBalancingPolicy.java          |   28 -
 ...rstElementConnectionLoadBalancingPolicy.java |   33 -
 .../RandomConnectionLoadBalancingPolicy.java    |   35 -
 ...ndomStickyConnectionLoadBalancingPolicy.java |   41 -
 ...RoundRobinConnectionLoadBalancingPolicy.java |   63 -
 .../core/client/loadbalance/package-info.java   |   21 -
 .../hornetq/api/core/client/package-info.java   |   19 -
 .../api/core/management/AcceptorControl.java    |   43 -
 .../api/core/management/AddressControl.java     |   77 -
 .../core/management/AddressSettingsInfo.java    |  206 -
 .../api/core/management/BridgeControl.java      |   83 -
 .../core/management/BroadcastGroupControl.java  |   58 -
 .../management/ClusterConnectionControl.java    |   85 -
 .../core/management/CoreNotificationType.java   |   54 -
 .../api/core/management/DayCounterInfo.java     |  102 -
 .../api/core/management/DivertControl.java      |   59 -
 .../management/HornetQComponentControl.java     |   36 -
 .../core/management/HornetQServerControl.java   |  621 --
 .../api/core/management/ManagementHelper.java   |  459 --
 .../api/core/management/NotificationType.java   |   30 -
 .../api/core/management/ObjectNameBuilder.java  |  203 -
 .../hornetq/api/core/management/Operation.java  |   39 -
 .../hornetq/api/core/management/Parameter.java  |   35 -
 .../api/core/management/QueueControl.java       |  379 --
 .../api/core/management/ResourceNames.java      |   56 -
 .../hornetq/api/core/management/RoleInfo.java   |  148 -
 .../api/core/management/package-info.java       |   20 -
 .../java/org/hornetq/api/core/package-info.java |   20 -
 .../impl/ResetLimitWrappedHornetQBuffer.java    |  392 --
 .../core/client/HornetQClientLogger.java        |  415 --
 .../core/client/HornetQClientMessageBundle.java |  247 -
 .../core/client/impl/AddressQueryImpl.java      |   44 -
 .../impl/AfterConnectInternalListener.java      |   27 -
 .../core/client/impl/ClientConsumerImpl.java    | 1239 ----
 .../client/impl/ClientConsumerInternal.java     |   72 -
 .../client/impl/ClientLargeMessageImpl.java     |  225 -
 .../client/impl/ClientLargeMessageInternal.java |   31 -
 .../core/client/impl/ClientMessageImpl.java     |  413 --
 .../core/client/impl/ClientMessageInternal.java |   46 -
 .../impl/ClientProducerCreditManager.java       |   42 -
 .../impl/ClientProducerCreditManagerImpl.java   |  233 -
 .../core/client/impl/ClientProducerCredits.java |   46 -
 .../client/impl/ClientProducerCreditsImpl.java  |  228 -
 .../core/client/impl/ClientProducerImpl.java    |  607 --
 .../client/impl/ClientProducerInternal.java     |   29 -
 .../client/impl/ClientSessionFactoryImpl.java   | 1609 -----
 .../impl/ClientSessionFactoryInternal.java      |   63 -
 .../core/client/impl/ClientSessionImpl.java     | 1959 ------
 .../core/client/impl/ClientSessionInternal.java |  121 -
 .../CompressedLargeMessageControllerImpl.java   |  769 ---
 .../core/client/impl/DelegatingSession.java     |  655 --
 .../core/client/impl/HornetQXAResource.java     |   20 -
 .../client/impl/LargeMessageController.java     |   66 -
 .../client/impl/LargeMessageControllerImpl.java | 1505 -----
 .../core/client/impl/QueueQueryImpl.java        |   99 -
 .../core/client/impl/ServerLocatorImpl.java     | 2126 ------
 .../core/client/impl/ServerLocatorInternal.java |   86 -
 .../org/hornetq/core/client/impl/Topology.java  |  546 --
 .../core/client/impl/TopologyMemberImpl.java    |  138 -
 .../hornetq/core/cluster/DiscoveryEntry.java    |   58 -
 .../hornetq/core/cluster/DiscoveryGroup.java    |  432 --
 .../hornetq/core/cluster/DiscoveryListener.java |   30 -
 .../core/exception/HornetQXAException.java      |   39 -
 .../org/hornetq/core/message/BodyEncoder.java   |   54 -
 .../hornetq/core/message/impl/MessageImpl.java  | 1126 ----
 .../core/message/impl/MessageInternal.java      |   64 -
 .../core/protocol/ClientPacketDecoder.java      |   71 -
 .../org/hornetq/core/protocol/core/Channel.java |  202 -
 .../core/protocol/core/ChannelHandler.java      |   30 -
 .../core/CommandConfirmationHandler.java        |   31 -
 .../protocol/core/CoreRemotingConnection.java   |  104 -
 .../org/hornetq/core/protocol/core/Packet.java  |   86 -
 .../core/protocol/core/impl/ChannelImpl.java    |  705 --
 .../core/impl/HornetQClientProtocolManager.java |  613 --
 .../HornetQClientProtocolManagerFactory.java    |   42 -
 .../core/impl/HornetQConsumerContext.java       |   54 -
 .../core/impl/HornetQSessionContext.java        |  940 ---
 .../core/protocol/core/impl/PacketDecoder.java  |  474 --
 .../core/protocol/core/impl/PacketImpl.java     |  379 --
 .../core/impl/RemotingConnectionImpl.java       |  470 --
 .../impl/wireformat/CheckFailoverMessage.java   |   49 -
 .../wireformat/CheckFailoverReplyMessage.java   |   56 -
 .../ClusterTopologyChangeMessage.java           |  217 -
 .../ClusterTopologyChangeMessage_V2.java        |  192 -
 .../ClusterTopologyChangeMessage_V3.java        |  108 -
 .../impl/wireformat/CreateQueueMessage.java     |  205 -
 .../impl/wireformat/CreateSessionMessage.java   |  272 -
 .../CreateSessionResponseMessage.java           |   91 -
 .../wireformat/CreateSharedQueueMessage.java    |  180 -
 .../wireformat/DisconnectConsumerMessage.java   |   50 -
 .../core/impl/wireformat/DisconnectMessage.java |  120 -
 .../impl/wireformat/DisconnectMessage_V2.java   |  105 -
 .../wireformat/HornetQExceptionMessage.java     |  118 -
 .../core/impl/wireformat/MessagePacket.java     |   42 -
 .../impl/wireformat/NullResponseMessage.java    |   33 -
 .../wireformat/PacketsConfirmedMessage.java     |  105 -
 .../protocol/core/impl/wireformat/Ping.java     |  103 -
 .../impl/wireformat/ReattachSessionMessage.java |  106 -
 .../ReattachSessionResponseMessage.java         |  109 -
 .../core/impl/wireformat/RollbackMessage.java   |   97 -
 .../wireformat/SessionAcknowledgeMessage.java   |  111 -
 .../wireformat/SessionAddMetaDataMessage.java   |  111 -
 .../wireformat/SessionAddMetaDataMessageV2.java |  140 -
 .../wireformat/SessionBindingQueryMessage.java  |   87 -
 .../SessionBindingQueryResponseMessage.java     |  119 -
 .../impl/wireformat/SessionCloseMessage.java    |   54 -
 .../impl/wireformat/SessionCommitMessage.java   |   34 -
 .../wireformat/SessionConsumerCloseMessage.java |   86 -
 .../SessionConsumerFlowCreditMessage.java       |   98 -
 .../wireformat/SessionContinuationMessage.java  |  121 -
 .../SessionCreateConsumerMessage.java           |  170 -
 .../wireformat/SessionDeleteQueueMessage.java   |   93 -
 .../impl/wireformat/SessionExpireMessage.java   |  103 -
 .../SessionForceConsumerDelivery.java           |  104 -
 .../SessionIndividualAcknowledgeMessage.java    |  119 -
 .../SessionProducerCreditsFailMessage.java      |   98 -
 .../SessionProducerCreditsMessage.java          |   98 -
 .../wireformat/SessionQueueQueryMessage.java    |   87 -
 .../SessionQueueQueryResponseMessage.java       |  231 -
 .../SessionReceiveClientLargeMessage.java       |   38 -
 .../SessionReceiveContinuationMessage.java      |  135 -
 .../wireformat/SessionReceiveLargeMessage.java  |  139 -
 .../impl/wireformat/SessionReceiveMessage.java  |  134 -
 .../SessionRequestProducerCreditsMessage.java   |  106 -
 .../SessionSendContinuationMessage.java         |  157 -
 .../wireformat/SessionSendLargeMessage.java     |   91 -
 .../impl/wireformat/SessionSendMessage.java     |  134 -
 .../SessionUniqueAddMetaDataMessage.java        |   55 -
 .../wireformat/SessionXAAfterFailedMessage.java |   99 -
 .../impl/wireformat/SessionXACommitMessage.java |  111 -
 .../impl/wireformat/SessionXAEndMessage.java    |  105 -
 .../impl/wireformat/SessionXAForgetMessage.java |   86 -
 .../SessionXAGetInDoubtXidsResponseMessage.java |  106 -
 .../SessionXAGetTimeoutResponseMessage.java     |   84 -
 .../impl/wireformat/SessionXAJoinMessage.java   |   86 -
 .../wireformat/SessionXAPrepareMessage.java     |   94 -
 .../wireformat/SessionXAResponseMessage.java    |  118 -
 .../impl/wireformat/SessionXAResumeMessage.java |   88 -
 .../wireformat/SessionXARollbackMessage.java    |   95 -
 .../wireformat/SessionXASetTimeoutMessage.java  |   80 -
 .../SessionXASetTimeoutResponseMessage.java     |   86 -
 .../impl/wireformat/SessionXAStartMessage.java  |   98 -
 .../SubscribeClusterTopologyUpdatesMessage.java |  102 -
 ...ubscribeClusterTopologyUpdatesMessageV2.java |   87 -
 .../hornetq/core/remoting/CloseListener.java    |   28 -
 .../hornetq/core/remoting/FailureListener.java  |   41 -
 .../impl/TransportConfigurationUtil.java        |   92 -
 .../impl/netty/HornetQAMQPFrameDecoder.java     |   41 -
 .../impl/netty/HornetQChannelHandler.java       |  122 -
 .../impl/netty/HornetQFrameDecoder2.java        |   39 -
 .../remoting/impl/netty/NettyConnection.java    |  448 --
 .../remoting/impl/netty/NettyConnector.java     | 1266 ----
 .../impl/netty/NettyConnectorFactory.java       |   61 -
 .../netty/PartialPooledByteBufAllocator.java    |  152 -
 .../impl/netty/SharedNioEventLoopGroup.java     |  150 -
 .../remoting/impl/netty/TransportConstants.java |  281 -
 .../core/remoting/impl/ssl/SSLSupport.java      |  188 -
 .../org/hornetq/core/remoting/package-info.java |   19 -
 .../hornetq/core/security/HornetQPrincipal.java |   41 -
 .../java/org/hornetq/core/security/Role.java    |  199 -
 .../hornetq/core/server/QueueQueryResult.java   |  124 -
 .../core/server/management/Notification.java    |   59 -
 .../server/management/NotificationListener.java |   28 -
 .../server/management/NotificationService.java  |   41 -
 .../settings/impl/AddressFullMessagePolicy.java |   25 -
 .../hornetq/core/transaction/impl/XidImpl.java  |  218 -
 .../java/org/hornetq/core/version/Version.java  |   39 -
 .../hornetq/core/version/impl/VersionImpl.java  |  202 -
 .../org/hornetq/reader/BytesMessageUtil.java    |  233 -
 .../java/org/hornetq/reader/MapMessageUtil.java |   59 -
 .../java/org/hornetq/reader/MessageUtil.java    |  201 -
 .../org/hornetq/reader/StreamMessageUtil.java   |  300 -
 .../org/hornetq/reader/TextMessageUtil.java     |   47 -
 .../java/org/hornetq/reader/package-info.java   |   21 -
 .../protocol/AbstractRemotingConnection.java    |  219 -
 .../spi/core/protocol/ConnectionEntry.java      |   50 -
 .../spi/core/protocol/RemotingConnection.java   |  181 -
 .../spi/core/remoting/AbstractConnector.java    |   30 -
 .../spi/core/remoting/BufferDecoder.java        |   34 -
 .../spi/core/remoting/BufferHandler.java        |   33 -
 .../core/remoting/ClientProtocolManager.java    |   78 -
 .../remoting/ClientProtocolManagerFactory.java  |   24 -
 .../hornetq/spi/core/remoting/Connection.java   |  117 -
 .../remoting/ConnectionLifeCycleListener.java   |   56 -
 .../hornetq/spi/core/remoting/Connector.java    |   61 -
 .../spi/core/remoting/ConnectorFactory.java     |   66 -
 .../spi/core/remoting/ConsumerContext.java      |   22 -
 .../spi/core/remoting/ReadyListener.java        |   26 -
 .../spi/core/remoting/SessionContext.java       |  268 -
 .../core/remoting/TopologyResponseHandler.java  |   37 -
 .../hornetq/spi/core/remoting/package-info.java |   20 -
 .../java/org/hornetq/utils/BufferHelper.java    |  193 -
 .../org/hornetq/utils/ConfigurationHelper.java  |  250 -
 .../utils/ConfirmationWindowWarning.java        |   36 -
 .../java/org/hornetq/utils/DeflaterReader.java  |  138 -
 .../java/org/hornetq/utils/ExecutorFactory.java |   27 -
 .../java/org/hornetq/utils/FutureLatch.java     |   61 -
 .../hornetq/utils/HornetQBufferInputStream.java |  181 -
 .../java/org/hornetq/utils/IDGenerator.java     |   31 -
 .../java/org/hornetq/utils/InflaterReader.java  |  139 -
 .../java/org/hornetq/utils/InflaterWriter.java  |  110 -
 .../main/java/org/hornetq/utils/JNDIUtil.java   |  122 -
 .../main/java/org/hornetq/utils/LinkedList.java |   35 -
 .../java/org/hornetq/utils/LinkedListImpl.java  |  456 --
 .../org/hornetq/utils/LinkedListIterator.java   |   32 -
 .../main/java/org/hornetq/utils/MemorySize.java |  140 -
 .../utils/ObjectInputStreamWithClassLoader.java |  195 -
 .../hornetq/utils/OrderedExecutorFactory.java   |  143 -
 .../org/hornetq/utils/PriorityLinkedList.java   |   38 -
 .../hornetq/utils/PriorityLinkedListImpl.java   |  277 -
 .../src/main/java/org/hornetq/utils/Random.java |   46 -
 .../org/hornetq/utils/SecurityFormatter.java    |   73 -
 .../org/hornetq/utils/SimpleIDGenerator.java    |   54 -
 .../org/hornetq/utils/SizeFormatterUtil.java    |   70 -
 .../org/hornetq/utils/SoftValueHashMap.java     |  434 --
 .../utils/TimeAndCounterIDGenerator.java        |  167 -
 .../org/hornetq/utils/TokenBucketLimiter.java   |   34 -
 .../hornetq/utils/TokenBucketLimiterImpl.java   |  119 -
 .../java/org/hornetq/utils/VersionLoader.java   |  252 -
 .../main/java/org/hornetq/utils/XMLUtil.java    |  523 --
 .../java/org/hornetq/utils/XidCodecSupport.java |   70 -
 .../java/org/hornetq/utils/json/JSONArray.java  | 1034 ---
 .../org/hornetq/utils/json/JSONException.java   |   73 -
 .../java/org/hornetq/utils/json/JSONObject.java | 1751 -----
 .../java/org/hornetq/utils/json/JSONString.java |   56 -
 .../org/hornetq/utils/json/JSONTokener.java     |  476 --
 .../java/org/hornetq/utils/package-info.java    |   19 -
 .../resources/HornetQDefaultConfiguration.txt   |  116 -
 .../main/resources/hornetq-version.properties   |    9 -
 .../src/main/resources/hqDefaults.xsl           |  128 -
 .../org/hornetq/tests/CoreUnitTestCase.java     |   85 -
 .../java/org/hornetq/tests/util/RandomUtil.java |  169 -
 .../org/hornetq/tests/util/SilentTestCase.java  |   55 -
 .../org/hornetq/util/CompressionUtilTest.java   |  201 -
 .../org/hornetq/util/ConcurrentHashSetTest.java |  157 -
 .../util/TimeAndCounterIDGeneratorTest.java     |  201 -
 .../util/TypedPropertiesConversionTest.java     |  372 --
 .../org/hornetq/util/TypedPropertiesTest.java   |  248 -
 .../test/java/org/hornetq/util/XMLUtilTest.java |  276 -
 hornetq-dto/pom.xml                             |  147 -
 .../java/org/hornetq/dto/BasicSecurityDTO.java  |   23 -
 .../main/java/org/hornetq/dto/BrokerDTO.java    |   40 -
 .../src/main/java/org/hornetq/dto/CoreDTO.java  |   28 -
 .../src/main/java/org/hornetq/dto/JmsDTO.java   |   29 -
 .../main/java/org/hornetq/dto/NamingDTO.java    |   35 -
 .../main/java/org/hornetq/dto/SecurityDTO.java  |   26 -
 .../src/main/java/org/hornetq/dto/XmlUtil.java  |  106 -
 .../main/java/org/hornetq/dto/package-info.java |   19 -
 .../main/resources/org/hornetq/dto/jaxb.index   |   19 -
 hornetq-jms-client/pom.xml                      |   76 -
 .../org/hornetq/api/jms/HornetQJMSClient.java   |  234 -
 .../hornetq/api/jms/HornetQJMSConstants.java    |   38 -
 .../org/hornetq/api/jms/JMSFactoryType.java     |   83 -
 .../management/ConnectionFactoryControl.java    |  389 --
 .../api/jms/management/DestinationControl.java  |   71 -
 .../api/jms/management/JMSConnectionInfo.java   |  102 -
 .../api/jms/management/JMSConsumerInfo.java     |  134 -
 .../api/jms/management/JMSManagementHelper.java |  168 -
 .../api/jms/management/JMSQueueControl.java     |  288 -
 .../api/jms/management/JMSServerControl.java    |  367 -
 .../api/jms/management/JMSSessionInfo.java      |   62 -
 .../api/jms/management/SubscriptionInfo.java    |  142 -
 .../api/jms/management/TopicControl.java        |  149 -
 .../api/jms/management/package-info.java        |   20 -
 .../java/org/hornetq/api/jms/package-info.java  |   21 -
 .../hornetq/jms/client/HornetQBytesMessage.java |  436 --
 .../hornetq/jms/client/HornetQConnection.java   |  862 ---
 .../jms/client/HornetQConnectionFactory.java    |  821 ---
 .../jms/client/HornetQConnectionForContext.java |   34 -
 .../client/HornetQConnectionForContextImpl.java |   91 -
 .../jms/client/HornetQConnectionMetaData.java   |   97 -
 .../hornetq/jms/client/HornetQDestination.java  |  376 --
 .../jms/client/HornetQJMSClientBundle.java      |   97 -
 .../jms/client/HornetQJMSClientLogger.java      |   79 -
 .../jms/client/HornetQJMSConnectionFactory.java |   67 -
 .../hornetq/jms/client/HornetQJMSConsumer.java  |  198 -
 .../hornetq/jms/client/HornetQJMSContext.java   |  769 ---
 .../hornetq/jms/client/HornetQJMSProducer.java  |  800 ---
 .../hornetq/jms/client/HornetQMapMessage.java   |  450 --
 .../org/hornetq/jms/client/HornetQMessage.java  | 1089 ---
 .../jms/client/HornetQMessageConsumer.java      |  253 -
 .../jms/client/HornetQMessageProducer.java      |  601 --
 .../jms/client/HornetQObjectMessage.java        |  202 -
 .../org/hornetq/jms/client/HornetQQueue.java    |   90 -
 .../hornetq/jms/client/HornetQQueueBrowser.java |  169 -
 .../client/HornetQQueueConnectionFactory.java   |   69 -
 .../org/hornetq/jms/client/HornetQSession.java  | 1276 ----
 .../jms/client/HornetQStreamMessage.java        |  466 --
 .../jms/client/HornetQTemporaryQueue.java       |   67 -
 .../jms/client/HornetQTemporaryTopic.java       |   53 -
 .../hornetq/jms/client/HornetQTextMessage.java  |  146 -
 .../org/hornetq/jms/client/HornetQTopic.java    |   85 -
 .../client/HornetQTopicConnectionFactory.java   |   70 -
 .../hornetq/jms/client/HornetQXAConnection.java |   70 -
 .../jms/client/HornetQXAConnectionFactory.java  |   76 -
 .../hornetq/jms/client/HornetQXAJMSContext.java |   23 -
 .../client/HornetQXAQueueConnectionFactory.java |   71 -
 .../hornetq/jms/client/HornetQXASession.java    |   47 -
 .../client/HornetQXATopicConnectionFactory.java |   69 -
 .../hornetq/jms/client/JMSExceptionHelper.java  |   91 -
 .../jms/client/JMSMessageListenerWrapper.java   |  152 -
 .../hornetq/jms/client/JmsExceptionUtils.java   |  100 -
 .../hornetq/jms/client/SelectorTranslator.java  |  149 -
 .../hornetq/jms/client/ThreadAwareContext.java  |  152 -
 .../org/hornetq/jms/client/package-info.java    |   22 -
 .../ConnectionFactoryObjectFactory.java         |   43 -
 .../referenceable/DestinationObjectFactory.java |   43 -
 .../SerializableObjectRefAddr.java              |   79 -
 hornetq-jms-server/pom.xml                      |   99 -
 .../jms/bridge/ConnectionFactoryFactory.java    |   25 -
 .../hornetq/jms/bridge/DestinationFactory.java  |   27 -
 .../jms/bridge/HornetQJMSBridgeLogger.java      |  101 -
 .../java/org/hornetq/jms/bridge/JMSBridge.java  |  115 -
 .../hornetq/jms/bridge/JMSBridgeControl.java    |   93 -
 .../jms/bridge/QualityOfServiceMode.java        |  100 -
 .../jms/bridge/impl/JMSBridgeControlImpl.java   |  256 -
 .../hornetq/jms/bridge/impl/JMSBridgeImpl.java  | 2438 -------
 .../impl/JNDIConnectionFactoryFactory.java      |   40 -
 .../jms/bridge/impl/JNDIDestinationFactory.java |   40 -
 .../jms/bridge/impl/JNDIFactorySupport.java     |   67 -
 .../impl/JMSConnectionFactoryControlImpl.java   |  471 --
 .../management/impl/JMSQueueControlImpl.java    |  389 --
 .../management/impl/JMSServerControlImpl.java   | 1049 ---
 .../management/impl/JMSTopicControlImpl.java    |  417 --
 .../jms/persistence/JMSStorageManager.java      |   54 -
 .../config/PersistedConnectionFactory.java      |  111 -
 .../config/PersistedDestination.java            |  128 -
 .../jms/persistence/config/PersistedJNDI.java   |  167 -
 .../jms/persistence/config/PersistedType.java   |   53 -
 .../journal/JMSJournalStorageManagerImpl.java   |  362 -
 .../impl/nullpm/NullJMSStorageManagerImpl.java  |  108 -
 .../jms/server/HornetQJMSServerBundle.java      |   62 -
 .../jms/server/HornetQJMSServerLogger.java      |  115 -
 .../jms/server/JMSServerConfigParser.java       |   65 -
 .../hornetq/jms/server/JMSServerManager.java    |  319 -
 .../config/ConnectionFactoryConfiguration.java  |  172 -
 .../jms/server/config/JMSConfiguration.java     |   47 -
 .../server/config/JMSQueueConfiguration.java    |   39 -
 .../jms/server/config/TopicConfiguration.java   |   29 -
 .../ConnectionFactoryConfigurationImpl.java     |  847 ---
 .../config/impl/JMSConfigurationImpl.java       |  103 -
 .../config/impl/JMSQueueConfigurationImpl.java  |  104 -
 .../config/impl/TopicConfigurationImpl.java     |   78 -
 .../TransportConfigurationEncodingSupport.java  |  153 -
 .../jms/server/embedded/EmbeddedJMS.java        |  124 -
 .../server/impl/JMSServerConfigParserImpl.java  |  518 --
 .../jms/server/impl/JMSServerDeployer.java      |  185 -
 .../jms/server/impl/JMSServerManagerImpl.java   | 1971 ------
 .../jms/server/impl/StandaloneNamingServer.java |  167 -
 .../server/management/JMSManagementService.java |   47 -
 .../server/management/JMSNotificationType.java  |   41 -
 .../impl/JMSManagementServiceImpl.java          |  163 -
 .../recovery/HornetQRecoveryRegistry.java       |  250 -
 .../server/recovery/HornetQRegistryBase.java    |   71 -
 .../recovery/HornetQXAResourceRecovery.java     |  231 -
 .../recovery/HornetQXAResourceWrapper.java      |  531 --
 .../jms/server/recovery/RecoveryDiscovery.java  |  232 -
 .../jms/server/recovery/XARecoveryConfig.java   |  167 -
 .../jms/server/recovery/package-info.java       |   22 -
 .../jms/transaction/JMSTransactionDetail.java   |   78 -
 .../src/main/resources/schema/hornetq-jms.xsd   |  267 -
 hornetq-journal/pom.xml                         |   92 -
 .../org/hornetq/core/asyncio/AIOCallback.java   |   31 -
 .../hornetq/core/asyncio/AsynchronousFile.java  |   59 -
 .../hornetq/core/asyncio/BufferCallback.java    |   27 -
 .../core/asyncio/IOExceptionListener.java       |   25 -
 .../core/asyncio/impl/AsynchronousFileImpl.java |  819 ---
 .../core/asyncio/impl/HornetQFileLock.java      |   47 -
 .../hornetq/core/journal/EncodingSupport.java   |   33 -
 .../org/hornetq/core/journal/IOAsyncTask.java   |   27 -
 .../org/hornetq/core/journal/IOCompletion.java  |   25 -
 .../core/journal/IOCriticalErrorListener.java   |   25 -
 .../java/org/hornetq/core/journal/Journal.java  |  227 -
 .../core/journal/JournalLoadInformation.java    |  116 -
 .../hornetq/core/journal/LoaderCallback.java    |   29 -
 .../core/journal/PreparedTransactionInfo.java   |   42 -
 .../org/hornetq/core/journal/RecordInfo.java    |   86 -
 .../hornetq/core/journal/SequentialFile.java    |  131 -
 .../core/journal/SequentialFileFactory.java     |   88 -
 .../hornetq/core/journal/TestableJournal.java   |   70 -
 .../journal/TransactionFailureCallback.java     |   31 -
 .../core/journal/impl/AIOSequentialFile.java    |  329 -
 .../journal/impl/AIOSequentialFileFactory.java  |  358 -
 .../journal/impl/AbstractJournalUpdateTask.java |  253 -
 .../journal/impl/AbstractSequentialFile.java    |  408 --
 .../impl/AbstractSequentialFileFactory.java     |  220 -
 .../core/journal/impl/CompactJournal.java       |   66 -
 .../core/journal/impl/DummyCallback.java        |   51 -
 .../core/journal/impl/ExportJournal.java        |  206 -
 .../core/journal/impl/FileWrapperJournal.java   |  337 -
 .../core/journal/impl/ImportJournal.java        |  388 --
 .../hornetq/core/journal/impl/JournalBase.java  |  217 -
 .../core/journal/impl/JournalCompactor.java     |  639 --
 .../core/journal/impl/JournalConstants.java     |   23 -
 .../hornetq/core/journal/impl/JournalFile.java  |   67 -
 .../core/journal/impl/JournalFileImpl.java      |  206 -
 .../journal/impl/JournalFilesRepository.java    |  767 ---
 .../hornetq/core/journal/impl/JournalImpl.java  | 3252 ---------
 .../journal/impl/JournalReaderCallback.java     |   79 -
 .../impl/JournalReaderCallbackAbstract.java     |   67 -
 .../core/journal/impl/JournalRecord.java        |   96 -
 .../journal/impl/JournalRecordProvider.java     |   33 -
 .../core/journal/impl/JournalTransaction.java   |  456 --
 .../core/journal/impl/NIOSequentialFile.java    |  415 --
 .../journal/impl/NIOSequentialFileFactory.java  |  171 -
 .../hornetq/core/journal/impl/Reclaimer.java    |  118 -
 .../core/journal/impl/SimpleWaitIOCallback.java |   92 -
 .../core/journal/impl/SyncIOCompletion.java     |   47 -
 .../core/journal/impl/SyncSpeedTest.java        |  354 -
 .../hornetq/core/journal/impl/TimedBuffer.java  |  560 --
 .../core/journal/impl/TimedBufferObserver.java  |   55 -
 .../core/journal/impl/TransactionCallback.java  |  116 -
 .../impl/dataformat/ByteArrayEncoding.java      |   51 -
 .../impl/dataformat/JournalAddRecord.java       |   85 -
 .../impl/dataformat/JournalAddRecordTX.java     |   96 -
 .../dataformat/JournalCompleteRecordTX.java     |  114 -
 .../impl/dataformat/JournalDeleteRecord.java    |   56 -
 .../impl/dataformat/JournalDeleteRecordTX.java  |   77 -
 .../impl/dataformat/JournalInternalRecord.java  |   73 -
 .../dataformat/JournalRollbackRecordTX.java     |   50 -
 .../hornetq/journal/HornetQJournalBundle.java   |   48 -
 .../hornetq/journal/HornetQJournalLogger.java   |  271 -
 .../asyncio/LibaioDependencyCheckTest.java      |   57 -
 hornetq-native/README                           |   45 -
 hornetq-native/bin/libHornetQAIO32.so           |  Bin 44488 -> 0 bytes
 hornetq-native/bin/libHornetQAIO64.so           |  Bin 51654 -> 0 bytes
 hornetq-native/compile-native.sh                |    1 -
 hornetq-native/pom.xml                          |  126 -
 hornetq-native/src/main/c/AIOController.cpp     |   59 -
 hornetq-native/src/main/c/AIOController.h       |   47 -
 hornetq-native/src/main/c/AIOException.h        |   71 -
 hornetq-native/src/main/c/AsyncFile.cpp         |  344 -
 hornetq-native/src/main/c/AsyncFile.h           |   89 -
 hornetq-native/src/main/c/CallbackAdapter.h     |   38 -
 hornetq-native/src/main/c/JAIODatatypes.h       |   24 -
 .../src/main/c/JNICallbackAdapter.cpp           |   58 -
 hornetq-native/src/main/c/JNICallbackAdapter.h  |   62 -
 .../src/main/c/JNI_AsynchronousFileImpl.cpp     |  373 --
 hornetq-native/src/main/c/JavaUtilities.cpp     |   58 -
 hornetq-native/src/main/c/JavaUtilities.h       |   22 -
 hornetq-native/src/main/c/LockClass.h           |   35 -
 hornetq-native/src/main/c/Version.h             |    8 -
 .../java/org/hornetq/core/libaio/Native.java    |   74 -
 hornetq-protocols/hornetq-amqp-protocol/pom.xml |   76 -
 .../proton/HornetQProtonRemotingConnection.java |  146 -
 .../protocol/proton/ProtonProtocolManager.java  |  122 -
 .../proton/ProtonProtocolManagerFactory.java    |   43 -
 .../proton/converter/HornetQJMSVendor.java      |  155 -
 .../converter/ProtonMessageConverter.java       |   78 -
 .../converter/jms/ServerJMSBytesMessage.java    |  239 -
 .../converter/jms/ServerJMSMapMessage.java      |  326 -
 .../proton/converter/jms/ServerJMSMessage.java  |  435 --
 .../converter/jms/ServerJMSStreamMessage.java   |  417 --
 .../converter/jms/ServerJMSTextMessage.java     |  112 -
 .../proton/converter/jms/package-info.java      |   21 -
 .../plug/HornetQProtonConnectionCallback.java   |  125 -
 .../plug/ProtonSessionIntegrationCallback.java  |  341 -
 .../core/protocol/proton/plug/package-info.java |   18 -
 .../protocol/proton/sasl/HornetQPlainSASL.java  |   50 -
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 -
 .../core/protocol/proton/TestConversions.java   |  841 ---
 .../hornetq-openwire-protocol/pom.xml           |   49 -
 .../protocol/openwire/AMQConnectorImpl.java     |  121 -
 .../protocol/openwire/AMQTransactionImpl.java   |   74 -
 .../core/protocol/openwire/BrokerState.java     |   23 -
 .../protocol/openwire/DataInputWrapper.java     |  257 -
 .../openwire/NotEnoughBytesException.java       |   21 -
 .../protocol/openwire/OpenWireConnection.java   | 1765 -----
 .../openwire/OpenWireMessageConverter.java      |  787 ---
 .../openwire/OpenWireProtocolManager.java       |  756 ---
 .../OpenWireProtocolManagerFactory.java         |   46 -
 .../core/protocol/openwire/OpenWireUtil.java    |   57 -
 .../core/protocol/openwire/SendingResult.java   |   63 -
 .../amq/AMQAbstractDeadLetterStrategy.java      |  107 -
 .../openwire/amq/AMQBrokerStoppedException.java |   41 -
 .../openwire/amq/AMQConnectionContext.java      |  393 --
 .../protocol/openwire/amq/AMQConnector.java     |   70 -
 .../openwire/amq/AMQConnectorStatistics.java    |  116 -
 .../core/protocol/openwire/amq/AMQConsumer.java |  390 --
 .../openwire/amq/AMQConsumerBrokerExchange.java |   89 -
 .../openwire/amq/AMQDeadLetterStrategy.java     |   65 -
 .../protocol/openwire/amq/AMQDestination.java   |  240 -
 .../openwire/amq/AMQDestinationStatistics.java  |  228 -
 .../AMQMapTransportConnectionStateRegister.java |  147 -
 .../amq/AMQMessageAuthorizationPolicy.java      |   28 -
 .../protocol/openwire/amq/AMQMessageStore.java  |   18 -
 .../openwire/amq/AMQPersistenceAdapter.java     |   58 -
 .../core/protocol/openwire/amq/AMQProducer.java |   33 -
 .../openwire/amq/AMQProducerBrokerExchange.java |  264 -
 .../openwire/amq/AMQSecurityContext.java        |   91 -
 .../openwire/amq/AMQServerConsumer.java         |  183 -
 .../protocol/openwire/amq/AMQServerSession.java |  451 --
 .../openwire/amq/AMQServerSessionFactory.java   |   50 -
 .../core/protocol/openwire/amq/AMQSession.java  |  590 --
 .../amq/AMQSharedDeadLetterStrategy.java        |   55 -
 ...QSingleTransportConnectionStateRegister.java |  183 -
 .../openwire/amq/AMQSlowConsumerStrategy.java   |   39 -
 .../protocol/openwire/amq/AMQSubscription.java  |  241 -
 .../openwire/amq/AMQSubscriptionRecovery.java   |   42 -
 .../protocol/openwire/amq/AMQTransaction.java   |  249 -
 .../openwire/amq/AMQTransactionFactory.java     |   29 -
 .../amq/AMQTransportConnectionState.java        |   86 -
 .../AMQTransportConnectionStateRegister.java    |   58 -
 .../protocol/openwire/amq/BrowserListener.java  |   18 -
 .../core/protocol/openwire/amq/MessageInfo.java |   47 -
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 -
 hornetq-protocols/hornetq-proton-plug/pom.xml   |   80 -
 .../plug/AMQPClientConnectionContext.java       |   34 -
 .../proton/plug/AMQPClientReceiverContext.java  |   29 -
 .../proton/plug/AMQPClientSenderContext.java    |   25 -
 .../proton/plug/AMQPClientSessionContext.java   |   27 -
 .../org/proton/plug/AMQPConnectionCallback.java |   41 -
 .../org/proton/plug/AMQPConnectionContext.java  |   68 -
 .../plug/AMQPConnectionContextFactory.java      |   26 -
 .../plug/AMQPServerConnectionContext.java       |   22 -
 .../org/proton/plug/AMQPSessionCallback.java    |   85 -
 .../org/proton/plug/AMQPSessionContext.java     |   35 -
 .../main/java/org/proton/plug/ClientSASL.java   |   24 -
 .../main/java/org/proton/plug/SASLResult.java   |   25 -
 .../main/java/org/proton/plug/ServerSASL.java   |   25 -
 .../plug/context/AbstractConnectionContext.java |  282 -
 .../context/AbstractProtonContextSender.java    |  154 -
 .../context/AbstractProtonReceiverContext.java  |   67 -
 .../context/AbstractProtonSessionContext.java   |  189 -
 .../plug/context/ProtonDeliveryHandler.java     |   31 -
 .../plug/context/ProtonInitializable.java       |   83 -
 .../proton/plug/context/ProtonPlugSender.java   |   27 -
 .../plug/context/ProtonTransactionHandler.java  |  134 -
 .../client/ProtonClientConnectionContext.java   |   97 -
 .../ProtonClientConnectionContextFactory.java   |   39 -
 .../context/client/ProtonClientContext.java     |   82 -
 .../client/ProtonClientReceiverContext.java     |   89 -
 .../client/ProtonClientSessionContext.java      |   91 -
 .../server/ProtonServerConnectionContext.java   |   76 -
 .../ProtonServerConnectionContextFactory.java   |   38 -
 .../server/ProtonServerReceiverContext.java     |  159 -
 .../server/ProtonServerSenderContext.java       |  283 -
 .../server/ProtonServerSessionContext.java      |  124 -
 .../plug/exceptions/HornetQAMQPException.java   |   45 -
 .../HornetQAMQPIllegalStateException.java       |   28 -
 .../HornetQAMQPInternalErrorException.java      |   33 -
 .../HornetQAMQPInvalidFieldException.java       |   28 -
 .../HornetQAMQPNotImplementedException.java     |   28 -
 .../exceptions/HornetQAMQPTimeoutException.java |   29 -
 .../org/proton/plug/handler/EventHandler.java   |   80 -
 .../java/org/proton/plug/handler/Events.java    |  109 -
 .../org/proton/plug/handler/ProtonHandler.java  |  134 -
 .../plug/handler/impl/DefaultEventHandler.java  |  167 -
 .../plug/handler/impl/ProtonHandlerImpl.java    |  423 --
 .../HornetQAMQPProtocolMessageBundle.java       |   83 -
 .../proton/plug/sasl/AnonymousServerSASL.java   |   41 -
 .../org/proton/plug/sasl/ClientSASLPlain.java   |   62 -
 .../org/proton/plug/sasl/PlainSASLResult.java   |   51 -
 .../org/proton/plug/sasl/ServerSASLPlain.java   |   75 -
 .../java/org/proton/plug/util/ByteUtil.java     |  152 -
 .../java/org/proton/plug/util/CodecCache.java   |   56 -
 .../org/proton/plug/util/CreditsSemaphore.java  |  134 -
 .../java/org/proton/plug/util/DebugInfo.java    |   23 -
 .../java/org/proton/plug/util/DeliveryUtil.java |   49 -
 .../org/proton/plug/util/FutureRunnable.java    |   70 -
 .../org/proton/plug/util/NettyWritable.java     |  120 -
 .../proton/plug/util/ProtonServerMessage.java   |  596 --
 .../org/proton/plug/util/ReusableLatch.java     |  156 -
 .../org/proton/plug/test/AbstractJMSTest.java   |  135 -
 .../java/org/proton/plug/test/Constants.java    |   23 -
 .../java/org/proton/plug/test/ProtonTest.java   |  372 --
 .../plug/test/invm/InVMTestConnector.java       |   38 -
 .../proton/plug/test/invm/ProtonINVMSPI.java    |  209 -
 .../plug/test/minimalclient/AMQPClientSPI.java  |  121 -
 .../plug/test/minimalclient/Connector.java      |   27 -
 .../test/minimalclient/SimpleAMQPConnector.java |   84 -
 .../plug/test/minimalserver/DumbServer.java     |   59 -
 .../minimalserver/MinimalConnectionSPI.java     |  151 -
 .../plug/test/minimalserver/MinimalServer.java  |  184 -
 .../test/minimalserver/MinimalSessionSPI.java   |  219 -
 .../SimpleServerThreadFactory.java              |   90 -
 .../proton/plug/test/sasl/PlainSASLTest.java    |   39 -
 .../plug/test/util/CreditsSemaphoreTest.java    |  149 -
 .../plug/test/util/ReusableLatchTest.java       |  335 -
 .../test/util/SimpleServerAbstractTest.java     |   79 -
 .../hornetq-stomp-protocol/pom.xml              |   36 -
 .../core/protocol/stomp/FrameEventListener.java |   26 -
 .../protocol/stomp/HornetQStompException.java   |  134 -
 .../stomp/HornetQStompProtocolLogger.java       |   54 -
 .../HornetQStompProtocolMessageBundle.java      |  152 -
 .../core/protocol/stomp/SimpleBytes.java        |   56 -
 .../org/hornetq/core/protocol/stomp/Stomp.java  |  208 -
 .../core/protocol/stomp/StompCommands.java      |   46 -
 .../core/protocol/stomp/StompConnection.java    |  823 ---
 .../core/protocol/stomp/StompDecoder.java       |  723 --
 .../hornetq/core/protocol/stomp/StompFrame.java |  280 -
 .../protocol/stomp/StompProtocolManager.java    |  499 --
 .../stomp/StompProtocolManagerFactory.java      |   46 -
 .../core/protocol/stomp/StompSession.java       |  407 --
 .../core/protocol/stomp/StompSubscription.java  |   68 -
 .../hornetq/core/protocol/stomp/StompUtils.java |  140 -
 .../core/protocol/stomp/StompVersions.java      |   37 -
 .../stomp/VersionedStompFrameHandler.java       |  409 --
 .../stomp/v10/StompFrameHandlerV10.java         |  181 -
 .../core/protocol/stomp/v10/StompFrameV10.java  |   28 -
 .../stomp/v11/StompFrameHandlerV11.java         |  907 ---
 .../core/protocol/stomp/v11/StompFrameV11.java  |  101 -
 .../stomp/v12/StompFrameHandlerV12.java         |  368 -
 .../core/protocol/stomp/v12/StompFrameV12.java  |  107 -
 ...etq.spi.core.protocol.ProtocolManagerFactory |    1 -
 hornetq-protocols/pom.xml                       |   26 -
 hornetq-ra/pom.xml                              |   72 -
 .../hornetq/ra/ConnectionFactoryProperties.java |  841 ---
 .../java/org/hornetq/ra/HornetQRABundle.java    |   70 -
 .../org/hornetq/ra/HornetQRABytesMessage.java   |  455 --
 .../hornetq/ra/HornetQRAConnectionFactory.java  |   65 -
 .../ra/HornetQRAConnectionFactoryImpl.java      |  570 --
 .../hornetq/ra/HornetQRAConnectionManager.java  |   90 -
 .../hornetq/ra/HornetQRAConnectionMetaData.java |  153 -
 .../ra/HornetQRAConnectionRequestInfo.java      |  306 -
 .../org/hornetq/ra/HornetQRACredential.java     |  241 -
 .../org/hornetq/ra/HornetQRAJMSContext.java     |   57 -
 .../hornetq/ra/HornetQRALocalTransaction.java   |  121 -
 .../java/org/hornetq/ra/HornetQRALogger.java    |  122 -
 .../org/hornetq/ra/HornetQRAMCFProperties.java  |  204 -
 .../hornetq/ra/HornetQRAManagedConnection.java  |  921 ---
 .../ra/HornetQRAManagedConnectionFactory.java   |  805 ---
 .../org/hornetq/ra/HornetQRAMapMessage.java     |  452 --
 .../java/org/hornetq/ra/HornetQRAMessage.java   |  897 ---
 .../hornetq/ra/HornetQRAMessageConsumer.java    |  334 -
 .../hornetq/ra/HornetQRAMessageListener.java    |   65 -
 .../hornetq/ra/HornetQRAMessageProducer.java    |  473 --
 .../java/org/hornetq/ra/HornetQRAMetaData.java  |  107 -
 .../org/hornetq/ra/HornetQRAObjectMessage.java  |   76 -
 .../org/hornetq/ra/HornetQRAProperties.java     |  358 -
 .../org/hornetq/ra/HornetQRAQueueReceiver.java  |   61 -
 .../org/hornetq/ra/HornetQRAQueueSender.java    |  138 -
 .../java/org/hornetq/ra/HornetQRAService.java   |   82 -
 .../java/org/hornetq/ra/HornetQRASession.java   | 1903 ------
 .../org/hornetq/ra/HornetQRASessionFactory.java |   51 -
 .../hornetq/ra/HornetQRASessionFactoryImpl.java | 1046 ---
 .../org/hornetq/ra/HornetQRAStreamMessage.java  |  408 --
 .../org/hornetq/ra/HornetQRATextMessage.java    |   74 -
 .../org/hornetq/ra/HornetQRATopicPublisher.java |  211 -
 .../hornetq/ra/HornetQRATopicSubscriber.java    |   77 -
 .../org/hornetq/ra/HornetQRAXAJMSContext.java   |   26 -
 .../org/hornetq/ra/HornetQRAXAResource.java     |  257 -
 .../java/org/hornetq/ra/HornetQRaUtils.java     |  354 -
 .../org/hornetq/ra/HornetQResourceAdapter.java  | 2411 -------
 .../hornetq/ra/HornetQXAResourceWrapper.java    |  143 -
 .../hornetq/ra/inflow/HornetQActivation.java    |  831 ---
 .../ra/inflow/HornetQActivationSpec.java        |  945 ---
 .../ra/inflow/HornetQMessageHandler.java        |  430 --
 .../src/main/java/org/hornetq/ra/package.html   |   24 -
 .../hornetq/ra/recovery/RecoveryManager.java    |  134 -
 hornetq-rest/pom.xml                            |  109 -
 .../org/hornetq/rest/HornetQRestBundle.java     |   31 -
 .../org/hornetq/rest/HornetQRestLogger.java     |   85 -
 .../src/main/java/org/hornetq/rest/Hornetq.java |  191 -
 .../org/hornetq/rest/HttpHeaderProperty.java    |   44 -
 .../src/main/java/org/hornetq/rest/Jms.java     |  197 -
 .../rest/MessageServiceConfiguration.java       |  157 -
 .../org/hornetq/rest/MessageServiceManager.java |  221 -
 .../java/org/hornetq/rest/UnknownMediaType.java |   27 -
 .../org/hornetq/rest/UnmarshalException.java    |   32 -
 .../rest/integration/EmbeddedRestHornetQ.java   |   92 -
 .../integration/EmbeddedRestHornetQJMS.java     |   36 -
 .../integration/HornetqBootstrapListener.java   |   55 -
 .../RestMessagingBootstrapListener.java         |   63 -
 .../ServletContextBindingRegistry.java          |   61 -
 .../rest/queue/AcknowledgedQueueConsumer.java   |  276 -
 .../org/hornetq/rest/queue/Acknowledgement.java |   66 -
 .../hornetq/rest/queue/ConsumedHttpMessage.java |   51 -
 .../org/hornetq/rest/queue/ConsumedMessage.java |   74 -
 .../rest/queue/ConsumedObjectMessage.java       |   61 -
 .../hornetq/rest/queue/ConsumersResource.java   |  327 -
 .../hornetq/rest/queue/DestinationResource.java |   54 -
 .../rest/queue/DestinationServiceManager.java   |  185 -
 .../hornetq/rest/queue/DestinationSettings.java |   63 -
 .../org/hornetq/rest/queue/PostMessage.java     |  300 -
 .../hornetq/rest/queue/PostMessageDupsOk.java   |  101 -
 .../hornetq/rest/queue/PostMessageNoDups.java   |   41 -
 .../org/hornetq/rest/queue/QueueConsumer.java   |  288 -
 .../org/hornetq/rest/queue/QueueDeployment.java |   43 -
 .../rest/queue/QueueDestinationsResource.java   |  207 -
 .../org/hornetq/rest/queue/QueueResource.java   |  209 -
 .../hornetq/rest/queue/QueueServiceManager.java |  119 -
 .../hornetq/rest/queue/push/FilePushStore.java  |  120 -
 .../rest/queue/push/HornetQPushStrategy.java    |   87 -
 .../hornetq/rest/queue/push/PushConsumer.java   |  161 -
 .../queue/push/PushConsumerMessageHandler.java  |   81 -
 .../rest/queue/push/PushConsumerResource.java   |  163 -
 .../org/hornetq/rest/queue/push/PushStore.java  |   34 -
 .../hornetq/rest/queue/push/PushStrategy.java   |   39 -
 .../hornetq/rest/queue/push/UriStrategy.java    |  239 -
 .../rest/queue/push/UriTemplateStrategy.java    |   29 -
 .../rest/queue/push/xml/Authentication.java     |   51 -
 .../rest/queue/push/xml/AuthenticationType.java |   26 -
 .../hornetq/rest/queue/push/xml/BasicAuth.java  |   58 -
 .../hornetq/rest/queue/push/xml/DigestAuth.java |   25 -
 .../rest/queue/push/xml/PushRegistration.java   |  211 -
 .../rest/queue/push/xml/XmlHttpHeader.java      |   65 -
 .../hornetq/rest/queue/push/xml/XmlLink.java    |  103 -
 .../topic/AcknowledgedSubscriptionResource.java |   66 -
 .../hornetq/rest/topic/FileTopicPushStore.java  |   46 -
 .../hornetq/rest/topic/PushSubscription.java    |   67 -
 .../rest/topic/PushSubscriptionsResource.java   |  257 -
 .../rest/topic/PushTopicRegistration.java       |   45 -
 .../org/hornetq/rest/topic/Subscription.java    |   32 -
 .../rest/topic/SubscriptionResource.java        |   66 -
 .../rest/topic/SubscriptionsResource.java       |  519 --
 .../org/hornetq/rest/topic/TopicDeployment.java |   44 -
 .../rest/topic/TopicDestinationsResource.java   |  201 -
 .../org/hornetq/rest/topic/TopicPushStore.java  |   26 -
 .../org/hornetq/rest/topic/TopicResource.java   |  214 -
 .../hornetq/rest/topic/TopicServiceManager.java |  122 -
 .../java/org/hornetq/rest/util/Constants.java   |   23 -
 .../rest/util/CustomHeaderLinkStrategy.java     |   45 -
 .../hornetq/rest/util/HttpMessageHelper.java    |  173 -
 .../rest/util/LinkHeaderLinkStrategy.java       |   56 -
 .../org/hornetq/rest/util/LinkStrategy.java     |   24 -
 .../java/org/hornetq/rest/util/TimeoutTask.java |  198 -
 .../src/main/resources/schema/hornetq-rest.xsd  |  103 -
 .../org/hornetq/rest/test/AutoAckQueueTest.java |   86 -
 .../org/hornetq/rest/test/AutoAckTopicTest.java |  230 -
 .../hornetq/rest/test/ClientAckQueueTest.java   |  387 --
 .../hornetq/rest/test/ClientAckTopicTest.java   |  338 -
 .../rest/test/CreateDestinationTest.java        |  186 -
 .../org/hornetq/rest/test/DupQueueTest.java     |  155 -
 .../java/org/hornetq/rest/test/Embedded.java    |  104 -
 .../org/hornetq/rest/test/EmbeddedTest.java     |  154 -
 .../hornetq/rest/test/FindDestinationTest.java  |  126 -
 .../java/org/hornetq/rest/test/JMSTest.java     |  298 -
 .../org/hornetq/rest/test/MessageTestBase.java  |   89 -
 .../test/PersistentPushQueueConsumerTest.java   |  213 -
 .../test/PersistentPushTopicConsumerTest.java   |  257 -
 .../rest/test/PushQueueConsumerTest.java        |  375 --
 .../rest/test/PushTopicConsumerTest.java        |  372 --
 .../java/org/hornetq/rest/test/RawAckTest.java  |  161 -
 .../hornetq/rest/test/RepostingQueueTest.java   |  575 --
 .../hornetq/rest/test/RepostingTopicTest.java   |  712 --
 .../hornetq/rest/test/RoundtripTimeTest.java    |   72 -
 .../org/hornetq/rest/test/SelectorTest.java     |  334 -
 .../java/org/hornetq/rest/test/SessionTest.java |  313 -
 .../org/hornetq/rest/test/TransformTest.java    |  264 -
 .../test/java/org/hornetq/rest/test/Util.java   |   49 -
 .../java/org/hornetq/rest/test/XmlTest.java     |   46 -
 .../test/resources/hornetq-configuration.xml    |   34 -
 hornetq-rest/src/test/resources/hornetq-jms.xml |   19 -
 .../src/test/resources/hornetq-rest.xml         |    3 -
 .../src/test/resources/hornetq-users.xml        |    7 -
 hornetq-selector/pom.xml                        |   96 -
 .../java/org/hornetq/selector/LRUCache.java     |  100 -
 .../org/hornetq/selector/SelectorParser.java    |  123 -
 .../selector/filter/ArithmeticExpression.java   |  258 -
 .../selector/filter/BinaryExpression.java       |  125 -
 .../selector/filter/BooleanExpression.java      |   36 -
 .../selector/filter/ComparisonExpression.java   |  651 --
 .../selector/filter/ConstantExpression.java     |  194 -
 .../org/hornetq/selector/filter/Expression.java |   34 -
 .../selector/filter/FilterException.java        |   45 -
 .../org/hornetq/selector/filter/Filterable.java |   54 -
 .../selector/filter/LogicExpression.java        |  102 -
 .../selector/filter/PropertyExpression.java     |   75 -
 .../selector/filter/UnaryExpression.java        |  334 -
 .../selector/filter/XPathExpression.java        |   90 -
 .../selector/filter/XQueryExpression.java       |   54 -
 .../selector/filter/XalanXPathEvaluator.java    |   86 -
 .../org/hornetq/selector/filter/package.html    |   27 -
 .../src/main/javacc/HyphenatedParser.jj         |  563 --
 .../src/main/javacc/StrictParser.jj             |  563 --
 .../hornetq/selector/SelectorParserTest.java    |   83 -
 .../java/org/hornetq/selector/SelectorTest.java |  555 --
 hornetq-server/pom.xml                          |  123 -
 .../api/core/management/MessageCounterInfo.java |  190 -
 .../org/hornetq/core/config/BackupStrategy.java |   20 -
 .../core/config/BridgeConfiguration.java        |  514 --
 .../config/ClusterConnectionConfiguration.java  |  495 --
 .../org/hornetq/core/config/Configuration.java  | 1036 ---
 .../hornetq/core/config/ConfigurationUtils.java |  142 -
 .../config/ConnectorServiceConfiguration.java   |  102 -
 .../core/config/CoreQueueConfiguration.java     |  140 -
 .../core/config/DivertConfiguration.java        |  216 -
 .../core/config/HAPolicyConfiguration.java      |   30 -
 .../core/config/ScaleDownConfiguration.java     |   93 -
 .../config/ha/ColocatedPolicyConfiguration.java |  149 -
 .../config/ha/LiveOnlyPolicyConfiguration.java  |   46 -
 .../config/ha/ReplicaPolicyConfiguration.java   |  124 -
 .../ha/ReplicatedPolicyConfiguration.java       |   68 -
 .../SharedStoreMasterPolicyConfiguration.java   |   55 -
 .../ha/SharedStoreSlavePolicyConfiguration.java |   96 -
 .../core/config/impl/ConfigurationImpl.java     | 1734 -----
 .../core/config/impl/FileConfiguration.java     |  104 -
 .../hornetq/core/config/impl/Validators.java    |  183 -
 .../org/hornetq/core/deployers/Deployer.java    |   53 -
 .../core/deployers/DeploymentManager.java       |   37 -
 .../deployers/impl/AddressSettingsDeployer.java |  102 -
 .../impl/BasicUserCredentialsDeployer.java      |  145 -
 .../deployers/impl/FileConfigurationParser.java | 1948 ------
 .../deployers/impl/FileDeploymentManager.java   |  333 -
 .../core/deployers/impl/QueueDeployer.java      |   93 -
 .../core/deployers/impl/SecurityDeployer.java   |  113 -
 .../core/deployers/impl/XmlDeployer.java        |  330 -
 .../java/org/hornetq/core/filter/Filter.java    |   30 -
 .../hornetq/core/filter/impl/FilterImpl.java    |  246 -
 .../core/management/impl/AbstractControl.java   |   99 -
 .../management/impl/AcceptorControlImpl.java    |  151 -
 .../management/impl/AddressControlImpl.java     |  281 -
 .../core/management/impl/BridgeControlImpl.java |  267 -
 .../impl/BroadcastGroupControlImpl.java         |  232 -
 .../impl/ClusterConnectionControlImpl.java      |  294 -
 .../core/management/impl/DivertControlImpl.java |  163 -
 .../impl/HornetQServerControlImpl.java          | 2187 ------
 .../core/management/impl/MBeanInfoHelper.java   |  156 -
 .../core/management/impl/QueueControlImpl.java  | 1053 ---
 .../core/messagecounter/MessageCounter.java     |  602 --
 .../messagecounter/MessageCounterManager.java   |   44 -
 .../impl/MessageCounterHelper.java              |  227 -
 .../impl/MessageCounterManagerImpl.java         |  230 -
 .../core/paging/PageTransactionInfo.java        |   66 -
 .../org/hornetq/core/paging/PagedMessage.java   |   36 -
 .../org/hornetq/core/paging/PagingManager.java  |   87 -
 .../org/hornetq/core/paging/PagingStore.java    |  174 -
 .../hornetq/core/paging/PagingStoreFactory.java |   40 -
 .../core/paging/cursor/LivePageCache.java       |   28 -
 .../hornetq/core/paging/cursor/PageCache.java   |   60 -
 .../core/paging/cursor/PageCursorProvider.java  |   78 -
 .../core/paging/cursor/PagePosition.java        |   41 -
 .../core/paging/cursor/PageSubscription.java    |  158 -
 .../paging/cursor/PageSubscriptionCounter.java  |   59 -
 .../core/paging/cursor/PagedReference.java      |   28 -
 .../core/paging/cursor/PagedReferenceImpl.java  |  265 -
 .../paging/cursor/impl/LivePageCacheImpl.java   |  124 -
 .../core/paging/cursor/impl/PageCacheImpl.java  |  128 -
 .../cursor/impl/PageCursorProviderImpl.java     |  677 --
 .../paging/cursor/impl/PagePositionImpl.java    |  162 -
 .../impl/PageSubscriptionCounterImpl.java       |  421 --
 .../cursor/impl/PageSubscriptionImpl.java       | 1479 -----
 .../java/org/hornetq/core/paging/impl/Page.java |  422 --
 .../hornetq/core/paging/impl/PageSyncTimer.java |  114 -
 .../paging/impl/PageTransactionInfoImpl.java    |  352 -
 .../core/paging/impl/PagedMessageImpl.java      |  160 -
 .../core/paging/impl/PagingManagerImpl.java     |  330 -
 .../core/paging/impl/PagingStoreFactoryNIO.java |  213 -
 .../core/paging/impl/PagingStoreImpl.java       | 1243 ----
 .../hornetq/core/persistence/GroupingInfo.java  |   28 -
 .../core/persistence/OperationContext.java      |   46 -
 .../core/persistence/QueueBindingInfo.java      |   42 -
 .../core/persistence/StorageManager.java        |  411 --
 .../config/PersistedAddressSetting.java         |  130 -
 .../core/persistence/config/PersistedRoles.java |  335 -
 .../core/persistence/impl/PageCountPending.java |   25 -
 .../impl/journal/AddMessageRecord.java          |   44 -
 .../impl/journal/BatchingIDGenerator.java       |  149 -
 .../impl/journal/DescribeJournal.java           |  725 --
 .../impl/journal/JournalRecordIds.java          |   81 -
 .../impl/journal/JournalStorageManager.java     | 3861 -----------
 .../impl/journal/LargeServerMessageImpl.java    |  531 --
 .../impl/journal/LargeServerMessageInSync.java  |  161 -
 .../impl/journal/OperationContextImpl.java      |  369 --
 .../nullpm/NullStorageLargeServerMessage.java   |  108 -
 .../impl/nullpm/NullStorageManager.java         |  630 --
 .../org/hornetq/core/postoffice/Address.java    |   38 -
 .../hornetq/core/postoffice/AddressManager.java |   49 -
 .../org/hornetq/core/postoffice/Binding.java    |   68 -
 .../hornetq/core/postoffice/BindingType.java    |   56 -
 .../org/hornetq/core/postoffice/Bindings.java   |   42 -
 .../core/postoffice/BindingsFactory.java        |   25 -
 .../core/postoffice/DuplicateIDCache.java       |   44 -
 .../org/hornetq/core/postoffice/PostOffice.java |   94 -
 .../hornetq/core/postoffice/QueueBinding.java   |   31 -
 .../org/hornetq/core/postoffice/QueueInfo.java  |  177 -
 .../core/postoffice/impl/AddressImpl.java       |  176 -
 .../core/postoffice/impl/BindingsImpl.java      |  703 --
 .../core/postoffice/impl/DivertBinding.java     |  166 -
 .../postoffice/impl/DuplicateIDCacheImpl.java   |  367 -
 .../core/postoffice/impl/LocalQueueBinding.java |  171 -
 .../core/postoffice/impl/PostOfficeImpl.java    | 1537 -----
 .../postoffice/impl/SimpleAddressManager.java   |  211 -
 .../postoffice/impl/WildcardAddressManager.java |  257 -
 .../hornetq/core/protocol/ProtocolHandler.java  |  226 -
 .../core/protocol/ServerPacketDecoder.java      |  236 -
 .../core/ServerSessionPacketHandler.java        |  688 --
 .../protocol/core/impl/CoreProtocolManager.java |  355 -
 .../core/impl/CoreProtocolManagerFactory.java   |   44 -
 .../protocol/core/impl/CoreSessionCallback.java |  136 -
 .../core/impl/HornetQPacketHandler.java         |  298 -
 .../wireformat/BackupRegistrationMessage.java   |  136 -
 .../BackupReplicationStartFailedMessage.java    |  113 -
 .../impl/wireformat/BackupRequestMessage.java   |  105 -
 .../impl/wireformat/BackupResponseMessage.java  |   63 -
 .../impl/wireformat/ClusterConnectMessage.java  |   61 -
 .../wireformat/ClusterConnectReplyMessage.java  |   63 -
 .../impl/wireformat/NodeAnnounceMessage.java    |  251 -
 .../core/impl/wireformat/QuorumVoteMessage.java |   71 -
 .../impl/wireformat/QuorumVoteReplyMessage.java |   75 -
 .../impl/wireformat/ReplicationAddMessage.java  |  163 -
 .../wireformat/ReplicationAddTXMessage.java     |  182 -
 .../wireformat/ReplicationCommitMessage.java    |  117 -
 .../wireformat/ReplicationDeleteMessage.java    |   97 -
 .../wireformat/ReplicationDeleteTXMessage.java  |  149 -
 .../ReplicationLargeMessageBeginMessage.java    |   84 -
 .../ReplicationLargeMessageEndMessage.java      |   84 -
 .../ReplicationLargeMessageWriteMessage.java    |  108 -
 .../ReplicationLiveIsStoppingMessage.java       |   93 -
 .../wireformat/ReplicationPageEventMessage.java |  129 -
 .../wireformat/ReplicationPageWriteMessage.java |  112 -
 .../wireformat/ReplicationPrepareMessage.java   |  145 -
 .../wireformat/ReplicationResponseMessage.java  |   27 -
 .../wireformat/ReplicationStartSyncMessage.java |  224 -
 .../wireformat/ReplicationSyncFileMessage.java  |  280 -
 .../wireformat/ScaleDownAnnounceMessage.java    |   59 -
 .../protocol/stomp/WebSocketServerHandler.java  |  185 -
 .../core/registry/JndiBindingRegistry.java      |  149 -
 .../core/registry/MapBindingRegistry.java       |   57 -
 .../core/remoting/impl/invm/InVMAcceptor.java   |  302 -
 .../remoting/impl/invm/InVMAcceptorFactory.java |   52 -
 .../core/remoting/impl/invm/InVMConnection.java |  298 -
 .../core/remoting/impl/invm/InVMConnector.java  |  259 -
 .../impl/invm/InVMConnectorFactory.java         |   64 -
 .../core/remoting/impl/invm/InVMRegistry.java   |   62 -
 .../remoting/impl/invm/TransportConstants.java  |   60 -
 .../remoting/impl/netty/ConnectionCreator.java  |   21 -
 .../impl/netty/HttpAcceptorHandler.java         |  252 -
 .../impl/netty/HttpKeepAliveRunnable.java       |   75 -
 .../core/remoting/impl/netty/NettyAcceptor.java |  772 ---
 .../impl/netty/NettyAcceptorFactory.java        |   50 -
 .../impl/netty/NettyServerConnection.java       |   37 -
 .../core/remoting/server/RemotingService.java   |   81 -
 .../server/impl/RemotingServiceImpl.java        |  795 ---
 .../core/replication/ReplicatedJournal.java     |  559 --
 .../replication/ReplicatedLargeMessage.java     |   54 -
 .../core/replication/ReplicationEndpoint.java   |  954 ---
 .../core/replication/ReplicationManager.java    |  676 --
 .../org/hornetq/core/security/CheckType.java    |   82 -
 .../hornetq/core/security/SecurityStore.java    |   32 -
 .../core/security/impl/SecurityStoreImpl.java   |  252 -
 .../hornetq/core/server/ActivateCallback.java   |   44 -
 .../hornetq/core/server/ActivationParams.java   |   18 -
 .../java/org/hornetq/core/server/Bindable.java  |   29 -
 .../hornetq/core/server/BindingQueryResult.java |   48 -
 .../hornetq/core/server/ConnectorService.java   |   22 -
 .../core/server/ConnectorServiceFactory.java    |   36 -
 .../java/org/hornetq/core/server/Consumer.java  |   73 -
 .../java/org/hornetq/core/server/Divert.java    |   36 -
 .../org/hornetq/core/server/HandleStatus.java   |   31 -
 .../core/server/HornetQMessageBundle.java       |  371 --
 .../org/hornetq/core/server/HornetQServer.java  |  249 -
 .../core/server/HornetQServerLogger.java        | 1360 ----
 .../org/hornetq/core/server/HornetQServers.java |  123 -
 .../org/hornetq/core/server/JournalType.java    |   25 -
 .../hornetq/core/server/LargeServerMessage.java |   53 -
 .../hornetq/core/server/LiveNodeLocator.java    |   93 -
 .../org/hornetq/core/server/MemoryManager.java  |  157 -
 .../hornetq/core/server/MessageReference.java   |   75 -
 .../org/hornetq/core/server/NodeManager.java    |  269 -
 .../java/org/hornetq/core/server/Queue.java     |  232 -
 .../org/hornetq/core/server/QueueFactory.java   |   45 -
 .../hornetq/core/server/RouteContextList.java   |   38 -
 .../org/hornetq/core/server/RoutingContext.java |   52 -
 .../core/server/ScheduledDeliveryHandler.java   |   33 -
 .../org/hornetq/core/server/ServerConsumer.java |   83 -
 .../org/hornetq/core/server/ServerMessage.java  |   77 -
 .../org/hornetq/core/server/ServerSession.java  |  157 -
 .../core/server/ServerSessionFactory.java       |   41 -
 .../core/server/TransientQueueManager.java      |   25 -
 .../core/server/cluster/BackupManager.java      |  415 --
 .../org/hornetq/core/server/cluster/Bridge.java |   57 -
 .../core/server/cluster/BroadcastGroup.java     |   42 -
 .../cluster/ClusterConfigurationUtil.java       |   93 -
 .../core/server/cluster/ClusterConnection.java  |   78 -
 .../core/server/cluster/ClusterControl.java     |  214 -
 .../core/server/cluster/ClusterController.java  |  455 --
 .../core/server/cluster/ClusterManager.java     |  895 ---
 ...HornetQServerSideProtocolManagerFactory.java |   55 -
 .../core/server/cluster/MessageFlowRecord.java  |   43 -
 .../core/server/cluster/RemoteQueueBinding.java |   40 -
 .../core/server/cluster/Transformer.java        |   29 -
 .../core/server/cluster/ha/BackupPolicy.java    |   61 -
 .../server/cluster/ha/ColocatedHAManager.java   |  313 -
 .../core/server/cluster/ha/ColocatedPolicy.java |  187 -
 .../core/server/cluster/ha/HAManager.java       |   31 -
 .../core/server/cluster/ha/HAPolicy.java        |   47 -
 .../core/server/cluster/ha/LiveOnlyPolicy.java  |   85 -
 .../core/server/cluster/ha/ReplicaPolicy.java   |  136 -
 .../server/cluster/ha/ReplicatedPolicy.java     |  167 -
 .../core/server/cluster/ha/ScaleDownPolicy.java |  164 -
 .../cluster/ha/SharedStoreMasterPolicy.java     |  111 -
 .../cluster/ha/SharedStoreSlavePolicy.java      |  110 -
 .../server/cluster/ha/StandaloneHAManager.java  |   56 -
 .../core/server/cluster/impl/BridgeImpl.java    | 1285 ----
 .../server/cluster/impl/BroadcastGroupImpl.java |  245 -
 .../cluster/impl/ClusterConnectionBridge.java   |  413 --
 .../cluster/impl/ClusterConnectionImpl.java     | 1738 -----
 .../core/server/cluster/impl/Redistributor.java |  309 -
 .../cluster/impl/RemoteQueueBindingImpl.java    |  383 --
 .../core/server/cluster/qourum/BooleanVote.java |   60 -
 .../core/server/cluster/qourum/Quorum.java      |   47 -
 .../server/cluster/qourum/QuorumManager.java    |  372 --
 .../core/server/cluster/qourum/QuorumVote.java  |   77 -
 .../cluster/qourum/QuorumVoteHandler.java       |   37 -
 .../cluster/qourum/QuorumVoteServerConnect.java |  138 -
 .../qourum/SharedNothingBackupQuorum.java       |  301 -
 .../core/server/cluster/qourum/Vote.java        |   47 -
 .../core/server/embedded/EmbeddedHornetQ.java   |  118 -
 .../core/server/group/GroupingHandler.java      |   57 -
 .../core/server/group/UnproposalListener.java   |   25 -
 .../core/server/group/impl/GroupBinding.java    |   83 -
 .../group/impl/GroupHandlingAbstract.java       |  125 -
 .../impl/GroupingHandlerConfiguration.java      |  174 -
 .../server/group/impl/LocalGroupingHandler.java |  534 --
 .../core/server/group/impl/Proposal.java        |   49 -
 .../group/impl/RemoteGroupingHandler.java       |  333 -
 .../core/server/group/impl/Response.java        |   93 -
 .../server/impl/AIOFileLockNodeManager.java     |  127 -
 .../hornetq/core/server/impl/Activation.java    |  118 -
 .../impl/AnyLiveNodeLocatorForReplication.java  |  183 -
 .../impl/AnyLiveNodeLocatorForScaleDown.java    |  182 -
 .../impl/BackupRecoveryJournalLoader.java       |  104 -
 .../server/impl/BackupTopologyListener.java     |   59 -
 .../core/server/impl/ColocatedActivation.java   |  331 -
 .../core/server/impl/ConnectorsService.java     |  154 -
 .../hornetq/core/server/impl/DivertImpl.java    |  165 -
 .../core/server/impl/FileLockNodeManager.java   |  353 -
 .../core/server/impl/HornetQServerImpl.java     | 2345 -------
 .../core/server/impl/InVMNodeManager.java       |  164 -
 .../hornetq/core/server/impl/JournalLoader.java |   54 -
 .../core/server/impl/LastValueQueue.java        |  351 -
 .../core/server/impl/LiveActivation.java        |   17 -
 .../core/server/impl/LiveOnlyActivation.java    |  197 -
 .../core/server/impl/MessageReferenceImpl.java  |  239 -
 .../NamedLiveNodeLocatorForReplication.java     |  140 -
 .../impl/NamedLiveNodeLocatorForScaleDown.java  |  186 -
 .../server/impl/NamedNodeIdNodeLocator.java     |   70 -
 .../server/impl/PostOfficeJournalLoader.java    |  506 --
 .../core/server/impl/QueueFactoryImpl.java      |  112 -
 .../org/hornetq/core/server/impl/QueueImpl.java | 3327 ----------
 .../hornetq/core/server/impl/RefsOperation.java |  218 -
 .../core/server/impl/ReplicationError.java      |   82 -
 .../core/server/impl/RoutingContextImpl.java    |  171 -
 .../core/server/impl/ScaleDownHandler.java      |  563 --
 .../impl/ScheduledDeliveryHandlerImpl.java      |  352 -
 .../core/server/impl/ServerConsumerImpl.java    | 1300 ----
 .../hornetq/core/server/impl/ServerInfo.java    |   90 -
 .../core/server/impl/ServerMessageImpl.java     |  369 --
 .../core/server/impl/ServerSessionImpl.java     | 1895 ------
 .../core/server/impl/ServiceRegistry.java       |  128 -
 .../impl/SharedNothingBackupActivation.java     |  498 --
 .../impl/SharedNothingLiveActivation.java       |  486 --
 .../impl/SharedStoreBackupActivation.java       |  276 -
 .../server/impl/SharedStoreLiveActivation.java  |  100 -
 .../server/impl/TransientQueueManagerImpl.java  |   85 -
 .../server/management/ManagementService.java    |  130 -
 .../management/impl/ManagementServiceImpl.java  |  847 ---
 .../core/settings/HierarchicalRepository.java   |   90 -
 .../HierarchicalRepositoryChangeListener.java   |   21 -
 .../org/hornetq/core/settings/Mergeable.java    |   23 -
 .../core/settings/impl/AddressSettings.java     |  752 ---
 .../impl/HierarchicalObjectRepository.java      |  459 --
 .../org/hornetq/core/settings/impl/Match.java   |  135 -
 .../core/settings/impl/SlowConsumerPolicy.java  |   24 -
 .../core/transaction/ResourceManager.java       |   51 -
 .../hornetq/core/transaction/Transaction.java   |   77 -
 .../core/transaction/TransactionDetail.java     |  123 -
 .../core/transaction/TransactionFactory.java    |   25 -
 .../core/transaction/TransactionOperation.java  |   59 -
 .../TransactionOperationAbstract.java           |   86 -
 .../transaction/TransactionPropertyIndexes.java |   42 -
 .../impl/BindingsTransactionImpl.java           |   58 -
 .../transaction/impl/CoreTransactionDetail.java |   66 -
 .../transaction/impl/ResourceManagerImpl.java   |  267 -
 .../core/transaction/impl/TransactionImpl.java  |  539 --
 .../spi/core/naming/BindingRegistry.java        |   41 -
 .../spi/core/protocol/MessageConverter.java     |   27 -
 .../spi/core/protocol/ProtocolManager.java      |   46 -
 .../core/protocol/ProtocolManagerFactory.java   |   32 -
 .../spi/core/protocol/SessionCallback.java      |   49 -
 .../org/hornetq/spi/core/remoting/Acceptor.java |   59 -
 .../spi/core/remoting/AcceptorFactory.java      |   63 -
 .../ServerConnectionLifeCycleListener.java      |   30 -
 .../core/security/HornetQSecurityManager.java   |   78 -
 .../security/HornetQSecurityManagerImpl.java    |  212 -
 .../spi/core/security/JAASSecurityManager.java  |  304 -
 .../hornetq/spi/core/security/package-info.java |   21 -
 .../org/hornetq/utils/XMLConfigurationUtil.java |  139 -
 .../org/hornetq/security/basic-security         |   13 -
 .../resources/schema/hornetq-configuration.xsd  | 2319 -------
 .../src/main/resources/schema/hornetq-users.xsd |   29 -
 .../core/config/impl/ConfigurationImplTest.java |  539 --
 .../impl/DefaultsFileConfigurationTest.java     |  155 -
 .../impl/FileConfigurationParserTest.java       |  200 -
 .../core/config/impl/FileConfigurationTest.java |  372 --
 .../config/impl/HAPolicyConfigurationTest.java  |  434 --
 .../core/config/impl/ValidatorsTest.java        |  138 -
 .../WrongRoleFileConfigurationParserTest.java   |  130 -
 .../hornetq/core/filter/impl/FilterTest.java    |  764 ---
 .../core/list/PriorityLinkedListTest.java       |  914 ---
 .../core/message/impl/MessagePropertyTest.java  |  119 -
 .../org/hornetq/core/security/RoleTest.java     |  114 -
 .../group/impl/ClusteredResetMockTest.java      |  423 --
 .../core/server/impl/EmbeddedServerTest.java    |   78 -
 .../impl/ScheduledDeliveryHandlerTest.java      | 1511 -----
 .../core/settings/AddressSettingsTest.java      |  146 -
 .../hornetq/core/settings/RepositoryTest.java   |  281 -
 .../core/version/impl/VersionImplTest.java      |  106 -
 .../tests/logging/AssertionLoggerHandler.java   |  152 -
 .../tests/util/ColocatedHornetQServer.java      |   96 -
 .../util/CountDownSessionFailureListener.java   |   68 -
 .../tests/util/InVMNodeManagerServer.java       |   72 -
 .../org/hornetq/tests/util/ServiceTestBase.java | 1230 ----
 .../hornetq/tests/util/SimpleStringTest.java    |  458 --
 .../tests/util/SingleServerTestBase.java        |   65 -
 .../org/hornetq/tests/util/UnitTestCase.java    | 2120 ------
 .../resources/ConfigurationTest-defaults.xml    |    6 -
 .../resources/ConfigurationTest-full-config.xml |  277 -
 .../resources/InvalidConfigurationTest0.xml     |  235 -
 .../resources/InvalidConfigurationTest1.xml     |  235 -
 .../resources/InvalidConfigurationTest2.xml     |  235 -
 .../resources/InvalidConfigurationTest3.xml     |  236 -
 .../resources/InvalidConfigurationTest4.xml     |  234 -
 .../resources/InvalidConfigurationTest5.xml     |  237 -
 .../resources/colocated-hapolicy-config.xml     |   34 -
 .../resources/colocated-hapolicy-config2.xml    |   28 -
 .../resources/divertRoutingNameNotRequired.xml  |   94 -
 .../resources/live-only-hapolicy-config.xml     |   16 -
 .../resources/live-only-hapolicy-config2.xml    |   22 -
 .../resources/live-only-hapolicy-config3.xml    |   11 -
 .../resources/live-only-hapolicy-config4.xml    |    7 -
 .../resources/live-only-hapolicy-config5.xml    |    6 -
 .../src/test/resources/logging.properties       |   61 -
 .../test/resources/replica-hapolicy-config.xml  |   24 -
 .../test/resources/replica-hapolicy-config2.xml |   25 -
 .../test/resources/replica-hapolicy-config3.xml |   16 -
 .../resources/replicated-hapolicy-config.xml    |   15 -
 .../shared-store-master-hapolicy-config.xml     |   14 -
 .../shared-store-slave-hapolicy-config.xml      |   22 -
 .../shared-store-slave-hapolicy-config2.xml     |   24 -
 .../shared-store-slave-hapolicy-config3.xml     |   15 -
 hornetq-service-sar/pom.xml                     |   49 -
 .../HornetQFileConfigurationService.java        |   50 -
 .../HornetQFileConfigurationServiceMBean.java   |   32 -
 .../service/HornetQJMSStarterService.java       |   46 -
 .../service/HornetQJMSStarterServiceMBean.java  |   27 -
 .../hornetq/service/HornetQServiceBundle.java   |   31 -
 .../hornetq/service/HornetQServiceLogger.java   |   38 -
 .../hornetq/service/HornetQStarterService.java  |  118 -
 .../service/HornetQStarterServiceMBean.java     |   36 -
 .../service/JBossASSecurityManagerService.java  |   35 -
 .../JBossASSecurityManagerServiceMBean.java     |   26 -
 hornetq-tools/pom.xml                           |   73 -
 .../main/java/org/hornetq/tools/DataTool.java   |  232 -
 .../org/hornetq/tools/HornetQToolsLogger.java   |   42 -
 .../src/main/java/org/hornetq/tools/Main.java   |  112 -
 .../main/java/org/hornetq/tools/PrintData.java  |   82 -
 .../main/java/org/hornetq/tools/PrintPages.java |  313 -
 .../java/org/hornetq/tools/TransferQueue.java   |  243 -
 .../org/hornetq/tools/XmlDataConstants.java     |  122 -
 .../java/org/hornetq/tools/XmlDataExporter.java | 1121 ----
 .../java/org/hornetq/tools/XmlDataImporter.java | 1074 ---
 .../activemq-aerogear-integration/pom.xml       |   52 +
 .../aerogear/AeroGearConnectorService.java      |  420 ++
 .../AeroGearConnectorServiceFactory.java        |   44 +
 .../integration/aerogear/AeroGearConstants.java |   81 +
 .../aerogear/HornetQAeroGearBundle.java         |   46 +
 .../aerogear/HornetQAeroGearLogger.java         |   66 +
 .../activemq-jboss-as-integration/pom.xml       |   61 +
 .../integration/jboss/HornetQJBossBundle.java   |   31 +
 .../integration/jboss/HornetQJBossLogger.java   |   58 +
 .../jboss/security/AS4SecurityActions.java      |  126 +
 .../jboss/security/JBossASSecurityManager.java  |  309 +
 .../jboss/security/SecurityActions.java         |  163 +
 .../tm/JBoss4TransactionManagerLocator.java     |   28 +
 .../tm/JBoss5TransactionManagerLocator.java     |   28 +
 integration/activemq-spring-integration/pom.xml |   74 +
 .../spring/SpringBindingRegistry.java           |   71 +
 .../integration/spring/SpringJmsBootstrap.java  |   31 +
 .../activemq/spring/HornetQSpringBundle.java    |   31 +
 .../activemq/spring/HornetQSpringLogger.java    |   37 +
 .../activemq-twitter-integration/pom.xml        |   44 +
 .../integration/twitter/TwitterConstants.java   |   95 +
 .../TwitterIncomingConnectorServiceFactory.java |   48 +
 .../TwitterOutgoingConnectorServiceFactory.java |   45 +
 .../twitter/impl/IncomingTweetsHandler.java     |  230 +
 .../twitter/impl/OutgoingTweetsHandler.java     |  262 +
 .../activemq/twitter/HornetQTwitterBundle.java  |   31 +
 .../activemq/twitter/HornetQTwitterLogger.java  |   54 +
 integration/activemq-vertx-integration/pom.xml  |  127 +
 .../integration/vertx/HornetQVertxLogger.java   |   53 +
 .../vertx/IncomingVertxEventHandler.java        |  319 +
 .../vertx/OutgoingVertxEventHandler.java        |  328 +
 .../integration/vertx/VertxConstants.java       |   80 +
 .../VertxIncomingConnectorServiceFactory.java   |   50 +
 .../VertxOutgoingConnectorServiceFactory.java   |   48 +
 .../hornetq-aerogear-integration/pom.xml        |   52 -
 .../aerogear/AeroGearConnectorService.java      |  420 --
 .../AeroGearConnectorServiceFactory.java        |   44 -
 .../integration/aerogear/AeroGearConstants.java |   81 -
 .../aerogear/HornetQAeroGearBundle.java         |   46 -
 .../aerogear/HornetQAeroGearLogger.java         |   66 -
 .../hornetq-jboss-as-integration/pom.xml        |   61 -
 .../integration/jboss/HornetQJBossBundle.java   |   31 -
 .../integration/jboss/HornetQJBossLogger.java   |   58 -
 .../jboss/security/AS4SecurityActions.java      |  126 -
 .../jboss/security/JBossASSecurityManager.java  |  309 -
 .../jboss/security/SecurityActions.java         |  163 -
 .../tm/JBoss4TransactionManagerLocator.java     |   28 -
 .../tm/JBoss5TransactionManagerLocator.java     |   28 -
 integration/hornetq-spring-integration/pom.xml  |   74 -
 .../spring/SpringBindingRegistry.java           |   71 -
 .../integration/spring/SpringJmsBootstrap.java  |   31 -
 .../org/hornetq/spring/HornetQSpringBundle.java |   31 -
 .../org/hornetq/spring/HornetQSpringLogger.java |   37 -
 integration/hornetq-twitter-integration/pom.xml |   44 -
 .../integration/twitter/TwitterConstants.java   |   95 -
 .../TwitterIncomingConnectorServiceFactory.java |   48 -
 .../TwitterOutgoingConnectorServiceFactory.java |   45 -
 .../twitter/impl/IncomingTweetsHandler.java     |  230 -
 .../twitter/impl/OutgoingTweetsHandler.java     |  262 -
 .../hornetq/twitter/HornetQTwitterBundle.java   |   31 -
 .../hornetq/twitter/HornetQTwitterLogger.java   |   54 -
 integration/hornetq-vertx-integration/pom.xml   |  127 -
 .../integration/vertx/HornetQVertxLogger.java   |   53 -
 .../vertx/IncomingVertxEventHandler.java        |  319 -
 .../vertx/OutgoingVertxEventHandler.java        |  328 -
 .../integration/vertx/VertxConstants.java       |   80 -
 .../VertxIncomingConnectorServiceFactory.java   |   50 -
 .../VertxOutgoingConnectorServiceFactory.java   |   48 -
 pom.xml                                         |  254 +-
 scripts/replace-wildfly.sh                      |   18 +-
 tests/byteman-tests/pom.xml                     |   42 +-
 .../activemq/byteman/tests/BMFailoverTest.java  |  448 ++
 .../BridgeServerLocatorConfigurationTest.java   |  177 +
 .../byteman/tests/ClusteredGroupingTest.java    |  469 ++
 .../activemq/byteman/tests/GroupingTest.java    |  198 +
 .../tests/HornetQMessageHandlerTest.java        |  430 ++
 .../tests/JMSBridgeReconnectionTest.java        |  159 +
 .../activemq/byteman/tests/LatencyTest.java     |   65 +
 .../activemq/byteman/tests/MessageCopyTest.java |  202 +
 .../byteman/tests/OrphanedConsumerTest.java     |  298 +
 .../activemq/byteman/tests/PagingLeakTest.java  |  270 +
 .../byteman/tests/ScaleDownFailoverTest.java    |  196 +
 .../byteman/tests/ScaleDownFailureTest.java     |  113 +
 .../tests/ScaleDownGroupedFailoverTest.java     |   21 +
 .../tests/ScaleDownGroupedFailureTest.java      |   21 +
 .../byteman/tests/StartStopDeadlockTest.java    |  165 +
 .../byteman/tests/StompInternalStateTest.java   |  142 +
 .../impl/HierarchicalObjectRepositoryTest.java  |  152 +
 .../hornetq/byteman/tests/BMFailoverTest.java   |  448 --
 .../BridgeServerLocatorConfigurationTest.java   |  177 -
 .../byteman/tests/ClusteredGroupingTest.java    |  469 --
 .../org/hornetq/byteman/tests/GroupingTest.java |  198 -
 .../tests/HornetQMessageHandlerTest.java        |  430 --
 .../tests/JMSBridgeReconnectionTest.java        |  159 -
 .../org/hornetq/byteman/tests/LatencyTest.java  |   65 -
 .../hornetq/byteman/tests/MessageCopyTest.java  |  202 -
 .../byteman/tests/OrphanedConsumerTest.java     |  298 -
 .../hornetq/byteman/tests/PagingLeakTest.java   |  270 -
 .../byteman/tests/ScaleDownFailoverTest.java    |  196 -
 .../byteman/tests/ScaleDownFailureTest.java     |  113 -
 .../tests/ScaleDownGroupedFailoverTest.java     |   21 -
 .../tests/ScaleDownGroupedFailureTest.java      |   21 -
 .../byteman/tests/StartStopDeadlockTest.java    |  165 -
 .../byteman/tests/StompInternalStateTest.java   |  142 -
 .../impl/HierarchicalObjectRepositoryTest.java  |  152 -
 tests/concurrent-tests/pom.xml                  |   34 +-
 .../tests/concurrent/server/impl/QueueTest.java |  226 +
 .../concurrent/stomp/ConcurrentStompTest.java   |  156 +
 .../tests/concurrent/server/impl/QueueTest.java |  226 -
 .../concurrent/stomp/ConcurrentStompTest.java   |  156 -
 tests/config/logging.properties                 |   20 +-
 tests/config/logging.properties.trace           |   20 +-
 .../config/server-start-stop-backup-config1.xml |    6 +-
 .../server-start-stop-backup-jms-config1.xml    |    2 +-
 tests/config/server-start-stop-live-config1.xml |    8 +-
 .../server-start-stop-live-jms-config1.xml      |    2 +-
 tests/integration-tests/pom.xml                 |   78 +-
 .../integration/DuplicateDetectionTest.java     | 2276 +++++++
 .../integration/IntegrationTestLogger.java      |   31 +
 .../tests/integration/InterceptorTest.java      | 1125 ++++
 .../integration/SimpleNotificationService.java  |   93 +
 .../tests/integration/String64KLimitTest.java   |  218 +
 .../aerogear/AeroGearBasicServerTest.java       |  388 ++
 .../integration/client/AckBatchSizeTest.java    |  140 +
 .../integration/client/AcknowledgeTest.java     |  828 +++
 .../integration/client/AddressSettingsTest.java |  372 ++
 .../integration/client/AutoCloseCoreTest.java   |   48 +
 .../integration/client/AutogroupIdTest.java     |  229 +
 .../integration/client/BlockingSendTest.java    |   83 +
 .../integration/client/CommitRollbackTest.java  |  293 +
 .../ConcurrentCreateDeleteProduceTest.java      |  169 +
 .../integration/client/ConsumerCloseTest.java   |  326 +
 .../integration/client/ConsumerFilterTest.java  |  304 +
 .../client/ConsumerRoundRobinTest.java          |   85 +
 .../integration/client/ConsumerStuckTest.java   |  305 +
 .../tests/integration/client/ConsumerTest.java  |  681 ++
 .../client/ConsumerWindowSizeTest.java          | 1582 +++++
 .../integration/client/CoreClientTest.java      |  125 +
 .../client/CreateQueueIdempotentTest.java       |  181 +
 .../client/DeadLetterAddressTest.java           |  529 ++
 .../integration/client/DeliveryOrderTest.java   |  195 +
 .../integration/client/DurableQueueTest.java    |  157 +
 .../client/ExpireTestOnRestartTest.java         |  162 +
 .../integration/client/ExpiryAddressTest.java   |  407 ++
 .../client/ExpiryLargeMessageTest.java          |  412 ++
 .../integration/client/FailureDeadlockTest.java |  198 +
 ...FlowControlOnIgnoreLargeMessageBodyTest.java |  420 ++
 .../integration/client/HangConsumerTest.java    |  720 ++
 .../integration/client/HeuristicXATest.java     |  505 ++
 .../integration/client/HornetQCrashTest.java    |  158 +
 .../InVMNonPersistentMessageBufferTest.java     |  286 +
 .../client/InVMPersistentMessageBufferTest.java |   35 +
 .../client/IncompatibleVersionTest.java         |  304 +
 .../client/InterruptedLargeMessageTest.java     |  772 +++
 .../client/JMSMessageCounterTest.java           |   76 +
 .../client/JMSPagingFileDeleteTest.java         |  282 +
 .../client/JmsNettyNioStressTest.java           |  331 +
 .../integration/client/JournalCrashTest.java    |  249 +
 .../LargeMessageAvoidLargeMessagesTest.java     |  415 ++
 .../client/LargeMessageCompressTest.java        |  415 ++
 .../integration/client/LargeMessageTest.java    | 3211 +++++++++
 .../client/LibaioDependencyCheckTest.java       |   60 +
 .../client/MessageConcurrencyTest.java          |  261 +
 .../client/MessageConsumerRollbackTest.java     |  286 +
 .../integration/client/MessageCounterTest.java  |  101 +
 .../client/MessageDurabilityTest.java           |  222 +
 .../client/MessageExpirationTest.java           |  260 +
 .../MessageGroupingConnectionFactoryTest.java   |  176 +
 .../integration/client/MessageGroupingTest.java |  668 ++
 .../integration/client/MessageHandlerTest.java  |  408 ++
 .../integration/client/MessagePriorityTest.java |  368 +
 .../integration/client/MessageRateTest.java     |  224 +
 .../client/MultipleThreadFilterOneTest.java     |  324 +
 .../tests/integration/client/NIOvsOIOTest.java  |  334 +
 .../integration/client/NettyConnectorTest.java  |   75 +
 .../client/NettyConsumerWindowSizeTest.java     |   49 +
 .../NettyNonPersistentMessageBufferTest.java    |   35 +
 .../NettyPersistentMessageBufferTest.java       |   35 +
 .../client/NettyProducerFlowControlTest.java    |   30 +
 .../client/NewDeadLetterAddressTest.java        |  113 +
 .../tests/integration/client/OrderTest.java     |  289 +
 .../integration/client/PagingOrderTest.java     |  871 +++
 .../integration/client/PagingSyncTest.java      |  121 +
 .../tests/integration/client/PagingTest.java    | 6271 ++++++++++++++++++
 .../integration/client/ProducerCloseTest.java   |   84 +
 .../client/ProducerFlowControlTest.java         |  871 +++
 .../tests/integration/client/ProducerTest.java  |  168 +
 .../integration/client/QueueBrowserTest.java    |  401 ++
 .../client/ReceiveImmediateTest.java            |  265 +
 .../tests/integration/client/ReceiveTest.java   |  171 +
 .../client/RedeliveryConsumerTest.java          |  378 ++
 .../tests/integration/client/RequestorTest.java |  325 +
 .../tests/integration/client/RoutingTest.java   |  242 +
 .../client/SelfExpandingBufferTest.java         |  147 +
 .../client/ServerLocatorConnectTest.java        |  184 +
 .../client/ServerLocatorSerializationTest.java  |  127 +
 .../client/SessionCloseOnGCTest.java            |  252 +
 .../integration/client/SessionCloseTest.java    |  296 +
 ...onClosedOnRemotingConnectionFailureTest.java |  123 +
 .../client/SessionCreateAndDeleteQueueTest.java |  162 +
 .../client/SessionCreateConsumerTest.java       |  125 +
 .../client/SessionCreateProducerTest.java       |   92 +
 .../integration/client/SessionFactoryTest.java  |  593 ++
 .../SessionSendAcknowledgementHandlerTest.java  |  196 +
 .../client/SessionStopStartTest.java            |  708 ++
 .../tests/integration/client/SessionTest.java   |  525 ++
 .../client/SimpleSendMultipleQueuesTest.java    |  138 +
 .../integration/client/SlowConsumerTest.java    |  361 +
 .../integration/client/TemporaryQueueTest.java  |  701 ++
 .../client/TransactionDurabilityTest.java       |  191 +
 .../client/TransactionalSendTest.java           |  108 +
 .../integration/client/TransientQueueTest.java  |  244 +
 .../integration/client/WildCardRoutingTest.java |  827 +++
 .../clientcrash/ClientCrashTest.java            |  178 +
 .../integration/clientcrash/ClientExitTest.java |  119 +
 .../integration/clientcrash/ClientTestBase.java |   77 +
 .../integration/clientcrash/CrashClient.java    |   93 +
 .../integration/clientcrash/CrashClient2.java   |  105 +
 .../clientcrash/DummyInterceptor.java           |   69 +
 .../clientcrash/DummyInterceptorB.java          |   51 +
 .../integration/clientcrash/GracefulClient.java |   98 +
 .../cluster/ClusterControllerTest.java          |   97 +
 .../integration/cluster/NodeManagerAction.java  |  146 +
 .../integration/cluster/NodeManagerTest.java    |  206 +
 .../cluster/RealNodeManagerTest.java            |   65 +
 .../cluster/bridge/BridgeFailoverTest.java      |  308 +
 .../cluster/bridge/BridgeReconnectTest.java     |  820 +++
 .../cluster/bridge/BridgeStartTest.java         |  822 +++
 .../integration/cluster/bridge/BridgeTest.java  | 1874 ++++++
 .../cluster/bridge/BridgeTestBase.java          |  154 +
 .../BridgeWithDiscoveryGroupStartTest.java      |  280 +
 .../cluster/bridge/SimpleTransformer.java       |   62 +
 .../distribution/ClusterHeadersRemovedTest.java |   94 +
 .../cluster/distribution/ClusterTestBase.java   | 2245 +++++++
 .../distribution/ClusterWithBackupTest.java     |  125 +
 .../distribution/ClusteredGroupingTest.java     | 1808 +++++
 .../ClusteredRequestResponseTest.java           |  159 +
 .../LargeMessageRedistributionTest.java         |   30 +
 .../distribution/MessageRedistributionTest.java | 1181 ++++
 .../MessageRedistributionWithDiscoveryTest.java |  196 +
 .../NettyFileStorageSymmetricClusterTest.java   |   40 +
 ...leStorageSymmetricClusterWithBackupTest.java |   36 +
 ...torageSymmetricClusterWithDiscoveryTest.java |   41 +
 .../NettyOneWayChainClusterTest.java            |   33 +
 .../NettyOneWayTwoNodeClusterTest.java          |   31 +
 .../distribution/NettySymmetricClusterTest.java |   31 +
 .../NettySymmetricClusterWithBackupTest.java    |   32 +
 .../NettySymmetricClusterWithDiscoveryTest.java |   32 +
 .../distribution/OneWayChainClusterTest.java    |  407 ++
 .../distribution/OnewayTwoNodeClusterTest.java  | 1257 ++++
 .../SimpleSymmetricClusterTest.java             |  400 ++
 .../distribution/SymmetricClusterTest.java      | 2003 ++++++
 .../SymmetricClusterWithBackupTest.java         |  575 ++
 .../SymmetricClusterWithDiscoveryTest.java      |  104 +
 .../distribution/TemporaryQueueClusterTest.java |  111 +
 .../distribution/TwoWayTwoNodeClusterTest.java  |  205 +
 .../TwoWayTwoNodeClusterWithDiscoveryTest.java  |   61 +
 .../AlmostLargeAsynchronousFailoverTest.java    |   51 +
 .../failover/AsynchronousFailoverTest.java      |  622 ++
 .../AutomaticColocatedQuorumVoteTest.java       |  376 ++
 .../failover/BackupAuthenticationTest.java      |  101 +
 .../cluster/failover/BackupSyncJournalTest.java |  436 ++
 .../failover/BackupSyncLargeMessageTest.java    |  197 +
 .../cluster/failover/BackupSyncPagingTest.java  |   71 +
 .../ClusterWithBackupFailoverTestBase.java      |  440 ++
 .../cluster/failover/DelayInterceptor.java      |   42 +
 .../cluster/failover/DelayInterceptor2.java     |   59 +
 .../cluster/failover/DelayInterceptor3.java     |   43 +
 .../DiscoveryClusterWithBackupFailoverTest.java |   60 +
 .../cluster/failover/FailBackAutoTest.java      |  350 +
 .../cluster/failover/FailBackManualTest.java    |  236 +
 .../cluster/failover/FailoverListenerTest.java  |  303 +
 .../failover/FailoverOnFlowControlTest.java     |  149 +
 .../cluster/failover/FailoverTest.java          | 2421 +++++++
 .../cluster/failover/FailoverTestBase.java      |  385 ++
 .../GroupingFailoverReplicationTest.java        |   27 +
 .../GroupingFailoverSharedServerTest.java       |   28 +
 .../failover/GroupingFailoverTestBase.java      |  237 +
 .../failover/LargeMessageFailoverTest.java      |   73 +
 .../failover/LiveToLiveFailoverTest.java        |  451 ++
 .../MultipleBackupsFailoverTestBase.java        |  187 +
 ...ultipleLivesMultipleBackupsFailoverTest.java |  221 +
 .../MultipleServerFailoverTestBase.java         |  338 +
 .../failover/NettyAsynchronousFailoverTest.java |   37 +
 .../failover/NettyAsynchronousReattachTest.java |   42 +
 ...yDiscoveryClusterWithBackupFailoverTest.java |   29 +
 .../cluster/failover/NettyFailoverTest.java     |   93 +
 ...eDiscoveryClusterWithBackupFailoverTest.java |   29 +
 ...rageStaticClusterWithBackupFailoverTest.java |   29 +
 .../failover/NettyReplicatedFailoverTest.java   |   63 +
 ...ettyStaticClusterWithBackupFailoverTest.java |   29 +
 .../cluster/failover/PagingFailoverTest.java    |  262 +
 .../cluster/failover/QuorumFailOverTest.java    |  134 +
 .../failover/QuorumVoteServerConnectTest.java   |   82 +
 .../ReplicatedAsynchronousFailoverTest.java     |   28 +
 .../failover/ReplicatedDistributionTest.java    |  252 +
 .../failover/ReplicatedFailoverTest.java        |  176 +
 ...eplicatedFailoverUsingNodeGroupNameTest.java |   35 +
 .../ReplicatedLargeMessageFailoverTest.java     |   65 +
 ...icatedLargeMessageWithDelayFailoverTest.java |   57 +
 ...ltipleServerFailoverNoNodeGroupNameTest.java |   27 +
 ...eplicatedManyMultipleServerFailoverTest.java |   33 +
 ...dMultipleServerFailoverExtraBackupsTest.java |  150 +
 ...ltipleServerFailoverNoGroupNodeNameTest.java |   27 +
 .../ReplicatedMultipleServerFailoverTest.java   |  183 +
 ...ReplicatedNettyAsynchronousFailoverTest.java |   30 +
 .../failover/ReplicatedPagedFailoverTest.java   |   40 +
 .../failover/ReplicatedPagingFailoverTest.java  |   31 +
 .../ReplicatedWithDelayFailoverTest.java        |   58 +
 .../cluster/failover/SecurityFailoverTest.java  |  147 +
 .../failover/SharedStoreDistributionTest.java   |   26 +
 .../SingleLiveMultipleBackupsFailoverTest.java  |  204 +
 .../StaticClusterWithBackupFailoverTest.java    |   93 +
 .../remote/FailoverWithSharedStoreTest.java     |   50 +
 .../ha/HAAutomaticBackupSharedStore.java        |   81 +
 .../reattach/MultiThreadRandomReattachTest.java |   53 +
 .../MultiThreadRandomReattachTestBase.java      | 1490 +++++
 .../MultiThreadReattachSupportTestBase.java     |  270 +
 .../NettyMultiThreadRandomReattachTest.java     |   53 +
 .../cluster/reattach/OrderReattachTest.java     |  315 +
 .../cluster/reattach/RandomReattachTest.java    | 1588 +++++
 .../cluster/reattach/ReattachTest.java          | 1159 ++++
 .../cluster/restart/ClusterRestartTest.java     |  177 +
 .../cluster/topology/HAClientTopologyTest.java  |   64 +
 .../HAClientTopologyWithDiscoveryTest.java      |   72 +
 .../cluster/topology/IsolatedTopologyTest.java  |  220 +
 .../topology/NettyHAClientTopologyTest.java     |   29 +
 .../NettyHAClientTopologyWithDiscoveryTest.java |   31 +
 .../cluster/topology/NonHATopologyTest.java     |  139 +
 .../topology/TopologyClusterTestBase.java       |  473 ++
 .../cluster/util/BackupSyncDelay.java           |  384 ++
 .../cluster/util/MultiServerTestBase.java       |  300 +
 .../cluster/util/RemoteServerConfiguration.java |   34 +
 .../cluster/util/SameProcessHornetQServer.java  |  111 +
 .../cluster/util/TestableServer.java            |   43 +
 .../core/deployers/impl/QueueDeployerTest.java  |   92 +
 .../integration/discovery/DiscoveryTest.java    | 1422 ++++
 .../tests/integration/divert/DivertTest.java    | 1455 ++++
 .../divert/PersistentDivertTest.java            |  478 ++
 .../integration/embedded/ValidateAIOTest.java   |   48 +
 .../http/CoreClientOverHttpTest.java            |  180 +
 .../tests/integration/jms/FloodServerTest.java  |  326 +
 .../jms/HornetQConnectionFactoryTest.java       |  746 +++
 .../tests/integration/jms/JMSSecurityTest.java  |   80 +
 .../tests/integration/jms/JmsProducerTest.java  |  430 ++
 .../ManualReconnectionToSingleServerTest.java   |  304 +
 .../integration/jms/bridge/BridgeTestBase.java  |  608 ++
 .../jms/bridge/ClusteredBridgeTestBase.java     |  307 +
 .../jms/bridge/JMSBridgeClusteredTest.java      |  272 +
 .../jms/bridge/JMSBridgeReconnectionTest.java   |  555 ++
 .../integration/jms/bridge/JMSBridgeTest.java   | 2457 +++++++
 .../jms/client/AutoGroupingTest.java            |   51 +
 .../integration/jms/client/ConnectionTest.java  |  183 +
 .../integration/jms/client/CreateQueueTest.java |  148 +
 .../jms/client/ExpiryMessageTest.java           |  108 +
 .../integration/jms/client/GroupIDTest.java     |   56 +
 .../integration/jms/client/GroupingTest.java    |  285 +
 .../jms/client/MessageProducerTest.java         |  102 +
 .../integration/jms/client/MessageTest.java     |  374 ++
 .../jms/client/NewQueueRequestorTest.java       |  111 +
 .../jms/client/NoLocalSubscriberTest.java       |  269 +
 .../integration/jms/client/PreACKJMSTest.java   |  218 +
 .../jms/client/ReSendMessageTest.java           |  328 +
 .../jms/client/ReceiveNoWaitTest.java           |  112 +
 .../jms/client/RemoteConnectionStressTest.java  |  113 +
 ...onClosedOnRemotingConnectionFailureTest.java |  178 +
 .../integration/jms/client/SessionTest.java     |  162 +
 .../integration/jms/client/StoreConfigTest.java |  374 ++
 .../integration/jms/client/TextMessageTest.java |  248 +
 .../jms/client/TopicCleanupTest.java            |  109 +
 .../jms/cluster/BindingsClusterTest.java        |  484 ++
 .../jms/cluster/JMSFailoverListenerTest.java    |  420 ++
 .../jms/cluster/JMSFailoverTest.java            |  618 ++
 .../jms/cluster/JMSReconnectTest.java           |  366 +
 .../jms/cluster/LargeMessageOverBridgeTest.java |  233 +
 .../jms/cluster/MultipleThreadsOpeningTest.java |   96 +
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |   82 +
 .../jms/cluster/TemporaryQueueClusterTest.java  |  185 +
 .../jms/cluster/TopicClusterTest.java           |  128 +
 .../CloseConnectionFactoryOnGCest.java          |   72 +
 .../jms/connection/CloseConnectionOnGCTest.java |  183 +
 .../CloseDestroyedConnectionTest.java           |  172 +
 .../connection/ConcurrentSessionCloseTest.java  |  119 +
 .../ConnectionFactorySerializationTest.java     |  141 +
 ...tionFactoryWithJGroupsSerializationTest.java |  192 +
 .../jms/connection/ExceptionListenerTest.java   |  171 +
 .../jms/connection/InvalidConnectorTest.java    |  113 +
 .../integration/jms/consumer/ConsumerTest.java  |  843 +++
 .../jms/divert/DivertAndACKClientTest.java      |  168 +
 .../integration/jms/jms2client/BodyTest.java    |   80 +
 .../jms/jms2client/InvalidDestinationTest.java  |  383 ++
 .../jms/jms2client/JmsContextTest.java          |  723 ++
 .../JmsProducerCompletionListenerTest.java      |  231 +
 .../jms/jms2client/NonExistentQueueTest.java    |   95 +
 .../jms/jms2client/SharedConsumerTest.java      |  306 +
 .../jms/largemessage/JMSLargeMessageTest.java   |  364 +
 .../jms/server/JMSServerDeployerTest.java       |  380 ++
 .../jms/server/JMSServerStartStopTest.java      |  216 +
 .../jms/server/config/JMSConfigurationTest.java |  123 +
 .../config/JMSServerConfigParserTest.java       |  123 +
 .../ConnectionFactoryControlTest.java           |  211 +
 .../server/management/JMSMessagingProxy.java    |   96 +
 .../server/management/JMSQueueControlTest.java  | 1377 ++++
 .../management/JMSQueueControlUsingJMSTest.java |  319 +
 .../management/JMSServerControl2Test.java       | 1318 ++++
 .../management/JMSServerControlRestartTest.java |  177 +
 .../server/management/JMSServerControlTest.java | 1254 ++++
 .../JMSServerControlUsingJMSTest.java           |  519 ++
 .../jms/server/management/JMSUtil.java          |  364 +
 .../server/management/NullInitialContext.java   |   58 +
 .../management/TopicControlClusterTest.java     |   82 +
 .../jms/server/management/TopicControlTest.java |  643 ++
 .../management/TopicControlUsingJMSTest.java    |  498 ++
 .../journal/AIOImportExportTest.java            |   44 +
 .../journal/AIOJournalCompactTest.java          |   51 +
 .../integration/journal/AIOJournalImplTest.java |   80 +
 .../journal/AIOSequentialFileFactoryTest.java   |   57 +
 .../journal/JournalPerfTuneTest.java            |  238 +
 .../journal/NIOBufferedJournalCompactTest.java  |   42 +
 .../journal/NIOImportExportTest.java            |  219 +
 .../journal/NIOJournalCompactTest.java          | 1950 ++++++
 .../integration/journal/NIOJournalImplTest.java |   53 +
 .../journal/NIONoBufferJournalImplTest.java     |   53 +
 ...NIONonBufferedSequentialFileFactoryTest.java |   34 +
 .../journal/NIOSequentialFileFactoryTest.java   |   34 +
 .../integration/journal/OldFormatTest.java      |  149 +
 .../journal/ValidateTransactionHealthTest.java  |  473 ++
 .../largemessage/LargeMessageTestBase.java      |  816 +++
 .../largemessage/ServerLargeMessageTest.java    |  125 +
 .../management/AcceptorControlTest.java         |  173 +
 .../AcceptorControlUsingCoreTest.java           |  109 +
 .../management/AddressControlTest.java          |  335 +
 .../management/AddressControlUsingCoreTest.java |  224 +
 .../management/BridgeControlTest.java           |  187 +
 .../management/BridgeControlUsingCoreTest.java  |  188 +
 .../management/BroadcastGroupControlTest.java   |  133 +
 .../BroadcastGroupControlUsingCoreTest.java     |   95 +
 .../ClusterConnectionControl2Test.java          |  195 +
 .../ClusterConnectionControlTest.java           |  306 +
 .../ClusterConnectionControlUsingCoreTest.java  |  180 +
 .../management/CoreMessagingProxy.java          |  114 +
 .../management/DivertControlTest.java           |  136 +
 .../management/DivertControlUsingCoreTest.java  |  133 +
 .../management/HornetQServerControlTest.java    | 1099 +++
 .../HornetQServerControlUsingCoreTest.java      |  716 ++
 .../integration/management/JMXDomainTest.java   |   99 +
 .../management/ManagementActivationTest.java    |  297 +
 .../management/ManagementControlHelper.java     |  164 +
 .../management/ManagementHelperTest.java        |  327 +
 .../management/ManagementServiceImplTest.java   |  181 +
 .../management/ManagementTestBase.java          |  153 +
 .../ManagementWithPagingServerTest.java         |  395 ++
 .../management/ManagementWithStompTest.java     |  269 +
 .../management/NotificationTest.java            |  339 +
 .../management/QueueControlTest.java            | 2035 ++++++
 .../management/QueueControlUsingCoreTest.java   |  362 +
 .../management/SecurityManagementTestBase.java  |  134 +
 ...tyManagementWithConfiguredAdminUserTest.java |  119 +
 ...yManagementWithDefaultConfigurationTest.java |   73 +
 ...ManagementWithModifiedConfigurationTest.java |   91 +
 .../management/SecurityNotificationTest.java    |  245 +
 .../integration/openwire/BasicOpenWireTest.java |  249 +
 .../integration/openwire/BasicSecurityTest.java |  256 +
 .../integration/openwire/OpenWireTestBase.java  |  190 +
 .../integration/openwire/OpenWireUtilTest.java  |   37 +
 .../openwire/SimpleOpenWireTest.java            |  280 +
 .../openwire/amq/JMSConsumer10Test.java         |  108 +
 .../openwire/amq/JMSConsumer11Test.java         |  115 +
 .../openwire/amq/JMSConsumer12Test.java         |   92 +
 .../openwire/amq/JMSConsumer13Test.java         |   85 +
 .../openwire/amq/JMSConsumer1Test.java          |  121 +
 .../openwire/amq/JMSConsumer2Test.java          |  240 +
 .../openwire/amq/JMSConsumer3Test.java          |  113 +
 .../openwire/amq/JMSConsumer4Test.java          |  103 +
 .../openwire/amq/JMSConsumer5Test.java          |  135 +
 .../openwire/amq/JMSConsumer6Test.java          |  146 +
 .../openwire/amq/JMSConsumer7Test.java          |  162 +
 .../openwire/amq/JMSConsumer8Test.java          |  159 +
 .../openwire/amq/JMSConsumer9Test.java          |  141 +
 .../amq/JMSDurableTopicRedeliverTest.java       |   95 +
 .../openwire/amq/JMSIndividualAckTest.java      |  151 +
 .../openwire/amq/JMSMessageTest.java            |  639 ++
 .../openwire/amq/JMSQueueRedeliverTest.java     |   33 +
 .../openwire/amq/JMSUsecase1Test.java           |  122 +
 .../openwire/amq/JMSUsecaseTest.java            |   88 +
 .../openwire/amq/JmsAutoAckListenerTest.java    |   67 +
 .../openwire/amq/JmsAutoAckTest.java            |   65 +
 .../openwire/amq/JmsClientAckTest.java          |  144 +
 .../amq/JmsConnectionStartStopTest.java         |  185 +
 .../amq/JmsConsumerResetActiveListenerTest.java |  165 +
 .../amq/JmsCreateConsumerInOnMessageTest.java   |   99 +
 .../JmsDurableQueueWildcardSendReceiveTest.java |   43 +
 .../amq/JmsDurableTopicSelectorTest.java        |   33 +
 .../amq/JmsDurableTopicSendReceiveTest.java     |  101 +
 .../amq/JmsDurableTopicTransactionTest.java     |   39 +
 .../JmsDurableTopicWildcardSendReceiveTest.java |   44 +
 .../openwire/amq/JmsQueueBrowserTest.java       |  506 ++
 .../openwire/amq/JmsQueueRequestReplyTest.java  |   38 +
 .../openwire/amq/JmsResourceProvider.java       |  265 +
 .../openwire/amq/JmsSendReceiveTestSupport.java |  245 +
 .../openwire/amq/JmsTopicRedeliverTest.java     |  154 +
 .../openwire/amq/JmsTopicRequestReplyTest.java  |  273 +
 .../openwire/amq/JmsTopicSelectorTest.java      |  230 +
 .../openwire/amq/JmsTopicSendReceiveTest.java   |  119 +
 ...sTopicSendReceiveWithTwoConnectionsTest.java |  110 +
 .../openwire/amq/JmsTopicTransactionTest.java   |   36 +
 .../amq/JmsTopicWildcardSendReceiveTest.java    |  255 +
 .../openwire/amq/JmsTransactionTestSupport.java |  760 +++
 .../amq/MessageListenerRedeliveryTest.java      |  457 ++
 .../amq/ProducerFlowControlSendFailTest.java    |  217 +
 .../openwire/amq/ProducerFlowControlTest.java   |  410 ++
 .../amq/ReconnectWithSameClientIDTest.java      |   97 +
 .../openwire/amq/RedeliveryPolicyTest.java      |  637 ++
 .../integration/openwire/amq/TimeStampTest.java |   91 +
 .../openwire/amq/TransactionContextTest.java    |  153 +
 .../openwire/interop/GeneralInteropTest.java    |  669 ++
 .../tests/integration/openwire/util/Wait.java   |   56 +
 .../paging/MultipleProducersPagingTest.java     |  209 +
 .../integration/paging/NettyPagingSendTest.java |   29 +
 .../paging/PageCountSyncOnNonTXTest.java        |  202 +
 .../integration/paging/PageCountSyncServer.java |   77 +
 .../integration/paging/PagingCounterTest.java   |  355 +
 .../integration/paging/PagingReceiveTest.java   |  147 +
 .../integration/paging/PagingSendTest.java      |  223 +
 .../PagingWithFailoverAndCountersTest.java      |  471 ++
 .../paging/PagingWithFailoverBackup.java        |   31 +
 .../paging/PagingWithFailoverServer.java        |   85 +
 .../paging/SpawnedServerSupport.java            |  147 +
 ...AddressSettingsConfigurationStorageTest.java |  122 +
 .../DeleteMessagesOnStartupTest.java            |   95 +
 .../persistence/DeleteQueueRestartTest.java     |  128 +
 .../persistence/DuplicateCacheTest.java         |  102 +
 .../persistence/ExportFormatTest.java           |  160 +
 ...nnectionFactoryConfigurationStorageTest.java |  187 +
 .../persistence/JMSDynamicConfigTest.java       |  100 +
 .../persistence/JMSStorageManagerTest.java      |   79 +
 .../integration/persistence/RestartSMTest.java  |  134 +
 .../RolesConfigurationStorageTest.java          |  143 +
 .../persistence/StorageManagerTestBase.java     |  139 +
 ...ansportConfigurationEncodingSupportTest.java |  132 +
 .../persistence/XmlImportExportTest.java        | 1078 +++
 .../tests/integration/proton/ProtonTest.java    |  974 +++
 .../tests/integration/ra/DummyTransaction.java  |   69 +
 .../integration/ra/DummyTransactionManager.java |   77 +
 .../integration/ra/HornetQActivationTest.java   |   67 +
 .../integration/ra/HornetQClusteredTest.java    |  111 +
 .../ra/HornetQMessageHandlerSecurityTest.java   |   93 +
 .../ra/HornetQMessageHandlerTest.java           |  908 +++
 .../ra/HornetQMessageHandlerXATest.java         |  303 +
 .../ra/HornetQRAClusteredTestBase.java          |   99 +
 .../tests/integration/ra/HornetQRATestBase.java |  235 +
 .../tests/integration/ra/JMSContextTest.java    |  166 +
 .../integration/ra/OutgoingConnectionTest.java  |  533 ++
 .../integration/ra/ResourceAdapterTest.java     |  762 +++
 .../integration/remoting/BatchDelayTest.java    |  125 +
 .../remoting/DestroyConsumerTest.java           |   78 +
 .../integration/remoting/DirectDeliverTest.java |  163 +
 .../remoting/NettyNetworkAddressTest.java       |   56 +
 .../remoting/NettySynchronousCloseTest.java     |   29 +
 .../remoting/NetworkAddressTestBase.java        |  278 +
 .../tests/integration/remoting/PingTest.java    |  463 ++
 .../integration/remoting/ReconnectTest.java     |  286 +
 .../remoting/SynchronousCloseTest.java          |  106 +
 .../replication/ReplicationOrderTest.java       |  136 +
 .../replication/ReplicationTest.java            |  900 +++
 .../scheduling/DelayedMessageTest.java          |  303 +
 .../MultipliedDelayedMessageTest.java           |  151 +
 .../scheduling/ScheduledMessageTest.java        | 1022 +++
 .../security/NettySecurityClientTest.java       |  117 +
 .../integration/security/SecurityTest.java      | 1429 ++++
 .../integration/security/SimpleClient.java      |  106 +
 .../server/AIOFileLockTimeoutTest.java          |   29 +
 .../server/AddressFullLoggingTest.java          |  142 +
 .../integration/server/ExpiryRunnerTest.java    |  359 +
 .../integration/server/FakeStorageManager.java  |   59 +
 .../integration/server/FileLockTimeoutTest.java |  115 +
 .../integration/server/LVQRecoveryTest.java     |  265 +
 .../tests/integration/server/LVQTest.java       |  695 ++
 .../server/NIOFileLockTimeoutTest.java          |   29 +
 .../integration/server/PredefinedQueueTest.java |  534 ++
 .../integration/server/ScaleDown3NodeTest.java  |  412 ++
 .../tests/integration/server/ScaleDownTest.java |  566 ++
 .../server/SuppliedThreadPoolTest.java          |  118 +
 .../integration/spring/ExampleListener.java     |   45 +
 .../tests/integration/spring/MessageSender.java |   67 +
 .../spring/SpringIntegrationTest.java           |   84 +
 .../ssl/CoreClientOverOneWaySSLTest.java        |  608 ++
 .../ssl/CoreClientOverTwoWaySSLTest.java        |  207 +
 .../tests/integration/stomp/ExtraStompTest.java |  813 +++
 .../stomp/StompConnectionCleanupTest.java       |  133 +
 .../integration/stomp/StompOverHttpTest.java    |   83 +
 .../stomp/StompOverWebsocketTest.java           |  145 +
 .../tests/integration/stomp/StompTest.java      | 1372 ++++
 .../tests/integration/stomp/StompTestBase.java  |  395 ++
 .../integration/stomp/StompWebSocketTest.java   |   99 +
 .../stomp/util/AbstractClientStompFrame.java    |  220 +
 .../util/AbstractStompClientConnection.java     |  394 ++
 .../stomp/util/ClientStompFrame.java            |   50 +
 .../stomp/util/ClientStompFrameV10.java         |   51 +
 .../stomp/util/ClientStompFrameV11.java         |   73 +
 .../stomp/util/ClientStompFrameV12.java         |   80 +
 .../stomp/util/StompClientConnection.java       |   59 +
 .../util/StompClientConnectionFactory.java      |   56 +
 .../stomp/util/StompClientConnectionV10.java    |  104 +
 .../stomp/util/StompClientConnectionV11.java    |  142 +
 .../stomp/util/StompClientConnectionV12.java    |  116 +
 .../stomp/util/StompFrameFactory.java           |   29 +
 .../stomp/util/StompFrameFactoryFactory.java    |   42 +
 .../stomp/util/StompFrameFactoryV10.java        |   77 +
 .../stomp/util/StompFrameFactoryV11.java        |  150 +
 .../stomp/util/StompFrameFactoryV12.java        |  155 +
 .../integration/stomp/v11/ExtraStompTest.java   |  396 ++
 .../integration/stomp/v11/StompV11Test.java     | 2414 +++++++
 .../integration/stomp/v11/StompV11TestBase.java |  197 +
 .../integration/stomp/v12/StompV12Test.java     | 2701 ++++++++
 .../integration/tools/TransferMessageTest.java  |  433 ++
 .../netty/HornetQFrameDecoder2Test.java         |  130 +
 .../NettyConnectorWithHTTPUpgradeTest.java      |  259 +
 .../tests/integration/twitter/TwitterTest.java  |  633 ++
 .../integration/vertx/HornetQVertxUnitTest.java |  866 +++
 .../integration/xa/BasicXaRecoveryTest.java     | 1360 ++++
 .../tests/integration/xa/BasicXaTest.java       |  985 +++
 .../tests/integration/xa/XaTimeoutTest.java     |  785 +++
 .../largemessage/LargeMessageTestBase.java      |  701 ++
 .../tests/util/JMSClusteredTestBase.java        |  307 +
 .../apache/activemq/tests/util/JMSTestBase.java |  313 +
 .../activemq/tests/util/JournalExample.java     |  156 +
 .../tests/util/NonSerializableFactory.java      |  107 +
 .../tests/util/ReplicatedBackupUtils.java       |   52 +
 .../tests/util/TransportConfigurationUtils.java |  125 +
 .../integration/DuplicateDetectionTest.java     | 2276 -------
 .../integration/IntegrationTestLogger.java      |   31 -
 .../tests/integration/InterceptorTest.java      | 1125 ----
 .../integration/SimpleNotificationService.java  |   93 -
 .../tests/integration/String64KLimitTest.java   |  218 -
 .../aerogear/AeroGearBasicServerTest.java       |  388 --
 .../integration/client/AckBatchSizeTest.java    |  140 -
 .../integration/client/AcknowledgeTest.java     |  828 ---
 .../integration/client/AddressSettingsTest.java |  372 --
 .../integration/client/AutoCloseCoreTest.java   |   48 -
 .../integration/client/AutogroupIdTest.java     |  229 -
 .../integration/client/BlockingSendTest.java    |   83 -
 .../integration/client/CommitRollbackTest.java  |  293 -
 .../ConcurrentCreateDeleteProduceTest.java      |  169 -
 .../integration/client/ConsumerCloseTest.java   |  326 -
 .../integration/client/ConsumerFilterTest.java  |  304 -
 .../client/ConsumerRoundRobinTest.java          |   85 -
 .../integration/client/ConsumerStuckTest.java   |  305 -
 .../tests/integration/client/ConsumerTest.java  |  681 --
 .../client/ConsumerWindowSizeTest.java          | 1582 -----
 .../integration/client/CoreClientTest.java      |  125 -
 .../client/CreateQueueIdempotentTest.java       |  181 -
 .../client/DeadLetterAddressTest.java           |  529 --
 .../integration/client/DeliveryOrderTest.java   |  195 -
 .../integration/client/DurableQueueTest.java    |  157 -
 .../client/ExpireTestOnRestartTest.java         |  162 -
 .../integration/client/ExpiryAddressTest.java   |  407 --
 .../client/ExpiryLargeMessageTest.java          |  412 --
 .../integration/client/FailureDeadlockTest.java |  198 -
 ...FlowControlOnIgnoreLargeMessageBodyTest.java |  420 --
 .../integration/client/HangConsumerTest.java    |  720 --
 .../integration/client/HeuristicXATest.java     |  505 --
 .../integration/client/HornetQCrashTest.java    |  158 -
 .../InVMNonPersistentMessageBufferTest.java     |  286 -
 .../client/InVMPersistentMessageBufferTest.java |   35 -
 .../client/IncompatibleVersionTest.java         |  304 -
 .../client/InterruptedLargeMessageTest.java     |  772 ---
 .../client/JMSMessageCounterTest.java           |   76 -
 .../client/JMSPagingFileDeleteTest.java         |  282 -
 .../client/JmsNettyNioStressTest.java           |  331 -
 .../integration/client/JournalCrashTest.java    |  249 -
 .../LargeMessageAvoidLargeMessagesTest.java     |  415 --
 .../client/LargeMessageCompressTest.java        |  415 --
 .../integration/client/LargeMessageTest.java    | 3211 ---------
 .../client/LibaioDependencyCheckTest.java       |   60 -
 .../client/MessageConcurrencyTest.java          |  261 -
 .../client/MessageConsumerRollbackTest.java     |  286 -
 .../integration/client/MessageCounterTest.java  |  101 -
 .../client/MessageDurabilityTest.java           |  222 -
 .../client/MessageExpirationTest.java           |  260 -
 .../MessageGroupingConnectionFactoryTest.java   |  176 -
 .../integration/client/MessageGroupingTest.java |  668 --
 .../integration/client/MessageHandlerTest.java  |  408 --
 .../integration/client/MessagePriorityTest.java |  368 -
 .../integration/client/MessageRateTest.java     |  224 -
 .../client/MultipleThreadFilterOneTest.java     |  324 -
 .../tests/integration/client/NIOvsOIOTest.java  |  334 -
 .../integration/client/NettyConnectorTest.java  |   75 -
 .../client/NettyConsumerWindowSizeTest.java     |   49 -
 .../NettyNonPersistentMessageBufferTest.java    |   35 -
 .../NettyPersistentMessageBufferTest.java       |   35 -
 .../client/NettyProducerFlowControlTest.java    |   30 -
 .../client/NewDeadLetterAddressTest.java        |  113 -
 .../tests/integration/client/OrderTest.java     |  289 -
 .../integration/client/PagingOrderTest.java     |  871 ---
 .../integration/client/PagingSyncTest.java      |  121 -
 .../tests/integration/client/PagingTest.java    | 6271 ------------------
 .../integration/client/ProducerCloseTest.java   |   84 -
 .../client/ProducerFlowControlTest.java         |  871 ---
 .../tests/integration/client/ProducerTest.java  |  168 -
 .../integration/client/QueueBrowserTest.java    |  401 --
 .../client/ReceiveImmediateTest.java            |  265 -
 .../tests/integration/client/ReceiveTest.java   |  171 -
 .../client/RedeliveryConsumerTest.java          |  378 --
 .../tests/integration/client/RequestorTest.java |  325 -
 .../tests/integration/client/RoutingTest.java   |  242 -
 .../client/SelfExpandingBufferTest.java         |  147 -
 .../client/ServerLocatorConnectTest.java        |  184 -
 .../client/ServerLocatorSerializationTest.java  |  127 -
 .../client/SessionCloseOnGCTest.java            |  252 -
 .../integration/client/SessionCloseTest.java    |  296 -
 ...onClosedOnRemotingConnectionFailureTest.java |  123 -
 .../client/SessionCreateAndDeleteQueueTest.java |  162 -
 .../client/SessionCreateConsumerTest.java       |  125 -
 .../client/SessionCreateProducerTest.java       |   92 -
 .../integration/client/SessionFactoryTest.java  |  593 --
 .../SessionSendAcknowledgementHandlerTest.java  |  196 -
 .../client/SessionStopStartTest.java            |  708 --
 .../tests/integration/client/SessionTest.java   |  525 --
 .../client/SimpleSendMultipleQueuesTest.java    |  138 -
 .../integration/client/SlowConsumerTest.java    |  361 -
 .../integration/client/TemporaryQueueTest.java  |  701 --
 .../client/TransactionDurabilityTest.java       |  191 -
 .../client/TransactionalSendTest.java           |  108 -
 .../integration/client/TransientQueueTest.java  |  244 -
 .../integration/client/WildCardRoutingTest.java |  827 ---
 .../clientcrash/ClientCrashTest.java            |  178 -
 .../integration/clientcrash/ClientExitTest.java |  119 -
 .../integration/clientcrash/ClientTestBase.java |   77 -
 .../integration/clientcrash/CrashClient.java    |   93 -
 .../integration/clientcrash/CrashClient2.java   |  105 -
 .../clientcrash/DummyInterceptor.java           |   69 -
 .../clientcrash/DummyInterceptorB.java          |   51 -
 .../integration/clientcrash/GracefulClient.java |   98 -
 .../cluster/ClusterControllerTest.java          |   97 -
 .../integration/cluster/NodeManagerAction.java  |  146 -
 .../integration/cluster/NodeManagerTest.java    |  206 -
 .../cluster/RealNodeManagerTest.java            |   65 -
 .../cluster/bridge/BridgeFailoverTest.java      |  308 -
 .../cluster/bridge/BridgeReconnectTest.java     |  820 ---
 .../cluster/bridge/BridgeStartTest.java         |  822 ---
 .../integration/cluster/bridge/BridgeTest.java  | 1874 ------
 .../cluster/bridge/BridgeTestBase.java          |  154 -
 .../BridgeWithDiscoveryGroupStartTest.java      |  280 -
 .../cluster/bridge/SimpleTransformer.java       |   62 -
 .../distribution/ClusterHeadersRemovedTest.java |   94 -
 .../cluster/distribution/ClusterTestBase.java   | 2245 -------
 .../distribution/ClusterWithBackupTest.java     |  125 -
 .../distribution/ClusteredGroupingTest.java     | 1808 -----
 .../ClusteredRequestResponseTest.java           |  159 -
 .../LargeMessageRedistributionTest.java         |   30 -
 .../distribution/MessageRedistributionTest.java | 1181 ----
 .../MessageRedistributionWithDiscoveryTest.java |  196 -
 .../NettyFileStorageSymmetricClusterTest.java   |   40 -
 ...leStorageSymmetricClusterWithBackupTest.java |   36 -
 ...torageSymmetricClusterWithDiscoveryTest.java |   41 -
 .../NettyOneWayChainClusterTest.java            |   33 -
 .../NettyOneWayTwoNodeClusterTest.java          |   31 -
 .../distribution/NettySymmetricClusterTest.java |   31 -
 .../NettySymmetricClusterWithBackupTest.java    |   32 -
 .../NettySymmetricClusterWithDiscoveryTest.java |   32 -
 .../distribution/OneWayChainClusterTest.java    |  407 --
 .../distribution/OnewayTwoNodeClusterTest.java  | 1257 ----
 .../SimpleSymmetricClusterTest.java             |  400 --
 .../distribution/SymmetricClusterTest.java      | 2003 ------
 .../SymmetricClusterWithBackupTest.java         |  575 --
 .../SymmetricClusterWithDiscoveryTest.java      |  104 -
 .../distribution/TemporaryQueueClusterTest.java |  111 -
 .../distribution/TwoWayTwoNodeClusterTest.java  |  205 -
 .../TwoWayTwoNodeClusterWithDiscoveryTest.java  |   61 -
 .../AlmostLargeAsynchronousFailoverTest.java    |   51 -
 .../failover/AsynchronousFailoverTest.java      |  622 --
 .../AutomaticColocatedQuorumVoteTest.java       |  376 --
 .../failover/BackupAuthenticationTest.java      |  101 -
 .../cluster/failover/BackupSyncJournalTest.java |  436 --
 .../failover/BackupSyncLargeMessageTest.java    |  197 -
 .../cluster/failover/BackupSyncPagingTest.java  |   71 -
 .../ClusterWithBackupFailoverTestBase.java      |  440 --
 .../cluster/failover/DelayInterceptor.java      |   42 -
 .../cluster/failover/DelayInterceptor2.java     |   59 -
 .../cluster/failover/DelayInterceptor3.java     |   43 -
 .../DiscoveryClusterWithBackupFailoverTest.java |   60 -
 .../cluster/failover/FailBackAutoTest.java      |  350 -
 .../cluster/failover/FailBackManualTest.java    |  236 -
 .../cluster/failover/FailoverListenerTest.java  |  303 -
 .../failover/FailoverOnFlowControlTest.java     |  149 -
 .../cluster/failover/FailoverTest.java          | 2421 -------
 .../cluster/failover/FailoverTestBase.java      |  385 --
 .../GroupingFailoverReplicationTest.java        |   27 -
 .../GroupingFailoverSharedServerTest.java       |   28 -
 .../failover/GroupingFailoverTestBase.java      |  237 -
 .../failover/LargeMessageFailoverTest.java      |   73 -
 .../failover/LiveToLiveFailoverTest.java        |  451 --
 .../MultipleBackupsFailoverTestBase.java        |  187 -
 ...ultipleLivesMultipleBackupsFailoverTest.java |  221 -
 .../MultipleServerFailoverTestBase.java         |  338 -
 .../failover/NettyAsynchronousFailoverTest.java |   37 -
 .../failover/NettyAsynchronousReattachTest.java |   42 -
 ...yDiscoveryClusterWithBackupFailoverTest.java |   29 -
 .../cluster/failover/NettyFailoverTest.java     |   93 -
 ...eDiscoveryClusterWithBackupFailoverTest.java |   29 -
 ...rageStaticClusterWithBackupFailoverTest.java |   29 -
 .../failover/NettyReplicatedFailoverTest.java   |   63 -
 ...ettyStaticClusterWithBackupFailoverTest.java |   29 -
 .../cluster/failover/PagingFailoverTest.java    |  262 -
 .../cluster/failover/QuorumFailOverTest.java    |  134 -
 .../failover/QuorumVoteServerConnectTest.java   |   82 -
 .../ReplicatedAsynchronousFailoverTest.java     |   28 -
 .../failover/ReplicatedDistributionTest.java    |  252 -
 .../failover/ReplicatedFailoverTest.java        |  176 -
 ...eplicatedFailoverUsingNodeGroupNameTest.java |   35 -
 .../ReplicatedLargeMessageFailoverTest.java     |   65 -
 ...icatedLargeMessageWithDelayFailoverTest.java |   57 -
 ...ltipleServerFailoverNoNodeGroupNameTest.java |   27 -
 ...eplicatedManyMultipleServerFailoverTest.java |   33 -
 ...dMultipleServerFailoverExtraBackupsTest.java |  150 -
 ...ltipleServerFailoverNoGroupNodeNameTest.java |   27 -
 .../ReplicatedMultipleServerFailoverTest.java   |  183 -
 ...ReplicatedNettyAsynchronousFailoverTest.java |   30 -
 .../failover/ReplicatedPagedFailoverTest.java   |   40 -
 .../failover/ReplicatedPagingFailoverTest.java  |   31 -
 .../ReplicatedWithDelayFailoverTest.java        |   58 -
 .../cluster/failover/SecurityFailoverTest.java  |  147 -
 .../failover/SharedStoreDistributionTest.java   |   26 -
 .../SingleLiveMultipleBackupsFailoverTest.java  |  204 -
 .../StaticClusterWithBackupFailoverTest.java    |   93 -
 .../remote/FailoverWithSharedStoreTest.java     |   50 -
 .../ha/HAAutomaticBackupSharedStore.java        |   81 -
 .../reattach/MultiThreadRandomReattachTest.java |   53 -
 .../MultiThreadRandomReattachTestBase.java      | 1490 -----
 .../MultiThreadReattachSupportTestBase.java     |  270 -
 .../NettyMultiThreadRandomReattachTest.java     |   53 -
 .../cluster/reattach/OrderReattachTest.java     |  315 -
 .../cluster/reattach/RandomReattachTest.java    | 1588 -----
 .../cluster/reattach/ReattachTest.java          | 1159 ----
 .../cluster/restart/ClusterRestartTest.java     |  177 -
 .../cluster/topology/HAClientTopologyTest.java  |   64 -
 .../HAClientTopologyWithDiscoveryTest.java      |   72 -
 .../cluster/topology/IsolatedTopologyTest.java  |  220 -
 .../topology/NettyHAClientTopologyTest.java     |   29 -
 .../NettyHAClientTopologyWithDiscoveryTest.java |   31 -
 .../cluster/topology/NonHATopologyTest.java     |  139 -
 .../topology/TopologyClusterTestBase.java       |  473 --
 .../cluster/util/BackupSyncDelay.java           |  384 --
 .../cluster/util/MultiServerTestBase.java       |  300 -
 .../cluster/util/RemoteServerConfiguration.java |   34 -
 .../cluster/util/SameProcessHornetQServer.java  |  111 -
 .../cluster/util/TestableServer.java            |   43 -
 .../core/deployers/impl/QueueDeployerTest.java  |   92 -
 .../integration/discovery/DiscoveryTest.java    | 1422 ----
 .../tests/integration/divert/DivertTest.java    | 1455 ----
 .../divert/PersistentDivertTest.java            |  478 --
 .../integration/embedded/ValidateAIOTest.java   |   48 -
 .../http/CoreClientOverHttpTest.java            |  180 -
 .../tests/integration/jms/FloodServerTest.java  |  326 -
 .../jms/HornetQConnectionFactoryTest.java       |  746 ---
 .../tests/integration/jms/JMSSecurityTest.java  |   80 -
 .../tests/integration/jms/JmsProducerTest.java  |  430 --
 .../ManualReconnectionToSingleServerTest.java   |  304 -
 .../integration/jms/bridge/BridgeTestBase.java  |  608 --
 .../jms/bridge/ClusteredBridgeTestBase.java     |  307 -
 .../jms/bridge/JMSBridgeClusteredTest.java      |  272 -
 .../jms/bridge/JMSBridgeReconnectionTest.java   |  555 --
 .../integration/jms/bridge/JMSBridgeTest.java   | 2457 -------
 .../jms/client/AutoGroupingTest.java            |   51 -
 .../integration/jms/client/ConnectionTest.java  |  183 -
 .../integration/jms/client/CreateQueueTest.java |  148 -
 .../jms/client/ExpiryMessageTest.java           |  108 -
 .../integration/jms/client/GroupIDTest.java     |   56 -
 .../integration/jms/client/GroupingTest.java    |  285 -
 .../jms/client/MessageProducerTest.java         |  102 -
 .../integration/jms/client/MessageTest.java     |  374 --
 .../jms/client/NewQueueRequestorTest.java       |  111 -
 .../jms/client/NoLocalSubscriberTest.java       |  269 -
 .../integration/jms/client/PreACKJMSTest.java   |  218 -
 .../jms/client/ReSendMessageTest.java           |  328 -
 .../jms/client/ReceiveNoWaitTest.java           |  112 -
 .../jms/client/RemoteConnectionStressTest.java  |  113 -
 ...onClosedOnRemotingConnectionFailureTest.java |  178 -
 .../integration/jms/client/SessionTest.java     |  162 -
 .../integration/jms/client/StoreConfigTest.java |  374 --
 .../integration/jms/client/TextMessageTest.java |  248 -
 .../jms/client/TopicCleanupTest.java            |  109 -
 .../jms/cluster/BindingsClusterTest.java        |  484 --
 .../jms/cluster/JMSFailoverListenerTest.java    |  420 --
 .../jms/cluster/JMSFailoverTest.java            |  618 --
 .../jms/cluster/JMSReconnectTest.java           |  366 -
 .../jms/cluster/LargeMessageOverBridgeTest.java |  233 -
 .../jms/cluster/MultipleThreadsOpeningTest.java |   96 -
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |   82 -
 .../jms/cluster/TemporaryQueueClusterTest.java  |  185 -
 .../jms/cluster/TopicClusterTest.java           |  128 -
 .../CloseConnectionFactoryOnGCest.java          |   72 -
 .../jms/connection/CloseConnectionOnGCTest.java |  183 -
 .../CloseDestroyedConnectionTest.java           |  172 -
 .../connection/ConcurrentSessionCloseTest.java  |  119 -
 .../ConnectionFactorySerializationTest.java     |  141 -
 ...tionFactoryWithJGroupsSerializationTest.java |  192 -
 .../jms/connection/ExceptionListenerTest.java   |  171 -
 .../jms/connection/InvalidConnectorTest.java    |  113 -
 .../integration/jms/consumer/ConsumerTest.java  |  843 ---
 .../jms/divert/DivertAndACKClientTest.java      |  168 -
 .../integration/jms/jms2client/BodyTest.java    |   80 -
 .../jms/jms2client/InvalidDestinationTest.java  |  383 --
 .../jms/jms2client/JmsContextTest.java          |  723 --
 .../JmsProducerCompletionListenerTest.java      |  231 -
 .../jms/jms2client/NonExistentQueueTest.java    |   95 -
 .../jms/jms2client/SharedConsumerTest.java      |  306 -
 .../jms/largemessage/JMSLargeMessageTest.java   |  364 -
 .../jms/server/JMSServerDeployerTest.java       |  380 --
 .../jms/server/JMSServerStartStopTest.java      |  216 -
 .../jms/server/config/JMSConfigurationTest.java |  123 -
 .../config/JMSServerConfigParserTest.java       |  123 -
 .../ConnectionFactoryControlTest.java           |  211 -
 .../server/management/JMSMessagingProxy.java    |   96 -
 .../server/management/JMSQueueControlTest.java  | 1377 ----
 .../management/JMSQueueControlUsingJMSTest.java |  319 -
 .../management/JMSServerControl2Test.java       | 1318 ----
 .../management/JMSServerControlRestartTest.java |  177 -
 .../server/management/JMSServerControlTest.java | 1254 ----
 .../JMSServerControlUsingJMSTest.java           |  519 --
 .../jms/server/management/JMSUtil.java          |  364 -
 .../server/management/NullInitialContext.java   |   58 -
 .../management/TopicControlClusterTest.java     |   82 -
 .../jms/server/management/TopicControlTest.java |  643 --
 .../management/TopicControlUsingJMSTest.java    |  498 --
 .../journal/AIOImportExportTest.java            |   44 -
 .../journal/AIOJournalCompactTest.java          |   51 -
 .../integration/journal/AIOJournalImplTest.java |   80 -
 .../journal/AIOSequentialFileFactoryTest.java   |   57 -
 .../journal/JournalPerfTuneTest.java            |  238 -
 .../journal/NIOBufferedJournalCompactTest.java  |   42 -
 .../journal/NIOImportExportTest.java            |  219 -
 .../journal/NIOJournalCompactTest.java          | 1950 ------
 .../integration/journal/NIOJournalImplTest.java |   53 -
 .../journal/NIONoBufferJournalImplTest.java     |   53 -
 ...NIONonBufferedSequentialFileFactoryTest.java |   34 -
 .../journal/NIOSequentialFileFactoryTest.java   |   34 -
 .../integration/journal/OldFormatTest.java      |  149 -
 .../journal/ValidateTransactionHealthTest.java  |  473 --
 .../largemessage/LargeMessageTestBase.java      |  816 ---
 .../largemessage/ServerLargeMessageTest.java    |  125 -
 .../management/AcceptorControlTest.java         |  173 -
 .../AcceptorControlUsingCoreTest.java           |  109 -
 .../management/AddressControlTest.java          |  335 -
 .../management/AddressControlUsingCoreTest.java |  224 -
 .../management/BridgeControlTest.java           |  187 -
 .../management/BridgeControlUsingCoreTest.java  |  188 -
 .../management/BroadcastGroupControlTest.java   |  133 -
 .../BroadcastGroupControlUsingCoreTest.java     |   95 -
 .../ClusterConnectionControl2Test.java          |  195 -
 .../ClusterConnectionControlTest.java           |  306 -
 .../ClusterConnectionControlUsingCoreTest.java  |  180 -
 .../management/CoreMessagingProxy.java          |  114 -
 .../management/DivertControlTest.java           |  136 -
 .../management/DivertControlUsingCoreTest.java  |  133 -
 .../management/HornetQServerControlTest.java    | 1099 ---
 .../HornetQServerControlUsingCoreTest.java      |  716 --
 .../integration/management/JMXDomainTest.java   |   99 -
 .../management/ManagementActivationTest.java    |  297 -
 .../management/ManagementControlHelper.java     |  164 -
 .../management/ManagementHelperTest.java        |  327 -
 .../management/ManagementServiceImplTest.java   |  181 -
 .../management/ManagementTestBase.java          |  153 -
 .../ManagementWithPagingServerTest.java         |  395 --
 .../management/ManagementWithStompTest.java     |  269 -
 .../management/NotificationTest.java            |  339 -
 .../management/QueueControlTest.java            | 2035 ------
 .../management/QueueControlUsingCoreTest.java   |  362 -
 .../management/SecurityManagementTestBase.java  |  134 -
 ...tyManagementWithConfiguredAdminUserTest.java |  119 -
 ...yManagementWithDefaultConfigurationTest.java |   73 -
 ...ManagementWithModifiedConfigurationTest.java |   91 -
 .../management/SecurityNotificationTest.java    |  245 -
 .../integration/openwire/BasicOpenWireTest.java |  249 -
 .../integration/openwire/BasicSecurityTest.java |  256 -
 .../integration/openwire/OpenWireTestBase.java  |  190 -
 .../integration/openwire/OpenWireUtilTest.java  |   37 -
 .../openwire/SimpleOpenWireTest.java            |  280 -
 .../openwire/amq/JMSConsumer10Test.java         |  108 -
 .../openwire/amq/JMSConsumer11Test.java         |  115 -
 .../openwire/amq/JMSConsumer12Test.java         |   92 -
 .../openwire/amq/JMSConsumer13Test.java         |   85 -
 .../openwire/amq/JMSConsumer1Test.java          |  121 -
 .../openwire/amq/JMSConsumer2Test.java          |  240 -
 .../openwire/amq/JMSConsumer3Test.java          |  113 -
 .../openwire/amq/JMSConsumer4Test.java          |  103 -
 .../openwire/amq/JMSConsumer5Test.java          |  135 -
 .../openwire/amq/JMSConsumer6Test.java          |  146 -
 .../openwire/amq/JMSConsumer7Test.java          |  162 -
 .../openwire/amq/JMSConsumer8Test.java          |  159 -
 .../openwire/amq/JMSConsumer9Test.java          |  141 -
 .../amq/JMSDurableTopicRedeliverTest.java       |   95 -
 .../openwire/amq/JMSIndividualAckTest.java      |  151 -
 .../openwire/amq/JMSMessageTest.java            |  639 --
 .../openwire/amq/JMSQueueRedeliverTest.java     |   33 -
 .../openwire/amq/JMSUsecase1Test.java           |  122 -
 .../openwire/amq/JMSUsecaseTest.java            |   88 -
 .../openwire/amq/JmsAutoAckListenerTest.java    |   67 -
 .../openwire/amq/JmsAutoAckTest.java            |   65 -
 .../openwire/amq/JmsClientAckTest.java          |  144 -
 .../amq/JmsConnectionStartStopTest.java         |  185 -
 .../amq/JmsConsumerResetActiveListenerTest.java |  165 -
 .../amq/JmsCreateConsumerInOnMessageTest.java   |   99 -
 .../JmsDurableQueueWildcardSendReceiveTest.java |   43 -
 .../amq/JmsDurableTopicSelectorTest.java        |   33 -
 .../amq/JmsDurableTopicSendReceiveTest.java     |  101 -
 .../amq/JmsDurableTopicTransactionTest.java     |   39 -
 .../JmsDurableTopicWildcardSendReceiveTest.java |   44 -
 .../openwire/amq/JmsQueueBrowserTest.java       |  506 --
 .../openwire/amq/JmsQueueRequestReplyTest.java  |   38 -
 .../openwire/amq/JmsResourceProvider.java       |  265 -
 .../openwire/amq/JmsSendReceiveTestSupport.java |  245 -
 .../openwire/amq/JmsTopicRedeliverTest.java     |  154 -
 .../openwire/amq/JmsTopicRequestReplyTest.java  |  273 -
 .../openwire/amq/JmsTopicSelectorTest.java      |  230 -
 .../openwire/amq/JmsTopicSendReceiveTest.java   |  119 -
 ...sTopicSendReceiveWithTwoConnectionsTest.java |  110 -
 .../openwire/amq/JmsTopicTransactionTest.java   |   36 -
 .../amq/JmsTopicWildcardSendReceiveTest.java    |  255 -
 .../openwire/amq/JmsTransactionTestSupport.java |  760 ---
 .../amq/MessageListenerRedeliveryTest.java      |  457 --
 .../amq/ProducerFlowControlSendFailTest.java    |  217 -
 .../openwire/amq/ProducerFlowControlTest.java   |  410 --
 .../amq/ReconnectWithSameClientIDTest.java      |   97 -
 .../openwire/amq/RedeliveryPolicyTest.java      |  637 --
 .../integration/openwire/amq/TimeStampTest.java |   91 -
 .../openwire/amq/TransactionContextTest.java    |  153 -
 .../openwire/interop/GeneralInteropTest.java    |  669 --
 .../tests/integration/openwire/util/Wait.java   |   56 -
 .../paging/MultipleProducersPagingTest.java     |  209 -
 .../integration/paging/NettyPagingSendTest.java |   29 -
 .../paging/PageCountSyncOnNonTXTest.java        |  202 -
 .../integration/paging/PageCountSyncServer.java |   77 -
 .../integration/paging/PagingCounterTest.java   |  355 -
 .../integration/paging/PagingReceiveTest.java   |  147 -
 .../integration/paging/PagingSendTest.java      |  223 -
 .../PagingWithFailoverAndCountersTest.java      |  471 --
 .../paging/PagingWithFailoverBackup.java        |   31 -
 .../paging/PagingWithFailoverServer.java        |   85 -
 .../paging/SpawnedServerSupport.java            |  147 -
 ...AddressSettingsConfigurationStorageTest.java |  122 -
 .../DeleteMessagesOnStartupTest.java            |   95 -
 .../persistence/DeleteQueueRestartTest.java     |  128 -
 .../persistence/DuplicateCacheTest.java         |  102 -
 .../persistence/ExportFormatTest.java           |  160 -
 ...nnectionFactoryConfigurationStorageTest.java |  187 -
 .../persistence/JMSDynamicConfigTest.java       |  100 -
 .../persistence/JMSStorageManagerTest.java      |   79 -
 .../integration/persistence/RestartSMTest.java  |  134 -
 .../RolesConfigurationStorageTest.java          |  143 -
 .../persistence/StorageManagerTestBase.java     |  139 -
 ...ansportConfigurationEncodingSupportTest.java |  132 -
 .../persistence/XmlImportExportTest.java        | 1078 ---
 .../tests/integration/proton/ProtonTest.java    |  974 ---
 .../tests/integration/ra/DummyTransaction.java  |   69 -
 .../integration/ra/DummyTransactionManager.java |   77 -
 .../integration/ra/HornetQActivationTest.java   |   67 -
 .../integration/ra/HornetQClusteredTest.java    |  111 -
 .../ra/HornetQMessageHandlerSecurityTest.java   |   93 -
 .../ra/HornetQMessageHandlerTest.java           |  908 ---
 .../ra/HornetQMessageHandlerXATest.java         |  303 -
 .../ra/HornetQRAClusteredTestBase.java          |   99 -
 .../tests/integration/ra/HornetQRATestBase.java |  235 -
 .../tests/integration/ra/JMSContextTest.java    |  166 -
 .../integration/ra/OutgoingConnectionTest.java  |  533 --
 .../integration/ra/ResourceAdapterTest.java     |  762 ---
 .../integration/remoting/BatchDelayTest.java    |  125 -
 .../remoting/DestroyConsumerTest.java           |   78 -
 .../integration/remoting/DirectDeliverTest.java |  163 -
 .../remoting/NettyNetworkAddressTest.java       |   56 -
 .../remoting/NettySynchronousCloseTest.java     |   29 -
 .../remoting/NetworkAddressTestBase.java        |  278 -
 .../tests/integration/remoting/PingTest.java    |  463 --
 .../integration/remoting/ReconnectTest.java     |  286 -
 .../remoting/SynchronousCloseTest.java          |  106 -
 .../replication/ReplicationOrderTest.java       |  136 -
 .../replication/ReplicationTest.java            |  900 ---
 .../scheduling/DelayedMessageTest.java          |  303 -
 .../MultipliedDelayedMessageTest.java           |  151 -
 .../scheduling/ScheduledMessageTest.java        | 1022 ---
 .../security/NettySecurityClientTest.java       |  117 -
 .../integration/security/SecurityTest.java      | 1429 ----
 .../integration/security/SimpleClient.java      |  106 -
 .../server/AIOFileLockTimeoutTest.java          |   29 -
 .../server/AddressFullLoggingTest.java          |  142 -
 .../integration/server/ExpiryRunnerTest.java    |  359 -
 .../integration/server/FakeStorageManager.java  |   59 -
 .../integration/server/FileLockTimeoutTest.java |  115 -
 .../integration/server/LVQRecoveryTest.java     |  265 -
 .../tests/integration/server/LVQTest.java       |  695 --
 .../server/NIOFileLockTimeoutTest.java          |   29 -
 .../integration/server/PredefinedQueueTest.java |  534 --
 .../integration/server/ScaleDown3NodeTest.java  |  412 --
 .../tests/integration/server/ScaleDownTest.java |  566 --
 .../server/SuppliedThreadPoolTest.java          |  118 -
 .../integration/spring/ExampleListener.java     |   45 -
 .../tests/integration/spring/MessageSender.java |   67 -
 .../spring/SpringIntegrationTest.java           |   84 -
 .../ssl/CoreClientOverOneWaySSLTest.java        |  585 --
 .../ssl/CoreClientOverTwoWaySSLTest.java        |  207 -
 .../tests/integration/stomp/ExtraStompTest.java |  813 ---
 .../stomp/StompConnectionCleanupTest.java       |  133 -
 .../integration/stomp/StompOverHttpTest.java    |   83 -
 .../stomp/StompOverWebsocketTest.java           |  145 -
 .../tests/integration/stomp/StompTest.java      | 1372 ----
 .../tests/integration/stomp/StompTestBase.java  |  395 --
 .../integration/stomp/StompWebSocketTest.java   |   99 -
 .../stomp/util/AbstractClientStompFrame.java    |  220 -
 .../util/AbstractStompClientConnection.java     |  394 --
 .../stomp/util/ClientStompFrame.java            |   50 -
 .../stomp/util/ClientStompFrameV10.java         |   51 -
 .../stomp/util/ClientStompFrameV11.java         |   73 -
 .../stomp/util/ClientStompFrameV12.java         |   80 -
 .../stomp/util/StompClientConnection.java       |   59 -
 .../util/StompClientConnectionFactory.java      |   56 -
 .../stomp/util/StompClientConnectionV10.java    |  104 -
 .../stomp/util/StompClientConnectionV11.java    |  142 -
 .../stomp/util/StompClientConnectionV12.java    |  116 -
 .../stomp/util/StompFrameFactory.java           |   29 -
 .../stomp/util/StompFrameFactoryFactory.java    |   42 -
 .../stomp/util/StompFrameFactoryV10.java        |   77 -
 .../stomp/util/StompFrameFactoryV11.java        |  150 -
 .../stomp/util/StompFrameFactoryV12.java        |  155 -
 .../integration/stomp/v11/ExtraStompTest.java   |  396 --
 .../integration/stomp/v11/StompV11Test.java     | 2414 -------
 .../integration/stomp/v11/StompV11TestBase.java |  197 -
 .../integration/stomp/v12/StompV12Test.java     | 2701 --------
 .../integration/tools/TransferMessageTest.java  |  433 --
 .../netty/HornetQFrameDecoder2Test.java         |  130 -
 .../NettyConnectorWithHTTPUpgradeTest.java      |  259 -
 .../tests/integration/twitter/TwitterTest.java  |  633 --
 .../integration/vertx/HornetQVertxUnitTest.java |  866 ---
 .../integration/xa/BasicXaRecoveryTest.java     | 1360 ----
 .../tests/integration/xa/BasicXaTest.java       |  985 ---
 .../tests/integration/xa/XaTimeoutTest.java     |  785 ---
 .../largemessage/LargeMessageTestBase.java      |  701 --
 .../tests/util/JMSClusteredTestBase.java        |  307 -
 .../org/hornetq/tests/util/JMSTestBase.java     |  313 -
 .../org/hornetq/tests/util/JournalExample.java  |  156 -
 .../tests/util/NonSerializableFactory.java      |  107 -
 .../tests/util/ReplicatedBackupUtils.java       |   52 -
 .../tests/util/TransportConfigurationUtils.java |  125 -
 .../colocated-server-start-stop-config1.xml     |    6 +-
 .../colocated-server-start-stop-config2.xml     |    6 +-
 .../colocated-server-start-stop-jms-config1.xml |    2 +-
 .../colocated-server-start-stop-jms-config2.xml |    2 +-
 .../hornetq-jms-for-JMSServerDeployerTest.xml   |    2 +-
 .../hornetq-jms-for-JMSServerDeployerTest2.xml  |    2 +-
 .../resources/server-start-stop-config1.xml     |    6 +-
 .../resources/server-start-stop-jms-config1.xml |    2 +-
 .../test/resources/spring-hornetq-config.xml    |    6 +-
 .../src/test/resources/spring-hornetq-jms.xml   |    2 +-
 .../src/test/resources/spring-jms-beans.xml     |    6 +-
 tests/jms-tests/pom.xml                         |   50 +-
 .../activemq/jms/tests/AcknowledgementTest.java | 1421 ++++
 .../jms/tests/AutoAckMesageListenerTest.java    |  164 +
 .../apache/activemq/jms/tests/BrowserTest.java  |  248 +
 .../jms/tests/CTSMiscellaneousTest.java         |  160 +
 .../jms/tests/ConnectionClosedTest.java         |  401 ++
 .../jms/tests/ConnectionFactoryTest.java        |  503 ++
 .../activemq/jms/tests/ConnectionTest.java      |  343 +
 .../activemq/jms/tests/ConsumerClosedTest.java  |   90 +
 .../activemq/jms/tests/DeliveryOrderTest.java   |  160 +
 .../jms/tests/DurableSubscriptionTest.java      |  469 ++
 .../jms/tests/HornetQServerTestCase.java        |  570 ++
 .../org/apache/activemq/jms/tests/JMSTest.java  |  367 +
 .../apache/activemq/jms/tests/JMSTestCase.java  |  249 +
 .../activemq/jms/tests/JmsTestLogger.java       |   31 +
 .../activemq/jms/tests/MessageConsumerTest.java | 4595 +++++++++++++
 .../activemq/jms/tests/MessageProducerTest.java |  925 +++
 .../jms/tests/MessageWithReadResolveTest.java   |  141 +
 .../activemq/jms/tests/MiscellaneousTest.java   |  310 +
 .../jms/tests/NonDurableSubscriberTest.java     |  113 +
 .../activemq/jms/tests/PersistenceTest.java     |  553 ++
 .../activemq/jms/tests/QueueReceiverTest.java   |   76 +
 .../apache/activemq/jms/tests/QueueTest.java    |  231 +
 .../activemq/jms/tests/ReferenceableTest.java   |  165 +
 .../apache/activemq/jms/tests/SecurityTest.java |  190 +
 .../apache/activemq/jms/tests/SessionTest.java  |  438 ++
 .../jms/tests/TemporaryDestinationTest.java     |  513 ++
 .../apache/activemq/jms/tests/TopicTest.java    |  199 +
 .../jms/tests/TransactedSessionTest.java        | 1213 ++++
 .../activemq/jms/tests/XARecoveryTest.java      | 3048 +++++++++
 .../org/apache/activemq/jms/tests/XATest.java   | 2332 +++++++
 .../tests/message/BodyIsAssignableFromTest.java |  179 +
 .../jms/tests/message/BytesMessageTest.java     |  101 +
 .../jms/tests/message/ExpiredMessageTest.java   |  120 +
 .../message/JMSCorrelationIDHeaderTest.java     |   96 +
 .../message/JMSDeliveryModeHeaderTest.java      |   75 +
 .../tests/message/JMSDestinationHeaderTest.java |   50 +
 .../tests/message/JMSExpirationHeaderTest.java  |  340 +
 .../tests/message/JMSMessageIDHeaderTest.java   |   90 +
 .../tests/message/JMSPriorityHeaderTest.java    |  248 +
 .../jms/tests/message/JMSReplyToHeaderTest.java |   73 +
 .../tests/message/JMSTimestampHeaderTest.java   |   68 +
 .../jms/tests/message/JMSTypeHeaderTest.java    |   63 +
 .../tests/message/JMSXDeliveryCountTest.java    |  789 +++
 .../jms/tests/message/MapMessageTest.java       |  119 +
 .../jms/tests/message/MessageBodyTest.java      | 1597 +++++
 .../jms/tests/message/MessageBodyTestCase.java  |   54 +
 .../jms/tests/message/MessageHeaderTest.java    | 1463 ++++
 .../tests/message/MessageHeaderTestBase.java    |  469 ++
 .../message/MessagePropertyConversionTest.java  | 1410 ++++
 .../jms/tests/message/MessageTestBase.java      |  228 +
 .../message/ObjectMessageDeliveryTest.java      |  138 +
 .../jms/tests/message/ObjectMessageTest.java    |  228 +
 .../tests/message/SimpleJMSBytesMessage.java    |  569 ++
 .../jms/tests/message/SimpleJMSMapMessage.java  |  592 ++
 .../jms/tests/message/SimpleJMSMessage.java     |  394 ++
 .../tests/message/SimpleJMSObjectMessage.java   |   57 +
 .../tests/message/SimpleJMSStreamMessage.java   |  736 ++
 .../jms/tests/message/SimpleJMSTextMessage.java |   65 +
 .../activemq/jms/tests/message/SomeObject.java  |   71 +
 .../jms/tests/message/StreamMessageTest.java    |  122 +
 .../jms/tests/message/TextMessageTest.java      |   91 +
 .../foreign/ForeignBytesMessageTest.java        |   61 +
 .../message/foreign/ForeignMapMessageTest.java  |   71 +
 .../message/foreign/ForeignMessageTest.java     |  140 +
 .../foreign/ForeignObjectMessageTest.java       |   76 +
 .../foreign/ForeignStreamMessageTest.java       |   79 +
 .../message/foreign/ForeignTestObject.java      |   78 +
 .../message/foreign/ForeignTextMessageTest.java |   49 +
 .../jms/tests/selector/SelectorTest.java        | 1124 ++++
 .../tests/stress/ConcurrentCloseStressTest.java |  293 +
 .../tests/stress/CorruptMessageStressTest.java  |  160 +
 .../jms/tests/stress/JMSStressTestBase.java     |  102 +
 .../tests/stress/ManyConnectionsStressTest.java |  214 +
 .../jms/tests/stress/OpenCloseStressTest.java   |  441 ++
 .../jms/tests/stress/QueueStressTest.java       |  267 +
 .../activemq/jms/tests/stress/Receiver.java     |  293 +
 .../jms/tests/stress/RecoveringReceiver.java    |  191 +
 .../jms/tests/stress/RelayStressTest.java       |  252 +
 .../activemq/jms/tests/stress/Runner.java       |   60 +
 .../activemq/jms/tests/stress/Sender.java       |   68 +
 .../tests/stress/SeveralClientsStressTest.java  |  543 ++
 .../jms/tests/stress/TopicStressTest.java       |  293 +
 .../tests/stress/Transactional2PCReceiver.java  |  227 +
 .../tests/stress/Transactional2PCSender.java    |  116 +
 .../jms/tests/stress/TransactionalReceiver.java |  196 +
 .../jms/tests/stress/TransactionalSender.java   |   89 +
 .../jms/tests/tools/ServerManagement.java       |  142 +
 .../jms/tests/tools/WrappedJNDIServer.java      |   88 +
 .../jms/tests/tools/container/Constants.java    |   41 +
 .../jms/tests/tools/container/InVMContext.java  |  375 ++
 .../container/InVMInitialContextFactory.java    |  135 +
 .../InVMInitialContextFactoryBuilder.java       |  106 +
 .../tests/tools/container/InVMNameParser.java   |   70 +
 .../tests/tools/container/LocalTestServer.java  |  478 ++
 .../tools/container/NonSerializableFactory.java |  106 +
 .../jms/tests/tools/container/Server.java       |  189 +
 .../activemq/jms/tests/util/JNDIUtilTest.java   |  120 +
 .../jms/tests/util/ProxyAssertSupport.java      |  476 ++
 .../hornetq/jms/tests/AcknowledgementTest.java  | 1421 ----
 .../jms/tests/AutoAckMesageListenerTest.java    |  164 -
 .../java/org/hornetq/jms/tests/BrowserTest.java |  248 -
 .../hornetq/jms/tests/CTSMiscellaneousTest.java |  160 -
 .../hornetq/jms/tests/ConnectionClosedTest.java |  401 --
 .../jms/tests/ConnectionFactoryTest.java        |  503 --
 .../org/hornetq/jms/tests/ConnectionTest.java   |  343 -
 .../hornetq/jms/tests/ConsumerClosedTest.java   |   90 -
 .../hornetq/jms/tests/DeliveryOrderTest.java    |  160 -
 .../jms/tests/DurableSubscriptionTest.java      |  469 --
 .../jms/tests/HornetQServerTestCase.java        |  570 --
 .../java/org/hornetq/jms/tests/JMSTest.java     |  367 -
 .../java/org/hornetq/jms/tests/JMSTestCase.java |  249 -
 .../org/hornetq/jms/tests/JmsTestLogger.java    |   31 -
 .../hornetq/jms/tests/MessageConsumerTest.java  | 4595 -------------
 .../hornetq/jms/tests/MessageProducerTest.java  |  925 ---
 .../jms/tests/MessageWithReadResolveTest.java   |  141 -
 .../hornetq/jms/tests/MiscellaneousTest.java    |  310 -
 .../jms/tests/NonDurableSubscriberTest.java     |  113 -
 .../org/hornetq/jms/tests/PersistenceTest.java  |  553 --
 .../hornetq/jms/tests/QueueReceiverTest.java    |   76 -
 .../java/org/hornetq/jms/tests/QueueTest.java   |  231 -
 .../hornetq/jms/tests/ReferenceableTest.java    |  165 -
 .../org/hornetq/jms/tests/SecurityTest.java     |  190 -
 .../java/org/hornetq/jms/tests/SessionTest.java |  438 --
 .../jms/tests/TemporaryDestinationTest.java     |  513 --
 .../java/org/hornetq/jms/tests/TopicTest.java   |  199 -
 .../jms/tests/TransactedSessionTest.java        | 1213 ----
 .../org/hornetq/jms/tests/XARecoveryTest.java   | 3048 ---------
 .../test/java/org/hornetq/jms/tests/XATest.java | 2332 -------
 .../tests/message/BodyIsAssignableFromTest.java |  179 -
 .../jms/tests/message/BytesMessageTest.java     |  101 -
 .../jms/tests/message/ExpiredMessageTest.java   |  120 -
 .../message/JMSCorrelationIDHeaderTest.java     |   96 -
 .../message/JMSDeliveryModeHeaderTest.java      |   75 -
 .../tests/message/JMSDestinationHeaderTest.java |   50 -
 .../tests/message/JMSExpirationHeaderTest.java  |  340 -
 .../tests/message/JMSMessageIDHeaderTest.java   |   90 -
 .../tests/message/JMSPriorityHeaderTest.java    |  248 -
 .../jms/tests/message/JMSReplyToHeaderTest.java |   73 -
 .../tests/message/JMSTimestampHeaderTest.java   |   68 -
 .../jms/tests/message/JMSTypeHeaderTest.java    |   63 -
 .../tests/message/JMSXDeliveryCountTest.java    |  789 ---
 .../jms/tests/message/MapMessageTest.java       |  119 -
 .../jms/tests/message/MessageBodyTest.java      | 1597 -----
 .../jms/tests/message/MessageBodyTestCase.java  |   54 -
 .../jms/tests/message/MessageHeaderTest.java    | 1463 ----
 .../tests/message/MessageHeaderTestBase.java    |  469 --
 .../message/MessagePropertyConversionTest.java  | 1410 ----
 .../jms/tests/message/MessageTestBase.java      |  228 -
 .../message/ObjectMessageDeliveryTest.java      |  138 -
 .../jms/tests/message/ObjectMessageTest.java    |  228 -
 .../tests/message/SimpleJMSBytesMessage.java    |  569 --
 .../jms/tests/message/SimpleJMSMapMessage.java  |  592 --
 .../jms/tests/message/SimpleJMSMessage.java     |  394 --
 .../tests/message/SimpleJMSObjectMessage.java   |   57 -
 .../tests/message/SimpleJMSStreamMessage.java   |  736 --
 .../jms/tests/message/SimpleJMSTextMessage.java |   65 -
 .../hornetq/jms/tests/message/SomeObject.java   |   71 -
 .../jms/tests/message/StreamMessageTest.java    |  122 -
 .../jms/tests/message/TextMessageTest.java      |   91 -
 .../foreign/ForeignBytesMessageTest.java        |   61 -
 .../message/foreign/ForeignMapMessageTest.java  |   71 -
 .../message/foreign/ForeignMessageTest.java     |  140 -
 .../foreign/ForeignObjectMessageTest.java       |   76 -
 .../foreign/ForeignStreamMessageTest.java       |   79 -
 .../message/foreign/ForeignTestObject.java      |   78 -
 .../message/foreign/ForeignTextMessageTest.java |   49 -
 .../jms/tests/selector/SelectorTest.java        | 1124 ----
 .../tests/stress/ConcurrentCloseStressTest.java |  293 -
 .../tests/stress/CorruptMessageStressTest.java  |  160 -
 .../jms/tests/stress/JMSStressTestBase.java     |  102 -
 .../tests/stress/ManyConnectionsStressTest.java |  214 -
 .../jms/tests/stress/OpenCloseStressTest.java   |  441 --
 .../jms/tests/stress/QueueStressTest.java       |  267 -
 .../org/hornetq/jms/tests/stress/Receiver.java  |  293 -
 .../jms/tests/stress/RecoveringReceiver.java    |  191 -
 .../jms/tests/stress/RelayStressTest.java       |  252 -
 .../org/hornetq/jms/tests/stress/Runner.java    |   60 -
 .../org/hornetq/jms/tests/stress/Sender.java    |   68 -
 .../tests/stress/SeveralClientsStressTest.java  |  543 --
 .../jms/tests/stress/TopicStressTest.java       |  293 -
 .../tests/stress/Transactional2PCReceiver.java  |  227 -
 .../tests/stress/Transactional2PCSender.java    |  116 -
 .../jms/tests/stress/TransactionalReceiver.java |  196 -
 .../jms/tests/stress/TransactionalSender.java   |   89 -
 .../jms/tests/tools/ServerManagement.java       |  142 -
 .../jms/tests/tools/WrappedJNDIServer.java      |   88 -
 .../jms/tests/tools/container/Constants.java    |   41 -
 .../jms/tests/tools/container/InVMContext.java  |  375 --
 .../container/InVMInitialContextFactory.java    |  135 -
 .../InVMInitialContextFactoryBuilder.java       |  106 -
 .../tests/tools/container/InVMNameParser.java   |   70 -
 .../tests/tools/container/LocalTestServer.java  |  478 --
 .../tools/container/NonSerializableFactory.java |  106 -
 .../jms/tests/tools/container/Server.java       |  189 -
 .../hornetq/jms/tests/util/JNDIUtilTest.java    |  120 -
 .../jms/tests/util/ProxyAssertSupport.java      |  476 --
 .../test/resources/hornetq-configuration.xml    |   10 +-
 .../src/test/resources/hornetq-jms.xml          |    2 +-
 .../src/test/resources/hornetq-queues.xml       |    2 +-
 .../src/test/resources/hornetq-users.xml        |    2 +-
 .../src/test/resources/jbossjta-properties.xml  |    2 +-
 tests/joram-tests/pom.xml                       |   20 +-
 .../org/apache/activemq/jms/AbstractAdmin.java  |  105 +
 .../org/apache/activemq/jms/GenericAdmin.java   |  127 +
 .../org/apache/activemq/jms/HornetQAdmin.java   |  336 +
 .../activemq/jms/JoramAggregationTest.java      |   98 +
 .../apache/activemq/jms/SpawnedJMSServer.java   |  137 +
 .../java/org/hornetq/jms/AbstractAdmin.java     |  105 -
 .../test/java/org/hornetq/jms/GenericAdmin.java |  127 -
 .../test/java/org/hornetq/jms/HornetQAdmin.java |  336 -
 .../org/hornetq/jms/JoramAggregationTest.java   |   98 -
 .../java/org/hornetq/jms/SpawnedJMSServer.java  |  137 -
 .../src/test/resources/provider.properties      |    4 +-
 tests/performance-tests/pom.xml                 |   34 +-
 .../journal/FakeJournalImplTest.java            |   32 +
 .../journal/JournalImplTestUnit.java            |  300 +
 .../journal/RealJournalImplAIOTest.java         |   61 +
 .../journal/RealJournalImplNIOTest.java         |   47 +
 .../paging/MeasurePagingMultiThreadTest.java    |  230 +
 .../journal/FakeJournalImplTest.java            |   32 -
 .../journal/JournalImplTestUnit.java            |  300 -
 .../journal/RealJournalImplAIOTest.java         |   61 -
 .../journal/RealJournalImplNIOTest.java         |   47 -
 .../paging/MeasurePagingMultiThreadTest.java    |  230 -
 tests/pom.xml                                   |   14 +-
 tests/soak-tests/pom.xml                        |   36 +-
 .../tests/soak/client/ClientAbstract.java       |  221 +
 .../soak/client/ClientNonDivertedSoakTest.java  |  159 +
 .../tests/soak/client/ClientSoakTest.java       |  200 +
 .../activemq/tests/soak/client/Receiver.java    |  182 +
 .../activemq/tests/soak/client/Sender.java      |  125 +
 .../soak/client/SimpleSendReceiveSoakTest.java  |  138 +
 .../soak/failover/RandomFailoverSoakTest.java   |   35 +
 .../tests/soak/client/ClientAbstract.java       |  221 -
 .../soak/client/ClientNonDivertedSoakTest.java  |  159 -
 .../tests/soak/client/ClientSoakTest.java       |  200 -
 .../org/hornetq/tests/soak/client/Receiver.java |  182 -
 .../org/hornetq/tests/soak/client/Sender.java   |  125 -
 .../soak/client/SimpleSendReceiveSoakTest.java  |  138 -
 .../soak/failover/RandomFailoverSoakTest.java   |   35 -
 tests/stress-tests/pom.xml                      |   36 +-
 .../stress/chunk/LargeMessageStressTest.java    |   69 +
 .../tests/stress/client/SendStressTest.java     |  147 +
 .../MultiThreadRandomReattachStressTest.java    |   31 +
 .../failover/RandomReattachStressTest.java      |   53 +
 .../AIOAllPossibilitiesCompactStressTest.java   |   64 +
 .../AIOMultiThreadCompactorStressTest.java      |   44 +
 .../stress/journal/AddAndRemoveStressTest.java  |  247 +
 .../AllPossibilitiesCompactStressTest.java      |  111 +
 ...ibilitiesCompactWithAddDeleteStressTest.java |   72 +
 .../stress/journal/CompactingStressTest.java    |  463 ++
 .../JournalCleanupCompactStressTest.java        |  618 ++
 .../journal/JournalRestartStressTest.java       |  219 +
 .../stress/journal/LargeJournalStressTest.java  |  344 +
 .../stress/journal/MixupCompactorTestBase.java  |  244 +
 .../journal/MultiThreadConsumerStressTest.java  |  356 +
 .../NIOMultiThreadCompactorStressTest.java      |  564 ++
 .../journal/XmlImportExportStressTest.java      |  133 +
 .../paging/MultipleConsumersPageStressTest.java |  513 ++
 .../stress/paging/PageCursorStressTest.java     |  966 +++
 .../tests/stress/paging/PageStressTest.java     |  294 +
 .../tests/stress/remote/PingStressTest.java     |  213 +
 .../tests/stress/stomp/StompStressTest.java     |  191 +
 .../stress/chunk/LargeMessageStressTest.java    |   69 -
 .../tests/stress/client/SendStressTest.java     |  147 -
 .../MultiThreadRandomReattachStressTest.java    |   31 -
 .../failover/RandomReattachStressTest.java      |   53 -
 .../AIOAllPossibilitiesCompactStressTest.java   |   64 -
 .../AIOMultiThreadCompactorStressTest.java      |   44 -
 .../stress/journal/AddAndRemoveStressTest.java  |  247 -
 .../AllPossibilitiesCompactStressTest.java      |  111 -
 ...ibilitiesCompactWithAddDeleteStressTest.java |   72 -
 .../stress/journal/CompactingStressTest.java    |  463 --
 .../JournalCleanupCompactStressTest.java        |  618 --
 .../journal/JournalRestartStressTest.java       |  219 -
 .../stress/journal/LargeJournalStressTest.java  |  344 -
 .../stress/journal/MixupCompactorTestBase.java  |  244 -
 .../journal/MultiThreadConsumerStressTest.java  |  356 -
 .../NIOMultiThreadCompactorStressTest.java      |  564 --
 .../journal/XmlImportExportStressTest.java      |  133 -
 .../paging/MultipleConsumersPageStressTest.java |  513 --
 .../stress/paging/PageCursorStressTest.java     |  966 ---
 .../tests/stress/paging/PageStressTest.java     |  294 -
 .../tests/stress/remote/PingStressTest.java     |  213 -
 .../tests/stress/stomp/StompStressTest.java     |  191 -
 tests/timing-tests/pom.xml                      |   28 +-
 .../core/journal/impl/AIOJournalImplTest.java   |   47 +
 .../core/journal/impl/FakeJournalImplTest.java  |   32 +
 .../core/journal/impl/JournalImplTestUnit.java  |  185 +
 .../core/journal/impl/NIOJournalImplTest.java   |   49 +
 .../timing/core/server/impl/QueueImplTest.java  |  286 +
 .../jms/bridge/impl/JMSBridgeImplTest.java      |  636 ++
 .../tests/timing/util/ReusableLatchTest.java    |   40 +
 .../timing/util/TokenBucketLimiterImplTest.java |  271 +
 .../activemq/tests/timing/util/UTF8Test.java    |  114 +
 .../activemq/tests/timing/util/UUIDTest.java    |   49 +
 .../core/journal/impl/AIOJournalImplTest.java   |   47 -
 .../core/journal/impl/FakeJournalImplTest.java  |   32 -
 .../core/journal/impl/JournalImplTestUnit.java  |  185 -
 .../core/journal/impl/NIOJournalImplTest.java   |   49 -
 .../timing/core/server/impl/QueueImplTest.java  |  286 -
 .../jms/bridge/impl/JMSBridgeImplTest.java      |  636 --
 .../tests/timing/util/ReusableLatchTest.java    |   40 -
 .../timing/util/TokenBucketLimiterImplTest.java |  271 -
 .../org/hornetq/tests/timing/util/UTF8Test.java |  114 -
 .../org/hornetq/tests/timing/util/UUIDTest.java |   49 -
 tests/unit-tests/pom.xml                        |   32 +-
 .../activemq/tests/unit/UnitTestLogger.java     |   32 +
 .../tests/unit/core/asyncio/AIOTestBase.java    |  153 +
 .../unit/core/asyncio/AsynchronousFileTest.java | 1013 +++
 .../core/asyncio/LibaioDependencyCheckTest.java |   57 +
 .../MultiThreadAsynchronousFileTest.java        |  323 +
 .../client/impl/LargeMessageBufferTest.java     |  940 +++
 .../impl/ConfigurationValidationTest.java       |   67 +
 .../core/config/impl/ConnectorsServiceTest.java |   95 +
 .../config/impl/TransportConfigurationTest.java |   83 +
 .../config/impl/fakes/FakeConnectorService.java |   45 +
 .../impl/fakes/FakeConnectorServiceFactory.java |   65 +
 .../impl/AddressSettingsDeployerTest.java       |  132 +
 .../impl/BasicUserCredentialsDeployerTest.java  |  542 ++
 .../deployers/impl/FakeDeploymentManager.java   |   47 +
 .../impl/FileDeploymentManagerTest.java         |  435 ++
 .../deployers/impl/SecurityDeployerTest.java    |  313 +
 .../core/deployers/impl/XMLDeployerTest.java    |  263 +
 .../journal/impl/AlignedJournalImplTest.java    | 1427 ++++
 .../unit/core/journal/impl/CleanBufferTest.java |  123 +
 .../core/journal/impl/FakeJournalImplTest.java  |   39 +
 .../impl/FakeSequentialFileFactoryTest.java     |   34 +
 .../core/journal/impl/FileFactoryTestBase.java  |   76 +
 .../core/journal/impl/JournalAsyncTest.java     |  248 +
 .../core/journal/impl/JournalImplTestBase.java  |  630 ++
 .../core/journal/impl/JournalImplTestUnit.java  | 3229 +++++++++
 .../unit/core/journal/impl/ReclaimerTest.java   | 1029 +++
 .../impl/SequentialFileFactoryTestBase.java     |  442 ++
 .../unit/core/journal/impl/TimedBufferTest.java |  405 ++
 .../impl/fakes/FakeSequentialFileFactory.java   |  739 +++
 .../core/journal/impl/fakes/SimpleEncoding.java |   71 +
 .../unit/core/message/impl/MessageImplTest.java |  369 ++
 .../unit/core/paging/impl/PagePositionTest.java |   53 +
 .../tests/unit/core/paging/impl/PageTest.java   |  249 +
 .../core/paging/impl/PagingManagerImplTest.java |  136 +
 .../core/paging/impl/PagingStoreImplTest.java   |  959 +++
 .../impl/BatchIDGeneratorUnitTest.java          |  158 +
 .../impl/OperationContextUnitTest.java          |  244 +
 .../core/postoffice/impl/AddressImplTest.java   |  301 +
 .../core/postoffice/impl/BindingsImplTest.java  |  425 ++
 .../impl/DuplicateDetectionUnitTest.java        |  193 +
 .../unit/core/postoffice/impl/FakeQueue.java    |  621 ++
 .../postoffice/impl/QueueComparatorTest.java    |   52 +
 .../impl/WildcardAddressManagerUnitTest.java    |  253 +
 .../core/remoting/HornetQBufferTestBase.java    |  357 +
 .../impl/invm/InVMConnectorFactoryTest.java     |   54 +
 .../impl/netty/ChannelBufferWrapper2Test.java   |   54 +
 .../impl/netty/NettyAcceptorFactoryTest.java    |   87 +
 .../remoting/impl/netty/NettyAcceptorTest.java  |  128 +
 .../impl/netty/NettyConnectionTest.java         |  107 +
 .../impl/netty/NettyConnectorFactoryTest.java   |   54 +
 .../remoting/impl/netty/NettyConnectorTest.java |  339 +
 .../core/remoting/impl/ssl/SSLSupportTest.java  |  185 +
 .../server/impl/RemotingServiceImplTest.java    |  142 +
 .../server/impl/fake/FakeInterceptor.java       |   33 +
 .../impl/HornetQSecurityManagerImplTest.java    |  181 +
 .../security/impl/JAASSecurityManagerTest.java  |  212 +
 .../impl/ClusterConnectionBridgeTest.java       |  110 +
 .../cluster/impl/RemoteQueueBindImplTest.java   |   82 +
 .../group/impl/SystemPropertyOverrideTest.java  |   47 +
 .../unit/core/server/impl/FileLockTest.java     |  106 +
 .../unit/core/server/impl/QueueImplTest.java    | 1667 +++++
 .../core/server/impl/fakes/FakeConsumer.java    |  180 +
 .../unit/core/server/impl/fakes/FakeFilter.java |   69 +
 .../server/impl/fakes/FakeJournalLoader.java    |   89 +
 .../core/server/impl/fakes/FakePostOffice.java  |  196 +
 .../server/impl/fakes/FakeQueueFactory.java     |   77 +
 .../tests/unit/jms/HornetQDestinationTest.java  |  102 +
 .../unit/jms/client/HornetQMapMessageTest.java  |  795 +++
 .../jms/client/HornetQStreamMessageTest.java    | 1059 +++
 .../unit/jms/client/JMSExceptionHelperTest.java |  123 +
 .../unit/jms/client/SelectorTranslatorTest.java |  277 +
 .../tests/unit/jms/misc/ManifestTest.java       |   93 +
 .../ConnectionFactoryObjectFactoryTest.java     |   61 +
 .../DestinationObjectFactoryTest.java           |   64 +
 .../tests/unit/ra/BootstrapContext.java         |   77 +
 .../ra/ConnectionFactoryPropertiesTest.java     |  113 +
 .../ra/HornetQResourceAdapterConfigTest.java    |  489 ++
 .../tests/unit/ra/MessageEndpointFactory.java   |   35 +
 .../tests/unit/ra/ResourceAdapterTest.java      |  573 ++
 .../tests/unit/util/FakePagingManager.java      |  194 +
 .../unit/util/HornetQBufferInputStreamTest.java |   69 +
 .../activemq/tests/unit/util/InVMContext.java   |  376 ++
 .../tests/unit/util/InVMNameParser.java         |   70 +
 .../tests/unit/util/InVMNamingContext.java      |  375 ++
 .../tests/unit/util/LinkedListTest.java         | 1305 ++++
 .../tests/unit/util/MemorySizeTest.java         |   52 +
 .../tests/unit/util/NonSerializableFactory.java |  106 +
 .../ObjectInputStreamWithClassLoaderTest.java   |  297 +
 .../tests/unit/util/ReusableLatchTest.java      |  322 +
 .../tests/unit/util/SoftValueMapTest.java       |  159 +
 .../activemq/tests/unit/util/UTF8Test.java      |  185 +
 .../tests/unit/util/UUIDGeneratorTest.java      |   78 +
 .../activemq/tests/unit/util/UUIDTest.java      |   70 +
 .../tests/unit/util/VersionLoaderTest.java      |   70 +
 .../tests/unit/xa/XAResourceWrapperTest.java    |   43 +
 .../activemq/tests/util/CreateMessage.java      |   61 +
 .../activemq/tests/util/SpawnedVMSupport.java   |  218 +
 .../org/hornetq/tests/unit/UnitTestLogger.java  |   32 -
 .../tests/unit/core/asyncio/AIOTestBase.java    |  153 -
 .../unit/core/asyncio/AsynchronousFileTest.java | 1013 ---
 .../core/asyncio/LibaioDependencyCheckTest.java |   57 -
 .../MultiThreadAsynchronousFileTest.java        |  323 -
 .../client/impl/LargeMessageBufferTest.java     |  940 ---
 .../impl/ConfigurationValidationTest.java       |   67 -
 .../core/config/impl/ConnectorsServiceTest.java |   95 -
 .../config/impl/TransportConfigurationTest.java |   83 -
 .../config/impl/fakes/FakeConnectorService.java |   45 -
 .../impl/fakes/FakeConnectorServiceFactory.java |   65 -
 .../impl/AddressSettingsDeployerTest.java       |  132 -
 .../impl/BasicUserCredentialsDeployerTest.java  |  542 --
 .../deployers/impl/FakeDeploymentManager.java   |   47 -
 .../impl/FileDeploymentManagerTest.java         |  435 --
 .../deployers/impl/SecurityDeployerTest.java    |  313 -
 .../core/deployers/impl/XMLDeployerTest.java    |  263 -
 .../journal/impl/AlignedJournalImplTest.java    | 1427 ----
 .../unit/core/journal/impl/CleanBufferTest.java |  123 -
 .../core/journal/impl/FakeJournalImplTest.java  |   39 -
 .../impl/FakeSequentialFileFactoryTest.java     |   34 -
 .../core/journal/impl/FileFactoryTestBase.java  |   76 -
 .../core/journal/impl/JournalAsyncTest.java     |  248 -
 .../core/journal/impl/JournalImplTestBase.java  |  630 --
 .../core/journal/impl/JournalImplTestUnit.java  | 3229 ---------
 .../unit/core/journal/impl/ReclaimerTest.java   | 1029 ---
 .../impl/SequentialFileFactoryTestBase.java     |  442 --
 .../unit/core/journal/impl/TimedBufferTest.java |  405 --
 .../impl/fakes/FakeSequentialFileFactory.java   |  739 ---
 .../core/journal/impl/fakes/SimpleEncoding.java |   71 -
 .../unit/core/message/impl/MessageImplTest.java |  369 --
 .../unit/core/paging/impl/PagePositionTest.java |   53 -
 .../tests/unit/core/paging/impl/PageTest.java   |  249 -
 .../core/paging/impl/PagingManagerImplTest.java |  136 -
 .../core/paging/impl/PagingStoreImplTest.java   |  959 ---
 .../impl/BatchIDGeneratorUnitTest.java          |  158 -
 .../impl/OperationContextUnitTest.java          |  244 -
 .../core/postoffice/impl/AddressImplTest.java   |  301 -
 .../core/postoffice/impl/BindingsImplTest.java  |  425 --
 .../impl/DuplicateDetectionUnitTest.java        |  193 -
 .../unit/core/postoffice/impl/FakeQueue.java    |  621 --
 .../postoffice/impl/QueueComparatorTest.java    |   52 -
 .../impl/WildcardAddressManagerUnitTest.java    |  253 -
 .../core/remoting/HornetQBufferTestBase.java    |  357 -
 .../impl/invm/InVMConnectorFactoryTest.java     |   54 -
 .../impl/netty/ChannelBufferWrapper2Test.java   |   54 -
 .../impl/netty/NettyAcceptorFactoryTest.java    |   87 -
 .../remoting/impl/netty/NettyAcceptorTest.java  |  128 -
 .../impl/netty/NettyConnectionTest.java         |  107 -
 .../impl/netty/NettyConnectorFactoryTest.java   |   54 -
 .../remoting/impl/netty/NettyConnectorTest.java |  339 -
 .../core/remoting/impl/ssl/SSLSupportTest.java  |  185 -
 .../server/impl/RemotingServiceImplTest.java    |  142 -
 .../server/impl/fake/FakeInterceptor.java       |   33 -
 .../impl/HornetQSecurityManagerImplTest.java    |  181 -
 .../security/impl/JAASSecurityManagerTest.java  |  212 -
 .../impl/ClusterConnectionBridgeTest.java       |  110 -
 .../cluster/impl/RemoteQueueBindImplTest.java   |   82 -
 .../group/impl/SystemPropertyOverrideTest.java  |   47 -
 .../unit/core/server/impl/FileLockTest.java     |  106 -
 .../unit/core/server/impl/QueueImplTest.java    | 1667 -----
 .../core/server/impl/fakes/FakeConsumer.java    |  180 -
 .../unit/core/server/impl/fakes/FakeFilter.java |   69 -
 .../server/impl/fakes/FakeJournalLoader.java    |   89 -
 .../core/server/impl/fakes/FakePostOffice.java  |  196 -
 .../server/impl/fakes/FakeQueueFactory.java     |   77 -
 .../tests/unit/jms/HornetQDestinationTest.java  |  102 -
 .../unit/jms/client/HornetQMapMessageTest.java  |  795 ---
 .../jms/client/HornetQStreamMessageTest.java    | 1059 ---
 .../unit/jms/client/JMSExceptionHelperTest.java |  123 -
 .../unit/jms/client/SelectorTranslatorTest.java |  277 -
 .../tests/unit/jms/misc/ManifestTest.java       |   93 -
 .../ConnectionFactoryObjectFactoryTest.java     |   61 -
 .../DestinationObjectFactoryTest.java           |   64 -
 .../hornetq/tests/unit/ra/BootstrapContext.java |   77 -
 .../ra/ConnectionFactoryPropertiesTest.java     |  113 -
 .../ra/HornetQResourceAdapterConfigTest.java    |  489 --
 .../tests/unit/ra/MessageEndpointFactory.java   |   35 -
 .../tests/unit/ra/ResourceAdapterTest.java      |  573 --
 .../tests/unit/util/FakePagingManager.java      |  194 -
 .../unit/util/HornetQBufferInputStreamTest.java |   69 -
 .../hornetq/tests/unit/util/InVMContext.java    |  376 --
 .../hornetq/tests/unit/util/InVMNameParser.java |   70 -
 .../tests/unit/util/InVMNamingContext.java      |  375 --
 .../hornetq/tests/unit/util/LinkedListTest.java | 1305 ----
 .../hornetq/tests/unit/util/MemorySizeTest.java |   52 -
 .../tests/unit/util/NonSerializableFactory.java |  106 -
 .../ObjectInputStreamWithClassLoaderTest.java   |  297 -
 .../tests/unit/util/ReusableLatchTest.java      |  322 -
 .../tests/unit/util/SoftValueMapTest.java       |  159 -
 .../org/hornetq/tests/unit/util/UTF8Test.java   |  185 -
 .../tests/unit/util/UUIDGeneratorTest.java      |   78 -
 .../org/hornetq/tests/unit/util/UUIDTest.java   |   70 -
 .../tests/unit/util/VersionLoaderTest.java      |   70 -
 .../tests/unit/xa/XAResourceWrapperTest.java    |   43 -
 .../org/hornetq/tests/util/CreateMessage.java   |   61 -
 .../hornetq/tests/util/SpawnedVMSupport.java    |  218 -
 tests/unit-tests/src/test/resources/beans1.xml  |    2 +-
 5284 files changed, 546244 insertions(+), 545370 deletions(-)
----------------------------------------------------------------------



[04/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 70e6cf1..0c4224a 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml
index a4e76ed..93cbf26 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml
index 2767387..a7f66f1 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
    
    <user name="bill" password="hornetq">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml
index ecc6651..839e31f 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml b/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml
index a4438a9..9e5ab97 100644
--- a/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml b/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml
index bc4af35..3461588 100644
--- a/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/spring-integration/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-users.xml b/examples/jms/spring-integration/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/spring-integration/src/main/resources/hornetq-users.xml
+++ b/examples/jms/spring-integration/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 059a7f3..b395781 100644
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4469bba..256ac23 100644
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 4064d48..4ddb194 100644
--- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml
index 9753dda..d79dc9e 100644
--- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d1ca9d9..6593a5f 100644
--- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
index 436c10f..469199c 100644
--- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b075fcf..64c0299 100644
--- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml
index 1f11442..e8541d4 100644
--- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml
index bd32c0a..9c63a4a 100644
--- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml
index bd32c0a..9c63a4a 100644
--- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml
index bd32c0a..9c63a4a 100644
--- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index addadd7..f36ff68 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 237686e..60817e3 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index d9da2c2..4af3aa3 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 24ca0ba..fc60a36 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml
index 7fae909..85cecc3 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 9616162..656b148 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml
index 6a0138a..b021ef1 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 29a1b63..2b97a8f 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml
index 1d1370b..af72290 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml
index 91a7094..b9c57d5 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml
index 6a0138a..b021ef1 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml
index 308aed4..f802bd7 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml
index d3f0626..1a16673 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml
index b6960fc..5dfbbdb 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml
index d3f0626..1a16673 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 988804e..e5e0fee 100644
--- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
index 26d3bd0..5b735f1 100644
--- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 0c9694c..8171700 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml
index 777d2c2..4fb55a2 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6cf0ac6..fd0a600 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6cf0ac6..fd0a600 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6cf0ac6..fd0a600 100644
--- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml
index f89d475..0cf0008 100644
--- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d87600e..322c3a5 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index d59c3de..391f51c 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 4dee04b..46c7310 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index d59c3de..391f51c 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4ca8771..0c4199a 100644
--- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4ca8771..0c4199a 100644
--- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4ca8771..0c4199a 100644
--- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c6e80a..758c863 100644
--- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml
index 4ca8771..0c4199a 100644
--- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/soak/normal/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/hornetq-configuration.xml b/examples/soak/normal/server0/hornetq-configuration.xml
index 593ce84..383c841 100644
--- a/examples/soak/normal/server0/hornetq-configuration.xml
+++ b/examples/soak/normal/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/soak/normal/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/hornetq-jms.xml b/examples/soak/normal/server0/hornetq-jms.xml
index 2ae22a1..050829c 100644
--- a/examples/soak/normal/server0/hornetq-jms.xml
+++ b/examples/soak/normal/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/config/server-start-stop-backup-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index f850b94..a4619a3 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/config/server-start-stop-backup-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml
index abd07d0..b81e688 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/config/server-start-stop-live-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index ce029a9..096a2fa 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/tests/config/server-start-stop-live-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml
index 0a4a4aa..b9281a2 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->


[05/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas

Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 736b700..975b30c 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index e60d32f..728efdf 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index d9da2c2..4af3aa3 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7215c93..d22da2a 100644
--- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml
index ef6635f..2dfe997 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml
index 116d02c..9eff93a 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
index 88d6295..7aeded2 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 19f81eb..e10a75a 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml
index b6337b2..9a747e8 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 0603e3f..c790d44 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 34976c6..f1e4a3a 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
index 9d8ba49..a1ff70c 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
index af159fd..62b47ec 100644
--- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml
index 9ec5894..b22ed1e 100644
--- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 1bf6569..0f09bfc 100644
--- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml
index b2ec7ca..53bfbb6 100644
--- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
index cd05fb3..4e22823 100644
--- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml
index 609804a..aa983b1 100644
--- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml
index b032bf7..9ad99fc 100644
--- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 275e48f..50d3f1f 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
index df39e5b..f429ec3 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 99aea5a..9befeed 100644
--- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
index efe02e7..12d60e0 100644
--- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 10e0c83..0cd2aff 100644
--- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq"            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f56cb9b..62eedeb 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
index 71b83dd..c2e9a5c 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d7f412e..c4b0d47 100644
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
index 07a0103..bf79c33 100644
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
index 560411f..4b83075 100644
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
index fe87d1e..4694b4b 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
index f307d63..2a1028a 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">   
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
index e1be0d6..9c36da3 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
index fb6f8cb..0c115fd 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 1d2b00b..dce9a45 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index 5562cd7..feff6bf 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index a64a8be..abd8a24 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index fb82d36..b10c99e 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
index dd1b882..5f0a1da 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
index e45679c..6f124f5 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 88e25d4..3e35fb6 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
index d59c3de..391f51c 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 5178432..943ac47 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
index d59c3de..391f51c 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
index fa948b3..4b06909 100644
--- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml
index 678e7f5..86a4c75 100644
--- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
index 51f6da9..2b5ebf7 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
index 15226c7..7f6d6c4 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml
index b83841d..7b8d950 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
index a4438a9..9e5ab97 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml
index b39a5c0..66e6964 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
index 51f6da9..2b5ebf7 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
index 15226c7..7f6d6c4 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml
index b83841d..7b8d950 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/push/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-client.xml b/examples/jms/rest/push/src/main/resources/hornetq-client.xml
index 51f6da9..2b5ebf7 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-client.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
index 15226c7..7f6d6c4 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/push/src/main/resources/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-jms.xml b/examples/jms/rest/push/src/main/resources/hornetq-jms.xml
index da7b23d..2c0f5e8 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-jms.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
     <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/rest/push/src/main/resources/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-users.xml b/examples/jms/rest/push/src/main/resources/hornetq-users.xml
index 880a966..4a9e49a 100644
--- a/examples/jms/rest/push/src/main/resources/hornetq-users.xml
+++ b/examples/jms/rest/push/src/main/resources/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 5e91b71..01bfc76 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
index 934306c..dcaf980 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<configuration xmlns="urn:activemq" 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">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 558cfd7..f6a7e65 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/574c8fe9/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
index 46e62b4..b4aff78 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml
@@ -1,4 +1,4 @@
-<configuration xmlns="urn:hornetq"
+<configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
    <!--the connection factory used by the example-->