Repository: activemq-6
Updated Branches:
  refs/heads/master 2fbd5d735 -> 09123d65d


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/stomp1.1/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/readme.html 
b/examples/jms/stomp1.1/readme.html
index 3f53f1b..dcfbe6b 100644
--- a/examples/jms/stomp1.1/readme.html
+++ b/examples/jms/stomp1.1/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Stomp 1.1 Example</title>
+    <title>ActiveMQ Stomp 1.1 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>Stomp 1.1 Example</h1>
 
-     <p>This example shows you how to configure HornetQ to send and receive 
Stomp messages using Stomp 1.1 protocol.</p>
-     <p>The example will start a HornetQ server configured with Stomp and 
JMS.</p>
+     <p>This example shows you how to configure ActiveMQ to send and receive 
Stomp messages using Stomp 1.1 protocol.</p>
+     <p>The example will start a ActiveMQ server configured with Stomp and 
JMS.</p>
      <p>The client will open a socket to initiate a Stomp 1.1 connection and 
then send one Stomp message (using TCP directly). 
        The client will then consume a message from a JMS Queue and check it is 
the message sent with Stomp.</p>
 
@@ -42,7 +42,7 @@
         </pre>
 
         <li>We send a SEND frame (a Stomp message) to the destination 
<code>jms.queue.exampleQueue</code> 
-          (which corresponds to the HornetQ address for the JMS Queue 
<code>exampleQueue</code>) with a text body</li>
+          (which corresponds to the ActiveMQ address for the JMS Queue 
<code>exampleQueue</code>) with a text body</li>
         <pre class="prettyprint">
           String text = "Hello World from Stomp 1.1 !";
           String message = "SEND\n" + 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/stomp1.2/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/readme.html 
b/examples/jms/stomp1.2/readme.html
index ab9b3d9..75183bb 100644
--- a/examples/jms/stomp1.2/readme.html
+++ b/examples/jms/stomp1.2/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Stomp 1.1 Example</title>
+    <title>ActiveMQ Stomp 1.1 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>Stomp 1.2 Example</h1>
 
-     <p>This example shows you how to configure HornetQ to send and receive 
Stomp messages using Stomp 1.2 protocol.</p>
-     <p>The example will start a HornetQ server configured with Stomp and 
JMS.</p>
+     <p>This example shows you how to configure ActiveMQ to send and receive 
Stomp messages using Stomp 1.2 protocol.</p>
+     <p>The example will start a ActiveMQ server configured with Stomp and 
JMS.</p>
      <p>The client will open a socket to initiate a Stomp 1.2 connection and 
then send one Stomp message (using TCP directly). 
        The client will then consume a message from a JMS Queue and check it is 
the message sent with Stomp.</p>
 
@@ -42,7 +42,7 @@
         </pre>
 
         <li>We send a SEND frame (a Stomp message) to the destination 
<code>jms.queue.exampleQueue</code> 
-          (which corresponds to the HornetQ address for the JMS Queue 
<code>exampleQueue</code>) with a text body</li>
+          (which corresponds to the ActiveMQ address for the JMS Queue 
<code>exampleQueue</code>) with a text body</li>
         <pre class="prettyprint">
           String text = "Hello World from Stomp 1.2 !";
           String message = "SEND\n" + 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/stop-server-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/readme.html 
b/examples/jms/stop-server-failover/readme.html
index 77a55bb..6c228ab 100644
--- a/examples/jms/stop-server-failover/readme.html
+++ b/examples/jms/stop-server-failover/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Failover Without Transactions Example</title>
+    <title>ActiveMQ JMS Failover Without 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>
@@ -15,7 +15,7 @@
         and it is possible some messages will be lost or delivered twice, 
depending when the failover to the backup server occurs.</p>
      <p>It is up to the client to deal with such cases. To ensure once and 
only once delivery, the client must
         use transacted JMS sessions (as shown in the example for <a 
href="../transaction-failover/readme.html">failover with transactions</a>).</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/symmetric-cluster/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/readme.html 
b/examples/jms/symmetric-cluster/readme.html
index cbe30c9..d42b013 100644
--- a/examples/jms/symmetric-cluster/readme.html
+++ b/examples/jms/symmetric-cluster/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Symmetric Cluster Example</title>
+    <title>ActiveMQ JMS Symmetric Cluster 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>JMS Symmetric Cluster Example</h1>
 
