activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [03/15] activemq-6 git commit: Remove references to HornetQ in doc and Comments
Date Wed, 19 Nov 2014 15:38:25 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/jca-config/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/readme.html b/examples/javaee/jca-config/readme.html
index ac73706..23be575 100644
--- a/examples/javaee/jca-config/readme.html
+++ b/examples/javaee/jca-config/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE JCA Configuration Example</title>
+    <title>ActiveMQ Java EE JCA Configuration Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>Java EE Resource Adapter Configuration Example</h1>
 
-     <p>This example demonstrates how to configure several properties on the HornetQ Resource Adapter. We setup two
+     <p>This example demonstrates how to configure several properties on the ActiveMQ Resource Adapter. We setup two
          WildFly. The enterprise application is being deployed in one application server while the MDBs and JMS
          Connections are pointing to a remote server</p>
      <p>This example is composed of two message-driven beans (MDB), MDBQueueA and MDBQueueB, and a stateless session
@@ -48,8 +48,8 @@
 
          <li>On the second server we invoke the EJB StatelessSender: This will send 2 messages to server 1 using the configured outbound adapter</li>
          <pre class="prettyprint">
-            Queue destQueueA = HornetQJMSClient.createQueue("A");
-            Queue destQueueB = HornetQJMSClient.createQueue("B");
+            Queue destQueueA = ActiveMQJMSClient.createQueue("A");
+            Queue destQueueB = ActiveMQJMSClient.createQueue("B");
          </pre>
       
          <li>Create a connection to a remote server using a connection-factory we injected. JCA will actually manage this through a <i>connection pool</i></li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/jca-remote/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/readme.html b/examples/javaee/jca-remote/readme.html
index 80518a6..54f7e0e 100644
--- a/examples/javaee/jca-remote/readme.html
+++ b/examples/javaee/jca-remote/readme.html
@@ -1,13 +1,13 @@
 <html>
   <head>
-    <title>HornetQ Java EE JCA Remote Server Configuration Example</title>
+    <title>ActiveMQ Java EE JCA Remote Server Configuration Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>
   </head>
   <body onload="prettyPrint()">
      <h1>Java EE JCA Resource Adapter Remote Server Configuration Example</h1>
-     <p>This example demonstrates how to configure the Resource adapter to connect to a remote HornetQ server</p>
+     <p>This example demonstrates how to configure the Resource adapter to connect to a remote ActiveMQ server</p>
      <p>This example is composed of a message driven bean and a client<p>
      <p>MDBRemoteServerClientExample will send a message to the MDB via a queue and wait for the MDB to send a response via
      a reply queue</p>
@@ -42,7 +42,7 @@
 
      <h2>Configuring the outgoing JCA resource adapter</h2>
 
-     <p>The same pooled-connection-factory used for JCA inflow also configures an outgoing JCA connection factory which Java EE components can use to send messages to the same remote HornetQ Server.</p>
+     <p>The same pooled-connection-factory used for JCA inflow also configures an outgoing JCA connection factory which Java EE components can use to send messages to the same remote ActiveMQ Server.</p>
      <pre class="prettyprint">
                     &lt;pooled-connection-factory name="hornetq-ra-remote">
                         &lt;transaction mode="xa"/>
@@ -106,7 +106,7 @@
          </pre>
          <li>The MDB looks up the reply queue</li>
          <pre class="prettyprint">
-            Queue destQueue = HornetQJMSClient.createQueue("mdbReplyQueue");
+            Queue destQueue = ActiveMQJMSClient.createQueue("mdbReplyQueue");
          </pre>
          <li>The MDB creates a connection</li>
          <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/jms-bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/readme.html b/examples/javaee/jms-bridge/readme.html
index bf64790..a5c0b7b 100644
--- a/examples/javaee/jms-bridge/readme.html
+++ b/examples/javaee/jms-bridge/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Bridge Example</title>
+    <title>ActiveMQ JMS Bridge Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>
@@ -11,7 +11,7 @@
      <p>This example shows how to configure and run a JMS Bridge in WildFly.<br />
          A bridge receives messages from a <em>source</em> JMS destination and forwards them to a <em>target</em> destination.</p>
      <p>The source and target destinations can be on different servers, even from different JMS providers. For example, you can use this
-         JMS Bridge to bridge a legacy JMS provider to HornetQ during migration.</p>
+         JMS Bridge to bridge a legacy JMS provider to ActiveMQ during migration.</p>
          
      <p>This example will show how to configure and run the simplest bridge:</p>
      <ul>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/jms-context-injection/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/readme.html b/examples/javaee/jms-context-injection/readme.html
index 5eaa6da..557257d 100644
--- a/examples/javaee/jms-context-injection/readme.html
+++ b/examples/javaee/jms-context-injection/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE Injected JMSContext Example</title>
+    <title>ActiveMQ Java EE Injected JMSContext Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-bmt/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/readme.html b/examples/javaee/mdb-bmt/readme.html
index 84cd130..bfc0c10 100644
--- a/examples/javaee/mdb-bmt/readme.html
+++ b/examples/javaee/mdb-bmt/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Bean Managed Transaction Example</title>
+    <title>ActiveMQ Java EE MDB Bean Managed Transaction Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
index 0fde090..0853c0c 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
+++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB SetRollbackOnly Example</title>
+    <title>ActiveMQ Java EE MDB SetRollbackOnly Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-cmt-setrollbackonly/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/readme.html b/examples/javaee/mdb-cmt-setrollbackonly/readme.html
index 6b37736..fce48e4 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly/readme.html
+++ b/examples/javaee/mdb-cmt-setrollbackonly/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB SetRollbackOnly Example</title>
+    <title>ActiveMQ Java EE MDB SetRollbackOnly Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-cmt-tx-local/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/readme.html b/examples/javaee/mdb-cmt-tx-local/readme.html
index 350864d..57b185a 100644
--- a/examples/javaee/mdb-cmt-tx-local/readme.html
+++ b/examples/javaee/mdb-cmt-tx-local/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB using a local transaction Example</title>
+    <title>ActiveMQ Java EE MDB using a local transaction Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-cmt-tx-not-supported/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/readme.html b/examples/javaee/mdb-cmt-tx-not-supported/readme.html
index fe43ff2..e125d26 100644
--- a/examples/javaee/mdb-cmt-tx-not-supported/readme.html
+++ b/examples/javaee/mdb-cmt-tx-not-supported/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Container Managed Transaction with NOT_SUPPORTED transaction Example</title>
+    <title>ActiveMQ Java EE MDB Container Managed Transaction with NOT_SUPPORTED transaction Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-cmt-tx-required/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/readme.html b/examples/javaee/mdb-cmt-tx-required/readme.html
index 8ecd05f..469b03c 100644
--- a/examples/javaee/mdb-cmt-tx-required/readme.html
+++ b/examples/javaee/mdb-cmt-tx-required/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Container Managed Transactions Example</title>
+    <title>ActiveMQ Java EE MDB Container Managed Transactions Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-message-selector/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/readme.html b/examples/javaee/mdb-message-selector/readme.html
index e5f02d5..19aa38f 100644
--- a/examples/javaee/mdb-message-selector/readme.html
+++ b/examples/javaee/mdb-message-selector/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Message Selector Example</title>
+    <title>ActiveMQ Java EE MDB Message Selector Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-remote-failover-static/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/readme.html b/examples/javaee/mdb-remote-failover-static/readme.html
index cff2f46..6bbb8a6 100644
--- a/examples/javaee/mdb-remote-failover-static/readme.html
+++ b/examples/javaee/mdb-remote-failover-static/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Message Selector Example</title>
+    <title>ActiveMQ Java EE MDB Message Selector Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-remote-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/readme.html b/examples/javaee/mdb-remote-failover/readme.html
index 836b8eb..6701669 100644
--- a/examples/javaee/mdb-remote-failover/readme.html
+++ b/examples/javaee/mdb-remote-failover/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Message Selector Example</title>
+    <title>ActiveMQ Java EE MDB Message Selector Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/mdb-tx-send/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/readme.html b/examples/javaee/mdb-tx-send/readme.html
index ef72d17..b9ae5c9 100644
--- a/examples/javaee/mdb-tx-send/readme.html
+++ b/examples/javaee/mdb-tx-send/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Java EE MDB Send Example</title>
+    <title>ActiveMQ Java EE MDB Send Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/javaee/xarecovery/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/readme.html b/examples/javaee/xarecovery/readme.html
index 01f10ec..b618ecc 100644
--- a/examples/javaee/xarecovery/readme.html
+++ b/examples/javaee/xarecovery/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ XA Recovery Example</title>
+    <title>ActiveMQ XA Recovery Example</title>
     <link rel="stylesheet" type="text/css" href="../../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
     <script type="text/javascript" src="../../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>Java EE XA Recovery Example</h1>
      
