activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [3/9] activemq-6 git commit: More name changes to activemq
Date Thu, 20 Nov 2014 08:57:48 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/management/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/management/readme.html b/examples/jms/management/readme.html
index cd1b861..bde5551 100644
--- a/examples/jms/management/readme.html
+++ b/examples/jms/management/readme.html
@@ -13,15 +13,15 @@
      <h2>Example configuration</h2>
 
      <p>ActiveMQ can be managed by sending JMS messages with specific properties to its <em>management</em> queue.</p>
-     </p>By default, the management name is called <code>hornetq.management</code> but this can be configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a>
+     </p>By default, the management name is called <code>activemq.management</code> but this can be configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>
      <pre class="prettyprint">
-         <code>&lt;management-address&gt;hornetq.management&lt;/management-address&gt;</code>
+         <code>&lt;management-address&gt;activemq.management&lt;/management-address&gt;</code>
      </pre>
      
      <p>The management queue requires a "special" user permission <code>manage</code> to be able to receive management messages.
-         This is also configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a></p>
+         This is also configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a></p>
      <pre class="prettyprint">
-         <code>&lt;security-setting match="hornetq.management"&gt;
+         <code>&lt;security-setting match="activemq.management"&gt;
             &lt;permission type="manage" roles="guest" /&gt;
          &lt;/security-setting&gt;</code>
      </pre>
@@ -74,7 +74,7 @@
             
         <li>We create the JMS management queue. This is a <em>special</em> queue which is not looked up from JNDI but instantiated directly</li>
         <pre class="prettyprint">
-            <code>Queue managementQueue = new ActiveMQQueue("hornetq.management", "hornetq.management");</code>
+            <code>Queue managementQueue = new ActiveMQQueue("activemq.management", "activemq.management");</code>
         </pre>
 
         <li>We create a <code>QueueRequestor</code> to send messages to the management queue and receive replies (see <a href="../queue-requestor/readme.html">queue-requestor example</a>)</li>
@@ -96,7 +96,7 @@
             We use a helper class <code>JMSManagementHelper</code> to fill these properties:
             <ul>
                 <li>The name of the resource to manage <code>jms.queue.exampleQueue</code> 
-                    (i.e. <code>jms.queue</code> followed by the name of the queue as defined in <a href="server0/hornetq-jms.xml">hornetq-jms.xml</a>)</li>
+                    (i.e. <code>jms.queue</code> followed by the name of the queue as defined in <a href="server0/activemq-jms.xml">activemq-jms.xml</a>)</li>
                 <li>In our case, the name of the attribute to retrieve <code>MessageCount</code></li>
             </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
index ee472b2..93d7678 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -11,7 +11,7 @@
    <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
 
 
-   <management-address>jms.queue.hornetq.management</management-address>
+   <management-address>jms.queue.activemq.management</management-address>
 
    <connectors>
       <connector name="netty">
@@ -39,7 +39,7 @@
       </security-setting>
 
       <!--security for management queue-->
-      <security-setting match="jms.queue.hornetq.management">
+      <security-setting match="jms.queue.activemq.management">
          <permission type="manage" roles="guest" />
       </security-setting>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-counters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 8a1cf93..84de40b 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -130,7 +130,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-counters/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index d2431f9..2668756 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -14,7 +14,7 @@
          at different times to display the metrics on the queue.
      </p>
      <h2>Example setup</h2>
-     <p>Message counter is configured in the server configuration file <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a>:</p>
+     <p>Message counter is configured in the server configuration file <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
      <pre class="prettyprint">
          <code>&lt;message-counter-enabled&gt;true&lt;/message-counter-enabled&gt;
          &lt;message-counter-sample-period&gt;2000&lt;/message-counter-sample-period&gt;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-group/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 325675f..2cfaa15 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-group/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/readme.html b/examples/jms/message-group/readme.html
index 41e8c3e..b2e38ed 100644
--- a/examples/jms/message-group/readme.html
+++ b/examples/jms/message-group/readme.html
@@ -21,7 +21,7 @@
      the first consumer. The second consumer will receive none. </p>
 
      <p>Alternatively, ActiveMQ's connection factories can be configured to <em>auto group</em> messages. By setting <code>autogroup</code> to </code>true</code> on the <code>ActiveMQConnectionFactory</code>