-     <p>This examples demonstrates a <b>symmetric cluster</b> set-up with 
HornetQ.</p>
-     <p>HornetQ has extremely flexible clustering which allows you to set-up 
servers in
+     <p>This examples demonstrates a <b>symmetric cluster</b> set-up with 
ActiveMQ.</p>
+     <p>ActiveMQ has extremely flexible clustering which allows you to set-up 
servers in
      many different topologies.</p>
      <p>The most common topology that you'll perhaps be familiar with if you 
are used to application
      server clustering is a <b>symmetric cluster</b>.</p>
@@ -17,9 +17,9 @@
      as every other node, and every node is connected to every other node in 
the cluster.</p>
      <p>By connecting node in such a way, we can, from a JMS point of view, 
give the impression of distributed
      JMS queues and topics.</p>
-     <p>The configuration used in this example is very similar to the 
configuration used by HornetQ
+     <p>The configuration used in this example is very similar to the 
configuration used by ActiveMQ
      when installed as a clustered profile in JBoss Application Server.</p>
-     <p>To set up HornetQ to form a symmetric cluster we simply need to mark 
each server as <code>clustered</code>
+     <p>To set up ActiveMQ to form a symmetric cluster we simply need to mark 
each server as <code>clustered</code>
      and we need to define a <code>cluster-connection</code> in 
<code>hornetq-configuration.xml</code>.</p>
      <p>The <code>cluster-connection</code> tells the nodes what other nodes 
to make connections to.
      With a <code>cluster-connection</code> each node that we connect to can 
either be specified
@@ -46,7 +46,7 @@
     <p>In this example will we will demonstrate this by deploying a JMS topic 
and Queue on all nodes of the cluster
      , sending messages to the queue and topic from different nodes, and 
verifying messages are received correctly
      by consumers on different nodes.</p>
-    <p>For more information on configuring HornetQ clustering in general, 
please see the clustering
+    <p>For more information on configuring 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>mvn verify</code> from this 
directory</i></p>
@@ -63,16 +63,16 @@
         
         <pre class="prettyprint">
            <code>
-   ConnectionFactory cf = 
HornetQJMSClient.createConnectionFactoryWithHA("231.7.7.7", 9876); 
+   ConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactoryWithHA("231.7.7.7", 9876); 
    </code>
         </pre>
 
         <li>Directly instantiate JMS Queue and Topic objects</li>
         <pre class="prettyprint">
            <code>
-   Queue queue = new HornetQQueue("exampleQueue");
+   Queue queue = new ActiveMQQueue("exampleQueue");
          
-   Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic");          
 
+   Topic topic = ActiveMQJMSClient.createActiveMQTopic("exampleTopic");        
   
            </code>
         </pre>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/temp-queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/readme.html 
b/examples/jms/temp-queue/readme.html
index 96b651d..44d1a0d 100644
--- a/examples/jms/temp-queue/readme.html
+++ b/examples/jms/temp-queue/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Temporary Queue Example</title>
+    <title>ActiveMQ JMS Temporary 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>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>JMS Temporary Queue Example</h1>
 
-     <p>This example shows you how to use a TemporaryQueue with HornetQ. First 
a temporary queue is created to send and receive a message and then deleted.
+     <p>This example shows you how to use a TemporaryQueue with ActiveMQ. 
First a temporary queue is created to send and receive a message and then 
deleted.
          Then another temporary queue is created and used after its connection 
is closed to illustrate its scope.</p>
      <p>A TemporaryQueue is a JMS queue that exists only within the lifetime 
of its connection. It is often used in request-reply
          type messaging where the reply is sent through a temporary 
destination. The temporary queue is often created as

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/topic-hierarchies/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/readme.html 
b/examples/jms/topic-hierarchies/readme.html
index 9446325..a0e81ee 100644
--- a/examples/jms/topic-hierarchies/readme.html
+++ b/examples/jms/topic-hierarchies/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ Topic Hierarchy Example</title>
+    <title>ActiveMQ Topic Hierarchy 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>Topic Hierarchy Example</h1>
 