-     <p>This example will demonstrate XA recovery in WildFly with a HornetQ XA resource and a "buggy" XA resource.</p>
+     <p>This example will demonstrate XA recovery in WildFly with a ActiveMQ XA resource and a "buggy" XA resource.</p>
 
      <p>The example application will invoke an EJB which will send a JMS message in a transaction.
         The server will crash while the transaction has not been committed (it is in the prepared state).<br />
@@ -195,7 +195,7 @@
          <p>When the transaction is committed, it will prepare both XAResources and then commit them.<br />
          <p>The failing resources will crash the server leaving the JMS XA Resource <em>prepared</em> but not <em>committed</em></p>
          
-         <p>When WildFly is restarted, it will automatically trigger a recovery phase. During that phase, HornetQ resources will be
+         <p>When WildFly is restarted, it will automatically trigger a recovery phase. During that phase, ActiveMQ resources will be
          scanned and the <em>prepared</em> transaction will be recovered and committed. It is then possible to consume this message</p>
   </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/README.md
----------------------------------------------------------------------
diff --git a/examples/jms/README.md b/examples/jms/README.md
index f95a3db..9c9e0fb 100644
--- a/examples/jms/README.md
+++ b/examples/jms/README.md
@@ -1,4 +1,4 @@
-Running the HornetQ Examples
+Running the ActiveMQ Examples
 ============================
 
 To run an individual example firstly cd into the example directory and run

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/activemq-jms-examples-common/config/logging.properties
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/config/logging.properties b/examples/jms/activemq-jms-examples-common/config/logging.properties
index 890ffa6..754d138 100644
--- a/examples/jms/activemq-jms-examples-common/config/logging.properties
+++ b/examples/jms/activemq-jms-examples-common/config/logging.properties
@@ -17,9 +17,9 @@
 # show messages at the INFO and above levels.
 handlers=java.util.logging.ConsoleHandler
 #handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
-java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.HornetQLoggerFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.level=INFO
-java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.HornetQLoggerFormatter
+java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.pattern=logs/hornetq.log
 # Default global logging level.
 # This specifies which kinds of events are logged across

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml b/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
index e7bbc63..67e1d2b 100644
--- a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
+++ b/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
@@ -8,8 +8,8 @@
            http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
            version="1.5">
 
-   <description>HornetQ 2.0 Resource Adapter</description>
-   <display-name>HornetQ 2.0 Resource Adapter</display-name>
+   <description>ActiveMQ 2.0 Resource Adapter</description>
+   <display-name>ActiveMQ 2.0 Resource Adapter</display-name>
 
    <vendor-name>Red Hat Middleware LLC</vendor-name>
    <eis-type>JMS 1.1 Server</eis-type>
@@ -32,7 +32,7 @@ Copyright 2009 Red Hat, Inc.
    </license>
 
    <resourceadapter>
-      <resourceadapter-class>org.apache.activemq6.ra.HornetQResourceAdapter</resourceadapter-class>
+      <resourceadapter-class>org.apache.activemq6.ra.ActiveMQResourceAdapter</resourceadapter-class>
       <config-property>
          <description>
             The transport type. Multiple connectors can be configured by using a comma separated list,
@@ -258,7 +258,7 @@ Copyright 2009 Red Hat, Inc.
 
       <outbound-resourceadapter>
          <connection-definition>
-            <managedconnectionfactory-class>org.apache.activemq6.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class>
+            <managedconnectionfactory-class>org.apache.activemq6.ra.ActiveMQRAManagedConnectionFactory</managedconnectionfactory-class>
 
             <config-property>
                <description>The default session type</description>
@@ -273,10 +273,10 @@ Copyright 2009 Red Hat, Inc.
                <config-property-value>0</config-property-value>
             </config-property>
 
-            <connectionfactory-interface>org.apache.activemq6.ra.HornetQRAConnectionFactory</connectionfactory-interface>
-            <connectionfactory-impl-class>org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class>
+            <connectionfactory-interface>org.apache.activemq6.ra.ActiveMQRAConnectionFactory</connectionfactory-interface>
+            <connectionfactory-impl-class>org.apache.activemq6.ra.ActiveMQRAConnectionFactoryImpl</connectionfactory-impl-class>
             <connection-interface>javax.jms.Session</connection-interface>
-            <connection-impl-class>org.apache.activemq6.ra.HornetQRASession</connection-impl-class>
+            <connection-impl-class>org.apache.activemq6.ra.ActiveMQRASession</connection-impl-class>
          </connection-definition>
          <transaction-support>XATransaction</transaction-support>
          <authentication-mechanism>
@@ -291,7 +291,7 @@ Copyright 2009 Red Hat, Inc.
             <messagelistener>
                <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
                <activationspec>
-                  <activationspec-class>org.apache.activemq6.ra.inflow.HornetQActivationSpec</activationspec-class>
+                  <activationspec-class>org.apache.activemq6.ra.inflow.ActiveMQActivationSpec</activationspec-class>
                   <required-config-property>
                       <config-property-name>destination</config-property-name>
                   </required-config-property>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/aerogear/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html
