activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [3/4] activemq-6 git commit: ACTIVEMQ6-4 - fix configuration files
Date Thu, 20 Nov 2014 10:03:18 GMT
ACTIVEMQ6-4 - fix configuration files

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

correct the schema name in alll the configuration files and rename substitution variables


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

Branch: refs/heads/master
Commit: a09a8ddb3a115d95093137b2d00b9ef98cb6430c
Parents: 81b00c8
Author: Andy Taylor <andytaylor@apache.org>
Authored: Thu Nov 20 08:44:13 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Thu Nov 20 09:04:38 2014 +0000

----------------------------------------------------------------------
 activemq-server/src/test/resources/live-only-hapolicy-config.xml | 2 +-
 .../src/test/resources/live-only-hapolicy-config2.xml            | 2 +-
 .../src/test/resources/live-only-hapolicy-config3.xml            | 2 +-
 .../src/test/resources/live-only-hapolicy-config4.xml            | 2 +-
 .../src/test/resources/live-only-hapolicy-config5.xml            | 2 +-
 activemq-server/src/test/resources/replica-hapolicy-config.xml   | 2 +-
 activemq-server/src/test/resources/replica-hapolicy-config2.xml  | 2 +-
 activemq-server/src/test/resources/replica-hapolicy-config3.xml  | 2 +-
 .../src/test/resources/replicated-hapolicy-config.xml            | 2 +-
 .../main/resources/config/replicated/activemq-configuration.xml  | 2 +-
 .../resources/config/shared-store/activemq-configuration.xml     | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 4 ++--
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 4 ++--
 examples/jms/clustered-standalone/readme.html                    | 4 ++--
 .../src/main/resources/hornetq/server0/activemq-users.xml        | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server2/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server2/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server2/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server0/activemq-configuration.xml    | 2 +-
 .../main/resources/hornetq/server1/activemq-configuration.xml    | 2 +-
 examples/soak/normal/server0/activemq-configuration.xml          | 2 +-
 36 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 35818e4..5152e15 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <live-only>
          <scale-down>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 db9d422..e80d509 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 c77f8e4..6d842be 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 0e7f45a..2fa7fbc 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy/>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 83c6c33..2a7a560 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -1,6 +1,6 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 6874afb..0166139 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 dba47b0..868d056 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 6dea68d..5c08357 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 3cb67e1..75e96f7 100644
--- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <master>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 06f014a..5bc5b61 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following
variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost
-Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost
-Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/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 0f60895..45f3820 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
@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following
variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost
-Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost
-Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
index 5cbdcfc..b42e5aa 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
index 2010768..00f88be 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
index 11aecb5..43692a4 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -34,7 +34,7 @@
       <broadcast-group name="my-broadcast-group">
          <broadcast-period>5000</broadcast-period>
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <connector-ref>netty-connector</connector-ref>
       </broadcast-group>
    </broadcast-groups>
@@ -42,7 +42,7 @@
    <discovery-groups>
       <discovery-group name="my-discovery-group">
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <refresh-timeout>10000</refresh-timeout>
       </discovery-group>
    </discovery-groups>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4023a2e..b19c11f 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -33,7 +33,7 @@
       <broadcast-group name="my-broadcast-group">
          <broadcast-period>5000</broadcast-period>
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <connector-ref>netty-connector</connector-ref>
       </broadcast-group>
    </broadcast-groups>
@@ -41,7 +41,7 @@
    <discovery-groups>
       <discovery-group name="my-discovery-group">
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <refresh-timeout>10000</refresh-timeout>
       </discovery-group>
    </discovery-groups>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/clustered-standalone/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/readme.html b/examples/jms/clustered-standalone/readme.html
index 54f0d4e..220e76a 100644
--- a/examples/jms/clustered-standalone/readme.html
+++ b/examples/jms/clustered-standalone/readme.html
@@ -32,10 +32,10 @@
         <li>in the first terminal, go to the <code>bin</code> directory
and start the first server (with default configuration):
            <pre class="prettyprint"><code>./run.sh ../config/stand-alone/clustered</code></pre>
         <li>in the second terminal, start the second server:
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2
-Djnp.port=2099 -Djnp.rmiPort=2098 -Dhornetq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
+           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2
-Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
 ./run.sh ../config/stand-alone/clustered</code></pre>
         <li>in the third terminal, start the third server (with default configuration):
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3
-Djnp.port=3099 -Djnp.rmiPort=3098 -Dhornetq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
+           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3
-Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
 ./run.sh ../config/stand-alone/clustered</code></pre>
         <li>finally, in the fourth terminal, start the example
            <pre class="prettyprint"><code>./build.sh runRemote</code> (or
<code>build.bat runRemote</code> on windows)</pre>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
index f7f5375..5db43ea 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/management-notifications/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:activemq ../schema/activemq-security.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-security.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/a09a8ddb/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index 5cbdcfc..b42e5aa 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index b4dd7a1..2094f57 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
index ee881cd..c1d1e84 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index a506972..5dce0cd 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4e2efba..c930120 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index 00a8aa0..27bbe99 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
index ee93080..b1ccc9a 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/perf/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
index 482f52a..3854f19 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4f69801..b6e3935 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/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:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index fd176b6..7e9f424 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index 6e9d929..95c5596 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/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:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index 437b70e..1b19ccf 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index b9fb02e..0be89a7 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-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:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index b25cb75..e1e6d9e 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/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:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a09a8ddb/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index ec4de64..a586414 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/stop-server-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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index b74f4ce..f545a18 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/stop-server-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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/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 34a26c1..5f96c16 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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/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 2e226bd..2089d76 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:activemq ../../../../../../../../activemq-server/src/main/resources/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/a09a8ddb/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 43d3297..3a7a4cb 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:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">


Mime
View raw message