-     <p>HornetQ supports topic hierarchies. With a topic hierarchy you can 
register a subscriber with a wild-card
+     <p>ActiveMQ supports topic hierarchies. With a topic hierarchy you can 
register a subscriber with a wild-card
      and that subscriber will receive any messages routed to an address that 
match the wildcard.</p>
-     <p>HornetQ wild-cards can use the character '#' which means "match any 
number of words", and
+     <p>ActiveMQ wild-cards can use the character '#' which means "match any 
number of words", and
      the character '*' which means "match a single word". Words are delimited 
by the character "."</p>
      <p>For example if I subscribe using the wild-card "news.europe.#", then 
that would match messages sent to the addresses
      "news.europe", "news.europe.sport" and "news.europe.entertainment", but 
it does not match messages sent to the
@@ -75,7 +75,7 @@
 
         <li>Instantiate a topic representing the wildcard we're going to 
subscribe to.</li>
         <pre class="prettyprint">
-           <code>Topic topicSubscribe = 
HornetQJMSClient.createHornetQTopic("news.europe.#");</code>
+           <code>Topic topicSubscribe = 
ActiveMQJMSClient.createActiveMQTopic("news.europe.#");</code>
         </pre>
 
         <li>Create a consumer (topic subscriber) that will consume using that 
wildcard.
@@ -93,11 +93,11 @@
          we're going to send messages to. You could look these up from JNDI if 
you wanted to.</li>
         <pre class="prettyprint">
            <code>
-         Topic topicNewsUsaWrestling = 
HornetQJMSClient.createHornetQTopic("news.usa.wrestling");
+         Topic topicNewsUsaWrestling = 
ActiveMQJMSClient.createActiveMQTopic("news.usa.wrestling");
          
-         Topic topicNewsEuropeSport = 
HornetQJMSClient.createHornetQTopic("news.europe.sport");
+         Topic topicNewsEuropeSport = 
ActiveMQJMSClient.createActiveMQTopic("news.europe.sport");
          
-         Topic topicNewsEuropeEntertainment = 
HornetQJMSClient.createHornetQTopic("news.europe.entertainment");</code>
+         Topic topicNewsEuropeEntertainment = 
ActiveMQJMSClient.createActiveMQTopic("news.europe.entertainment");</code>
         </pre>
 
         <li>Send a message destined for the usa wrestling topic.</li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/topic-selector-example1/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/readme.html 
b/examples/jms/topic-selector-example1/readme.html
index 61c6b4c..50a5e0e 100644
--- a/examples/jms/topic-selector-example1/readme.html
+++ b/examples/jms/topic-selector-example1/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Topic Selector Example 1</title>
+    <title>ActiveMQ JMS Topic Selector Example 1</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/topic-selector-example2/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/readme.html 
b/examples/jms/topic-selector-example2/readme.html
index 269d128..789f52b 100644
--- a/examples/jms/topic-selector-example2/readme.html
+++ b/examples/jms/topic-selector-example2/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Topic Selector Example 2</title>
+    <title>ActiveMQ JMS Topic Selector Example 2</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 you how to selectively consume messages using 
message selectors with topic consumers.</p>
      
      <p>Message selectors are strings with special syntax that can be used in 
creating consumers. Message consumers
-     that are thus created only receive messages that match its selector. On 
message delivering, the HornetQ
+     that are thus created only receive messages that match its selector. On 
message delivering, the ActiveMQ
      Server evaluates the corresponding message headers of the messages 
against each selector, if any, and then delivers
      the 'matched' messages to its consumer. Please consult the JMS 1.1 
specification for full details.</p>
      

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/topic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic/readme.html b/examples/jms/topic/readme.html
index 34909fc..12cae52 100644
--- a/examples/jms/topic/readme.html
+++ b/examples/jms/topic/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Topic Example</title>
+    <title>ActiveMQ JMS 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>
@@ -8,7 +8,7 @@
   <body onload="prettyPrint()">
      <h1>JMS Topic Example</h1>
 
-     <p>This example shows you how to send and receive a message to a JMS 
Topic with HornetQ.</p>
+     <p>This example shows you how to send and receive a message to a JMS 
Topic with ActiveMQ.</p>
      <p>Topics are a standard part of JMS, please consult the JMS 1.1 
specification for full details.</p>
      <p>A Topic is used to send messages using the publish-subscribe model, 