index 80b0b06..d29075d 100644
--- a/examples/jms/aerogear/readme.html
+++ b/examples/jms/aerogear/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS AeroGear Example</title>
+    <title>ActiveMQ JMS AeroGear Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -26,7 +26,7 @@
 
      <p>Now before we run the example we need a mobile application to receive it. Writing a mobile app is beyond the scope
      of this example but for testing purposes we have supplied an Android app you can use, simply install on your android phone.
-     It can be found <a href="http://downloads.jboss.org.apache.activemq/HornetQAeroGear.apk">here</a>. For a more in depth mobile
+     It can be found <a href="http://downloads.jboss.org.apache.activemq/ActiveMQAeroGear.apk">here</a>. For a more in depth mobile
          app example visit the AeroGear site.</p>
 
      <p>Once you have installed the mobile app you will need to configure the following:</p>
@@ -45,7 +45,7 @@
          'mvn -Dendpoint=my aerogear url -Dapplicationid=my application id -Dmastersecret=my master secret -Djsse.enableSNIExtension=false clean verify'.
      If you arent using java 7 you can omit the 'jsse.enableSNIExtension=false'</p>
 
-   <p>You should see something like this in your HornetQServer</p>
+   <p>You should see something like this in your ActiveMQServer</p>
      <ol>
         <pre class="prettyprint">
            <code>
@@ -58,7 +58,7 @@
            </code>
         </pre>
      </ol>
-   <p>And on your mobile app you should see a message from HornetQ</p>
+   <p>And on your mobile app you should see a message from ActiveMQ</p>
 
   <p>Now lets look a bit more closely at the configuration in hornetq-configuration.xml</p>
      <ol>
@@ -122,7 +122,7 @@
   // Step 7. Create a Text Message
   Message message = session.createMessage();
 
-  message.setStringProperty("AEROGEAR_ALERT", "Hello this is a notification from HornetQ");
+  message.setStringProperty("AEROGEAR_ALERT", "Hello this is a notification from ActiveMQ");
 
   producer.send(message);
       </code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/applet/applet.html
----------------------------------------------------------------------
diff --git a/examples/jms/applet/applet.html b/examples/jms/applet/applet.html
index 4edd86e..cb24c3d 100644
--- a/examples/jms/applet/applet.html
+++ b/examples/jms/applet/applet.html
@@ -1,11 +1,11 @@
 <html>
   <head>
-    <title>HornetQ Applet Example</title>
+    <title>ActiveMQ Applet Example</title>
   </head>
   <body>
-     <h1>HornetQ Applet Example</h1>
+     <h1>ActiveMQ Applet Example</h1>
      
-     <p>The Applet will connect to HornetQ server running on localhost and
+     <p>The Applet will connect to ActiveMQ server running on localhost and
      publishes messages on a topic <code>exampleTopic</code> when "Send" is pressed.</p>
      <p>The Applet is also a MessageListener and will display messages received from the topic</p>
      

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/applet/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/applet/readme.html b/examples/jms/applet/readme.html
index e954316..c124f3c 100644
--- a/examples/jms/applet/readme.html
+++ b/examples/jms/applet/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Applet Example</title>
+    <title>ActiveMQ Applet Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -12,7 +12,7 @@
 	 <h2>Example step-by-step</h2>
      
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i> to start
-     the HornetQ server and an HTTP server.</p>
+     the ActiveMQ server and an HTTP server.</p>
      
      <p>Then, go to <a href="http://127.0.0.1:8088/applet.html">http://127.0.0.1:8088/applet.html</a> to load
      and use the applet.</p>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/application-layer-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/readme.html b/examples/jms/application-layer-failover/readme.html
index 8fa4b32..9dd8b6d 100644
--- a/examples/jms/application-layer-failover/readme.html
+++ b/examples/jms/application-layer-failover/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Application-Layer Failover Example</title>
+    <title>ActiveMQ Application-Layer Failover Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,18 +8,18 @@
   <body onload="prettyPrint()">
      <h1>Application-Layer Failover Example</h1>
 
-     <p>HornetQ implements fully transparent <b>automatic</b> failover of connections from a live node to a backup node which requires
+     <p>ActiveMQ implements fully transparent <b>automatic</b> failover of connections from a live node to a backup node which requires
      no special coding. This is described in a different example and requires server replication.</p>
-     <p>However, HornetQ also supports <b>Application-Layer</b> failover which is useful in the case where replication is not enabled.</p>
-     <p>With Application-Layer failover, it's up to the application to register a JMS ExceptionListener with HornetQ.
-         This listener will then be called by HornetQ in the event that connection failure is detected.</p>
+     <p>However, ActiveMQ also supports <b>Application-Layer</b> failover which is useful in the case where replication is not enabled.</p>
+     <p>With Application-Layer failover, it's up to the application to register a JMS ExceptionListener with ActiveMQ.
+         This listener will then be called by ActiveMQ in the event that connection failure is detected.</p>
      <p>User code in the ExceptionListener can then recreate any JMS Connection, Session, etc on another node and the application
      can continue.</p>
      <p>Application-Layer failover is an alternative approach to High Availabilty (HA).</p>
      <p>Application-Layer failover differs from automatic failover in that some client side coding is required in order
      to implement this. Also, with Application-Layer failover, since the old Session object dies and a new is created, any uncommitted
      work in the old Session will be lost, and any unacknowledged messages might be redelivered.</p>    
-     <p>For more information on HornetQ failover and HA, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ failover and HA, and clustering in general, please see the clustering
      section of the user manual.</p>      
 
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html
index 49cbd77..7b3acdd 100644
--- a/examples/jms/bridge/readme.html
+++ b/examples/jms/bridge/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Core Bridge Example</title>
+    <title>ActiveMQ Core Bridge Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -11,7 +11,7 @@
      <p>This example demonstrates a core bridge deployed on one server, which consumes messages from a
      local queue and forwards them to an address on a second server.</p>
      
-     <p>Core bridges are used to create message flows between any two HornetQ servers which are remotely separated.
+     <p>Core bridges are used to create message flows between any two ActiveMQ servers which are remotely separated.
      Core bridges are resilient and will cope with temporary connection failure allowing them to be an ideal
      choice for forwarding over unreliable connections, e.g. a WAN.</p>
      <p>They can also be configured with an optional filter expression, and will only forward messages that
@@ -19,11 +19,11 @@
      <p>Furthermore they can be configured to use an optional Transformer class. A user-defined Transformer class
      can be specified which is called at forwarding time. This gives the user the opportunity to transform
      the message in some ways, e.g. changing its properties or body</p>
-     <p>HornetQ also includes a <b>JMS Bridge</b>. This is similar to a core bridge, but uses the JMS API
+     <p>ActiveMQ also includes a <b>JMS Bridge</b>. This is similar to a core bridge, but uses the JMS API
      and can be used to bridge between any two JMS 1.1 compliant messaging systems. The core bridge is limited to bridging
