activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [2/6] activemq-artemis git commit: Ensure all references to the project use ActiveMQ Artemis
Date Wed, 13 May 2015 13:29:38 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
index 743efec..c64b59d 100644
--- a/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
+++ b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
@@ -102,7 +102,7 @@ public class ExpiryExample extends ActiveMQExample
          // The message received from the expiry queue has the same content than the expired message but its JMS headers
          // differ
          // (from JMS point of view, it's not the same message).
-         // ActiveMQ defines additional properties to correlate the message received from the expiry queue with the
+         // ActiveMQ Artemis defines additional properties to correlate the message received from the expiry queue with the
          // message expired from the queue
 
          System.out.println();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/http-transport/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index 0cf324d..9cc3f8c 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS HTTP Transport Example</title>
+    <title>ActiveMQ Artemis 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>
@@ -27,11 +27,11 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS HTTP Example</h1>
 
-     <p>This example shows you how to configure ActiveMQ to use the HTTP protocol as its transport layer.</p>
+     <p>This example shows you how to configure ActiveMQ Artemis to use the HTTP protocol as its transport layer.</p>
      
-     <p>ActiveMQ supports a variety of network protocols to be its underlying transport without any specific code change.</p>
+     <p>ActiveMQ Artemis 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 ActiveMQ 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 Artemis working with HTTP transport.</p>
      <p>All you need to do is open the server0/broker.xml and enable HTTP like the following</p>
  
  

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/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 3767918..ff4e17a 100644
--- a/examples/jms/instantiate-connection-factory/readme.html
+++ b/examples/jms/instantiate-connection-factory/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Instantiate Connection Factory Example</title>
+    <title>ActiveMQ Artemis 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/interceptor/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 137d767..a680c12 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Interceptor Example</title>
+    <title>ActiveMQ Artemis 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>
@@ -27,9 +27,9 @@ under the License.
   <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 ActiveMQ.</p>
+     <p>This example shows you how to implement and configure a simple incoming, server-side interceptor with ActiveMQ Artemis.</p>
 
-     <p>ActiveMQ allows an application to use an interceptor to hook into the messaging system. All that needs to do is to implement the
+     <p>ActiveMQ Artemis 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
index 75e2937..c2b7aa2 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
@@ -28,7 +28,7 @@ import javax.naming.InitialContext;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * A simple JMS example that shows how to implement and use interceptors with ActiveMQ.
+ * A simple JMS example that shows how to implement and use interceptors with ActiveMQ Artemis.
  */
 public class InterceptorExample extends ActiveMQExample
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jms-auto-closeable/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/readme.html b/examples/jms/jms-auto-closeable/readme.html
index 482bffb..48cc246 100644
--- a/examples/jms/jms-auto-closeable/readme.html
+++ b/examples/jms/jms-auto-closeable/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Auto Closable Example</title>
+    <title>ActiveMQ Artemis JMS Auto Closable 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-artemis/blob/a17c828b/examples/jms/jms-bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/readme.html b/examples/jms/jms-bridge/readme.html
index 900b4a8..973abfd 100644
--- a/examples/jms/jms-bridge/readme.html
+++ b/examples/jms/jms-bridge/readme.html
@@ -19,21 +19,21 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Bridge Example</title>
+    <title>ActiveMQ Artemis 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>
   </head>
   <body onload="prettyPrint()">
      <h1>JMS Bridge Example</h1>
-     <p>This example shows you how to create a JMS Bridge between two ActiveMQ servers.</p>
+     <p>This example shows you how to create a JMS Bridge between two ActiveMQ Artemis servers.</p>
      <img src="jms-bridge.png"  />
-     <p>The example will use two ActiveMQ servers:</p>
+     <p>The example will use two ActiveMQ Artemis servers:</p>
      <ul>
         <li>Server #0 &ndash; the <em>Source</em> server. It will be configured with a JMS Topic bound to JNDI under <code>source/topic</code>
         <li>Server #1 &ndash; the <em>Target</em> server. It will be configured with a JMS Queue bound to JNDI under <code>target/queue</code><br />
      </ul>