from a producer to 1 or more consumers.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/transaction-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/readme.html 
b/examples/jms/transaction-failover/readme.html
index 3714a5f..1b2c4bb 100644
--- a/examples/jms/transaction-failover/readme.html
+++ b/examples/jms/transaction-failover/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Failover With Transaction Example</title>
+    <title>ActiveMQ JMS Failover With 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>
@@ -17,8 +17,8 @@
            will need to retry the transaction work.</li>
         <li>if the failover occurs while there is <em>no</em> in-flight 
transaction, the failover will be transparent to the user.</li>
      </ul>
-     <p>HornetQ also provides an example for <a 
href="../non-transactional-failover/readme.html">non-transaction 
failover</a>.</p>
-     <p>For more information on HornetQ failover and HA, and clustering in 
general, please see the clustering
+     <p>ActiveMQ also provides an example for <a 
href="../non-transactional-failover/readme.html">non-transaction 
failover</a>.</p>
+     <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/transactional/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/readme.html 
b/examples/jms/transactional/readme.html
index 96d1ace..aeab3e9 100644
--- a/examples/jms/transactional/readme.html
+++ b/examples/jms/transactional/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS Transactional Session Example</title>
+    <title>ActiveMQ JMS Transactional Session 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 Transactional Session Example</h1>
 
-     <p>This example shows you how to use a transacted Session with 
HornetQ.</p>
+     <p>This example shows you how to use a transacted Session with 
ActiveMQ.</p>
      <p>Firstly 2 messages are sent via the transacted sending session before 
being committed. This ensures that both message
      are sent</p>
      <p>Secondly the receiving session receives the messages firstly 
demonstrating a message being redelivered after the session

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/xa-heuristic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/readme.html 
b/examples/jms/xa-heuristic/readme.html
index 9d648a0..a7cfca7 100644
--- a/examples/jms/xa-heuristic/readme.html
+++ b/examples/jms/xa-heuristic/readme.html
@@ -1,13 +1,13 @@
 <html>
   <head>
-    <title>HornetQ JMS XA Heuristic Example</title>
+    <title>ActiveMQ JMS XA Heuristic 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>JMS XA Heuristic Example</h1>
-     <p>This example shows you how to make an XA heuristic decision through 
the HornetQ Management Interface.</p>
+     <p>This example shows you how to make an XA heuristic decision through 
the ActiveMQ Management Interface.</p>
      
      <p>A heuristic decision is a unilateral decision to commit or rollback an 
XA transaction branch after it has 
      been prepared. </p>
@@ -20,7 +20,7 @@
      Then we get the MBeanServerConnection object to manipulate the prepared 
transactions. To illustrate, we roll back the first 
      transaction but commit the second. This will result in that only the 
message 'world' is received. </p>
 
-     <p>This example uses JMX to manipulate transactions in a HornetQ Server. 
For details on JMX facilities with HornetQ,
+     <p>This example uses JMX to manipulate transactions in a ActiveMQ Server. 
For details on JMX facilities with ActiveMQ,
      please look at the JMX Example.</p>
      
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/xa-receive/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/readme.html 
b/examples/jms/xa-receive/readme.html
index de8396a..b085e01 100644
--- a/examples/jms/xa-receive/readme.html
+++ b/examples/jms/xa-receive/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS XA Receive Example</title>
+    <title>ActiveMQ JMS XA Receive 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 @@
          the message will only be acknowledged and removed from the queue when 
the transaction is committed.
      If the transaction is not committed the message maybe redelivered after 
rollback or during XA recovery.</p>
      
-     <p>HornetQ is JTA aware, meaning you can use HornetQ in an XA 
transactional environment
+     <p>ActiveMQ is JTA aware, meaning you can use ActiveMQ in an XA 
transactional environment
      and participate in XA transactions. It provides the 
javax.transaction.xa.XAResource interface for that
      purpose. Users can get a XAConnectionFactory to create XAConnections and 
XASessions.</p>
      

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/xa-send/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/readme.html b/examples/jms/xa-send/readme.html
index 4736af8..2c786a2 100644
--- a/examples/jms/xa-send/readme.html
+++ b/examples/jms/xa-send/readme.html
@@ -1,17 +1,17 @@
 <html>
   <head>
