activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [08/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor schemas
Date Tue, 18 Nov 2014 12:34:23 GMT
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-->


Mime
View raw message