-     <p>Both ActiveMQ server will run their own JNDI server used by the JMS Bridge and the JMS Client to lookup JMS
+     <p>Both ActiveMQ Artemis server will run their own JNDI server used by the JMS Bridge and the JMS Client to lookup JMS
         resources (ConnectionFactory and Destination).</p>
      <p>The JMS Bridge will be started in the example code and be configured to bridge messages from the <em>source</em> destination
      (the topic hosted on server #0) and the <em>target</em> destination (the queue hosted on server #1)</p>
@@ -46,7 +46,7 @@ under the License.
      <h3>JMS Bridge Configuration</h3>
      <p>The JMS Bridge is a <abbr title="Plain Old Java Object">POJO</abbr> that we configure with both source and target
         JNDI configurations. In the actual example we are programatically creating the Bridge, however the following section
-        describes how you would do this if you wanted to deploy with an actual ActiveMQ server via the activemq-beans.xml.
+        describes how you would do this if you wanted to deploy with an actual ActiveMQ Artemis server via the activemq-beans.xml.
 
      <h4>Configuring the Bridge with the JBoss Microcontainer</h4>
      <p>
@@ -107,7 +107,7 @@ under the License.
        &lt;/bean>
       </pre>
      <h2>Example step-by-step</h2>
-     <p>To run the example after having setup both ActiveMQ servers and the JMS bridge:</p>
+     <p>To run the example after having setup both ActiveMQ Artemis servers and the JMS bridge:</p>
      <ol>
         <li>To run the example simply run <code>mvn verify -Pexample</code></li>
      </ol>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
index 3947aa0..748aac9 100644
--- a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
+++ b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
@@ -36,7 +36,7 @@ import javax.naming.InitialContext;
 
 /**
  * An example which sends a message to a source topic and consume from a target queue.
- * The source and target destinations are located on 2 different ActiveMQ server.
+ * The source and target destinations are located on 2 different ActiveMQ Artemis server.
  * The source and target queues are bridged by a JMS Bridge configured and running on the "target" server.
  */
 public class JMSBridgeExample

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jms-completion-listener/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/readme.html b/examples/jms/jms-completion-listener/readme.html
index 12d1aae..c29066a 100644
--- a/examples/jms/jms-completion-listener/readme.html
+++ b/examples/jms/jms-completion-listener/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Completion Listener Example</title>
+    <title>ActiveMQ Artemis JMS Completion 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Completion Listener Example</h1>
 
-     <p>This example shows you how to send a message asynchronously to ActiveMQ and use a CompletionListener to be notified of
+     <p>This example shows you how to send a message asynchronously to ActiveMQ Artemis and use a CompletionListener to be notified of
      the Broker receiving it</p>
 
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jms-context/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/readme.html b/examples/jms/jms-context/readme.html
index 6a856f5..253fe1b 100644
--- a/examples/jms/jms-context/readme.html
+++ b/examples/jms/jms-context/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Context Example</title>
+    <title>ActiveMQ Artemis JMS Context 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Context Example</h1>
 
-     <p>This example shows you how to send and receive a message to a JMS Queue using ActiveMQ by using a JMS Context</p>
+     <p>This example shows you how to send and receive a message to a JMS Queue using ActiveMQ Artemis by using a JMS Context</p>
      <p>A JMSContext is part of JMS 2.0 and combines the JMS Connection and Session Objects into a simple Interface</p>
 
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jms-shared-consumer/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/readme.html b/examples/jms/jms-shared-consumer/readme.html
index b5453d0..54e57f9 100644
--- a/examples/jms/jms-shared-consumer/readme.html
+++ b/examples/jms/jms-shared-consumer/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Shared Consumer Example</title>
+    <title>ActiveMQ Artemis JMS Shared Consumer 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-artemis/blob/a17c828b/examples/jms/jmx/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/readme.html b/examples/jms/jmx/readme.html
index a606617..462ec6a 100644
--- a/examples/jms/jmx/readme.html
+++ b/examples/jms/jmx/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMX Management Example</title>
+    <title>ActiveMQ Artemis JMX Management 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>
@@ -27,11 +27,11 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMX Management Example</h1>
 
-     <p>This example shows how to manage ActiveMQ using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p>
+     <p>This example shows how to manage ActiveMQ Artemis using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p>
 
      <h2>Example configuration</h2>
 
-     <p>ActiveMQ exposes its managed resources by default on the platform MBeanServer.</p>
+     <p>ActiveMQ Artemis 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
@@ -41,7 +41,7 @@ under the License.
         </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 sake).</p>        
-        <p>With these properties, ActiveMQ server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p> 
+        <p>With these properties, ActiveMQ Artemis server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p> 
      </p>
          
      <h2>Example step-by-step</h2>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java b/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
index 96d9874..3c82586 100644
--- a/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
+++ b/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
@@ -39,7 +39,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * An example that shows how to manage ActiveMQ using JMX.
+ * An example that shows how to manage ActiveMQ Artemis using JMX.
  */
 public class JMXExample extends ActiveMQExample
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
index b167295..7a30153 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
@@ -38,7 +38,7 @@ under the License.
       <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
-      <!-- true to expose ActiveMQ resources through JMX -->
+      <!-- true to expose ActiveMQ Artemis resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>
 
       <!-- Acceptors -->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/large-message/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/readme.html b/examples/jms/large-message/readme.html
index ee3abf7..6f0e6f8 100644
--- a/examples/jms/large-message/readme.html
+++ b/examples/jms/large-message/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Large Message Example</title>
+    <title>ActiveMQ Artemis Large Message 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>
@@ -27,19 +27,19 @@ under the License.
   <body onload="prettyPrint()">
      <h1>Large Message Example</h1>
 
-     <p>This example shows you how to send and receive very large messages with ActiveMQ.</p>
-     <p>ActiveMQ supports the sending and receiving of huge messages, much larger than can fit in available RAM
+     <p>This example shows you how to send and receive very large messages with ActiveMQ Artemis.</p>
+     <p>ActiveMQ Artemis supports the sending and receiving of huge messages, much larger than can fit in available RAM
      on the client or server. Effectively the only limit to message size is the amount of disk space you have on the server.</p>
-     <p>Large messages are persisted on the server so they can survive a server restart. In other words ActiveMQ doesn't just
+     <p>Large messages are persisted on the server so they can survive a server restart. In other words ActiveMQ Artemis doesn't just
      do a simple socket stream from the sender to the consumer.</p>
-     <p>In order to do this ActiveMQ provides an extension to JMS where you can use an InputStream or OutputStream as the source and destination for your messages. You can send messages as large as it would fit in your disk.</p>
+     <p>In order to do this ActiveMQ Artemis provides an extension to JMS where you can use an InputStream or OutputStream as the source and destination for your messages. You can send messages as large as it would fit in your disk.</p>
      <p>You may also choose to read LargeMessages using the regular ByteStream or ByteMessage methods, but using the InputStream and OutputStream will provide you a much better performance</p>
 
      <h2>Example step-by-step</h2>     
      <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
      <p>In this example we limit both the server and the client to be running in a maximum of 50MB of RAM,
      and we send a message with a body of size 256MB.</p>
-     <p>ActiveMQ can support much large message sizes but we
+     <p>ActiveMQ Artemis can support much large message sizes but we
      choose these sizes and limit RAM so the example runs more quickly.</p>
      <p>We create a file on disk representing the message body, create
      a FileInputStream on that file and set that InputStream as the body of the message before sending.</p>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java b/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