-    <title>HornetQ JMS XA Send Example</title>
+    <title>ActiveMQ JMS XA 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>
   </head>
   <body onload="prettyPrint()">
      <h1>JMS XA Send Example</h1>
-     <p>This example shows you how message sending behaves in an XA 
transaction in HornetQ. When a message is sent within
+     <p>This example shows you how message sending behaves in an XA 
transaction in ActiveMQ. When a message is sent within
          the scope of an XA transaction, it will only reach the queue once the 
transaction is committed.
      If the transaction is rolled back the sent messages will be discarded by 
the server.</p>
      
-     <p>HornetQ is JTA aware, meaning you can use HornetQ in a XA 
transactional environment
+     <p>ActiveMQ is JTA aware, meaning you can use ActiveMQ in a XA 
transactional environment
      and participate in XA transactions. It provides the 
javax.transaction.xa.XAResource interface for that
      purpose. Users can get a XAConnectionFactory to create XAConnections and 
XASessions.</p>
      

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/jms/xa-with-jta/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/readme.html 
b/examples/jms/xa-with-jta/readme.html
index 1cd5e39..291b5a3 100644
--- a/examples/jms/xa-with-jta/readme.html
+++ b/examples/jms/xa-with-jta/readme.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>HornetQ JMS XA with JTA Example</title>
+    <title>ActiveMQ JMS XA with JTA 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 XA with JTA Example</h1>
 
-     <p>This example shows you how to use JTA interfaces to control 
transactions with HornetQ. JTA provides
+     <p>This example shows you how to use JTA interfaces to control 
transactions with ActiveMQ. JTA provides
      facilities to start and stop a transaction and enlist XA resources into a 
transaction.</p>
      
-     <p>HornetQ is JTA aware, meaning you can use HornetQ in a XA 
transactional environment
+     <p>ActiveMQ is JTA aware, meaning you can use ActiveMQ in a XA 
transactional environment
      and participate in XA transactions. It provides the 
javax.transaction.xa.XAResource interface for that
      purpose. Users can get a XAConnectionFactory to create XAConnections and 
XASessions.</p>
      

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/examples/soak/normal/README
----------------------------------------------------------------------
diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index b1025c4..9f2361d 100644
--- a/examples/soak/normal/README
+++ b/examples/soak/normal/README
@@ -5,7 +5,7 @@
 Running the Soak Tests
 =======================
 
-The default soak tests with start a HornetQ instance, 1 producer and 1 
consumer.  To run the default suite.
+The default soak tests with start a ActiveMQ instance, 1 producer and 1 
consumer.  To run the default suite.
 
   $mvn verify
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/tests/config/logging.properties
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index e0fe0f4..25fdede 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -26,7 +26,7 @@ 
loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.ut
 
 # Root logger level
 logger.level=INFO
-# HornetQ logger levels
+# ActiveMQ logger levels
 logger.org.apache.activemq.core.server.level=INFO
 logger.org.apache.activemq.journal.level=INFO
 logger.org.apache.activemq.utils.level=INFO

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/tests/config/logging.properties.trace
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties.trace 
b/tests/config/logging.properties.trace
index fa38040..3197b3d 100644
--- a/tests/config/logging.properties.trace
+++ b/tests/config/logging.properties.trace
@@ -28,7 +28,7 @@ 
loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.ut
 
 # Root logger level
 logger.level=INFO
-# HornetQ logger levels
+# ActiveMQ logger levels
 logger.org.apache.activemq.core.server.level=TRACE
 logger.org.apache.activemq.journal.level=INFO
 logger.org.apache.activemq.utils.level=INFO

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/tests/jms-tests/src/test/resources/jbossjta-properties.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/jbossjta-properties.xml 
b/tests/jms-tests/src/test/resources/jbossjta-properties.xml
index 2cfb6db..2d09153 100644
--- a/tests/jms-tests/src/test/resources/jbossjta-properties.xml
+++ b/tests/jms-tests/src/test/resources/jbossjta-properties.xml
@@ -156,7 +156,7 @@
         <!--
                        
com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
                        -->
-<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" 
value="org.apache.activemq.api.jms.server.recovery.HornetQXAResourceRecovery;adaptor1"/>
+<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" 
value="org.apache.activemq.api.jms.server.recovery.ActiveMQXAResourceRecovery;adaptor1"/>
 
 
 

Reply via email to