-        (or setting <code>&lt;autogroup&gt;true&lt;/autogroup&gt;</code> in <code>hornetq-jms.xml</code>'s connection factory settings), a random unique id
+        (or setting <code>&lt;autogroup&gt;true&lt;/autogroup&gt;</code> in <code>activemq-jms.xml</code>'s connection factory settings), a random unique id
         will be picked to create a message group. <em>Every messages</em> sent by a producer created from this connection factory will automatically
         be part of this message group.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-group2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 5bad1af..2e0f983 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-group2/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/readme.html b/examples/jms/message-group2/readme.html
index ef25ea8..70e5a2e 100644
--- a/examples/jms/message-group2/readme.html
+++ b/examples/jms/message-group2/readme.html
@@ -19,7 +19,7 @@
      In this example we set the group id 'Group-0'on a connection factory and send messages via 2 different producers and check that only 1 consumer receives them. </p>
 
      <p>Alternatively, ActiveMQ's connection factories can be configured to <em>auto group</em> messages. By setting <code>autogroup</code> to </code>true</code> on the <code>ActiveMQConnectionFactory</code>
-        (or setting <code>&lt;autogroup&gt;true&lt;/autogroup&gt;</code> in <code>hornetq-jms.xml</code>'s connection factory settings), a random unique id
+        (or setting <code>&lt;autogroup&gt;true&lt;/autogroup&gt;</code> in <code>activemq-jms.xml</code>'s connection factory settings), a random unique id
         will be picked to create a message group. <em>Every messages</em> sent by a producer created from this connection factory will automatically
         be part of this message group.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/message-priority/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index e13979c..db6c291 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 9d62bc6..b9827f6 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -79,7 +79,7 @@
                   <configuration>
                      <jndiPort>1299</jndiPort>
                      <jndiRmiPort>1298</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -108,7 +108,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -119,7 +119,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -128,7 +128,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -137,7 +137,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 3a086ee..5cbdcfc 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 55f0ffc..b4dd7a1 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 328ade9..ee881cd 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 29854dd..e8c0744 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -79,7 +79,7 @@
                   <configuration>
                      <jndiPort>1299</jndiPort>
                      <jndiRmiPort>1298</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -108,7 +108,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -119,7 +119,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -128,7 +128,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -137,7 +137,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 f4004c4..a506972 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 8c6b49f..4e2efba 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 99413b1..00a8aa0 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/no-consumer-buffering/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 022e291..0415b4b 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/no-consumer-buffering/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/readme.html b/examples/jms/no-consumer-buffering/readme.html
index 8201c1c..79942e5 100644
--- a/examples/jms/no-consumer-buffering/readme.html
+++ b/examples/jms/no-consumer-buffering/readme.html
@@ -24,9 +24,9 @@
      <p>To turn off client side buffering of messages, set <code>consumer-window-size</code> to zero.</p>
      
      <p>With ActiveMQ you can specify a maximum consume rate at which a JMS MessageConsumer will consume messages.
-     This can be specified when creating or deploying the connection factory. See <code>hornetq-jms.xml</code></p>     
+     This can be specified when creating or deploying the connection factory. See <code>activemq-jms.xml</code></p>
      <h2>Example step-by-step</h2>
-     <p>In this example we specify a <code>consumer-window-size</code> of <code>0</code> bytes in the <code>hornetq-jms.xml</code>
+     <p>In this example we specify a <code>consumer-window-size</code> of <code>0</code> bytes in the <code>activemq-jms.xml</code>
      file when deploying the connection factory:</p>
      <pre class="prettyprint">
      <code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index ccfc326..54afb76 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -42,7 +42,7 @@
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -63,7 +63,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -91,7 +91,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -102,7 +102,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -111,7 +111,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index be59ad3..b2ba575 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -116,7 +116,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/paging/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index beab47c..d635df5 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/paging/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/paging/readme.html b/examples/jms/paging/readme.html
index 65c6c52..ef9c838 100644
--- a/examples/jms/paging/readme.html
+++ b/examples/jms/paging/readme.html
@@ -9,7 +9,7 @@
      <h1>Paging Example</h1>
 
      <p>This example shows how ActiveMQ would avoid running out of memory resources by paging messages.</p>
-     <p>A maxSize can be specified per Destination via the destinations settings configuration file (hornetq-configuration.xml).</p>
+     <p>A maxSize can be specified per Destination via the destinations settings configuration file (activemq-configuration.xml).</p>
      <p>When messages routed to an address exceed the specified maxSize the server will begin to write messages to the file
      system, this is called paging. This will continue to occur until messages have been delivered to consumers and subsequently
      acknowledged freeing up memory. Messages will then be read from the file system , i.e. depaged, and routed as normal. </p>
@@ -69,7 +69,7 @@
          </pre></code>
          
 
-         <li>Send only 20 messages to the Queue. This will be already enough for pagingQueue. Look at ./paging/config/hornetq-queues.xml for the config.</li>
+         <li>Send only 20 messages to the Queue. This will be already enough for pagingQueue. Look at ./paging/config/activemq-queues.xml for the config.</li>
          <pre class="prettyprint"><code>
          for (int i = 0; i < 20; i++)
          {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index 6fcd9fb..3416cf6 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -68,7 +68,7 @@
                         </goals>
                         <configuration>
                            <waitOnStart>true</waitOnStart>
-                           <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                           <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                            <systemProperties>
                               <property>
                                  <name>build.directory</name>
@@ -80,7 +80,7 @@
                   </executions>
                   <configuration>
                      <waitOnStart>false</waitOnStart>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                   <dependencies>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 4eb3215..ee93080 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
index 9b77211..d00ad0a 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
@@ -18,10 +18,10 @@
    
    <persistence-enabled>true</persistence-enabled>
 
-   <large-messages-directory>/hornetq-data/large-messages</large-messages-directory>
-   <bindings-directory>/hornetq-data/bindings</bindings-directory>
-   <journal-directory>/hornetq-data/journal</journal-directory>
-   <paging-directory>/hornetq-data/paging</paging-directory> 
+   <large-messages-directory>/activemq-data/large-messages</large-messages-directory>
+   <bindings-directory>/activemq-data/bindings</bindings-directory>
+   <journal-directory>/activemq-data/journal</journal-directory>
+   <paging-directory>/activemq-data/paging</paging-directory>
    
    <queues>
 	   <queue name="perfQueue">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/pre-acknowledge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 2b3212e..35112bd 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
index 23fb7ea..d661c7c 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -38,7 +38,7 @@
          <permission type="send" roles="guest"/>
       </security-setting>
 
-      <security-setting match="jms.queue.hornetq.management">
+      <security-setting match="jms.queue.activemq.management">
          <permission type="manage" roles="guest" />
       </security-setting>
    </security-settings>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/producer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index e45d34c..35dcd66 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/producer-rate-limit/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/readme.html b/examples/jms/producer-rate-limit/readme.html
index 5871a2e..e1f914d 100644
--- a/examples/jms/producer-rate-limit/readme.html
+++ b/examples/jms/producer-rate-limit/readme.html
@@ -9,11 +9,11 @@
      <h1>JMS Message Producer Rate Limiting</h1>
 
      <p>With ActiveMQ you can specify a maximum send rate at which a JMS MessageProducer will send messages.
-     This can be specified when creating or deploying the connection factory. See <code>hornetq-jms.xml</code></p>
+     This can be specified when creating or deploying the connection factory. See <code>activemq-jms.xml</code></p>
      <p>If this value is specified then ActiveMQ will ensure that messages are never produced at a rate higher than
      specified. This is a form of producer <i>throttling</i>.</p>     
      <h2>Example step-by-step</h2>
-     <p>In this example we specify a <code>producer-max-rate</code> of <code>50</code> messages per second in the <code>hornetq-jms.xml</code>
+     <p>In this example we specify a <code>producer-max-rate</code> of <code>50</code> messages per second in the <code>activemq-jms.xml</code>
      file when deploying the connection factory:</p>
      <pre class="prettyprint">
      <code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/proton-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index e682663..801d97d 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -69,7 +69,7 @@
                         </goals>
                         <configuration>
                            <waitOnStart>true</waitOnStart>
-                           <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                           <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                            <systemProperties>
                               <property>
                                  <name>build.directory</name>
@@ -81,7 +81,7 @@
                   </executions>
                   <configuration>
                      <waitOnStart>false</waitOnStart>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                   <dependencies>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/proton-cpp/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/readme.html b/examples/jms/proton-cpp/readme.html
index caff310..fc92461 100644
--- a/examples/jms/proton-cpp/readme.html
+++ b/examples/jms/proton-cpp/readme.html
@@ -9,7 +9,7 @@
 <h1>AMQP CPP example</h1>
 
 <p>ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
-<p>All you need to do is to connect a client into hornetq's configured port and you should be able connect.</p>
+<p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
 <p>To run this example simply run the command <literal>mvn verify</literal>, execute the compile.sh script and start the executable called ./hello</p>
 <pre>
     # first make sure you have the dependencies you need to compile and run the client

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index 8c6749c..7f2fad5 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -113,7 +113,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/proton-j/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/readme.html b/examples/jms/proton-j/readme.html
index aabd71e..5713f48 100644
--- a/examples/jms/proton-j/readme.html
+++ b/examples/jms/proton-j/readme.html
@@ -9,7 +9,7 @@
 <h1>Proton qpid java example</h1>
 
 <<p>ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
-<p>All you need to do is to connect a client into hornetq's configured port and you should be able connect.</p>
+<p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
 <p>To run this example simply run the command <literal>mvn verify</literal>, execute the compile.sh script and start the executable called ./hello</p>
 
 <p>You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. </p>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/proton-ruby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index 52d5d3e..d3a2e7a 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -91,7 +91,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 9aeabc9..a8868e8 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -85,7 +85,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -96,7 +96,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -105,7 +105,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/queue-message-redistribution/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/readme.html b/examples/jms/queue-message-redistribution/readme.html
index c5c9156..c93395d 100644
--- a/examples/jms/queue-message-redistribution/readme.html
+++ b/examples/jms/queue-message-redistribution/readme.html
@@ -18,12 +18,12 @@
      with no consumers, to nodes where there are consumers. If the consumers have JMS selectors set on them, then they
      will only be redistributed to nodes with consumers whose selectors match.</p>
      <p>By default, message redistribution is disabled, but can be enabled by specifying some AddressSettings configuration
-     in either <code>hornetq-queues.xml</code> or <code>hornetq-configuration.xml</code></p>
+     in either <code>activemq-queues.xml</code> or <code>activemq-configuration.xml</code></p>
      <p>Setting <code>redistribution-delay</code> to <code>0</code> will cause redistribution to occur immediately
      once there are no more matching consumers on a particular queue instance. Setting it to a positive value > 0 specifies
      a delay in milliseconds before attempting to redistribute. The delay is useful in the case that another consumer is
      likely to be created on the queue, to avoid unnecessary redistribution.</p>     
-     <p>Here's the relevant snippet from the <code>hornetq-queues.xml</code> configuration, which tells the server
+     <p>Here's the relevant snippet from the <code>activemq-queues.xml</code> configuration, which tells the server
      to use a redistribution delay of <code>0</code> on any jms queues, i.e. any queues whose name starts with
      <code>jms.</code></p>
      <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index effabbd..f9e6eac 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index f19478a..0cc2420 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 24caa0a..97797a0 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index c7dbb52..f7d955e 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -52,7 +52,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -63,7 +63,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/reattach-node/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/readme.html b/examples/jms/reattach-node/readme.html
index f3407b0..02797f3 100644
--- a/examples/jms/reattach-node/readme.html
+++ b/examples/jms/reattach-node/readme.html
@@ -25,7 +25,7 @@
      <p>We then wait a few seconds, then restart the acceptor. The client reattaches and the session resumes
      as if nothing happened.</p>
      <p>The JMS Connection Factory is configured to reattach automatically by specifying the various reconnect
-     related attributes in the <code>hornetq-jms.xml</code> file.</p>
+     related attributes in the <code>activemq-jms.xml</code> file.</p>
 
      <p>For more details on how to configure this and for clustering in general
      please consult the ActiveMQ user manual.</p>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
index 0dad558..a090748 100644
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -55,7 +55,7 @@
          <permission type="send" roles="guest"/>
       </security-setting>
 
-      <security-setting match="jms.queue.hornetq.management">
+      <security-setting match="jms.queue.activemq.management">
          <!--  only the admin role can interact with the management address  -->
          <permission type="consume" roles="admin"/>
          <permission type="send" roles="admin"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index 92c9f70..6617de1 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -85,7 +85,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -96,7 +96,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -105,7 +105,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 be10b3d..482f52a 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 8efc20a..4f69801 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/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/89a84c6a/examples/jms/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 930019a..570e4d8 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -85,7 +85,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -96,7 +96,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -105,7 +105,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 dc63477..fd176b6 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 cb37bc9..6e9d929 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/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/89a84c6a/examples/jms/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 2a7748a..e6c503a 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -79,7 +79,7 @@
                   <configuration>
                      <jndiPort>1299</jndiPort>
                      <jndiRmiPort>1298</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -108,7 +108,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -119,7 +119,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -128,7 +128,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -137,7 +137,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server2</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 dd2ed3f..437b70e 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/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 835dc38..b9fb02e 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/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/89a84c6a/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 5fa9ed2..b25cb75 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 ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/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/89a84c6a/examples/jms/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 5cadc10..02f9ea8 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -57,7 +57,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>build.directory</name>
@@ -85,7 +85,7 @@
                      <systemProperties>
                         <property>
                            <name>exampleConfigDir</name>
-                           <value>${basedir}/target/classes/hornetq</value>
+                           <value>${basedir}/target/classes/activemq</value>
                         </property>
                      </systemProperties>
                   </configuration>
@@ -96,7 +96,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -105,7 +105,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/request-reply/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 5627512..3c50986 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/rest/dup-send/README.txt
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/README.txt b/examples/jms/rest/dup-send/README.txt
index 9d267d2..da8eb48 100644
--- a/examples/jms/rest/dup-send/README.txt
+++ b/examples/jms/rest/dup-send/README.txt
@@ -5,7 +5,7 @@ with earlier or later versions of Maven.
 
 This is an example of using duplicate detection for posted messages.  The first file to look at is:
 
-src/main/resource/hornetq-rest.xml
+src/main/resource/activemq-rest.xml
 
 You see that by default, all messages posted to msg-create URLs will follow the duplicate detection pattern talked
 about in the documentation.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
index 49a8436..c9afc2f 100644
--- a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
 <web-app>
     <context-param>
         <param-name>rest.messaging.config.file</param-name>
-        <param-value>hornetq-rest.xml</param-value>
+        <param-value>activemq-rest.xml</param-value>
     </context-param>
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/rest/jms-to-rest/receiveOrder.py
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/receiveOrder.py b/examples/jms/rest/jms-to-rest/receiveOrder.py
index f853e07..2117f1b 100644
--- a/examples/jms/rest/jms-to-rest/receiveOrder.py
+++ b/examples/jms/rest/jms-to-rest/receiveOrder.py
@@ -34,7 +34,7 @@ try:
             raise Exception('failed')
 finally:
     if session != None:
-        print "deleting hornetq session..."
+        print "deleting activemq session..."
         createParsed = urlparse.urlparse(session)
         conn = httplib.HTTPConnection(createParsed.netloc)
         conn.request("DELETE", createParsed.path)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index 676b310..4264551 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/pom.xml
@@ -36,7 +36,7 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                      <systemProperties>
                         <property>
                            <name>udp-address</name>
@@ -53,7 +53,7 @@
                   <configuration>
                      <jndiPort>1199</jndiPort>
                      <jndiRmiPort>1198</jndiRmiPort>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                      <fork>true</fork>
                      <systemProperties>
                         <property>
@@ -77,7 +77,7 @@
                       <systemProperties>
                           <property>
                               <name>exampleConfigDir</name>
-                              <value>${basedir}/target/classes/hornetq</value>
+                              <value>${basedir}/target/classes/activemq</value>
                           </property>
                       </systemProperties>
                   </configuration>
@@ -88,7 +88,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
                   </configuration>
                </execution>
                <execution>
@@ -97,7 +97,7 @@
                      <goal>stop</goal>
                   </goals>
                   <configuration>
-                     <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server1</hornetqConfigurationDir>
+                     <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
                   </configuration>
                </execution>
             </executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
index e63f3b2..784a5bf 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -76,7 +76,7 @@
          <permission type="consume" roles="guest"/>
          <permission type="send" roles="guest"/>
       </security-setting>
-      <security-setting match="jms.queue.hornetq.management">
+      <security-setting match="jms.queue.activemq.management">
          <permission type="createDurableQueue" roles="guest"/>
          <permission type="deleteDurableQueue" roles="guest"/>
          <permission type="createNonDurableQueue" roles="guest"/>
@@ -85,7 +85,7 @@
          <permission type="send" roles="guest"/>
          <permission type="manage" roles="guest"/>
       </security-setting>
-      <security-setting match="jms.queue.hornetq.management.*">
+      <security-setting match="jms.queue.activemq.management.*">
          <permission type="createDurableQueue" roles="guest"/>
          <permission type="deleteDurableQueue" roles="guest"/>
          <permission type="createNonDurableQueue" roles="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/scheduled-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 6e24f1a..ba480a8 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 127a811..d943938 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -107,7 +107,7 @@
             </dependencies>
             <configuration>
                <waitOnStart>false</waitOnStart>
-               <hornetqConfigurationDir>${basedir}/target/classes/hornetq/server0</hornetqConfigurationDir>
+               <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
             </configuration>
          </plugin>
       </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/examples/jms/security/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index a55096f..bcd6100 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -23,12 +23,12 @@
      <p>This example demonstrates how to configure users/roles, how to configure topics with proper permissions using wild-card
      expressions, and how they take effects in a simple program. </p>
      
-     <p>First we need to configure users with roles. Users and Roles are configured in <code>hornetq-users.xml</code>. This example has four users
+     <p>First we need to configure users with roles. Users and Roles are configured in <code>activemq-users.xml</code>. This example has four users
      configured as below </p>
      
      <pre class="prettyprint">
      <code>
-		   &lt;user name=&quot;bill&quot; password=&quot;hornetq&quot;&gt;
+		   &lt;user name=&quot;bill&quot; password=&quot;activemq&quot;&gt;
 		      &lt;role name=&quot;user&quot;/&gt;
 		   &lt;/user&gt;
 		  
@@ -58,7 +58,7 @@
      <p>
      User name and password consists of a valid account that can be used to establish connections to a ActiveMQ server, while 
      roles are used in controlling the access privileges against ActiveMQ topics and queues. You can achieve this control by
-     configuring proper permissions in <code>hornetq-configuration.xml</code>, like the following
+     configuring proper permissions in <code>activemq-configuration.xml</code>, like the following
      </p>
      <pre class="prettyprint"><code>
       &lt;security-settings&gt;
@@ -108,8 +108,8 @@
      jms.topic.news.europe.#' wild-cards, and topic 'news.us.usTopic' matches 'jms.topic.news.us.#'.</p>
      
      <p>With ActiveMQ, the security manager is also configurable. You can use JAASSecurityManager or JBossASSecurityManager based on you need. Please
-     check out the hornetq-beans.xml for how to do. In this example we just use the basic ActiveMQSecurityManagerImpl which reads users/roles/passwords from the xml
-     file <code>hornetq-users.xml</code>.
+     check out the activemq-beans.xml for how to do. In this example we just use the basic ActiveMQSecurityManagerImpl which reads users/roles/passwords from the xml
+     file <code>activemq-users.xml</code>.
 
 
      <h2>Example step-by-step</h2>
@@ -173,7 +173,7 @@
         <li>Bill makes a good connection.</li>
         <pre class="prettyprint">
           <code>
-           billConnection = createConnection("bill", "hornetq", cf);
+           billConnection = createConnection("bill", "activemq", cf);
            billConnection.start();
           </code>
        </pre>

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


Mime
View raw message