-     between HornetQ instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in
+     between ActiveMQ instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in
      a separate example.</p>
-     <p>For more information on bridges, please see the HornetQ user manual.</p>
+     <p>For more information on bridges, please see the ActiveMQ user manual.</p>
 
      <p>In this example we will demonstrate a simple sausage factory for aardvarks.</p>
      <p>We have a JMS queue on server 0 named <code>sausage-factory</code>, and we have a 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/browser/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/browser/readme.html b/examples/jms/browser/readme.html
index 42551ae..8757e2b 100644
--- a/examples/jms/browser/readme.html
+++ b/examples/jms/browser/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS QueueBrowser Example</title>
+    <title>ActiveMQ JMS QueueBrowser Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>JMS QueueBrowser Example</h1>
 
-     <p>This example shows you how to use a JMS <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a> with HornetQ.<br />
+     <p>This example shows you how to use a JMS <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a> with ActiveMQ.<br />
      Queues are a standard part of JMS, please consult the JMS 1.1 specification for full details.<br />
      A QueueBrowser is used to look at messages on the queue without removing them. 
      It can scan the entire content of a queue or only messages matching a message selector.</p>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/client-kickoff/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html
index 3fea2cd..4522c23 100644
--- a/examples/jms/client-kickoff/readme.html
+++ b/examples/jms/client-kickoff/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Client Kickoff Example</title>
+    <title>ActiveMQ Client Kickoff Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,16 +8,16 @@
   <body onload="prettyPrint()">
      <h1>Client Kickoff Example</h1>
 
-     <p>This example shows how to kick off a client connected to HornetQ 
+     <p>This example shows how to kick off a client connected to ActiveMQ 
          using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p>
 
-     <p>The example will connect to HornetQ. Using JMX, we will list the remote addresses connected to the 
-         server and close the corresponding connections. The client will be kicked off from HornetQ receiving
+     <p>The example will connect to ActiveMQ. Using JMX, we will list the remote addresses connected to the 
+         server and close the corresponding connections. The client will be kicked off from ActiveMQ receiving
          an exception that its JMS connection was interrupted.</p>
 
      <h2>Example configuration</h2>
 
-     <p>HornetQ exposes its managed resources by default on the platform MBeanServer.</p>
+     <p>ActiveMQ exposes its managed resources by default on the platform MBeanServer.</p>
      <p>To access this MBeanServer remotely, the Java Virtual machine must be started with system properties:
          <pre class="prettyprint">
              <code>-Dcom.sun.management.jmxremote
@@ -27,7 +27,7 @@
         </pre>
         <p>These properties are explained in the Java 5 <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#remote">Management guide</a>
             (please note that for this example, we will disable user authentication for simplicity).</p>        
-        <p>With these properties, HornetQ server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p> 
+        <p>With these properties, ActiveMQ server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p> 
      </p>
          
      <h2>Example step-by-step</h2>
@@ -65,15 +65,15 @@
             <code>connection.start();</code>
        </pre>
 
-        <li>We create a MBean proxy to the HornetQServerControlMBean used to manage HornetQ server
+        <li>We create a MBean proxy to the ActiveMQServerControlMBean used to manage ActiveMQ server
             (see <a href="../jmx/readme.html">JMX example</a> for a complete explanation of the different steps)</li>
         <pre class="prettyprint">
-            <code>ObjectName on = ObjectNameBuilder.DEFAULT.getHornetQServerObjectName();
+            <code>ObjectName on = ObjectNameBuilder.DEFAULT.getActiveMQServerObjectName();
             JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap<String, String>());
             MBeanServerConnection mbsc = connector.getMBeanServerConnection();
