http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
index b6023cc..c857e18 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
             
    <!--This connection factory is not actually used in the example, but we 
keep it here for good
    measure -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
index 97e6ea9..defe6e0 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    
    <!--This connection factory is not actually used in the example, but we 
keep it here for good
    measure -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
index b6023cc..c857e18 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
             
    <!--This connection factory is not actually used in the example, but we 
keep it here for good
    measure -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
index 7d3234b..7d1c771 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
 
    <!--This connection factory is not actually used in the example, but we 
keep it here for good
    measure -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
index 7d3234b..7d1c771 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
 
    <!--This connection factory is not actually used in the example, but we 
keep it here for good
    measure -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
+++ 
b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
index 9e9a5d0..5f8724a 100644
--- 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
index 7d2b8c7..6c89891 100644
--- 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
index eca1df9..2fe40d9 100644
--- 
a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-               xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

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

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- a/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index 3b68661..2d25a10 100644
--- 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index d08b35a..e82484f 100644
--- 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
index 49e37cf..8ef5e46 100644
--- 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
index 49e37cf..8ef5e46 100644
--- 
a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
index 49e37cf..8ef5e46 100644
--- 
a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
index 49e37cf..8ef5e46 100644
--- 
a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
index 49e37cf..8ef5e46 100644
--- 
a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/soak/normal/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/activemq-configuration.xml 
b/examples/soak/normal/server0/activemq-configuration.xml
index 49b2217..8ec646d 100644
--- a/examples/soak/normal/server0/activemq-configuration.xml
+++ b/examples/soak/normal/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/soak/normal/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/activemq-jms.xml 
b/examples/soak/normal/server0/activemq-jms.xml
index d727ece..d84281b 100644
--- a/examples/soak/normal/server0/activemq-jms.xml
+++ b/examples/soak/normal/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 5dcca84..2b9a479 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    
    
    <backup>true</backup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 f4bbed1..06291be 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connector-ref connector-name="netty-connector"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 c68ebb9..5633166 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../src/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../src/schema/activemq-configuration.xsd">
    
    
    <backup-connector-ref connector-name="backup-connector"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 34148a3..f2fb22c 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
 
b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
index 493cfbe..021796c 100644
--- 
a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
+++ 
b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd 
">
+            xsi:schemaLocation="urn:activemq 
../../src/schemas/activemq-jms.xsd ">
 
    <connection-factory name="fullConfigurationConnectionFactory">
       <entries>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml
 
b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml
index e8ff393..0e59ead 100644
--- 
a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml
+++ 
b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd 
">
+            xsi:schemaLocation="urn:activemq 
../../src/schemas/activemq-jms.xsd ">
 
    <connection-factory name="fullConfigurationConnectionFactory">
       <entries>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 ebc4bc1..7bfccde 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 cde31e7..7eabd5b 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 e673504..b57c8a5 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 e673504..b57c8a5 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 d7d384d..578f9be 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/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 34148a3..f2fb22c 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,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/tests/integration-tests/src/test/resources/spring-activemq-config.xml
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/resources/spring-activemq-config.xml 
b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
index f704dc7..57cee10 100644
--- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-               xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
     <persistence-enabled>false</persistence-enabled>
     <security-enabled>false</security-enabled>

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

Reply via email to