index ee4b6d1..0592115 100644
--- a/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
+++ b/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
@@ -36,7 +36,7 @@ import javax.naming.InitialContext;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * This example demonstrates the ability of ActiveMQ to send and consume a very large message, much
+ * This example demonstrates the ability of ActiveMQ Artemis to send and consume a very large message, much
  * bigger than can fit in RAM.
  */
 public class LargeMessageExample extends ActiveMQExample

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/last-value-queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/readme.html b/examples/jms/last-value-queue/readme.html
index 260ef8a..303c136 100644
--- a/examples/jms/last-value-queue/readme.html
+++ b/examples/jms/last-value-queue/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Last-Value Queue Example</title>
+    <title>ActiveMQ Artemis Last-Value 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/management-notifications/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/readme.html b/examples/jms/management-notifications/readme.html
index 5075360..20406cb 100644
--- a/examples/jms/management-notifications/readme.html
+++ b/examples/jms/management-notifications/readme.html
@@ -19,15 +19,15 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Management Notification Example</title>
+    <title>ActiveMQ Artemis Management Notification 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>Management Notification Example</h1>
-     <p>This example shows how to receive management notifications from ActiveMQ using JMS Messages.</p>
-     <p>ActiveMQ servers emit management notifications when events of interest occur (consumers are created or closed,
+     <p>This example shows how to receive management notifications from ActiveMQ Artemis using JMS Messages.</p>
+     <p>ActiveMQ Artemis servers emit management notifications when events of interest occur (consumers are created or closed,
          destinations are created or deleted, security authentication fails, etc.).<br />
          These notifications can be received either by using JMX (see <a href="../jmx/readme.html">JMX example</a>) or by receiving JMS Messages
          from a well-known destination.</p>
@@ -36,7 +36,7 @@ under the License.
      
      <h2>Example configuration</h2>
 
-     <p>ActiveMQ can configured to send JMS messages when management notifications are emitted on the server.</p>
+     <p>ActiveMQ Artemis can configured to send JMS messages when management notifications are emitted on the server.</p>
      <p>By default, the management name is called <code>activemq.notifications</code> but this can be configured in <a href="server0/broker.xml">broker.xml</a>.
         For this example, we will set it to <code>jms.topic.notificationsTopic</code> to be able to receive notifications from a JMS Topic.</p>
       <pre class="prettyprint">
@@ -184,7 +184,7 @@ under the License.
             ------------------------
             </code>
         </pre>
-        <p>The notification tells us that a user named <code>not.a.valid.user</code> failed to authenticate when creating a connection to ActiveMQ.</p>
+        <p>The notification tells us that a user named <code>not.a.valid.user</code> failed to authenticate when creating a connection to ActiveMQ Artemis.</p>
         
         <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/management/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/management/readme.html b/examples/jms/management/readme.html
index b7ec5cf..423d41e 100644
--- a/examples/jms/management/readme.html
+++ b/examples/jms/management/readme.html
@@ -19,19 +19,19 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Management Example</title>
+    <title>ActiveMQ Artemis Management 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>Management Example</h1>
-     <p>This example shows how to manage ActiveMQ using JMS Messages to invoke management operations on the server.</a></p>
-     <p>To manage ActiveMQ using JMX, see the <a href="../jmx/readme.html">JMX</a> example.</p>
+     <p>This example shows how to manage ActiveMQ Artemis using JMS Messages to invoke management operations on the server.</a></p>
+     <p>To manage ActiveMQ Artemis using JMX, see the <a href="../jmx/readme.html">JMX</a> example.</p>
      
      <h2>Example configuration</h2>
 
-     <p>ActiveMQ can be managed by sending JMS messages with specific properties to its <em>management</em> queue.</p>
+     <p>ActiveMQ Artemis can be managed by sending JMS messages with specific properties to its <em>management</em> queue.</p>
      </p>By default, the management name is called <code>activemq.management</code> but this can be configured in <a href="server0/broker.xml">broker.xml</a>
      <pre class="prettyprint">
          <code>&lt;management-address&gt;activemq.management&lt;/management-address&gt;</code>
@@ -111,7 +111,7 @@ under the License.
             <code>Message m = session.createMessage();</code>
         </pre>
         
-        <li>a <em>management</em> message has well-defined properties that ActiveMQ server needs to know to perform management operations.<br />
+        <li>a <em>management</em> message has well-defined properties that ActiveMQ Artemis server needs to know to perform management operations.<br />
             We use a helper class <code>JMSManagementHelper</code> to fill these properties:
             <ul>
                 <li>The name of the resource to manage <code>jms.queue.exampleQueue</code> 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java b/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
index 3d06296..be4da58 100644
--- a/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
+++ b/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * An example that shows how to manage ActiveMQ using JMS messages.
+ * An example that shows how to manage ActiveMQ Artemis using JMS messages.
  */
 public class ManagementExample extends ActiveMQExample
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/message-counters/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index e4b2fb4..8a7f4c2 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Message Counter Example</title>
+    <title>ActiveMQ Artemis Message Counter 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>
@@ -41,9 +41,9 @@ under the License.
      </pre>
      <p>By default, Message counter is not enabled (for performance reason). To enable them, set <code>message-counter-enabled</code> to <code>true</code>.<br />
      Queues are sampled every 10 seconds by default. For this example we will reduce it to 2 seconds by setting <code>message-counter-sample-period</code> to <code>2000</code>.<br />
-     ActiveMQ holds in memory the message counters' history for a maximum number of days (10 by default). We can change the number of days the history is kept by setting
+     ActiveMQ Artemis holds in memory the message counters' history for a maximum number of days (10 by default). We can change the number of days the history is kept by setting
          the <code>message-counter-max-day-history</code> parameter.</p>
-     <p>The sample period and the max day history parameters have an small impact on the performance of ActiveMQ (the resources taken to sample a queue are not available to the system's
+     <p>The sample period and the max day history parameters have an small impact on the performance of ActiveMQ Artemis (the resources taken to sample a queue are not available to the system's
          normal use). You should set these parameters accordingly to the use and throughput of your messages.</p>
          
      <h2>Example step-by-step</h2>
@@ -87,7 +87,7 @@ under the License.
         
         <p>We now need to retrieve the message counters. They're available from the JMS Queue management resource. In this example, we
             will retrieve them using JMX (see the <a href="../jmx/readme.html">JMX example</a> for a more complete description). You can also use JMS message to retrieve them (see the <a href="../management/readme.html">Management example</a> to
-            learn about managing ActiveMQ using JMS messages).</p>
+            learn about managing ActiveMQ Artemis using JMS messages).</p>
 
        <li>We retrieve the JMX MBean used to manage the JMS queue</li>
         <pre class="prettyprint">

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/message-group/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/readme.html b/examples/jms/message-group/readme.html
index de90fe8..e44aa51 100644
--- a/examples/jms/message-group/readme.html
+++ b/examples/jms/message-group/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Message Group Example</title>
+    <title>ActiveMQ Artemis Message Group 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>Message Group Example</h1>
 
-     <p>This example shows you how to configure and use message groups with ActiveMQ.</p>
+     <p>This example shows you how to configure and use message groups with ActiveMQ Artemis.</p>
      
      <p>Message groups are sets of messages that has the following characteristics: </p>
      <li>Messages in a message group share the same group id, i.e. they have same JMSXGroupID string property values.</li>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/message-group2/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/readme.html b/examples/jms/message-group2/readme.html
index 26e4c92..a5d85ac 100644
--- a/examples/jms/message-group2/readme.html
+++ b/examples/jms/message-group2/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Message Group Example</title>
+    <title>ActiveMQ Artemis Message Group 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>Message Group Example</h1>
 
-     <p>This example shows you how to configure and use message groups via a connection factory with ActiveMQ.</p>
+     <p>This example shows you how to configure and use message groups via a connection factory with ActiveMQ Artemis.</p>
      
      <p>Message groups are sets of messages that has the following characteristics: </p>
      <li>Messages in a message group share the same group id, i.e. they have same JMSXGroupID string property values.</li>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/message-priority/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/readme.html b/examples/jms/message-priority/readme.html
index 7380f57..96af7e2 100644
--- a/examples/jms/message-priority/readme.html
+++ b/examples/jms/message-priority/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Message Priority Example</title>
+    <title>ActiveMQ Artemis JMS Message Priority 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-artemis/blob/a17c828b/examples/jms/no-consumer-buffering/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/readme.html b/examples/jms/no-consumer-buffering/readme.html
index aa64266..f05480b 100644
--- a/examples/jms/no-consumer-buffering/readme.html
+++ b/examples/jms/no-consumer-buffering/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ No Consumer Buffering Example</title>
+    <title>ActiveMQ Artemis No Consumer Buffering 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>
@@ -27,12 +27,12 @@ under the License.
   <body onload="prettyPrint()">
      <h1>No Consumer Buffering Example</h1>
 
-     <p>By default, ActiveMQ consumers buffer messages from the server in a client side buffer
+     <p>By default, ActiveMQ Artemis consumers buffer messages from the server in a client side buffer
      before actual delivery actually occurs.</p>
      <p>This improves performance since otherwise every time you called receive() or had processed the last
-     message in a MessageListener onMessage() method, the ActiveMQ client would have to go the
+     message in a MessageListener onMessage() method, the ActiveMQ Artemis client would have to go the
      server to request the next message involving a network round trip for every message reducing performance.</p>
-     <p>Therefore, by default, ActiveMQ pre-fetches messages into a buffer on each consumer. The total maximum size of
+     <p>Therefore, by default, ActiveMQ Artemis pre-fetches messages into a buffer on each consumer. The total maximum size of
      messages in bytes that will be buffered on each consumer is determined by the <code>consumer-window-size</code>
      parameter on the connection factory.</p>
      <p>In some cases it is not desirable to buffer any messages on the client side consumer.</p>
@@ -42,7 +42,7 @@ under the License.
      to process orders which were already in the client side buffer of another consumer.</p>
      <p>To turn off client side buffering of messages, set <code>consumer-window-size</code> to zero.</p>
      
-     <p>With ActiveMQ you can specify a maximum consume rate at which a JMS MessageConsumer will consume messages.
+     <p>With ActiveMQ Artemis 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>activemq-jms.xml</code></p>
      <h2>Example step-by-step</h2>
      <p>In this example we specify a <code>consumer-window-size</code> of <code>0</code> bytes in the <code>activemq-jms.xml</code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
index a5588f4..1c42535 100644
--- a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
+++ b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
@@ -28,7 +28,7 @@ import javax.naming.InitialContext;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * This example demonstrates how ActiveMQ consumers can be configured to not buffer any messages from
+ * This example demonstrates how ActiveMQ Artemis consumers can be configured to not buffer any messages from
  * the server.
  */
 public class NoConsumerBufferingExample extends ActiveMQExample

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/non-transaction-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/readme.html b/examples/jms/non-transaction-failover/readme.html
index c5c552f..0e83d37 100644
--- a/examples/jms/non-transaction-failover/readme.html
+++ b/examples/jms/non-transaction-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Failover Without Transactions Example</title>
+    <title>ActiveMQ Artemis 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>
@@ -34,7 +34,7 @@ under the License.
         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 ActiveMQ failover and HA, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/openwire/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/readme.html b/examples/jms/openwire/readme.html
index 5ab6f25..df1e272 100644
--- a/examples/jms/openwire/readme.html
+++ b/examples/jms/openwire/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ OpenWire Example</title>
+    <title>ActiveMQ Artemis OpenWire 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>
@@ -27,13 +27,13 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS OpenWire Example</h1>
 
-     <p>This example shows you how to configure ActiveMQ server to communicate with an ActiveMQ JMS client using ActiveMQ's native openwire protocol.</p>
+     <p>This example shows you how to configure ActiveMQ Artemis server to communicate with an ActiveMQ Artemis JMS client using ActiveMQ's native openwire protocol.</p>
 
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
 
      <ol>
-        <li>First we need to create an ActiveMQ connection factory.</code></li>
+        <li>First we need to create an ActiveMQ Artemis connection factory.</code></li>
         <pre class="prettyprint">
            <code>ConnectionFactory factory = new ActiveMQConnectionFactory(urlString);</code>
         </pre>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java b/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
index 59eb72c..771d875 100644
--- a/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
+++ b/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
@@ -51,7 +51,7 @@ public class OpenWireExample extends ActiveMQExample
       {
          String urlString = "tcp://" + OWHOST + ":" + OWPORT;
 
-         // Step 1. Create an ActiveMQ Connection Factory
+         // Step 1. Create an ActiveMQ Artemis Connection Factory
          ConnectionFactory factory = new ActiveMQConnectionFactory(urlString);
 
          // Step 2. Create the target queue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
index 73823a6..dbb0ca6 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
@@ -49,7 +49,7 @@ under the License.
       <!-- Other config -->
 
       <security-settings>
-         <security-setting match="jms.topic.ActiveMQ.Advisory.#">
+         <security-setting match="jms.topic.ActiveMQ Artemis.Advisory.#">
             <permission type="createNonDurableQueue" roles="guest"/>
             <permission type="consume" roles="guest"/>
             <permission type="send" roles="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/paging/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/paging/readme.html b/examples/jms/paging/readme.html
index 841d517..938d087 100644
--- a/examples/jms/paging/readme.html
+++ b/examples/jms/paging/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Paging Example</title>
+    <title>ActiveMQ Artemis Paging 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>Paging Example</h1>
 
-     <p>This example shows how ActiveMQ would avoid running out of memory resources by paging messages.</p>
+     <p>This example shows how ActiveMQ Artemis would avoid running out of memory resources by paging messages.</p>
      <p>A maxSize can be specified per Destination via the destinations settings configuration file (broker.xml).</p>
      <p>When messages routed to an address exceed the specified maxSize the server will begin to write messages to the file
      system, this is called paging. This will continue to occur until messages have been delivered to consumers and subsequently
@@ -133,7 +133,7 @@ under the License.
          </pre></code>
          
          
-         <li>Receive the messages. It's important to ACK for messages as ActiveMQ will not read messages from paging until messages are ACKed</li>
+         <li>Receive the messages. It's important to ACK for messages as ActiveMQ Artemis will not read messages from paging until messages are ACKed</li>
          
          <pre class="prettyprint"><code>
          for (int i = 0; i < 30000; i++)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
index becef16..bffb316 100644
--- a/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
+++ b/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
@@ -104,7 +104,7 @@ public class PagingExample extends ActiveMQExample
          // Step 16. Start the JMS Connection. This step will activate the subscribers to receive messages.
          connection.start();
 
-         // Step 17. Receive the messages. It's important to ACK for messages as ActiveMQ will not read messages from
+         // Step 17. Receive the messages. It's important to ACK for messages as ActiveMQ Artemis will not read messages from
          // paging
          // until messages are ACKed
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/perf/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/perf/readme.html b/examples/jms/perf/readme.html
index dcf1772..c3d44c2 100644
--- a/examples/jms/perf/readme.html
+++ b/examples/jms/perf/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Queue Selector Example</title>
+    <title>ActiveMQ Artemis JMS Queue 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-artemis/blob/a17c828b/examples/jms/pre-acknowledge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/readme.html b/examples/jms/pre-acknowledge/readme.html
index f322628..893423c 100644
--- a/examples/jms/pre-acknowledge/readme.html
+++ b/examples/jms/pre-acknowledge/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Pre-Acknowledge Example</title>
+    <title>ActiveMQ Artemis JMS Pre-Acknowledge 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>
@@ -42,8 +42,8 @@ under the License.
      <p>An example of a use-case where it might be a good idea to use pre-acknowledge, is for stock price update
      messages. With these messages it might be ok to lose a message in event of crash, since the next price
      update message will arrive soon, overriding the previous price.</p>
-     <p>In order to use pre-acknowledge functionality with ActiveMQ the session has to be created with
-     a special, ActiveMQ specific acknowledgement mode, given by the value of
+     <p>In order to use pre-acknowledge functionality with ActiveMQ Artemis the session has to be created with
+     a special, ActiveMQ Artemis specific acknowledgement mode, given by the value of
      <code>ActiveMQJMSConstants.PRE_ACKNOWLEDGE</code>.     
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
index 1150007..9cf7114 100644
--- a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
+++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * This example demonstrates the use of ActiveMQ "pre-acknowledge" functionality where
+ * This example demonstrates the use of ActiveMQ Artemis "pre-acknowledge" functionality where
  * messages are acknowledged before they are delivered to the consumer.
  *
  * Please see the readme.html for more details.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/producer-rate-limit/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/readme.html b/examples/jms/producer-rate-limit/readme.html
index b6394fb..a2615ea 100644
--- a/examples/jms/producer-rate-limit/readme.html
+++ b/examples/jms/producer-rate-limit/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Message Producer Rate Limiting</title>
+    <title>ActiveMQ Artemis JMS Message Producer 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>
@@ -27,9 +27,9 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Message Producer Rate Limiting</h1>
 
-     <p>With ActiveMQ you can specify a maximum send rate at which a JMS MessageProducer will send messages.
+     <p>With ActiveMQ Artemis you can specify a maximum send rate at which a JMS MessageProducer will send messages.
      This can be specified when creating or deploying the connection factory. See <code>activemq-jms.xml</code></p>
-     <p>If this value is specified then ActiveMQ will ensure that messages are never produced at a rate higher than
+     <p>If this value is specified then ActiveMQ Artemis will ensure that messages are never produced at a rate higher than
      specified. This is a form of producer <i>throttling</i>.</p>     
      <h2>Example step-by-step</h2>
      <p>In this example we specify a <code>producer-max-rate</code> of <code>50</code> messages per second in the <code>activemq-jms.xml</code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/proton-cpp/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/readme.html b/examples/jms/proton-cpp/readme.html
index 61d63ad..1e51091 100644
--- a/examples/jms/proton-cpp/readme.html
+++ b/examples/jms/proton-cpp/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
 <head>
-    <title>ActiveMQ QPID cpp example</title>
+    <title>ActiveMQ Artemis QPID cpp 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>
@@ -27,7 +27,7 @@ under the License.
 <body onload="prettyPrint()">
 <h1>AMQP CPP example</h1>
 
-<p>ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
+<p>ActiveMQ Artemis is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
 <p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
 <p>To run this example simply run the command <literal>mvn verify -Pexample</literal>, execute the compile.sh script and start the executable called ./hello</p>
 <pre>
@@ -46,8 +46,8 @@ under the License.
 </pre>
 
 
-<p>You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. </p>
-<p>Just for the sake of documentation though we are setting the port of ActiveMQ on this example as 5672 which is the port qpid have by default. </p>
+<p>You don't need to do anything special to configure the ActiveMQ Artemis server to accept AMQP clients. </p>
+<p>Just for the sake of documentation though we are setting the port of ActiveMQ Artemis on this example as 5672 which is the port qpid have by default. </p>
 <p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
      <pre class="prettyprint">
      <code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java b/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
index 172e83e..245ecd1 100644
--- a/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
+++ b/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
@@ -36,7 +36,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
 import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
- * This example demonstrates the use of ActiveMQ "pre-acknowledge" functionality where
+ * This example demonstrates the use of ActiveMQ Artemis "pre-acknowledge" functionality where
  * messages are acknowledged before they are delivered to the consumer.
  *
  * Please see the readme.html for more details.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/proton-j/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/readme.html b/examples/jms/proton-j/readme.html
index 9eba7af..7a5c88a 100644
--- a/examples/jms/proton-j/readme.html
+++ b/examples/jms/proton-j/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
 <head>
-    <title>ActiveMQ QPID java example</title>
+    <title>ActiveMQ Artemis QPID java 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>
@@ -27,12 +27,12 @@ under the License.
 <body onload="prettyPrint()">
 <h1>Proton qpid java example</h1>
 
-<<p>ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
+<<p>ActiveMQ Artemis is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
 <p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
 <p>To run this example simply run the command <literal>mvn verify -Pexample</literal>, execute the compile.sh script and start the executable called ./hello</p>
 
-<p>You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. </p>
-<p>Just for the sake of documentation though we are setting the port of ActiveMQ on this example as 5672 which is the port qpid have by default. </p>
+<p>You don't need to do anything special to configure the ActiveMQ Artemis server to accept AMQP clients. </p>
+<p>Just for the sake of documentation though we are setting the port of ActiveMQ Artemis on this example as 5672 which is the port qpid have by default. </p>
 <p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
      <pre class="prettyprint">
      <code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/proton-ruby/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/readme.html b/examples/jms/proton-ruby/readme.html
index bd4537f..0277e7b 100644
--- a/examples/jms/proton-ruby/readme.html
+++ b/examples/jms/proton-ruby/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Proton Ruby Example</title>
+    <title>ActiveMQ Artemis Proton Ruby 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>Proton Ruby Example</h1>
 
-     <p>ActiveMQ can be configured to accept requests from any AMQP client that supports the 1.0 version of the protocol.
+     <p>ActiveMQ Artemis can be configured to accept requests from any AMQP client that supports the 1.0 version of the protocol.
      This example shows a simply proton ruby client that sends and receives messages</p>
      <p>To run the example you will need the following packages installed, alsa-lib.i686 libXv.i686 libXScrnSaver.i686 qt.i686 qt-x11.i686 qtwebkit-2.2.2-2.fc18.i686, gcc, ruby</p>
      <p>On fedora you can install these via the <literal>yum install alsa-lib.i686 libXv.i686 libXScrnSaver.i686 qt.i686 qt-x11.i686 qtwebkit-2.2.2-2.fc18.i686, gcc, ruby</literal>
@@ -35,7 +35,7 @@ under the License.
      <p>you will also need the qpid-proton libraries installed, again <literal>yum install qpid-proton</literal></p>
      <p>lastly you wull have to create the gems <literal>gem install qpid_proton</literal></p>
 
-     <p>To configure ActiveMQ to accept AMQP client connections you need to add an Acceptor like so:</p>
+     <p>To configure ActiveMQ Artemis to accept AMQP client connections you need to add an Acceptor like so:</p>
      <pre class="prettyprint">
      <code>
      &lt;acceptor name="proton-acceptor"&gt;tcp://localhost:5672?protocols=AMQP&lt;/acceptor&gt;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/queue-message-redistribution/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/readme.html b/examples/jms/queue-message-redistribution/readme.html
index 7fc43fb..386e046 100644
--- a/examples/jms/queue-message-redistribution/readme.html
+++ b/examples/jms/queue-message-redistribution/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Message Redistribution Example</title>
+    <title>ActiveMQ Artemis Message Redistribution 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>
@@ -30,10 +30,10 @@ under the License.
      <p>This example demonstrates message redistribution between queues with the same name deployed in different
      nodes of a cluster.</p>
      <p>As demontrated in the clustered queue example, if queues with the same name are deployed on different nodes of
-     a cluster, ActiveMQ can be configured to load balance messages between the nodes on the server side.</p>
+     a cluster, ActiveMQ Artemis can be configured to load balance messages between the nodes on the server side.</p>
      <p>However, if the consumer(s) on a particular node are closed, then messages in the queue at that node can
      appear to be stranded, since they have no local consumers.</p>
-     <p>If this is undesirable, ActiveMQ can be configured to <b>redistribute</b> messages from the node
+     <p>If this is undesirable, ActiveMQ Artemis can be configured to <b>redistribute</b> messages from the node
      with no consumers, to nodes where there are consumers. If the consumers have JMS selectors set on them, then they
      will only be redistributed to nodes with consumers whose selectors match.</p>
      <p>By default, message redistribution is disabled, but can be enabled by specifying some AddressSettings configuration
@@ -52,7 +52,7 @@ under the License.
    &lt;/address-setting&gt;
    </code>
      </pre>    
-     <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ Artemis 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 -Pexample</code> from this directory</i></p>
@@ -155,8 +155,8 @@ under the License.
         
         <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.
-         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
+         ActiveMQ Artemis has <b>load balanced</b> the messages between the available consumers on the different nodes.
+         ActiveMQ Artemis 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.
@@ -191,7 +191,7 @@ under the License.
         </pre>
         
         <li>Since there is no more consumer on node 1, the messages on node 1 are now stranded (no local consumers)
-        so ActiveMQ will redistribute them to node 0 so they can be consumed. We consume them from
+        so ActiveMQ Artemis will redistribute them to node 0 so they can be consumed. We consume them from
         node 0.</li>
         <pre class="prettyprint">
            <code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
index b9eb17c..b731e68 100644
--- a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
+++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
@@ -148,7 +148,7 @@ public class QueueMessageRedistributionExample extends ActiveMQExample
 
          // Step 17. Since there is no more consumer on node 1, the messages on node 1 are now stranded (no local
          // consumers)
-         // so ActiveMQ will redistribute them to node 0 so they can be consumed.
+         // so ActiveMQ Artemis will redistribute them to node 0 so they can be consumed.
 
          for (int i = 0; i < numMessages; i += 2)
          {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/queue-requestor/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/readme.html b/examples/jms/queue-requestor/readme.html
index c9b41b0..416406a 100644
--- a/examples/jms/queue-requestor/readme.html
+++ b/examples/jms/queue-requestor/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS QueueRequestor Example</title>
+    <title>ActiveMQ Artemis JMS QueueRequestor 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS QueueRequestor Example</h1>
 
-     <p>This example shows you how to use a <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueRequestor.html">QueueRequestor</a> with ActiveMQ.</p>
+     <p>This example shows you how to use a <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueRequestor.html">QueueRequestor</a> with ActiveMQ Artemis.</p>
      <p>JMS is mainly used to send messages asynchronously so that the producer of a message is not waiting for the result of the message consumption.
         However, there are cases where it is necessary to have a synchronous behavior: the code sending a message requires a reply for this message
         before continuing its execution.<br />

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/queue-selector/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/readme.html b/examples/jms/queue-selector/readme.html
index eb9598b..4af57ba 100644
--- a/examples/jms/queue-selector/readme.html
+++ b/examples/jms/queue-selector/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Queue Selector Example</title>
+    <title>ActiveMQ Artemis JMS Queue 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-artemis/blob/a17c828b/examples/jms/queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/queue/readme.html b/examples/jms/queue/readme.html
index 43d3c40..788f9b7 100644
--- a/examples/jms/queue/readme.html
+++ b/examples/jms/queue/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Queue Example</title>
+    <title>ActiveMQ Artemis JMS 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Queue Example</h1>
 
-     <p>This example shows you how to send and receive a message to a JMS Queue using ActiveMQ.</p>
+     <p>This example shows you how to send and receive a message to a JMS Queue using ActiveMQ Artemis.</p>
      <p>Queues are a standard part of JMS, please consult the JMS 1.1 specification for full details.</p>
      <p>A Queue is used to send messages point to point, from a producer to a consumer. The queue guarantees message ordering between these 2 points.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/reattach-node/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/readme.html b/examples/jms/reattach-node/readme.html
index 6ec2da6..36fbfa2 100644
--- a/examples/jms/reattach-node/readme.html
+++ b/examples/jms/reattach-node/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Automatic Reattach Example</title>
+    <title>ActiveMQ Artemis JMS Automatic Reattach 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Reattach Example</h1>
 
-     <p>This example demonstrates how ActiveMQ connections can be configured to be resilient to
+     <p>This example demonstrates how ActiveMQ Artemis connections can be configured to be resilient to
      temporary network failures.</p>
      <p>In the case of a network failure being detected, either as a result of a failure to read/write to the connection,
      or the failure of a pong to arrive back from the server in good time after a ping is sent, instead of
@@ -47,7 +47,7 @@ under the License.
      related attributes in the <code>activemq-jms.xml</code> file.</p>
 
      <p>For more details on how to configure this and for clustering in general
-     please consult the ActiveMQ user manual.</p>
+     please consult the ActiveMQ Artemis user manual.</p>
 
      <h2>Example step-by-step</h2>
      <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/replicated-failback-static/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/readme.html b/examples/jms/replicated-failback-static/readme.html
index 1682921..1dfb8b6 100644
--- a/examples/jms/replicated-failback-static/readme.html
+++ b/examples/jms/replicated-failback-static/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Failback using Static selectors Example</title>
+    <title>ActiveMQ Artemis JMS Failback using Static selectors 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>
@@ -30,7 +30,7 @@ under the License.
      <p>This example demonstrates three servers coupled as a live-backup-backup group for high availability (HA) using replication, and a client
      connection failing over from live to backup when the live server is crashed and then to the second backup once the new live fails.</p>
 
-     <p>For more information on ActiveMQ failover and HA, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/replicated-failback/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/readme.html b/examples/jms/replicated-failback/readme.html
index a950520..c42eaa1 100644
--- a/examples/jms/replicated-failback/readme.html
+++ b/examples/jms/replicated-failback/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Multiple Failover using Replication Example</title>
+    <title>ActiveMQ Artemis JMS Multiple Failover using Replication 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>
@@ -32,7 +32,7 @@ under the License.
      <p>This example demonstrates three servers coupled as a live-backup-backup group for high availability (HA) using replication, and a client
      connection failing over from live to backup when the live server is crashed and then to the second backup once the new live fails.</p>
 
-     <p>For more information on ActiveMQ failover and HA, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/replicated-multiple-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/readme.html b/examples/jms/replicated-multiple-failover/readme.html
index cce6ea0..d852f8f 100644
--- a/examples/jms/replicated-multiple-failover/readme.html
+++ b/examples/jms/replicated-multiple-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Multiple Failover using Replication Example</title>
+    <title>ActiveMQ Artemis JMS Multiple Failover using Replication 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>
@@ -30,7 +30,7 @@ under the License.
      <p>This example demonstrates three servers coupled as a live-backup-backup group for high availability (HA) using replication, and a client
      connection failing over from live to backup when the live server is crashed and then to the second backup once the new live fails.</p>
 
-     <p>For more information on ActiveMQ failover and HA, and clustering in general, please see the clustering
+     <p>For more information on ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/replicated-transaction-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/readme.html b/examples/jms/replicated-transaction-failover/readme.html
index 0586519..f61b3ba 100644
--- a/examples/jms/replicated-transaction-failover/readme.html
+++ b/examples/jms/replicated-transaction-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Failover With Transaction using Replication Example</title>
+    <title>ActiveMQ Artemis JMS Failover With Transaction using Replication 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,8 +36,8 @@ under the License.
            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>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
+     <p>ActiveMQ Artemis also provides an example for <a href="../non-transactional-failover/readme.html">non-transaction failover</a>.</p>
+     <p>For more information on ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/request-reply/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/readme.html b/examples/jms/request-reply/readme.html
index 87cd829..cdd7474 100644
--- a/examples/jms/request-reply/readme.html
+++ b/examples/jms/request-reply/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Request-Reply Example</title>
+    <title>ActiveMQ Artemis JMS Request-Reply 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-artemis/blob/a17c828b/examples/jms/rest/dup-send/README.txt
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/README.txt b/examples/jms/rest/dup-send/README.txt
index da8eb48..0e794b8 100644
--- a/examples/jms/rest/dup-send/README.txt
+++ b/examples/jms/rest/dup-send/README.txt
@@ -15,7 +15,7 @@ To run the example you will need 3 shell-script windows (or you'll need to run 2
 Step 1:
 $ mvn jetty:run
 
-This will bring up ActiveMQ and the ActiveMQ REST Interface.
+This will bring up ActiveMQ Artemis and the ActiveMQ Artemis REST Interface.
 
 Step 2:
 $ mvn exec:java -Dexec.mainClass="ReceiveOrder"

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/rest/javascript-chat/README.txt
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/README.txt b/examples/jms/rest/javascript-chat/README.txt
index 71dc2dc..ae0e57c 100644
--- a/examples/jms/rest/javascript-chat/README.txt
+++ b/examples/jms/rest/javascript-chat/README.txt
@@ -9,7 +9,7 @@ The example is a very simple chat application between two browser windows.
 Step 1:
 $ mvn jetty:run
 
-This will bring up ActiveMQ and the ActiveMQ REST Interface.
+This will bring up ActiveMQ Artemis and the ActiveMQ Artemis REST Interface.
 
 Step 2:
 Bring up two browsers and point them to http://localhost:9095.  In the textbox type a message you want to send.  Click

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/rest/jms-to-rest/README.txt
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/README.txt b/examples/jms/rest/jms-to-rest/README.txt
index 1da9575..f012d94 100644
--- a/examples/jms/rest/jms-to-rest/README.txt
+++ b/examples/jms/rest/jms-to-rest/README.txt
@@ -12,7 +12,7 @@ To run the example you will need 5 shell-script windows (or you'll need to run 4
 Step 1:
 $ mvn jetty:run
 
-This will bring up ActiveMQ and the ActiveMQ REST Interface.
+This will bring up ActiveMQ Artemis and the ActiveMQ Artemis REST Interface.
 
 Step 2:
 $ mvn exec:java -Dexec.mainClass="RestReceive"

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/rest/push/README.txt
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/README.txt b/examples/jms/rest/push/README.txt
index 470d594..307e444 100644
--- a/examples/jms/rest/push/README.txt
+++ b/examples/jms/rest/push/README.txt
@@ -3,14 +3,14 @@ You will need JDK 1.6 and Maven to run this example.  This example has been test
 with earlier or later versions of Maven.
 
 
-This is an example of having the ActiveMQ REST interface forward a posted message to a registered URL.
+This is an example of having the ActiveMQ Artemis REST interface forward a posted message to a registered URL.
 
 To run the example you will need 3 shell-script windows (or you'll need to run 2 processes in background)
 
 Step 1:
 $ mvn jetty:run
 
-This will bring up ActiveMQ and the ActiveMQ REST Interface.  Two queues will be created.  An "order" queue and a "shipping"
+This will bring up ActiveMQ Artemis and the ActiveMQ Artemis REST Interface.  Two queues will be created.  An "order" queue and a "shipping"
 queue.  The server will forward posted messages to the "shipping" queue through a registered push subscription.
 
 Step 2:

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/scale-down/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/readme.html b/examples/jms/scale-down/readme.html
index d40341c..a73a170 100644
--- a/examples/jms/scale-down/readme.html
+++ b/examples/jms/scale-down/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ JMS Scale Down Example</title>
+    <title>ActiveMQ Artemis JMS 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-artemis/blob/a17c828b/examples/jms/scheduled-message/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/readme.html b/examples/jms/scheduled-message/readme.html
index 66f979b..b2d1621 100644
--- a/examples/jms/scheduled-message/readme.html
+++ b/examples/jms/scheduled-message/readme.html
@@ -19,7 +19,7 @@ under the License.
 
 <html>
   <head>
-    <title>ActiveMQ Scheduled Message Example</title>
+    <title>ActiveMQ Artemis Scheduled Message 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>
@@ -27,7 +27,7 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Scheduled Message Example</h1>
 
-     <p>This example shows you how to send a scheduled message to a JMS Queue using ActiveMQ.</p>
+     <p>This example shows you how to send a scheduled message to a JMS Queue using ActiveMQ Artemis.</p>
      <p>A Scheduled Message is a message that will be delivered at a time specified by the sender. To do this, 
      simply set a HDR_SCHEDULED_DELIVERY_TIME header property. The value of the property should be the time of 
      delivery in milliseconds. </p>


Mime
View raw message