-            HornetQServerControlMBean serverControl = (HornetQServerControlMBean)MBeanServerInvocationHandler.newProxyInstance(mbsc,
+            ActiveMQServerControlMBean serverControl = (ActiveMQServerControlMBean)MBeanServerInvocationHandler.newProxyInstance(mbsc,
                                                                                                 on,
-                                                                                                HornetQServerControlMBean.class,
+                                                                                                ActiveMQServerControlMBean.class,
                                                                                                 false);
             </code>
         </pre>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
index ad0ab57..1696017 100644
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -10,7 +10,7 @@
 
    <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
 
-    <!-- true to expose HornetQ resources through JMX -->
+    <!-- true to expose ActiveMQ resources through JMX -->
     <jmx-management-enabled>true</jmx-management-enabled>
 
    <!-- Connectors -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/client-side-failoverlistener/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index b67642b..c24b50e 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Client Side Failover Listener Example</title>
+    <title>ActiveMQ Client Side Failover Listener Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -36,7 +36,7 @@
             <code>
             Thread.sleep(5000);
             connectionA = connectionFactory.createConnection();
-            ((HornetQConnection)connectionA).setFailoverListener(new FailoverListenerImpl());
+            ((ActiveMQConnection)connectionA).setFailoverListener(new FailoverListenerImpl());
 			</code>
         </pre>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/client-side-load-balancing/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/readme.html b/examples/jms/client-side-load-balancing/readme.html
index 7793546..cc304ba 100644
--- a/examples/jms/client-side-load-balancing/readme.html
+++ b/examples/jms/client-side-load-balancing/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Client-Side Load-Balancing Example</title>
+    <title>ActiveMQ JMS Client-Side Load-Balancing Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -9,12 +9,12 @@
      <h1>JMS Client-Side Load-Balancing Example</h1>
 
      <p>This example demonstrates how connnections created from a single JMS Connection factory can be created
-     to different nodes of the cluster. In other words it demonstrates how HornetQ does <b>client side load balancing</b> of
+     to different nodes of the cluster. In other words it demonstrates how ActiveMQ does <b>client side load balancing</b> of
      connections across the cluster.</p>
      <p>The particular load-balancing policy can be chosen to be random, round-robin or user-defined. Please see the user
      guide for more details of how to configure the specific load-balancing policy. In this example we will use
      the default round-robin load balancing policy.</p>
-     <p>The list of servers over which HornetQ will round-robin the connections can either be specified explicitly
+     <p>The list of servers over which ActiveMQ will round-robin the connections can either be specified explicitly
      in the connection factory when instantiating it directly, when configuring it on the server or configured
      to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP
      discovery to obtain the list.</p>
@@ -22,7 +22,7 @@
      can be seen in the <code>hornetq-configuration.xml</code> file.</p>
      <p>A JMS ConnectionFactory is deployed on each server specifying the discovery group that will be used by that
      connection factory.</p>      
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>      
 
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-durable-subscription/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/readme.html b/examples/jms/clustered-durable-subscription/readme.html
index e83bb33..061f26e 100644
--- a/examples/jms/clustered-durable-subscription/readme.html
+++ b/examples/jms/clustered-durable-subscription/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Durable Subscription Example</title>
+    <title>ActiveMQ JMS Durable Subscription Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -10,7 +10,7 @@
 
      <p>This example demonstrates a clustered JMS durable subscription.
      Normally durable subscriptions exist on a single node and can only have one subscriber at any one time,
-     however, with HornetQ it's possible to create durable subscription instances with the same name and client-id
+     however, with ActiveMQ it's possible to create durable subscription instances with the same name and client-id
      on different nodes of the cluster, and consume from them simultaneously.
      This allows the work of processing messages from a durable subscription to be spread across the cluster in
      a similar way to how JMS Queues can be load balanced across the cluster
@@ -37,7 +37,7 @@
      &lt;/cluster-connection&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>    
        
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-grouping/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/readme.html b/examples/jms/clustered-grouping/readme.html
index f8ebf87..83a5687 100644
--- a/examples/jms/clustered-grouping/readme.html
+++ b/examples/jms/clustered-grouping/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Clustered Grouping Example</title>
+    <title>ActiveMQ JMS Clustered Grouping Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css">
   </head>
   <body>
@@ -56,7 +56,7 @@
      </code>
      </pre>
      
-     <p>For more information on HornetQ clustering and grouping see the clustering and grouping
+     <p>For more information on ActiveMQ clustering and grouping see the clustering and grouping
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
@@ -163,7 +163,7 @@
          {
             TextMessage message = session0.createTextMessage("This is text message " + i);
 
-            message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0");
+            message.setStringProperty(ActiveMQMessage.JMSXGROUPID, "Group-0");
 
             producer0.send(message);
 
@@ -174,7 +174,7 @@
          {
             TextMessage message = session1.createTextMessage("This is text message " + (i + 10));
 
-            message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0");
+            message.setStringProperty(ActiveMQMessage.JMSXGROUPID, "Group-0");
 
             producer1.send(message);
 
@@ -186,7 +186,7 @@
          {
             TextMessage message = session2.createTextMessage("This is text message " + (i + 20));
 
-            message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0");
+            message.setStringProperty(ActiveMQMessage.JMSXGROUPID, "Group-0");
 
             producer2.send(message);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-jgroups/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/readme.html b/examples/jms/clustered-jgroups/readme.html
index bf1c661..def6288 100644
--- a/examples/jms/clustered-jgroups/readme.html
+++ b/examples/jms/clustered-jgroups/readme.html
@@ -1,12 +1,12 @@
 <html>
   <head>
-    <title>HornetQ Clustering with JGroups Example</title>
+    <title>ActiveMQ Clustering with JGroups Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
   </head>
   <body onload="prettyPrint()">
-     <h1>HornetQ Clustering with JGroups Example</h1>
+     <h1>ActiveMQ Clustering with JGroups Example</h1>
 
      <p>This example demonstrates the working of a two node cluster using JGroups as the underlying topology broadcasting/discovery 
      technique.</p>
@@ -15,7 +15,7 @@
      in a round-robin fashion.</p>
      <p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
      JNDI, these could be instantiated directly.</p>
-     <p>To enable HornetQ to use JGroups you need to configure JGroups configuration file and make sure it is on the classpath
+     <p>To enable ActiveMQ to use JGroups you need to configure JGroups configuration file and make sure it is on the classpath
          by placing in the configuration directory, the file test-jgroups-file_ping.xml is the configuration used in this
      exaample</p>
      <p>You then configure the jgroups file used by the broadcast and discovery groups in the configuration along with the
@@ -40,7 +40,7 @@
    &lt;/discovery-groups&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ clustering in general, please see the clustering
+     <p>For more information on ActiveMQ clustering in general, please see the clustering
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>./build.sh</code> (or <code>build.bat</code> on windows) from this directory</i></p>
@@ -144,8 +144,8 @@
         
         <li>We now consume those messages on *both* server 0 and server 1.
          We note the messages have been distributed between servers in a round robin fashion.
-         HornetQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
-         HornetQ can be configured to always load balance messages to all nodes, or to only balance messages
+         ActiveMQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
+         ActiveMQ can be configured to always load balance messages to all nodes, or to only balance messages
          to nodes which have consumers with no or matching selectors. See the user manual for more details.</li>
          JMS Queues implement point-to-point message where each message is only ever consumed by a
          maximum of one consumer.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/readme.html b/examples/jms/clustered-queue/readme.html
index 9ac1c06..e06edbc 100644
--- a/examples/jms/clustered-queue/readme.html
+++ b/examples/jms/clustered-queue/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Load Balanced Clustered Queue Example</title>
+    <title>ActiveMQ JMS Load Balanced Clustered Queue Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -12,7 +12,7 @@
      <p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
      <p>We then send some messages via the producer, and we verify that <b>both</b> consumers receive the sent messages
      in a round-robin fashion.</p>
-     <p>In other words, HornetQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+     <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
      <p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
      JNDI, these could be instantiated directly.</p>     
      <p>Here's the relevant snippet from the server configuration, which tells the server to form a cluster between the two nodes
@@ -29,7 +29,7 @@
      &lt;/cluster-connection&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
@@ -133,8 +133,8 @@
         
         <li>We now consume those messages on *both* server 0 and server 1.
          We note the messages have been distributed between servers in a round robin fashion.
-         HornetQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
-         HornetQ can be configured to always load balance messages to all nodes, or to only balance messages
+         ActiveMQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
+         ActiveMQ can be configured to always load balance messages to all nodes, or to only balance messages
          to nodes which have consumers with no or matching selectors. See the user manual for more details.</li>
          JMS Queues implement point-to-point message where each message is only ever consumed by a
          maximum of one consumer.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-standalone/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/readme.html b/examples/jms/clustered-standalone/readme.html
index 0b48a17..54f0d4e 100644
--- a/examples/jms/clustered-standalone/readme.html
+++ b/examples/jms/clustered-standalone/readme.html
@@ -13,7 +13,7 @@
      <p>Subscribers for the topic are created on each node, and a producer is created on only one of the nodes.</p>
      <p>Some messages are sent by the producer, and we verify that <strong>all</strong> subscribers receive all the
      sent messages.</p>
-     <p>This example uses HornetQ's default stand-alone clustered configuration.
+     <p>This example uses ActiveMQ's default stand-alone clustered configuration.
         The relevant snippet from the server configuration, which tells the servers to form a cluster between the three nodes
      and to load balance the messages between the nodes is:</p>     
      <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-static-discovery/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/readme.html b/examples/jms/clustered-static-discovery/readme.html
index 96ef23c..84b5355 100644
--- a/examples/jms/clustered-static-discovery/readme.html
+++ b/examples/jms/clustered-static-discovery/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Load Balanced Static Clustered Queue Example</title>
+    <title>ActiveMQ JMS Load Balanced Static Clustered Queue Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -13,7 +13,7 @@
      <p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
      <p>We then send some messages via the producer, and we verify that <b>both</b> consumers receive the sent messages
      in a round-robin fashion.</p>
-     <p>In other words, HornetQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+     <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
      <p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
      JNDI, these could be instantiated directly.</p>     
      <p>Here's the relevant snippet from the server configuration, which tells the server to form a cluster between the two nodes
@@ -32,7 +32,7 @@
      &lt;/cluster-connection&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
@@ -136,8 +136,8 @@
         
         <li>We now consume those messages on *both* server 0 and server 1.
          We note the messages have been distributed between servers in a round robin fashion.
-         HornetQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
-         HornetQ can be configured to always load balance messages to all nodes, or to only balance messages
+         ActiveMQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
+         ActiveMQ can be configured to always load balance messages to all nodes, or to only balance messages
          to nodes which have consumers with no or matching selectors. See the user manual for more details.</li>
          JMS Queues implement point-to-point message where each message is only ever consumed by a
          maximum of one consumer.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-static-oneway/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/readme.html b/examples/jms/clustered-static-oneway/readme.html
index 7372621..432f384 100644
--- a/examples/jms/clustered-static-oneway/readme.html
+++ b/examples/jms/clustered-static-oneway/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Load Balanced Static Clustered Queue Example</title>
+    <title>ActiveMQ JMS Load Balanced Static Clustered Queue Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -15,7 +15,7 @@
      <p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
      <p>We then send some messages via the producer, and we verify that <b>all</b> consumers receive the sent messages
      in a round-robin fashion.</p>
-     <p>In other words, HornetQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+     <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
      <p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
      JNDI, these could be instantiated directly.</p>     
      <p>Here's the relevant snippet from the server configuration, which tells the server to form a one way cluster between the three nodes
@@ -38,7 +38,7 @@
      &lt;/cluster-connection&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
@@ -166,8 +166,8 @@
         
         <li>We now consume those messages on *both* server 0 and server 1.
          We note the messages have been distributed between servers in a round robin fashion.
-         HornetQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
-         HornetQ can be configured to always load balance messages to all nodes, or to only balance messages
+         ActiveMQ has <b>load balanced</b> the messages between the available consumers on the different nodes.
+         ActiveMQ can be configured to always load balance messages to all nodes, or to only balance messages
          to nodes which have consumers with no or matching selectors. See the user manual for more details.</li>
          JMS Queues implement point-to-point message where each message is only ever consumed by a
          maximum of one consumer.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/clustered-topic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/readme.html b/examples/jms/clustered-topic/readme.html
index 38c6521..34326fe 100644
--- a/examples/jms/clustered-topic/readme.html
+++ b/examples/jms/clustered-topic/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Clustered Topic Example</title>
+    <title>ActiveMQ JMS Clustered Topic Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -29,7 +29,7 @@
      &lt;/cluster-connection&gt;
      </code>
      </pre>    
-     <p>For more information on HornetQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
      section of the user manual.</p>      
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/colocated-failover-scale-down/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/readme.html b/examples/jms/colocated-failover-scale-down/readme.html
index a731a15..3617b97 100644
--- a/examples/jms/colocated-failover-scale-down/readme.html
+++ b/examples/jms/colocated-failover-scale-down/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Colocated Failover Scale Down Example</title>
+    <title>ActiveMQ JMS Colocated Failover Scale Down Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/colocated-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/readme.html b/examples/jms/colocated-failover/readme.html
index 64665f4..5400809 100644
--- a/examples/jms/colocated-failover/readme.html
+++ b/examples/jms/colocated-failover/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Colocated Failover Example</title>
+    <title>ActiveMQ JMS Colocated Failover Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/consumer-rate-limit/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/readme.html b/examples/jms/consumer-rate-limit/readme.html
index 3b454df..e19a098 100644
--- a/examples/jms/consumer-rate-limit/readme.html
+++ b/examples/jms/consumer-rate-limit/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Message Consumer Rate Limiting</title>
+    <title>ActiveMQ JMS Message Consumer Rate Limiting</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,9 +8,9 @@
   <body onload="prettyPrint()">
      <h1>JMS Message Consumer Rate Limiting</h1>
 
-     <p>With HornetQ you can specify a maximum consume rate at which a JMS MessageConsumer will consume messages.
+     <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>
-     <p>If this value is specified then HornetQ will ensure that messages are never consumed at a rate higher than
+     <p>If this value is specified then ActiveMQ will ensure that messages are never consumed at a rate higher than
      the specified rate. This is a form of consumer <i>throttling</i>.</p>     
      <h2>Example step-by-step</h2>
      <p>In this example we specify a <code>consumer-max-rate</code> of <code>10</code> messages per second in the <code>hornetq-jms.xml</code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/dead-letter/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/readme.html b/examples/jms/dead-letter/readme.html
index 5856c58..c0f9872 100644
--- a/examples/jms/dead-letter/readme.html
+++ b/examples/jms/dead-letter/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Dead Letter Example</title>
+    <title>ActiveMQ Dead Letter Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -15,7 +15,7 @@
      <p>To prevent this, messaging systems define dead letter messages: after a specified unsuccessful delivery attempts, the message is removed from the destination
          and instead routed to a <em>dead letter address</em> where they can be consumed for further investigation.
      <p>
-         The example will show how to configure HornetQ to route a message to a dead letter address after 3 unsuccessful delivery attempts.<br />
+         The example will show how to configure ActiveMQ to route a message to a dead letter address after 3 unsuccessful delivery attempts.<br />
          The example will send 1 message to a queue. We will deliver the message 3 times and rollback the session every time.<br />
          On the 4th attempt, there won't be any message to consume: it will have been moved to a <em>dead letter address</em>.<br />
          We will then consume this dead letter message.
@@ -30,7 +30,7 @@
          </code>
      </pre>          
      <p>This configuration will moved dead letter messages from <code>exampleQueue</code> to the <code>deadLetterQueue</code>.</p>
-     <p>HornetQ allows to specify either a <code>Queue</code> by prefixing the <code>dead-letter-address</code> with <code>jms.queue.</code>
+     <p>ActiveMQ allows to specify either a <code>Queue</code> by prefixing the <code>dead-letter-address</code> with <code>jms.queue.</code>
          or a <code>Topic</code> by prefixing with <code>jms.topic.</code>.<br />
          In this example, we will use a <code>Queue</code> to hold the dead letter messages.</p>
      <p>The maximum attempts of delivery is <code>3</code>. Once this figure is reached, a message is considered a dead letter message and is moved to 
@@ -137,7 +137,7 @@
            System.out.println("4th delivery from " + queue.getQueueName() + ": " + messageReceived);</code>
         </pre>
         
-        <p>We have configured HornetQ to send any dead letter messages to the <code>deadLetterQueue</code>.
+        <p>We have configured ActiveMQ to send any dead letter messages to the <code>deadLetterQueue</code>.
             We will now consume messages from this queue and receives the <em>dead letter messages</em>.</p>
             
         <li>We look up the JMS <em>dead letter queue</em> object from JNDI</li>
@@ -163,7 +163,7 @@
         <p>JMS does not specify the notion of dead letter destinations and messages. From JMS point of view, the message received from the dead letter queue
             is a <strong>different</strong> message than the message removed from the queue after the unsuccessful delivery attempts:
             the messages have the same content (properties and body) but their JMS headers differ.<br />
-            HornetQ defines additional properties for messages received from a dead letter destination</p>
+            ActiveMQ defines additional properties for messages received from a dead letter destination</p>
             
         <li>The message's destination is the dead letter queue</li>
         <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/delayed-redelivery/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/readme.html b/examples/jms/delayed-redelivery/readme.html
index 0a2f44d..d2bd1b7 100644
--- a/examples/jms/delayed-redelivery/readme.html
+++ b/examples/jms/delayed-redelivery/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Delayed Redelivery Example</title>
+    <title>ActiveMQ Delayed Redelivery Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>Delayed Redelivery Example</h1>
      
-     <p>This example demonstrates how HornetQ can be configured to provide a delayed redelivery in the case
+     <p>This example demonstrates how ActiveMQ can be configured to provide a delayed redelivery in the case
      where a message needs to be redelivered.</p>
      <p>Delaying redelivery can often be useful in the case that clients regularly fail or roll-back. Without a delayed
      redelivery, the system can get into a "thrashing" state, with delivery being attempted, the client rolling back, and

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/divert/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index 538283f..a60001f 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Divert Example</title>
+    <title>ActiveMQ Divert Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>Divert Example</h1>
 
-     <p>HornetQ diverts allow messages to be transparently "diverted" from one address to another
+     <p>ActiveMQ diverts allow messages to be transparently "diverted" from one address to another
      with just some simple configuration defined on the server side.</p>
      <p>Diverts can be defined to be <b>exclusive</b> or <b>non-exclusive</b>.</p>
      <p>With an <b>exclusive</b> divert the message is intercepted and does not get sent to the queues originally

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/durable-subscription/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/readme.html b/examples/jms/durable-subscription/readme.html
index 0174734..a180969 100644
--- a/examples/jms/durable-subscription/readme.html
+++ b/examples/jms/durable-subscription/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Durable Subscription Example</title>
+    <title>ActiveMQ JMS Durable Subscription Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>JMS Durable Subscription Example</h1>
 
-     <p>This example demonstrates how to use a durable subscription with HornetQ.</p>
+     <p>This example demonstrates how to use a durable subscription with ActiveMQ.</p>
      <p>Durable subscriptions are a standard part of JMS, please consult the JMS 1.1 specification for full details.</p>
      <p>Unlike non durable subscriptions, the key function of durable subscriptions is that the messages contained in them
          persist longer than the lifetime of the subscriber - i.e. they will accumulate messages sent to the topic even

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/embedded-simple/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/readme.html b/examples/jms/embedded-simple/readme.html
index 9ee98d3..9963775 100644
--- a/examples/jms/embedded-simple/readme.html
+++ b/examples/jms/embedded-simple/readme.html
@@ -1,6 +1,6 @@
 <html>
    <head>
-      <title>HornetQ Embedded JMS Server Example</title>
+      <title>ActiveMQ Embedded JMS Server Example</title>
       <link rel="stylesheet" type="text/css" href="../common/common.css" />
       <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
       <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,15 +8,15 @@
    <body onload="prettyPrint()">
       <h1>Embedded JMS Server Example</h1>
       
-      <p>This examples shows how to setup and run an embedded JMS server using HornetQ along with HornetQ configuration files.</p>
+      <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ along with ActiveMQ configuration files.</p>
      
       <h2>Example step-by-step</h2>     
       <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
 
       <ol>
-         <li>Create HornetQ core configuration files and make sure they are within your classpath.  By default, HornetQ
+         <li>Create ActiveMQ core configuration files and make sure they are within your classpath.  By default, ActiveMQ
              expects the classnames to be "hornetq-configuration.xml", "hornetq-jms.xml", and "hornetq-users.xml".</li>
-         <li>Create and start HornetQ JMS server</li>
+         <li>Create and start ActiveMQ JMS server</li>
          <pre class="prettyprint">
             <code>EmbeddedJMS jmsServer = new EmbeddedJMS();
             jmsServer.start();</code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/embedded/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/readme.html b/examples/jms/embedded/readme.html
index b40b827..e49a0b0 100644
--- a/examples/jms/embedded/readme.html
+++ b/examples/jms/embedded/readme.html
@@ -1,6 +1,6 @@
 <html>
    <head>
-      <title>HornetQ Embedded JMS Server Example</title>
+      <title>ActiveMQ Embedded JMS Server Example</title>
       <link rel="stylesheet" type="text/css" href="../common/common.css" />
       <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
       <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,8 +8,8 @@
    <body onload="prettyPrint()">
       <h1>Embedded JMS Server Example</h1>
       
-      <p>This examples shows how to setup and run an embedded JMS server using HornetQ.</p>
-      <p>HornetQ was designed using POJOs (Plain Old Java Objects) which means embedding HornetQ in your own application
+      <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ.</p>
+      <p>ActiveMQ was designed using POJOs (Plain Old Java Objects) which means embedding ActiveMQ in your own application
           is as simple as instantiating a few objects.</p>
       <p>This example does not use any configuration files. The server is configured using POJOs and can be easily ported to any dependency injection framework.<br /> 
          We will setup and run a full-fledged JMS server which binds its JMS resources to JNDI and can be accessed by remote clients.</p>
@@ -18,7 +18,7 @@
       <p><i>To run the example, simply type <code>mvn verify</code> from this directory</i></p>
 
       <ol>
-         <li>Create HornetQ core configuration, and set the properties accordingly</li>
+         <li>Create ActiveMQ core configuration, and set the properties accordingly</li>
          <pre class="prettyprint">
             <code>Configuration configuration = new ConfigurationImpl();
             configuration.setPersistenceEnabled(false);
@@ -26,9 +26,9 @@
             configuration.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));</code>
             Configuration configuration = new ConfigurationImpl();</pre>
 
-         <li>Create the HornetQ core server</li>
+         <li>Create the ActiveMQ core server</li>
          <pre class="prettyprint">
-            <code>HornetQServer hornetqServer = HornetQ.newHornetQServer(configuration);</code>
+            <code>ActiveMQServer hornetqServer = ActiveMQ.newActiveMQServer(configuration);</code>
          </pre>
         
          <li>Create and start the JNDI server (using JBoss JNDI implementation)</li>
@@ -73,7 +73,7 @@
             jmsConfig.getQueueConfigurations().add(queueConfig);</code>
          </pre>
      
-         <li>Start the JMS Server using the HornetQ core server and the JMS configuration</li>
+         <li>Start the JMS Server using the ActiveMQ core server and the JMS configuration</li>
          <pre class="prettyprint">
             <code>JMSServerManager jmsServer = new JMSServerManagerImpl(hornetqServer, jmsConfig);
             jmsServer.start();</code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/expiry/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/readme.html b/examples/jms/expiry/readme.html
index df2f2fa..9ed21ec 100644
--- a/examples/jms/expiry/readme.html
+++ b/examples/jms/expiry/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Message Expiration Example</title>
+    <title>ActiveMQ Message Expiration Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,10 +8,10 @@
   <body onload="prettyPrint()">
      <h1>JMS Expiration Example</h1>
 
-     <p>This example shows you how to configure HornetQ so messages are expipired after a certain time..</p>
+     <p>This example shows you how to configure ActiveMQ so messages are expipired after a certain time..</p>
      <p>Messages can be retained in the messaging system for a limited period of time before being removed.
          JMS specification states that clients should not receive messages that have been expired (but it does not guarantee this will not happen).</p>
-     <p>HornetQ can assign a <em>expiry address</em> to a given queue so that when messages are expired, they are removed from the queue and
+     <p>ActiveMQ can assign a <em>expiry address</em> to a given queue so that when messages are expired, they are removed from the queue and
         routed to an this address. These "expired" messages can later be consumed for further inspection.
      <p>
          The example will send 1 message with a short <em>time-to-live</em> to a queue. We will wait for the message to expire and checks that the message
@@ -27,7 +27,7 @@
          </code>
      </pre>          
      <p>This configuration will moved expired messages from the <code>exampleQueue</code> to the <code>expiryQueue</code></p>
-     <p>HornetQ allows to specify either a <code>Queue</code> by prefixing the <code>expiry-address</code> with <code>jms.queue.</code>
+     <p>ActiveMQ allows to specify either a <code>Queue</code> by prefixing the <code>expiry-address</code> with <code>jms.queue.</code>
          or a <code>Topic</code> by prefixing with <code>jms.topic.</code>.<br />
          In this example, we will use a <code>Queue</code> to hold the expired messages.</p>
      <p>Since we want to consume messages from this expiryQueue, we also need to add a JNDI binding to perform a lookup.
@@ -109,7 +109,7 @@
            System.out.println("Received message from " + queue.getQueueName() + ": " + messageReceived);</code>
         </pre>
         
-        <p>However, we have configured HornetQ to send any expired messages to the <code>expiryQueue</code>.
+        <p>However, we have configured ActiveMQ to send any expired messages to the <code>expiryQueue</code>.
             We will now consume messages from this expiry queue and receives the <em>expired</em> message.</p>
             
         <li>We look up the JMS <em>expiry queue</em> object from JNDI</li>
@@ -135,7 +135,7 @@
         <p>JMS does not specify the notion of expiry queue. From JMS point of view, the message received from the expiry queue
             is a <strong>different</strong> message than the message expired from the queue: the two messages have the same content (properties and body) but
             their JMS headers differ.<br />
-            HornetQ defines additional properties to correlate the message received from the expiry queue with the 
+            ActiveMQ defines additional properties to correlate the message received from the expiry queue with the 
             message expired from the queue</p>
             
         <li>The expired message's destination is the expiry queue</li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/http-transport/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index 401d164..d88570c 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS HTTP Transport Example</title>
+    <title>ActiveMQ JMS HTTP Transport Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,11 +8,11 @@
   <body onload="prettyPrint()">
      <h1>JMS HTTP Example</h1>
 
-     <p>This example shows you how to configure HornetQ to use the HTTP protocol as its transport layer.</p>
+     <p>This example shows you how to configure ActiveMQ to use the HTTP protocol as its transport layer.</p>
      
-     <p>HornetQ supports a variety of network protocols to be its underlying transport without any specific code change.</p>
+     <p>ActiveMQ supports a variety of network protocols to be its underlying transport without any specific code change.</p>
      
-     <p>This example is taken from the queue example without any code change. By changing the configuration file, one can get HornetQ working with HTTP transport.</p>
+     <p>This example is taken from the queue example without any code change. By changing the configuration file, one can get ActiveMQ working with HTTP transport.</p>
      <p>All you need to do is open the server0/hornetq-configuration.xml and enable HTTP like the following</p>
  
  

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/instantiate-connection-factory/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/readme.html b/examples/jms/instantiate-connection-factory/readme.html
index 59f63db..6bc09f3 100644
--- a/examples/jms/instantiate-connection-factory/readme.html
+++ b/examples/jms/instantiate-connection-factory/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Instantiate Connection Factory Example</title>
+    <title>ActiveMQ JMS Instantiate Connection Factory Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -11,7 +11,7 @@
      <p>Usually, JMS Objects such as ConnectionFactories, Queue and Topic instances are looked up from JNDI
      before being used by the client code. This objects are called "administered objects" in JMS specification
      terminology.</p>
-     <p>However, in some cases a JNDI server may not be available or desired. To come to the rescue HornetQ
+     <p>However, in some cases a JNDI server may not be available or desired. To come to the rescue ActiveMQ
      also supports the direct instantiation of these administered objects on the client side.</p>
      <p>This allows the full set of JMS functionality to be available without requiring a JNDI server!</p>
      <p>This example is very simple and based on the simple Queue example, however in this example we
@@ -34,7 +34,7 @@
         the server.</li>
         <pre class="prettyprint">
            <code>
-     Queue queue = new HornetQQueue("exampleQueue");</code>
+     Queue queue = new ActiveMQQueue("exampleQueue");</code>
         </pre>
 
         <li>Instantiate the TransportConfiguration object. The TransportConfiguration instance encapsulates
@@ -55,7 +55,7 @@
         <li>Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration.</li>
         <pre class="prettyprint">
            <code>
-     ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(transportConfiguration);
+     ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(transportConfiguration);
            </code>
         </pre>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/interceptor/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 4ded622..523ef24 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Interceptor Example</title>
+    <title>ActiveMQ JMS Interceptor Example</title>
     <link rel="stylesheet" type="text/css" href="../common/common.css" />
     <link rel="stylesheet" type="text/css" href="../common/prettify.css" />
     <script type="text/javascript" src="../common/prettify.js"></script>
@@ -8,9 +8,9 @@
   <body onload="prettyPrint()">
      <h1>JMS Interceptor Example</h1>
 
-     <p>This example shows you how to implement and configure a simple incoming, server-side interceptor with HornetQ.</p>
+     <p>This example shows you how to implement and configure a simple incoming, server-side interceptor with ActiveMQ.</p>
      
-     <p>HornetQ allows an application to use an interceptor to hook into the messaging system. All that needs to do is to implement the
+     <p>ActiveMQ allows an application to use an interceptor to hook into the messaging system. All that needs to do is to implement the
      Interceptor interface, as defined below: </p>
      <pre class="prettyprint">
      <code>


Mime
View raw message