You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/05/13 15:29:37 UTC
[1/6] activemq-artemis git commit: Ensure all references to the
project use ActiveMQ Artemis
Repository: activemq-artemis
Updated Branches:
refs/heads/master 085437161 -> d5f6aec08
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/security/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index 5bcd220..4cca6a0 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Security Example</title>
+ <title>ActiveMQ Artemis JMS Security 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,16 +27,16 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Security Example</h1>
- <p>This example shows how to configure and use security using ActiveMQ.</p>
+ <p>This example shows how to configure and use security using ActiveMQ Artemis.</p>
- <p>With security properly configured, ActiveMQ can restrict client access to its resources, including
+ <p>With security properly configured, ActiveMQ Artemis can restrict client access to its resources, including
connection creation, message sending/receiving, etc. This is done by configuring users and roles as well as permissions in
the configuration files. </p>
- <p>ActiveMQ supports wild-card security configuration. This feature makes security configuration very
+ <p>ActiveMQ Artemis supports wild-card security configuration. This feature makes security configuration very
flexible and enables fine-grained control over permissions in an efficient way.</p>
- <p>For a full description of how to configure security with ActiveMQ, please consult the user
+ <p>For a full description of how to configure security with ActiveMQ Artemis, please consult the user
manual.</p>
<p>This example demonstrates how to configure users/roles, how to configure topics with proper permissions using wild-card
@@ -75,8 +75,8 @@ under the License.
belongs to role 'europe-user', user 'frank' also belongs to 'us-user' and 'news-user' and user 'sam' also belongs to 'news-user'.
</p>
<p>
- User name and password consists of a valid account that can be used to establish connections to a ActiveMQ server, while
- roles are used in controlling the access privileges against ActiveMQ topics and queues. You can achieve this control by
+ User name and password consists of a valid account that can be used to establish connections to a ActiveMQ Artemis server, while
+ roles are used in controlling the access privileges against ActiveMQ Artemis topics and queues. You can achieve this control by
configuring proper permissions in <code>broker.xml</code>, like the following
</p>
<pre class="prettyprint"><code>
@@ -126,7 +126,7 @@ under the License.
<p>To illustrate the effect of permissions, three topics are deployed. Topic 'genericTopic' matches 'jms.topic.#' wild-card, topic 'news.europe.europeTopic' matches
jms.topic.news.europe.#' wild-cards, and topic 'news.us.usTopic' matches 'jms.topic.news.us.#'.</p>
- <p>With ActiveMQ, the security manager is also configurable. You can use JAASSecurityManager or JBossASSecurityManager based on you need. Please
+ <p>With ActiveMQ Artemis, the security manager is also configurable. You can use JAASSecurityManager or JBossASSecurityManager based on you need. Please
check out the activemq-beans.xml for how to do. In this example we just use the basic ActiveMQSecurityManagerImpl which reads users/roles/passwords from the xml
file <code>activemq-users.xml</code>.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/send-acknowledgements/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/readme.html b/examples/jms/send-acknowledgements/readme.html
index d89a77e..1077f32 100644
--- a/examples/jms/send-acknowledgements/readme.html
+++ b/examples/jms/send-acknowledgements/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Asynchronous Send Acknowledgements Example</title>
+ <title>ActiveMQ Artemis Asynchronous Send Acknowledgements 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>Asynchronous Send Acknowledgements Example</h1>
- <p>Asynchronous Send Acknowledgements are an advanced feature of ActiveMQ which allow you to
+ <p>Asynchronous Send Acknowledgements are an advanced feature of ActiveMQ Artemis which allow you to
receive acknowledgements that messages were successfully received at the server in a separate thread to the sending thread<p/>
<p>In this example we create a normal JMS session, then set a SendAcknowledgementHandler on the JMS
session's underlying core session. We send many messages to the server without blocking and asynchronously
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
index f1b0d0f..d6c5431 100644
--- a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
+++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQSession;
/**
*
- * Asynchronous Send Acknowledgements are an advanced feature of ActiveMQ which allow you to
+ * Asynchronous Send Acknowledgements are an advanced feature of ActiveMQ Artemis which allow you to
* receive acknowledgements that messages were successfully received at the server in a separate stream
* to the stream of messages being sent to the server.
* For more information please see the readme.html file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/spring-integration/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/readme.html b/examples/jms/spring-integration/readme.html
index 4125fe6..0861528 100644
--- a/examples/jms/spring-integration/readme.html
+++ b/examples/jms/spring-integration/readme.html
@@ -19,15 +19,15 @@ under the License.
<html>
<head>
- <title>ActiveMQ Spring Example</title>
+ <title>ActiveMQ Artemis Spring 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>ActiveMQ Spring Example</h1>
+ <h1>ActiveMQ Artemis Spring Example</h1>
- <p>This examples shows how to setup and run an embedded JMS server within a Spring ApplicationContext using ActiveMQ along with ActiveMQ configuration files.</p>
+ <p>This examples shows how to setup and run an embedded JMS server within a Spring ApplicationContext using ActiveMQ Artemis along with ActiveMQ Artemis configuration files.</p>
<h2>Example step-by-step</h2>
<p><i><b>YOU MUST DOWNLOAD THE SPRING LIBRARIES TO RUN THIS EXAMPLE!!!</b> You must also modify the build.xml file to include the spring jars. You'll see the placeholder that is already there.</i></p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/ssl-enabled/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/readme.html b/examples/jms/ssl-enabled/readme.html
index d851c2e..42db4de 100644
--- a/examples/jms/ssl-enabled/readme.html
+++ b/examples/jms/ssl-enabled/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS SSL Example</title>
+ <title>ActiveMQ Artemis JMS SSL 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 SSL Example</h1>
- <p>This example shows you how to configure SSL with ActiveMQ to send and receive message. </p>
+ <p>This example shows you how to configure SSL with ActiveMQ Artemis to send and receive message. </p>
- <p>Using SSL can make your messaging applications interact with ActiveMQ securely. An application can
+ <p>Using SSL can make your messaging applications interact with ActiveMQ Artemis securely. An application can
be secured transparently without extra coding effort. To secure your messaging application with SSL, you need to configure connector and acceptor as follows:</p>
<p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/static-selector-jms/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/readme.html b/examples/jms/static-selector-jms/readme.html
index de72f5b..7cda407 100644
--- a/examples/jms/static-selector-jms/readme.html
+++ b/examples/jms/static-selector-jms/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Static Message Selector JMS Example</title>
+ <title>ActiveMQ Artemis Static Message Selector JMS 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/static-selector/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html
index 834d806..e0a3fc3 100644
--- a/examples/jms/static-selector/readme.html
+++ b/examples/jms/static-selector/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Static Message Selector Example</title>
+ <title>ActiveMQ Artemis Static Message Selector Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>Static Message Selector Example</h1>
- <p>This example shows you how to configure a ActiveMQ queue with static message selectors (filters)
+ <p>This example shows you how to configure a ActiveMQ Artemis queue with static message selectors (filters)
(to configure a static selector directly on a <em>JMS</em> queue, please see the
<a href="../static-selector-jms/readme.html">static-selector-jms example</a>).</p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/stomp-websockets/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/readme.html b/examples/jms/stomp-websockets/readme.html
index 6e9433d..6bdef7f 100644
--- a/examples/jms/stomp-websockets/readme.html
+++ b/examples/jms/stomp-websockets/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Stomp WebSockets Example</title>
+ <title>ActiveMQ Artemis Stomp WebSockets Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script src="../common/prettify.js"></script>
@@ -27,9 +27,9 @@ under the License.
<body onload="prettyPrint()">
<h1>Stomp WebSockets Example</h1>
- <p>This example shows you how to configure ActiveMQ to send and receive Stomp messages from modern web browser using Web Sockets.</p>
+ <p>This example shows you how to configure ActiveMQ Artemis to send and receive Stomp messages from modern web browser using Web Sockets.</p>
- <p>The example will start a ActiveMQ server configured with Stomp over Web Sockets and JMS. Web browsers clients and
+ <p>The example will start a ActiveMQ Artemis server configured with Stomp over Web Sockets and JMS. Web browsers clients and
Java application will exchange message using a JMS Topic.</p></para>
<pre class="prettyprint">
<acceptor name="stomp-websocket">tcp://localhost:61614</acceptor></pre>
@@ -39,7 +39,7 @@ under the License.
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
<p>To subscribe to the topic from your web browser, open the <a href="chat/index.html">Chat Example</a> or the <a href="aerogear-chat/aerogear-index.html">JBoss AeroGear STOMP notifier Chat Example</a> from another tab.
- The chat example is preconfigured to connect to the ActiveMQ server with the URL <code>ws://localhost:61614/stomp</code> and subscribe to the JMS Topic (through its core address
+ The chat example is preconfigured to connect to the ActiveMQ Artemis server with the URL <code>ws://localhost:61614/stomp</code> and subscribe to the JMS Topic (through its core address
<code>jms.topic.chat</code>).
</p>
<p>You can open as many Web clients as you want and they will all exchange messages through the topic</p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/stomp/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/readme.html b/examples/jms/stomp/readme.html
index e02a8e5..3935090 100644
--- a/examples/jms/stomp/readme.html
+++ b/examples/jms/stomp/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Stomp Example</title>
+ <title>ActiveMQ Artemis Stomp 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,8 +27,8 @@ under the License.
<body onload="prettyPrint()">
<h1>Stomp Example</h1>
- <p>This example shows you how to configure ActiveMQ to send and receive Stomp messages.</p>
- <p>The example will start a ActiveMQ server configured with Stomp and JMS.</p>
+ <p>This example shows you how to configure ActiveMQ Artemis to send and receive Stomp messages.</p>
+ <p>The example will start a ActiveMQ Artemis server configured with Stomp and JMS.</p>
<p>The client will open a socket to 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>
@@ -53,7 +53,7 @@ under the License.
</pre>
<li>We send a SEND frame (a Stomp message) to the destination <code>jms.queue.exampleQueue</code>
- (which corresponds to the ActiveMQ address for the JMS Queue <code>exampleQueue</code>) with a text body</li>
+ (which corresponds to the ActiveMQ Artemis address for the JMS Queue <code>exampleQueue</code>) with a text body</li>
<pre class="prettyprint">
String text = "Hello, world from Stomp!";
String message = "SEND\n" +
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/stomp1.1/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/readme.html b/examples/jms/stomp1.1/readme.html
index c4252bc..afa0d06 100644
--- a/examples/jms/stomp1.1/readme.html
+++ b/examples/jms/stomp1.1/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Stomp 1.1 Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,8 +27,8 @@ under the License.
<body onload="prettyPrint()">
<h1>Stomp 1.1 Example</h1>
- <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>This example shows you how to configure ActiveMQ Artemis to send and receive Stomp messages using Stomp 1.1 protocol.</p>
+ <p>The example will start a ActiveMQ Artemis 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>
@@ -61,7 +61,7 @@ under the License.
</pre>
<li>We send a SEND frame (a Stomp message) to the destination <code>jms.queue.exampleQueue</code>
- (which corresponds to the ActiveMQ address for the JMS Queue <code>exampleQueue</code>) with a text body</li>
+ (which corresponds to the ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/stomp1.2/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/readme.html b/examples/jms/stomp1.2/readme.html
index 9900025..f8d94ee 100644
--- a/examples/jms/stomp1.2/readme.html
+++ b/examples/jms/stomp1.2/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Stomp 1.1 Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,8 +27,8 @@ under the License.
<body onload="prettyPrint()">
<h1>Stomp 1.2 Example</h1>
- <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>This example shows you how to configure ActiveMQ Artemis to send and receive Stomp messages using Stomp 1.2 protocol.</p>
+ <p>The example will start a ActiveMQ Artemis 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>
@@ -61,7 +61,7 @@ under the License.
</pre>
<li>We send a SEND frame (a Stomp message) to the destination <code>jms.queue.exampleQueue</code>
- (which corresponds to the ActiveMQ address for the JMS Queue <code>exampleQueue</code>) with a text body</li>
+ (which corresponds to the ActiveMQ Artemis 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-artemis/blob/a17c828b/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 c5c552f..0e83d37 100644
--- a/examples/jms/stop-server-failover/readme.html
+++ b/examples/jms/stop-server-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/symmetric-cluster/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/readme.html b/examples/jms/symmetric-cluster/readme.html
index 35e0ce4..116735c 100644
--- a/examples/jms/symmetric-cluster/readme.html
+++ b/examples/jms/symmetric-cluster/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Symmetric Cluster Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,8 +27,8 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Symmetric Cluster Example</h1>
- <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
+ <p>This examples demonstrates a <b>symmetric cluster</b> set-up with ActiveMQ Artemis.</p>
+ <p>ActiveMQ Artemis 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>
@@ -38,7 +38,7 @@ under the License.
JMS queues and topics.</p>
<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 ActiveMQ to form a symmetric cluster we simply need to mark each server as <code>clustered</code>
+ <p>To set up ActiveMQ Artemis 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>broker.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
@@ -65,7 +65,7 @@ under the License.
<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 ActiveMQ clustering in general, please see the clustering
+ <p>For more information on configuring ActiveMQ Artemis 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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
index 5a513c6..6a38ff4 100644
--- a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
+++ b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
@@ -39,7 +39,7 @@ import org.apache.activemq.artemis.common.example.ActiveMQExample;
* with from using clustering in an app server, where every node has pretty much identical
* configuration to every other node.
* <p>
- * By clustering nodes symmetrically, ActiveMQ can give the impression of clustered queues, topics
+ * By clustering nodes symmetrically, ActiveMQ Artemis can give the impression of clustered queues, topics
* and durable subscriptions.
* <p>
* In this example we send some messages to a distributed queue and topic and kill all the live
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/temp-queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/readme.html b/examples/jms/temp-queue/readme.html
index fcc8c56..2685f31 100644
--- a/examples/jms/temp-queue/readme.html
+++ b/examples/jms/temp-queue/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Temporary Queue Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Temporary Queue Example</h1>
- <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.
+ <p>This example shows you how to use a TemporaryQueue with ActiveMQ Artemis. 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-artemis/blob/a17c828b/examples/jms/topic-hierarchies/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/readme.html b/examples/jms/topic-hierarchies/readme.html
index 7ec4a79..d87cb1a 100644
--- a/examples/jms/topic-hierarchies/readme.html
+++ b/examples/jms/topic-hierarchies/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Topic Hierarchy Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,9 +27,9 @@ under the License.
<body onload="prettyPrint()">
<h1>Topic Hierarchy Example</h1>
- <p>ActiveMQ supports topic hierarchies. With a topic hierarchy you can register a subscriber with a wild-card
+ <p>ActiveMQ Artemis 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>ActiveMQ wild-cards can use the character '#' which means "match any number of words", and
+ <p>ActiveMQ Artemis 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
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/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 9ddd492..630cd2b 100644
--- a/examples/jms/topic-selector-example1/readme.html
+++ b/examples/jms/topic-selector-example1/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Topic Selector Example 1</title>
+ <title>ActiveMQ Artemis 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-artemis/blob/a17c828b/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 6acdcab..2962812 100644
--- a/examples/jms/topic-selector-example2/readme.html
+++ b/examples/jms/topic-selector-example2/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Topic Selector Example 2</title>
+ <title>ActiveMQ Artemis 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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/topic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/topic/readme.html b/examples/jms/topic/readme.html
index 337b191..56b0a07 100644
--- a/examples/jms/topic/readme.html
+++ b/examples/jms/topic/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Topic Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,7 +27,7 @@ under the License.
<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 ActiveMQ.</p>
+ <p>This example shows you how to send and receive a message to a JMS Topic with ActiveMQ Artemis.</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-artemis/blob/a17c828b/examples/jms/transaction-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/readme.html b/examples/jms/transaction-failover/readme.html
index dcf13ff..f6b4c5d 100644
--- a/examples/jms/transaction-failover/readme.html
+++ b/examples/jms/transaction-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Failover With Transaction Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -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/transactional/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/readme.html b/examples/jms/transactional/readme.html
index e2b0f47..a7517c5 100644
--- a/examples/jms/transactional/readme.html
+++ b/examples/jms/transactional/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Transactional Session Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Transactional Session Example</h1>
- <p>This example shows you how to use a transacted Session with ActiveMQ.</p>
+ <p>This example shows you how to use a transacted Session with ActiveMQ Artemis.</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-artemis/blob/a17c828b/examples/jms/xa-heuristic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/readme.html b/examples/jms/xa-heuristic/readme.html
index e499073..9ca84b0 100644
--- a/examples/jms/xa-heuristic/readme.html
+++ b/examples/jms/xa-heuristic/readme.html
@@ -19,14 +19,14 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS XA Heuristic Example</title>
+ <title>ActiveMQ Artemis 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 ActiveMQ Management Interface.</p>
+ <p>This example shows you how to make an XA heuristic decision through the ActiveMQ Artemis 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>
@@ -39,7 +39,7 @@ under the License.
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 ActiveMQ Server. For details on JMX facilities with ActiveMQ,
+ <p>This example uses JMX to manipulate transactions in a ActiveMQ Artemis Server. For details on JMX facilities with ActiveMQ Artemis,
please look at the JMX Example.</p>
<h2>Example step-by-step</h2>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/xa-receive/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/readme.html b/examples/jms/xa-receive/readme.html
index 02aa0e4..0d24cde 100644
--- a/examples/jms/xa-receive/readme.html
+++ b/examples/jms/xa-receive/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS XA Receive Example</title>
+ <title>ActiveMQ Artemis 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>
@@ -30,7 +30,7 @@ under the License.
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>ActiveMQ is JTA aware, meaning you can use ActiveMQ in an XA transactional environment
+ <p>ActiveMQ Artemis is JTA aware, meaning you can use ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/jms/xa-send/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/readme.html b/examples/jms/xa-send/readme.html
index 0205993..7139e32 100644
--- a/examples/jms/xa-send/readme.html
+++ b/examples/jms/xa-send/readme.html
@@ -19,18 +19,18 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS XA Send Example</title>
+ <title>ActiveMQ Artemis 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 ActiveMQ. When a message is sent within
+ <p>This example shows you how message sending behaves in an XA transaction in ActiveMQ Artemis. 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>ActiveMQ is JTA aware, meaning you can use ActiveMQ in a XA transactional environment
+ <p>ActiveMQ Artemis is JTA aware, meaning you can use ActiveMQ Artemis 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-artemis/blob/a17c828b/examples/soak/normal/README
----------------------------------------------------------------------
diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index b422dd5..0a4dfe9 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 ActiveMQ instance, 1 producer and 1 consumer. To run the default suite.
+The default soak tests with start a ActiveMQ Artemis instance, 1 producer and 1 consumer. To run the default suite.
$mvn verify
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/config/logging.properties
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index ce85dd8..6514913 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -21,7 +21,7 @@ loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.act
# Root logger level
logger.level=INFO
-# ActiveMQ logger levels
+# ActiveMQ Artemis logger levels
logger.org.apache.activemq.artemis.core.server.level=INFO
logger.org.apache.activemq.artemis.journal.level=INFO
logger.org.apache.activemq.artemis.utils.level=INFO
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/config/logging.properties.trace
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace
index 8a0a632..02d5269 100644
--- a/tests/config/logging.properties.trace
+++ b/tests/config/logging.properties.trace
@@ -23,7 +23,7 @@ loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.act
# Root logger level
logger.level=INFO
-# ActiveMQ logger levels
+# ActiveMQ Artemis logger levels
logger.org.apache.activemq.artemis.core.server.level=TRACE
logger.org.apache.activemq.artemis.journal.level=INFO
logger.org.apache.activemq.artemis.utils.level=INFO
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index dcfb673..399ec6d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
/**
- * A test that makes sure that a ActiveMQ server cleans up the associated
+ * A test that makes sure that a ActiveMQ Artemis server cleans up the associated
* resources when one of its client crashes.
*/
public class ClientCrashTest extends ClientTestBase
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index 346f36b..9b8c90a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
/**
- * A test that makes sure that a ActiveMQ client gracefully exists after the last session is
+ * A test that makes sure that a ActiveMQ Artemis client gracefully exists after the last session is
* closed. Test for http://jira.jboss.org/jira/browse/JBMESSAGING-417.
*
* This is not technically a crash test, but it uses the same type of topology as the crash tests
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
index ae2d6eb..d574d5b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
@@ -85,7 +85,7 @@ public class SuppliedThreadPoolTest extends UnitTestCase
assertNotNull(threadPool);
assertNotNull(scheduledExecutorService);
- // Ensure that ActiveMQ does not shutdown supplied thread pools.
+ // Ensure that ActiveMQ Artemis does not shutdown supplied thread pools.
assertFalse(threadPool.isShutdown());
assertFalse(scheduledExecutorService.isShutdown());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index 7ecf920..1c3cd7b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -73,12 +73,12 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase
/** These artifacts are required for testing 1-way SSL
*
* Commands to create the JKS artifacts:
- * keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ, OU=ActiveMQ, O=ActiveMQ, L=ActiveMQ, S=ActiveMQ, C=AMQ"
+ * keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis, OU=ActiveMQ Artemis, O=ActiveMQ Artemis, L=ActiveMQ Artemis, S=ActiveMQ Artemis, C=AMQ"
* keytool -export -keystore server-side-keystore.jks -file activemq-jks.cer -storepass secureexample
* keytool -import -keystore client-side-truststore.jks -file activemq-jks.cer -storepass secureexample -keypass secureexample -noprompt
*
* Commands to create the JCEKS artifacts:
- * keytool -genkey -keystore server-side-keystore.jceks -storetype JCEKS -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ, OU=ActiveMQ, O=ActiveMQ, L=ActiveMQ, S=ActiveMQ, C=AMQ"
+ * keytool -genkey -keystore server-side-keystore.jceks -storetype JCEKS -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis, OU=ActiveMQ Artemis, O=ActiveMQ Artemis, L=ActiveMQ Artemis, S=ActiveMQ Artemis, C=AMQ"
* keytool -export -keystore server-side-keystore.jceks -file activemq-jceks.cer -storetype jceks -storepass secureexample
* keytool -import -keystore client-side-truststore.jceks -storetype JCEKS -file activemq-jceks.cer -storepass secureexample -keypass secureexample -noprompt
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
index 2bf605b..2ffaabf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
@@ -77,12 +77,12 @@ public class CoreClientOverTwoWaySSLTest extends ServiceTestBase
/** These artifacts are required for testing 2-way SSL
*
* Commands to create the JKS artifacts:
- * keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ, OU=ActiveMQ, O=ActiveMQ, L=ActiveMQ, S=ActiveMQ, C=AMQ"
+ * keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis, OU=ActiveMQ Artemis, O=ActiveMQ Artemis, L=ActiveMQ Artemis, S=ActiveMQ Artemis, C=AMQ"
* keytool -export -keystore client-side-keystore.jks -file activemq-jks.cer -storepass secureexample
* keytool -import -keystore server-side-truststore.jks -file activemq-jks.cer -storepass secureexample -keypass secureexample -noprompt
*
* Commands to create the JCEKS artifacts:
- * keytool -genkey -keystore client-side-keystore.jceks -storetype JCEKS -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ, OU=ActiveMQ, O=ActiveMQ, L=ActiveMQ, S=ActiveMQ, C=AMQ"
+ * keytool -genkey -keystore client-side-keystore.jceks -storetype JCEKS -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis, OU=ActiveMQ Artemis, O=ActiveMQ Artemis, L=ActiveMQ Artemis, S=ActiveMQ Artemis, C=AMQ"
* keytool -export -keystore client-side-keystore.jceks -file activemq-jceks.cer -storetype jceks -storepass secureexample
* keytool -import -keystore server-side-truststore.jceks -storetype JCEKS -file activemq-jceks.cer -storepass secureexample -keypass secureexample -noprompt
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
index d3b2582..a086de6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
@@ -107,7 +107,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends UnitTestCase
locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, httpParams));
addServerLocator(locator);
- // THe web server owns the HTTP port, not ActiveMQ.
+ // THe web server owns the HTTP port, not ActiveMQ Artemis.
startWebServer(HTTP_PORT);
}
@@ -209,7 +209,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends UnitTestCase
p.addLast("encoder", new HttpResponseEncoder());
p.addLast("http-upgrade-handler", new SimpleChannelInboundHandler<Object>()
{
- // handle HTTP GET + Upgrade with a handshake specific to ActiveMQ remoting.
+ // handle HTTP GET + Upgrade with a handshake specific to ActiveMQ Artemis remoting.
@Override
protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
index 98fcdcc..6a69aa9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
@@ -115,7 +115,7 @@ public class ConnectionFactoryTest extends JMSTestCase
@Test
public void testNoClientIDConfigured_1() throws Exception
{
- // the ConnectionFactories that ship with ActiveMQ do not have their clientID
+ // the ConnectionFactories that ship with ActiveMQ Artemis do not have their clientID
// administratively configured.
deployConnectionFactory(0, JMSFactoryType.TOPIC_CF, "CF_XA_FALSE", "/CF_XA_FALSE");
@@ -131,7 +131,7 @@ public class ConnectionFactoryTest extends JMSTestCase
@Test
public void testNoClientIDConfigured_2() throws Exception
{
- // the ConnectionFactories that ship with ActiveMQ do not have their clientID
+ // the ConnectionFactories that ship with ActiveMQ Artemis do not have their clientID
// administratively configured.
deployConnectionFactory(0, JMSFactoryType.TOPIC_CF, "CF_XA_FALSE", "/CF_XA_FALSE");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index 3add320..9133ce8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -439,7 +439,7 @@ public class MessageConsumerTest extends JMSTestCase
// It will be available some indeterminate time later.
// This is fine and as per spec.
// To implement receiveNoWait otherwise would be very costly
- // Also other messaging systems e.g. Sun, ActiveMQ implement it this way
+ // Also other messaging systems e.g. Sun, ActiveMQ Artemis implement it this way
Thread.sleep(500);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
index df1015e..ef712a7 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
@@ -55,7 +55,7 @@ public class PersistenceTest extends JMSTestCase
startNoDelete();
- // ActiveMQ server restart implies new ConnectionFactory lookup
+ // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -146,7 +146,7 @@ public class PersistenceTest extends JMSTestCase
startNoDelete();
- // ActiveMQ server restart implies new ConnectionFactory lookup
+ // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -217,7 +217,7 @@ public class PersistenceTest extends JMSTestCase
startNoDelete();
- // ActiveMQ server restart implies new ConnectionFactory lookup
+ // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -494,7 +494,7 @@ public class PersistenceTest extends JMSTestCase
startNoDelete();
- // ActiveMQ server restart implies new ConnectionFactory lookup
+ // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
index 064f6d1..9caaf00 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
@@ -90,7 +90,7 @@ public class QueueTest extends JMSTestCase
startNoDelete();
- // ActiveMQ server restart implies new ConnectionFactory lookup
+ // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
index 8dc3e89..142aa2a 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
@@ -48,7 +48,7 @@ public class ConnectionTest extends PTPTestCase
receiverSession = receiverConnection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE);
receiver.close(); // Before assigning a new receiver, we need to close the old one...
// Not closing it could cause load balancing between receivers.
- // Not having this close might be valid for JORAM or JBossMQ, but it's not valid for ActiveMQ (and still legal)
+ // Not having this close might be valid for JORAM or JBossMQ, but it's not valid for ActiveMQ Artemis (and still legal)
receiver = receiverSession.createReceiver(receiverQueue);
receiverConnection.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
----------------------------------------------------------------------
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
index 78cf153..c0af164 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
@@ -30,7 +30,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
* TransactionManager. This class is doing the job of a TransactionManager that fits for the purpose
* of this test only, however there are many more pitfalls to deal with Transactions.
* <p>
- * This is just to stress and soak test Transactions with ActiveMQ.
+ * This is just to stress and soak test Transactions with ActiveMQ Artemis.
* <p>
* And this is dealing with XA directly for the purpose testing only.
*/
[5/6] activemq-artemis git commit: Ensure all references to the
project use ActiveMQ Artemis
Posted by an...@apache.org.
Ensure all references to the project use ActiveMQ Artemis
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a17c828b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a17c828b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a17c828b
Branch: refs/heads/master
Commit: a17c828b85382ce5919dc3218cd24b526e4f10e0
Parents: d1b317b
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed May 13 11:12:07 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed May 13 11:51:26 2015 +0100
----------------------------------------------------------------------
RELEASING.md | 2 +-
.../apache/activemq/artemis/boot/Artemis.java | 2 +-
.../cli/commands/tools/XmlDataImporter.java | 2 +-
.../cli/commands/bin/artemis-service.xml | 2 +-
.../artemis/cli/commands/etc/artemis.profile | 2 +-
.../cli/commands/etc/artemis.profile.cmd | 2 +-
.../artemis/cli/commands/etc/broker.xml | 4 ++--
.../artemis/cli/commands/etc/logging.properties | 2 +-
artemis-cli/src/test/resources/broker-nojms.xml | 4 ++--
artemis-cli/src/test/resources/broker.xml | 4 ++--
.../artemis/api/core/ActiveMQBuffer.java | 2 +-
.../ActiveMQConnectionTimedOutException.java | 2 +-
.../api/core/ActiveMQDisconnectedException.java | 2 +-
.../artemis/api/core/ActiveMQException.java | 2 +-
.../api/core/ActiveMQIllegalStateException.java | 2 +-
.../core/ActiveMQInternalErrorException.java | 2 +-
.../api/core/ActiveMQNotConnectedException.java | 2 +-
.../ActiveMQUnsupportedPacketException.java | 2 +-
.../activemq/artemis/api/core/SimpleString.java | 2 +-
.../artemis/utils/ClassloadingUtil.java | 2 +-
.../activemq/artemis/utils/ReusableLatch.java | 2 +-
.../config/ActiveMQDefaultConfiguration.java | 8 ++++----
.../artemis/api/core/FilterConstants.java | 16 ++++++++--------
.../activemq/artemis/api/core/Interceptor.java | 4 ++--
.../api/core/JGroupsBroadcastEndpoint.java | 2 +-
.../api/core/JGroupsFileBroadcastEndpoint.java | 2 +-
.../JGroupsPropertiesBroadcastEndpoint.java | 2 +-
.../activemq/artemis/api/core/Message.java | 2 +-
.../api/core/TransportConfiguration.java | 2 +-
.../artemis/api/core/client/ActiveMQClient.java | 2 +-
.../artemis/api/core/client/ClientConsumer.java | 6 +++---
.../artemis/api/core/client/ClientMessage.java | 4 ++--
.../api/core/client/ClientSessionFactory.java | 2 +-
.../management/ActiveMQComponentControl.java | 2 +-
.../core/management/ActiveMQServerControl.java | 4 ++--
.../api/core/management/ManagementHelper.java | 10 +++++-----
.../api/core/management/NotificationType.java | 4 ++--
.../api/core/management/ObjectNameBuilder.java | 4 ++--
.../artemis/core/message/BodyEncoder.java | 10 +++++-----
.../artemis/core/message/impl/MessageImpl.java | 2 +-
.../protocol/core/CoreRemotingConnection.java | 2 +-
.../core/impl/ActiveMQSessionContext.java | 4 ++--
.../core/remoting/impl/ssl/SSLSupport.java | 2 +-
artemis-distribution/pom.xml | 2 +-
.../activemq/artemis/dto/package-info.java | 2 +-
.../artemis/api/jms/ActiveMQJMSClient.java | 2 +-
.../artemis/api/jms/ActiveMQJMSConstants.java | 2 +-
.../management/ConnectionFactoryControl.java | 2 +-
.../api/jms/management/DestinationControl.java | 2 +-
.../api/jms/management/JMSManagementHelper.java | 2 +-
.../api/jms/management/JMSServerControl.java | 2 +-
.../api/jms/management/SubscriptionInfo.java | 2 +-
.../jms/client/ActiveMQBytesMessage.java | 2 +-
.../artemis/jms/client/ActiveMQConnection.java | 2 +-
.../jms/client/ActiveMQConnectionFactory.java | 2 +-
.../jms/client/ActiveMQConnectionMetaData.java | 2 +-
.../artemis/jms/client/ActiveMQDestination.java | 2 +-
.../artemis/jms/client/ActiveMQJMSContext.java | 2 +-
.../artemis/jms/client/ActiveMQMapMessage.java | 2 +-
.../artemis/jms/client/ActiveMQMessage.java | 4 ++--
.../jms/client/ActiveMQMessageConsumer.java | 2 +-
.../jms/client/ActiveMQMessageProducer.java | 2 +-
.../jms/client/ActiveMQObjectMessage.java | 2 +-
.../artemis/jms/client/ActiveMQQueue.java | 2 +-
.../jms/client/ActiveMQQueueBrowser.java | 2 +-
.../artemis/jms/client/ActiveMQSession.java | 4 ++--
.../jms/client/ActiveMQStreamMessage.java | 2 +-
.../jms/client/ActiveMQTemporaryQueue.java | 2 +-
.../artemis/jms/client/ActiveMQTextMessage.java | 4 ++--
.../artemis/jms/client/ActiveMQTopic.java | 2 +-
.../jms/client/ActiveMQXAConnection.java | 2 +-
.../artemis/jms/client/SelectorTranslator.java | 6 +++---
.../jndi/ActiveMQInitialContextFactory.java | 2 +-
.../jms/bridge/QualityOfServiceMode.java | 2 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 +-
.../ActiveMQProtonRemotingConnection.java | 2 +-
.../protocol/proton/ProtonProtocolManager.java | 2 +-
.../converter/jms/ServerJMSMapMessage.java | 2 +-
.../converter/jms/ServerJMSTextMessage.java | 2 +-
.../openwire/OpenWireMessageConverter.java | 4 ++--
.../context/AbstractProtonContextSender.java | 4 ++--
.../server/ProtonServerSenderContext.java | 4 ++--
.../org/proton/plug/util/ReusableLatch.java | 2 +-
.../core/protocol/stomp/StompDecoder.java | 2 +-
.../protocol/stomp/StompFrameInterceptor.java | 4 ++--
.../ra/ActiveMQRAManagedConnectionFactory.java | 2 +-
.../activemq/artemis/ra/ActiveMQRAService.java | 2 +-
.../org/apache/activemq/artemis/ra/package.html | 2 +-
.../apache/activemq/artemis/rest/ActiveMQ.java | 2 +-
.../artemis/rest/util/HttpMessageHelper.java | 2 +-
.../src/main/resources/schema/artemis-rest.xsd | 12 ++++++------
.../artemis/core/config/Configuration.java | 8 ++++----
.../artemis/core/filter/impl/FilterImpl.java | 4 ++--
.../artemis/core/paging/PagingStore.java | 2 +-
.../core/paging/impl/PagingStoreImpl.java | 2 +-
.../core/security/impl/SecurityStoreImpl.java | 2 +-
.../artemis/core/server/ActiveMQServer.java | 4 ++--
.../core/server/ActiveMQServerLogger.java | 2 +-
.../core/server/embedded/EmbeddedActiveMQ.java | 2 +-
.../server/impl/AIOFileLockNodeManager.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 4 ++--
.../core/server/impl/ServiceRegistry.java | 2 +-
.../artemis/core/transaction/Transaction.java | 2 +-
.../spi/core/protocol/ProtocolManager.java | 2 +-
.../resources/schema/artemis-configuration.xsd | 4 ++--
.../artemis/core/filter/impl/FilterTest.java | 2 +-
.../xa/ActiveMQXAResourceWrapperImpl.java | 2 +-
.../xa/recovery/ActiveMQXAResourceRecovery.java | 4 ++--
.../xa/recovery/ActiveMQXAResourceWrapper.java | 2 +-
docs/design-guide/en/clustering.md | 2 +-
docs/quickstart-guide/en/README.md | 2 +-
docs/quickstart-guide/en/about.md | 10 +++++-----
docs/quickstart-guide/en/download.md | 4 ++--
docs/quickstart-guide/en/examples.md | 20 ++++++++++----------
docs/quickstart-guide/en/installation.md | 12 ++++++------
docs/quickstart-guide/en/introduction.md | 4 ++--
docs/quickstart-guide/en/running.md | 2 +-
docs/user-manual/en/README.md | 2 +-
docs/user-manual/en/architecture.md | 8 ++++----
docs/user-manual/en/configuration-index.md | 4 ++--
docs/user-manual/en/core-bridges.md | 2 +-
docs/user-manual/en/diverts.md | 2 +-
docs/user-manual/en/flow-control.md | 2 +-
docs/user-manual/en/ha.md | 8 ++++----
docs/user-manual/en/management.md | 8 ++++----
docs/user-manual/en/message-grouping.md | 2 +-
docs/user-manual/en/preface.md | 2 +-
docs/user-manual/en/rest.md | 4 ++--
docs/user-manual/en/using-jms.md | 2 +-
docs/user-manual/en/using-server.md | 2 +-
etc/findbugs-exclude.xml | 2 +-
examples/core/embedded-remote/readme.html | 14 +++++++-------
.../core/example/EmbeddedRemoteExample.java | 2 +-
examples/core/embedded/readme.html | 16 ++++++++--------
.../artemis/core/example/EmbeddedExample.java | 2 +-
examples/core/vertx-connector/readme.html | 10 +++++-----
examples/jms/README.md | 2 +-
examples/jms/aerogear/readme.html | 2 +-
.../jms/application-layer-failover/readme.html | 12 ++++++------
.../artemis-ra-rar/src/main/resources/ra.xml | 4 ++--
examples/jms/bridge/readme.html | 10 +++++-----
examples/jms/browser/readme.html | 4 ++--
examples/jms/client-kickoff/readme.html | 12 ++++++------
.../jms/example/ClientKickoffExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../client-side-failoverlistener/readme.html | 2 +-
.../jms/client-side-load-balancing/readme.html | 8 ++++----
.../clustered-durable-subscription/readme.html | 6 +++---
examples/jms/clustered-grouping/readme.html | 4 ++--
examples/jms/clustered-jgroups/readme.html | 12 ++++++------
examples/jms/clustered-queue/readme.html | 10 +++++-----
.../jms/clustered-static-discovery/readme.html | 10 +++++-----
.../jms/clustered-static-oneway/readme.html | 10 +++++-----
examples/jms/clustered-topic/readme.html | 4 ++--
.../colocated-failover-scale-down/readme.html | 2 +-
examples/jms/colocated-failover/readme.html | 2 +-
.../artemis/common/example/ActiveMQExample.java | 2 +-
examples/jms/consumer-rate-limit/readme.html | 6 +++---
examples/jms/dead-letter/readme.html | 10 +++++-----
.../artemis/jms/example/DeadLetterExample.java | 2 +-
examples/jms/delayed-redelivery/readme.html | 4 ++--
.../jms/example/DelayedRedeliveryExample.java | 2 +-
examples/jms/divert/readme.html | 4 ++--
.../artemis/jms/example/DivertExample.java | 2 +-
examples/jms/durable-subscription/readme.html | 4 ++--
examples/jms/embedded-simple/readme.html | 10 +++++-----
.../artemis/jms/example/EmbeddedExample.java | 2 +-
examples/jms/embedded/readme.html | 14 +++++++-------
.../artemis/jms/example/EmbeddedExample.java | 6 +++---
examples/jms/expiry/readme.html | 12 ++++++------
.../artemis/jms/example/ExpiryExample.java | 2 +-
examples/jms/http-transport/readme.html | 8 ++++----
.../instantiate-connection-factory/readme.html | 2 +-
examples/jms/interceptor/readme.html | 6 +++---
.../artemis/jms/example/InterceptorExample.java | 2 +-
examples/jms/jms-auto-closeable/readme.html | 2 +-
examples/jms/jms-bridge/readme.html | 12 ++++++------
.../artemis/jms/example/JMSBridgeExample.java | 2 +-
.../jms/jms-completion-listener/readme.html | 4 ++--
examples/jms/jms-context/readme.html | 4 ++--
examples/jms/jms-shared-consumer/readme.html | 2 +-
examples/jms/jmx/readme.html | 8 ++++----
.../artemis/jms/example/JMXExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
examples/jms/large-message/readme.html | 12 ++++++------
.../jms/example/LargeMessageExample.java | 2 +-
examples/jms/last-value-queue/readme.html | 2 +-
.../jms/management-notifications/readme.html | 10 +++++-----
examples/jms/management/readme.html | 10 +++++-----
.../artemis/jms/example/ManagementExample.java | 2 +-
examples/jms/message-counters/readme.html | 8 ++++----
examples/jms/message-group/readme.html | 4 ++--
examples/jms/message-group2/readme.html | 4 ++--
examples/jms/message-priority/readme.html | 2 +-
examples/jms/no-consumer-buffering/readme.html | 10 +++++-----
.../jms/example/NoConsumerBufferingExample.java | 2 +-
.../jms/non-transaction-failover/readme.html | 4 ++--
examples/jms/openwire/readme.html | 6 +++---
.../artemis/jms/example/OpenWireExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
examples/jms/paging/readme.html | 6 +++---
.../artemis/jms/example/PagingExample.java | 2 +-
examples/jms/perf/readme.html | 2 +-
examples/jms/pre-acknowledge/readme.html | 6 +++---
.../jms/example/PreacknowledgeExample.java | 2 +-
examples/jms/producer-rate-limit/readme.html | 6 +++---
examples/jms/proton-cpp/readme.html | 8 ++++----
.../artemis/jms/example/ProtonCPPExample.java | 2 +-
examples/jms/proton-j/readme.html | 8 ++++----
examples/jms/proton-ruby/readme.html | 6 +++---
.../queue-message-redistribution/readme.html | 14 +++++++-------
.../QueueMessageRedistributionExample.java | 2 +-
examples/jms/queue-requestor/readme.html | 4 ++--
examples/jms/queue-selector/readme.html | 2 +-
examples/jms/queue/readme.html | 4 ++--
examples/jms/reattach-node/readme.html | 6 +++---
.../jms/replicated-failback-static/readme.html | 4 ++--
examples/jms/replicated-failback/readme.html | 4 ++--
.../replicated-multiple-failover/readme.html | 4 ++--
.../replicated-transaction-failover/readme.html | 6 +++---
examples/jms/request-reply/readme.html | 2 +-
examples/jms/rest/dup-send/README.txt | 2 +-
examples/jms/rest/javascript-chat/README.txt | 2 +-
examples/jms/rest/jms-to-rest/README.txt | 2 +-
examples/jms/rest/push/README.txt | 4 ++--
examples/jms/scale-down/readme.html | 2 +-
examples/jms/scheduled-message/readme.html | 4 ++--
examples/jms/security/readme.html | 16 ++++++++--------
examples/jms/send-acknowledgements/readme.html | 4 ++--
.../example/SendAcknowledgementsExample.java | 2 +-
examples/jms/spring-integration/readme.html | 6 +++---
examples/jms/ssl-enabled/readme.html | 6 +++---
examples/jms/static-selector-jms/readme.html | 2 +-
examples/jms/static-selector/readme.html | 4 ++--
examples/jms/stomp-websockets/readme.html | 8 ++++----
examples/jms/stomp/readme.html | 8 ++++----
examples/jms/stomp1.1/readme.html | 8 ++++----
examples/jms/stomp1.2/readme.html | 8 ++++----
examples/jms/stop-server-failover/readme.html | 4 ++--
examples/jms/symmetric-cluster/readme.html | 10 +++++-----
.../jms/example/SymmetricClusterExample.java | 2 +-
examples/jms/temp-queue/readme.html | 4 ++--
examples/jms/topic-hierarchies/readme.html | 6 +++---
.../jms/topic-selector-example1/readme.html | 2 +-
.../jms/topic-selector-example2/readme.html | 2 +-
examples/jms/topic/readme.html | 4 ++--
examples/jms/transaction-failover/readme.html | 6 +++---
examples/jms/transactional/readme.html | 4 ++--
examples/jms/xa-heuristic/readme.html | 6 +++---
examples/jms/xa-receive/readme.html | 4 ++--
examples/jms/xa-send/readme.html | 6 +++---
examples/soak/normal/README | 2 +-
tests/config/logging.properties | 2 +-
tests/config/logging.properties.trace | 2 +-
.../clientcrash/ClientCrashTest.java | 2 +-
.../integration/clientcrash/ClientExitTest.java | 2 +-
.../server/SuppliedThreadPoolTest.java | 2 +-
.../ssl/CoreClientOverOneWaySSLTest.java | 4 ++--
.../ssl/CoreClientOverTwoWaySSLTest.java | 4 ++--
.../NettyConnectorWithHTTPUpgradeTest.java | 4 ++--
.../jms/tests/ConnectionFactoryTest.java | 4 ++--
.../artemis/jms/tests/MessageConsumerTest.java | 2 +-
.../artemis/jms/tests/PersistenceTest.java | 8 ++++----
.../activemq/artemis/jms/tests/QueueTest.java | 2 +-
.../jms/conform/connection/ConnectionTest.java | 2 +-
.../tests/soak/client/ClientAbstract.java | 2 +-
266 files changed, 551 insertions(+), 551 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/RELEASING.md
----------------------------------------------------------------------
diff --git a/RELEASING.md b/RELEASING.md
index 63a1963..57cc35f 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -23,4 +23,4 @@ Things to do before issuing a new release:
* If every thing is successful. Follow the Apache guide (http://www.apache.org/dev/publishing-maven-artifacts.html) to build and publish artifacts to Nexus and send out a release vote.
-Note: There is one additional step to remove the activemq-pom-<version>-source-release.zip from the Nexus staging repository before closing the staging repository. At the moment this artifact is uploaded automatically by the Apache release plugin. In future versions the ActiveMQ pom will be updated to take this into account.
+Note: There is one additional step to remove the activemq-pom-<version>-source-release.zip from the Nexus staging repository before closing the staging repository. At the moment this artifact is uploaded automatically by the Apache release plugin. In future versions the ActiveMQ Artemis pom will be updated to take this into account.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
----------------------------------------------------------------------
diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index ca3699e..db5bbe6 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -29,7 +29,7 @@ import java.util.Comparator;
/**
* <p>
* A main class which setups up a classpath and then passes
- * execution off to the ActiveMQ cli main.
+ * execution off to the ActiveMQ Artemis cli main.
* </p>
*/
public class Artemis
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
index ce3d673..a9865cc 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
@@ -59,7 +59,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
/**
* Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
- * send the messages to a running instance of ActiveMQ. It uses the StAX <code>javax.xml.stream.XMLStreamReader</code>
+ * send the messages to a running instance of ActiveMQ Artemis. It uses the StAX <code>javax.xml.stream.XMLStreamReader</code>
* for speed and simplicity.
*/
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 3828dd0..5e37c56 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -32,7 +32,7 @@
<argument>-Xms512M</argument>
<argument>-Xmx1024M</argument>
- <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+ <!-- Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
<argument>-Dartemis.remoting.default.port=61617</argument>
<argument>-Dartemis.remoting.amqp.port=5673</argument>
<argument>-Dartemis.remoting.stomp.port=61614</argument>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 937a1f9..ff31642 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -17,7 +17,7 @@
ARTEMIS_HOME='${artemis.home}'
-# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+# Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
#ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index fc9ce0c..c52d70f 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -17,7 +17,7 @@ rem under the License.
set ARTEMIS_HOME=${artemis.home}
-rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
rem Java Opts
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 761c6d9..851572e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -42,7 +42,7 @@ under the License.
</connectors>
<acceptors>
- <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
+ <!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
<acceptor name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</acceptor>
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
@@ -51,7 +51,7 @@ under the License.
<!-- STOMP Acceptor. -->
<acceptor name="stomp">tcp://${activemq.remoting.stomp.host:${host}}:${activemq.remoting.stomp.port:${stomp.port}}?protocols=STOMP</acceptor>
- <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
<acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=HORNETQ,STOMP</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
index 084b74c..5a5ad3e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
@@ -21,7 +21,7 @@ loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.act
# Root logger level
logger.level=INFO
-# ActiveMQ logger levels
+# ActiveMQ Artemis logger levels
logger.org.apache.activemq.artemis.core.server.level=INFO
logger.org.apache.activemq.artemis.journal.level=INFO
logger.org.apache.activemq.artemis.utils.level=INFO
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/test/resources/broker-nojms.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/resources/broker-nojms.xml b/artemis-cli/src/test/resources/broker-nojms.xml
index d25c75c..e0fcced 100644
--- a/artemis-cli/src/test/resources/broker-nojms.xml
+++ b/artemis-cli/src/test/resources/broker-nojms.xml
@@ -36,7 +36,7 @@ under the License.
</connectors>
<acceptors>
- <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
+ <!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
<acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
@@ -45,7 +45,7 @@ under the License.
<!-- STOMP Acceptor. -->
<acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
- <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
<acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/resources/broker.xml b/artemis-cli/src/test/resources/broker.xml
index df5610d..de51e9a 100644
--- a/artemis-cli/src/test/resources/broker.xml
+++ b/artemis-cli/src/test/resources/broker.xml
@@ -40,7 +40,7 @@ under the License.
</connectors>
<acceptors>
- <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
+ <!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
<acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
@@ -49,7 +49,7 @@ under the License.
<!-- STOMP Acceptor. -->
<acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
- <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
<acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
index dcdc0b2..8a81bf7 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import io.netty.buffer.ByteBuf;
/**
- * A ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ code base.
+ * A ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ Artemis code base.
* <p>
* Instances of it can be obtained from {@link ActiveMQBuffers} factory.
* <p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
index 2061e9c..6aa217b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client timed out will connecting to ActiveMQ server.
+ * A client timed out will connecting to ActiveMQ Artemis server.
*/
public final class ActiveMQConnectionTimedOutException extends ActiveMQException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
index 663269a..fd5526e 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client was disconnected from ActiveMQ server when the server has shut down.
+ * A client was disconnected from ActiveMQ Artemis server when the server has shut down.
*/
public final class ActiveMQDisconnectedException extends ActiveMQException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
index f8a09e9..d22bb68 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * ActiveMQException is the root exception for the ActiveMQ API.
+ * ActiveMQException is the root exception for the ActiveMQ Artemis API.
*/
public class ActiveMQException extends Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
index 1bf4185..bf311b9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A ActiveMQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a
+ * A ActiveMQ Artemis resource is not in a legal state (e.g. calling ClientConsumer.receive() if a
* MessageHandler is set).
*/
public final class ActiveMQIllegalStateException extends ActiveMQException
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
index f1934d6..4c8d53d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * Internal error which prevented ActiveMQ from performing an important operation.
+ * Internal error which prevented ActiveMQ Artemis from performing an important operation.
*/
public final class ActiveMQInternalErrorException extends ActiveMQException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
index 2878d69..6739070 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client is not able to connect to ActiveMQ server.
+ * A client is not able to connect to ActiveMQ Artemis server.
*/
public final class ActiveMQNotConnectedException extends ActiveMQException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
index d8b6aa9..f401f2b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A packet of unsupported type was received by ActiveMQ PacketHandler.
+ * A packet of unsupported type was received by ActiveMQ Artemis PacketHandler.
*/
public final class ActiveMQUnsupportedPacketException extends ActiveMQException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index 3defc73..0e523f5 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
* A simple String class that can store all characters, and stores as simple {@code byte[]}, this
* minimises expensive copying between String objects.
* <p>
- * This object is used heavily throughout ActiveMQ for performance reasons.
+ * This object is used heavily throughout ActiveMQ Artemis for performance reasons.
*
*/
public final class SimpleString implements CharSequence, Serializable, Comparable<SimpleString>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index e5cd954..77176c7 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -20,7 +20,7 @@ import java.net.URL;
/**
* This class will be used to perform generic class-loader operations,
- * such as load a class first using TCCL, and then the classLoader used by ActiveMQ (ClassloadingUtil.getClass().getClassLoader()).
+ * such as load a class first using TCCL, and then the classLoader used by ActiveMQ Artemis (ClassloadingUtil.getClass().getClassLoader()).
* <p>
* Is't required to use a Security Block on any calls to this class.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
index 117386a..d6fa2aa 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
*
* <p>It could be used for sync points when one process is feeding the latch while another will wait when everything is done. (e.g. waiting IO completions to finish)</p>
*
- * <p>On ActiveMQ we have the requirement of increment and decrement a counter until the user fires a ready event (commit). At that point we just act as a regular countDown.</p>
+ * <p>On ActiveMQ Artemis we have the requirement of increment and decrement a counter until the user fires a ready event (commit). At that point we just act as a regular countDown.</p>
*
* <p>Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.</p>
*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 0cafc0b..c4043e1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
/**
- * Default values of ActiveMQ configuration parameters.
+ * Default values of ActiveMQ Artemis configuration parameters.
*/
public final class ActiveMQDefaultConfiguration
{
@@ -135,7 +135,7 @@ public final class ActiveMQDefaultConfiguration
// Following fields are generated from the activemq-schema.xsd annotations
// -------------------------------------------------------------------
- // If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+ // If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
private static boolean DEFAULT_RESOLVE_PROTOCOLS = true;
// true means that the server will load configuration from the configuration files
@@ -407,7 +407,7 @@ public final class ActiveMQDefaultConfiguration
/**
- * If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+ * If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
*/
public static boolean isDefaultResolveProtocols()
{
@@ -543,7 +543,7 @@ public final class ActiveMQDefaultConfiguration
}
/**
- * the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+ * the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
*/
public static String getDefaultJmxDomain()
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
index 25c862b..2430805 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
@@ -17,23 +17,23 @@
package org.apache.activemq.artemis.api.core;
/**
- * Constants representing pre-defined message attributes that can be referenced in ActiveMQ core
+ * Constants representing pre-defined message attributes that can be referenced in ActiveMQ Artemis core
* filter expressions.
*/
public final class FilterConstants
{
/**
- * Name of the ActiveMQ UserID header.
+ * Name of the ActiveMQ Artemis UserID header.
*/
public static final SimpleString ACTIVEMQ_USERID = new SimpleString("AMQUserID");
/**
- * Name of the ActiveMQ Message expiration header.
+ * Name of the ActiveMQ Artemis Message expiration header.
*/
public static final SimpleString ACTIVEMQ_EXPIRATION = new SimpleString("AMQExpiration");
/**
- * Name of the ActiveMQ Message durable header.
+ * Name of the ActiveMQ Artemis Message durable header.
*/
public static final SimpleString ACTIVEMQ_DURABLE = new SimpleString("AMQDurable");
@@ -48,22 +48,22 @@ public final class FilterConstants
public static final SimpleString DURABLE = new SimpleString("DURABLE");
/**
- * Name of the ActiveMQ Message timestamp header.
+ * Name of the ActiveMQ Artemis Message timestamp header.
*/
public static final SimpleString ACTIVEMQ_TIMESTAMP = new SimpleString("AMQTimestamp");
/**
- * Name of the ActiveMQ Message priority header.
+ * Name of the ActiveMQ Artemis Message priority header.
*/
public static final SimpleString ACTIVEMQ_PRIORITY = new SimpleString("AMQPriority");
/**
- * Name of the ActiveMQ Message size header.
+ * Name of the ActiveMQ Artemis Message size header.
*/
public static final SimpleString ACTIVEMQ_SIZE = new SimpleString("AMQSize");
/**
- * All ActiveMQ headers are prepended by this prefix.
+ * All ActiveMQ Artemis headers are prepended by this prefix.
*/
public static final SimpleString ACTIVEMQ_PREFIX = new SimpleString("AMQ");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
index 2e1a9a3..c131d82 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
@@ -19,9 +19,9 @@ package org.apache.activemq.artemis.api.core;
import org.apache.activemq.artemis.core.protocol.core.Packet;
/**
- * This is class is a simple way to intercepting calls on ActiveMQ client and servers.
+ * This is class is a simple way to intercepting calls on ActiveMQ Artemis client and servers.
* <p>
- * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
+ * To add an interceptor to ActiveMQ Artemis server, you have to modify the server configuration file
* {@literal broker.xml}.<br>
* To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index ea750c9..33e9fdf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -28,7 +28,7 @@ import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
/**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
*/
public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
index d6181a0..f3d3403 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
@@ -21,7 +21,7 @@ import org.jgroups.JChannel;
import java.net.URL;
/**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
*/
public final class JGroupsFileBroadcastEndpoint extends JGroupsBroadcastEndpoint
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
index 98f5ee9..cadc316 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
@@ -20,7 +20,7 @@ import org.jgroups.JChannel;
import org.jgroups.conf.PlainConfigurator;
/**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
*/
public final class JGroupsPropertiesBroadcastEndpoint extends JGroupsBroadcastEndpoint
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index a159760..f773cba 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -158,7 +158,7 @@ public interface Message
* Returns the message timestamp.
* <br>
* The timestamp corresponds to the time this message
- * was handled by a ActiveMQ server.
+ * was handled by a ActiveMQ Artemis server.
*/
long getTimestamp();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index 8d2fdb0..e29fca3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -293,7 +293,7 @@ public class TransportConfiguration implements Serializable
/**
* Encodes this TransportConfiguration into a buffer.
* <p>
- * Note that this is only used internally ActiveMQ.
+ * Note that this is only used internally ActiveMQ Artemis.
*
* @param buffer the buffer to encode into
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index fb11b88..e8b149f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.uri.ServerLocatorParser;
import java.net.URI;
/**
- * Utility class for creating ActiveMQ {@link ClientSessionFactory} objects.
+ * Utility class for creating ActiveMQ Artemis {@link ClientSessionFactory} objects.
* <p>
* Once a {@link ClientSessionFactory} has been created, it can be further configured using its
* setter methods before creating the sessions. Once a session is created, the factory can no longer
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
index 91c8e88..62057f2 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
/**
- * A ClientConsumer receives messages from ActiveMQ queues.
+ * A ClientConsumer receives messages from ActiveMQ Artemis queues.
* <br>
* Messages can be consumed synchronously by using the <code>receive()</code> methods
* which will block until a message is received (or a timeout expires) or asynchronously
@@ -36,7 +36,7 @@ public interface ClientConsumer extends AutoCloseable
/**
* The server's ID associated with this consumer.
- * ActiveMQ implements this as a long but this could be protocol dependent.
+ * ActiveMQ Artemis implements this as a long but this could be protocol dependent.
* @return
*/
ConsumerContext getConsumerContext();
@@ -65,7 +65,7 @@ public interface ClientConsumer extends AutoCloseable
ClientMessage receive(long timeout) throws ActiveMQException;
/**
- * Receives a message from a queue. This call will force a network trip to ActiveMQ server to
+ * Receives a message from a queue. This call will force a network trip to ActiveMQ Artemis server to
* ensure that there are no messages in the queue which can be delivered to this consumer.
* <p>
* This call will never wait indefinitely for a message, it will return {@code null} if no
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
index a487190..5801a67 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.core.Message;
/**
*
- * A ClientMessage represents a message sent and/or received by ActiveMQ.
+ * A ClientMessage represents a message sent and/or received by ActiveMQ Artemis.
*/
public interface ClientMessage extends Message
{
@@ -37,7 +37,7 @@ public interface ClientMessage extends Message
/**
* Sets the delivery count for this message.
* <p>
- * This method is not meant to be called by ActiveMQ clients.
+ * This method is not meant to be called by ActiveMQ Artemis clients.
* @param deliveryCount message delivery count
* @return this ClientMessage
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
index 87ce2e9..3aeca3e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
/**
- * A ClientSessionFactory is the entry point to create and configure ActiveMQ resources to produce and consume messages.
+ * A ClientSessionFactory is the entry point to create and configure ActiveMQ Artemis resources to produce and consume messages.
* <br>
* It is possible to configure a factory using the setter methods only if no session has been created.
* Once a session is created, the configuration is fixed and any call to a setter method will throw a IllegalStateException.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
index 97d6121..18df184 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core.management;
/**
- * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ component.
+ * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ Artemis component.
*/
public interface ActiveMQComponentControl
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 9aa93ac..d8c1cae 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -19,7 +19,7 @@ package org.apache.activemq.artemis.api.core.management;
import javax.management.MBeanOperationInfo;
/**
- * A ActiveMQServerControl is used to manage ActiveMQ servers.
+ * A ActiveMQServerControl is used to manage ActiveMQ Artemis servers.
*/
public interface ActiveMQServerControl
{
@@ -508,7 +508,7 @@ public interface ActiveMQServerControl
String[] listSessions(@Parameter(desc = "a connection ID", name = "connectionID") String connectionID) throws Exception;
/**
- * This method is used by ActiveMQ clustering and must not be called by ActiveMQ clients.
+ * This method is used by ActiveMQ Artemis clustering and must not be called by ActiveMQ Artemis clients.
*/
void sendQueueInfoToQueue(String queueName, String address) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
index ae9c091..00bb831 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
@@ -28,7 +28,7 @@ import org.apache.activemq.artemis.utils.json.JSONArray;
import org.apache.activemq.artemis.utils.json.JSONObject;
/**
- * Helper class to use ActiveMQ Core messages to manage server resources.
+ * Helper class to use ActiveMQ Artemis Core messages to manage server resources.
*/
public final class ManagementHelper
{
@@ -298,7 +298,7 @@ public final class ManagementHelper
}
/**
- * Used by ActiveMQ management service.
+ * Used by ActiveMQ Artemis management service.
*/
public static Object[] retrieveOperationParameters(final Message message) throws Exception
{
@@ -334,7 +334,7 @@ public final class ManagementHelper
}
/**
- * Used by ActiveMQ management service.
+ * Used by ActiveMQ Artemis management service.
*/
public static void storeResult(final Message message, final Object result) throws Exception
{
@@ -418,7 +418,7 @@ public final class ManagementHelper
}
/**
- * Used by ActiveMQ management service.
+ * Used by ActiveMQ Artemis management service.
*/
public static Map<String, Object> fromCommaSeparatedKeyValues(final String str) throws Exception
{
@@ -434,7 +434,7 @@ public final class ManagementHelper
}
/**
- * Used by ActiveMQ management service.
+ * Used by ActiveMQ Artemis management service.
*/
public static Object[] fromCommaSeparatedArrayOfCommaSeparatedKeyValues(final String str) throws Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
index 29878ac..8a8dfa5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core.management;
/**
- * Types of notification emitted by ActiveMQ servers.
+ * Types of notification emitted by ActiveMQ Artemis servers.
* <p>
* These notifications can be received through:
* <ul>
@@ -25,7 +25,7 @@ package org.apache.activemq.artemis.api.core.management;
* <li>Core messages to a notification address (default value is {@code activemq.notifications})
* <li>JMS messages
* </ul>
- * @see the ActiveMQ user manual section on "Management Notifications"
+ * @see the ActiveMQ Artemis user manual section on "Management Notifications"
*/
public interface NotificationType
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index 7a48fc0..2a1dfe1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
/**
- * Helper class to build ObjectNames for ActiveMQ resources.
+ * Helper class to build ObjectNames for ActiveMQ Artemis resources.
*/
public final class ObjectNameBuilder
{
@@ -30,7 +30,7 @@ public final class ObjectNameBuilder
// Constants -----------------------------------------------------
/**
- * Default JMX domain for ActiveMQ resources.
+ * Default JMX domain for ActiveMQ Artemis resources.
*/
public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
index 951f156..aaea7f9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
@@ -29,27 +29,27 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
public interface BodyEncoder
{
/**
- * This method must not be called directly by ActiveMQ clients.
+ * This method must not be called directly by ActiveMQ Artemis clients.
*/
void open() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ clients.
+ * This method must not be called directly by ActiveMQ Artemis clients.
*/
void close() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ clients.
+ * This method must not be called directly by ActiveMQ Artemis clients.
*/
int encode(ByteBuffer bufferRead) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ clients.
+ * This method must not be called directly by ActiveMQ Artemis clients.
*/
int encode(ActiveMQBuffer bufferOut, int size) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ clients.
+ * This method must not be called directly by ActiveMQ Artemis clients.
*/
long getLargeBodySize();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
index 1fc3073..c4a76f1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
@@ -38,7 +38,7 @@ import org.apache.activemq.artemis.utils.UUID;
/**
* A concrete implementation of a message
* <p>
- * All messages handled by ActiveMQ core are of this type
+ * All messages handled by ActiveMQ Artemis core are of this type
*/
public abstract class MessageImpl implements MessageInternal
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
index 25e8275..f87f982 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
@@ -21,7 +21,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
/**
- * Extension of RemotingConnection for the ActiveMQ core protocol
+ * Extension of RemotingConnection for the ActiveMQ Artemis core protocol
*/
public interface CoreRemotingConnection extends RemotingConnection
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index aad2ec6..c3f50d71 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -384,7 +384,7 @@ public class ActiveMQSessionContext extends SessionContext
}
/**
- * ActiveMQ does support large messages
+ * ActiveMQ Artemis does support large messages
*
* @return
*/
@@ -750,7 +750,7 @@ public class ActiveMQSessionContext extends SessionContext
/**
- * This doesn't apply to other protocols probably, so it will be an ActiveMQ exclusive feature
+ * This doesn't apply to other protocols probably, so it will be an ActiveMQ Artemis exclusive feature
*
* @throws ActiveMQException
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index ebdfcb5..7642e42 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -35,7 +35,7 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
/**
- * Please note, this class supports PKCS#11 keystores, but there are no specific tests in the ActiveMQ test-suite to
+ * Please note, this class supports PKCS#11 keystores, but there are no specific tests in the ActiveMQ Artemis test-suite to
* validate/verify this works because this requires a functioning PKCS#11 provider which is not available by default
* (see java.security.Security#getProviders()). The main thing to keep in mind is that PKCS#11 keystores will have a
* null keystore path.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 0e9b22a..041bfcd 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -36,7 +36,7 @@
</properties>
<dependencies>
- <!-- ActiveMQ artifacts -->
+ <!-- ActiveMQ Artemis artifacts -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-boot</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
index 7752e27..60e76fd 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
/**
- * The JAXB POJOs for the XML configuration of ActiveMQ broker
+ * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
*/
@javax.xml.bind.annotation.XmlSchema(
namespace = "http://activemq.org/schema",
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
index 0ce6e81..9f70773 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQXATopicConnectionFactory;
import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
/**
- * A utility class for creating ActiveMQ client-side JMS managed resources.
+ * A utility class for creating ActiveMQ Artemis client-side JMS managed resources.
*/
public class ActiveMQJMSClient
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
index fb51608..bd9096c 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.jms;
/**
- * Constants for ActiveMQ for property keys used for ActiveMQ specific extensions to JMS.
+ * Constants for ActiveMQ Artemis for property keys used for ActiveMQ Artemis specific extensions to JMS.
*/
public class ActiveMQJMSConstants
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
index 5046f87..2ac8f69 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
/**
* A ConnectionFactoryControl is used to manage a JMS ConnectionFactory. <br>
- * ActiveMQ JMS ConnectionFactory uses an underlying ClientSessionFactory to connect to ActiveMQ
+ * ActiveMQ Artemis JMS ConnectionFactory uses an underlying ClientSessionFactory to connect to ActiveMQ
* servers. Please refer to the ClientSessionFactory for a detailed description.
*
* @see org.apache.activemq.artemis.api.core.client.ServerLocator
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
index 7ee35a0..7547b29 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
@@ -34,7 +34,7 @@ public interface DestinationControl
String getName();
/**
- * Returns the ActiveMQ address corresponding to this destination.
+ * Returns the ActiveMQ Artemis address corresponding to this destination.
*/
String getAddress();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
index 2e55002..765fc58 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.management.ManagementHelper;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
/**
- * Helper class to use JMS messages to manage ActiveMQ server resources.
+ * Helper class to use JMS messages to manage ActiveMQ Artemis server resources.
*/
public class JMSManagementHelper
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
index 4fa2fe2..06489d9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.management.Operation;
import org.apache.activemq.artemis.api.core.management.Parameter;
/**
- * A JMSSserverControl is used to manage ActiveMQ JMS server.
+ * A JMSSserverControl is used to manage ActiveMQ Artemis JMS server.
*/
public interface JMSServerControl
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
index 131f001..c71f8bc 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
@@ -87,7 +87,7 @@ public class SubscriptionInfo
// Public --------------------------------------------------------
/**
- * Returns the name of the ActiveMQ core queue corresponding to this subscription.
+ * Returns the name of the ActiveMQ Artemis core queue corresponding to this subscription.
*/
public String getQueueName()
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index ed38b1c..c9cf9a9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -54,7 +54,7 @@ import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteShor
import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF;
/**
- * ActiveMQ implementation of a JMS {@link BytesMessage}.
+ * ActiveMQ Artemis implementation of a JMS {@link BytesMessage}.
*/
public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessage
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index 282c6e6..1d98692 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -53,7 +53,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.VersionLoader;
/**
- * ActiveMQ implementation of a JMS Connection.
+ * ActiveMQ Artemis implementation of a JMS Connection.
* <p>
* The flat implementation of {@link TopicConnection} and {@link QueueConnection} is per design,
* following the common usage of these as one flat API in JMS 1.1.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 1dd8327..17a96be 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -53,7 +53,7 @@ import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
import org.apache.activemq.artemis.uri.ServerLocatorParser;
/**
- * ActiveMQ implementation of a JMS ConnectionFactory.
+ * ActiveMQ Artemis implementation of a JMS ConnectionFactory.
*/
public class ActiveMQConnectionFactory implements Externalizable, Referenceable, ConnectionFactory, XAConnectionFactory
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
index 21b0765..c7edc5a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
@@ -25,7 +25,7 @@ import javax.jms.JMSException;
import org.apache.activemq.artemis.core.version.Version;
/**
- * ActiveMQ implementation of a JMS ConnectionMetaData.
+ * ActiveMQ Artemis implementation of a JMS ConnectionMetaData.
*/
public class ActiveMQConnectionMetaData implements ConnectionMetaData
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index f451bae..728882d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory;
import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr;
/**
- * ActiveMQ implementation of a JMS Destination.
+ * ActiveMQ Artemis implementation of a JMS Destination.
*/
public class ActiveMQDestination implements Destination, Serializable, Referenceable
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
index 9cdbd15..d5aabb1 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
@@ -43,7 +43,7 @@ import javax.transaction.xa.XAResource;
import java.io.Serializable;
/**
- * ActiveMQ implementation of a JMSContext.
+ * ActiveMQ Artemis implementation of a JMSContext.
*/
public class ActiveMQJMSContext implements JMSContext
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index 94cf695..9f1dcb4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -37,7 +37,7 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
/**
- * ActiveMQ implementation of a JMS MapMessage.
+ * ActiveMQ Artemis implementation of a JMS MapMessage.
*/
public final class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage
{
[3/6] activemq-artemis git commit: Ensure all references to the
project use ActiveMQ Artemis
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/core-bridges.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/core-bridges.md b/docs/user-manual/en/core-bridges.md
index 9b10002..80c6624 100644
--- a/docs/user-manual/en/core-bridges.md
+++ b/docs/user-manual/en/core-bridges.md
@@ -98,7 +98,7 @@ Let's take a look at all the parameters in turn:
- `filter-string`. An optional filter string can be supplied. If
specified then only messages which match the filter expression
specified in the filter string will be forwarded. The filter string
- follows the ActiveMQ filter expression syntax described in [Filter Expressions](filter-expressions.md).
+ follows the ActiveMQ Artemis filter expression syntax described in [Filter Expressions](filter-expressions.md).
- `transformer-class-name`. An optional transformer-class-name can be
specified. This is the name of a user-defined class which implements
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/diverts.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/diverts.md b/docs/user-manual/en/diverts.md
index 240e391..22282c5 100644
--- a/docs/user-manual/en/diverts.md
+++ b/docs/user-manual/en/diverts.md
@@ -81,7 +81,7 @@ adds a header that records the time the divert happened.
This example is actually diverting messages to a local store and forward
queue, which is configured with a bridge which forwards the message to
-an address on another ActiveMQ server. Please see the example for more
+an address on another ActiveMQ Artemis server. Please see the example for more
details.
## Non-exclusive Divert
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/flow-control.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index e8fbf05..7bec8b7 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -153,7 +153,7 @@ can be set via the `ActiveMQConnectionFactory.setConsumerMaxRate(int
> buffer. So if you had a slow rate limit and a high window based limit
> the clients internal buffer would soon fill up with messages.
-Please see ? for an example which shows how to configure ActiveMQ to
+Please see ? for an example which shows how to configure ActiveMQ Artemis to
prevent consumer buffering when dealing with slow consumers.
## Producer flow control
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/ha.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md
index 572947b..5112ba1 100644
--- a/docs/user-manual/en/ha.md
+++ b/docs/user-manual/en/ha.md
@@ -346,7 +346,7 @@ If you require the highest performance during normal operation, have
access to a fast SAN and live with a slightly slower failover (depending
on amount of data).
-
+
#### Configuration
@@ -587,7 +587,7 @@ the above example is configured to use replication, in this case the
`master` and `slave` configurations must match those for normal
replication as in the previous chapter. `shared-store` is also supported
-
+
#### Configuring Connectors and Acceptors
@@ -685,7 +685,7 @@ so server 1 could have messages 1,3,5,7,9 and server 2 would have
2,4,6,8,10, if server 2 scales down the order in server 1 would be
1,3,5,7,9,2,4,6,8,10.
-
+
The configuration for a live server to scale down would be something
like:
@@ -994,7 +994,7 @@ The Apache ActiveMQ Artemis core API also provides a similar feature in the form
class `org.apache.activemq.artemis.core.client.SessionFailureListener`
Any ExceptionListener or SessionFailureListener instance will always be
-called by ActiveMQ on event of connection failure, **irrespective** of
+called by ActiveMQ Artemis on event of connection failure, **irrespective** of
whether the connection was successfully failed over, reconnected or
reattached, however you can find out if reconnect or reattach has
happened by either the `failedOver` flag passed in on the
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/management.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index a719841..75e42dc 100644
--- a/docs/user-manual/en/management.md
+++ b/docs/user-manual/en/management.md
@@ -524,7 +524,7 @@ To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, t
domain can be configured for each individual Apache ActiveMQ Artemis server by setting
`jmx-domain` in `broker.xml`:
- <!-- use a specific JMX domain for ActiveMQ MBeans -->
+ <!-- use a specific JMX domain for ActiveMQ Artemis MBeans -->
<jmx-domain>my.org.apache.activemq</jmx-domain>
#### MBeanServer configuration
@@ -553,7 +553,7 @@ This would give you back something like the following:
## Using Management Via Core API
-The core management API in ActiveMQ is called by sending Core messages
+The core management API in ActiveMQ Artemis is called by sending Core messages
to a special address, the *management address*.
*Management messages* are regular Core messages with well-known
@@ -643,7 +643,7 @@ configured in broker.xml:
## Using Management Via JMS
-Using JMS messages to manage ActiveMQ is very similar to using core API.
+Using JMS messages to manage ActiveMQ Artemis is very similar to using core API.
An important difference is that JMS requires a JMS queue to send the
messages to (instead of an address for the core API).
@@ -794,7 +794,7 @@ notificationConsumer.setMessageListener(new MessageListener()
```
### Example
-See the [examples](examples.md) chapter for an example which shows how to use a JMS `MessageListener` to receive management notifications from ActiveMQ server.
+See the [examples](examples.md) chapter for an example which shows how to use a JMS `MessageListener` to receive management notifications from ActiveMQ Artemis server.
### Notification Types and Headers
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/message-grouping.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md
index 049efc7..7eea79d 100644
--- a/docs/user-manual/en/message-grouping.md
+++ b/docs/user-manual/en/message-grouping.md
@@ -178,4 +178,4 @@ Some best practices should be followed when using clustered grouping:
## Clustered Grouping Example
-See the [examples](examples.md) chapter for an example of how to configure message groups with a ActiveMQ Cluster.
+See the [examples](examples.md) chapter for an example of how to configure message groups with a ActiveMQ Artemis Cluster.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/preface.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/preface.md b/docs/user-manual/en/preface.md
index 21c05b0..3035bec 100644
--- a/docs/user-manual/en/preface.md
+++ b/docs/user-manual/en/preface.md
@@ -32,7 +32,7 @@ Why use Apache ActiveMQ Artemis? Here are just a few of the reasons:
messaging system, and others you won't find anywhere else.
- Elegant, clean-cut design with minimal third party dependencies. Run
- ActiveMQ stand-alone, run it in integrated in your favourite JEE
+ ActiveMQ Artemis stand-alone, run it in integrated in your favourite JEE
application server, or run it embedded inside your own product. It's
up to you.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/rest.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md
index c9ec95a..dbafbcf 100644
--- a/docs/user-manual/en/rest.md
+++ b/docs/user-manual/en/rest.md
@@ -54,7 +54,7 @@ of the REST interface?
## Installation and Configuration
-Apache ActiveMQ Artemis's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ Artemis REST interface is a little bit different depending whether Apache ActiveMQ Artemis is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ REST WAR to startup and manage the Apache ActiveMQ Artemis server (e.g. you're deploying within something like Apache Tomcat).
+Apache ActiveMQ Artemis's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ Artemis REST interface is a little bit different depending whether Apache ActiveMQ Artemis is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ Artemis REST WAR to startup and manage the Apache ActiveMQ Artemis server (e.g. you're deploying within something like Apache Tomcat).
### Installing Within Pre-configured Environment
@@ -126,7 +126,7 @@ The project structure should look this like:
It is worth noting that when deploying a WAR in a Java EE application server like Wildfly the URL for the resulting application will include the name of the WAR by default. For example, if you've constructed a WAR as described above named "activemq-rest.war" then clients will access it at, e.g. http://localhost:8080/activemq-rest/[queues|topics]. We'll see more about this later.
-### Bootstrapping ActiveMQ Along with REST
+### Bootstrapping ActiveMQ Artemis Along with REST
You can bootstrap Apache ActiveMQ Artemis within your WAR as well. To do this, you must have the Apache ActiveMQ Artemis core and JMS jars along with Netty, RESTEasy, and the Apache ActiveMQ Artemis REST jar within your WEB-INF/lib. You must also have an Apache ActiveMQ Artemis-configuration.xml config file within WEB-INF/classes. The examples that come with the Apache ActiveMQ Artemis REST distribution show how to do this. You must also add an additional listener to your web.xml file. Here's an example:
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/using-jms.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md
index 2ae78b6..3a244d7 100644
--- a/docs/user-manual/en/using-jms.md
+++ b/docs/user-manual/en/using-jms.md
@@ -113,7 +113,7 @@ connector(s)* for the underlying connection.
The `udp` scheme is also supported which should use an host:port
combination that matches the `group-address` and `group-port` from the
-corresponding `broadcast-group` configured on the ActiveMQ server(s).
+corresponding `broadcast-group` configured on the ActiveMQ Artemis server(s).
Each scheme has a specific set of properties which can be set using the
traditional URL query string format (e.g.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/using-server.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index cbae852..59dc3c4 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -17,7 +17,7 @@ distribution has been extracted to as `${ARTEMIS_HOME}` directory.
A broker instance is the directory containing all the configuration and runtime
data, such as logs and data files, associated with a broker process. It is recommended that
you do *not* create the instance directory under `${ARTEMIS_HOME}`. This separation is
-encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
+encouraged so that you can more easily upgrade when the next version of ActiveMQ Artemis is released.
On Unix systems, it is a common convention to store this kind of runtime data under
the `/var/lib` directory. For example, to create an instance at '/var/lib/mybroker', run
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/etc/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml
index 562fcf1..8ec9284 100644
--- a/etc/findbugs-exclude.xml
+++ b/etc/findbugs-exclude.xml
@@ -135,7 +135,7 @@ under the License.
<Match>
<!-- Files generated by JBoss Logging are ignored -->
- <Class name="~org\.activemq\..*\.ActiveMQ.*(Logger_\$logger|Bundle_\$bundle)"/>
+ <Class name="~org\.activemq\..*\.ActiveMQ Artemis.*(Logger_\$logger|Bundle_\$bundle)"/>
</Match>
<!-- Ignore checks on return values, example File.delete(), on samples/examples -->
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/core/embedded-remote/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/readme.html b/examples/core/embedded-remote/readme.html
index a5cc882..4e389ad 100644
--- a/examples/core/embedded-remote/readme.html
+++ b/examples/core/embedded-remote/readme.html
@@ -19,20 +19,20 @@ under the License.
<html>
<head>
- <title>ActiveMQ Embedded Example</title>
+ <title>ActiveMQ Artemis Embedded 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>Embedded Example</h1>
- <p>This example shows how to setup and run ActiveMQ embedded with remote clients connecting.</p>
- <p>ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.</p>
+ <p>This example shows how to setup and run ActiveMQ Artemis embedded with remote clients connecting.</p>
+ <p>ActiveMQ Artemis was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ Artemis as simple as instantiating a few objects.</p>
- <p>ActiveMQ Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</p>
+ <p>ActiveMQ Artemis Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</p>
- <h2>Example step-by-step</h2>
+ <h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>mvn verify -Pserver</code> from this directory to start the server and <code>mvn verify -Pclient</code> to run the client example</i></p>
<p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, ActiveMQServer, start it and operate on JMS regularly</p>
<br/>
@@ -43,7 +43,7 @@ under the License.
configuration.setEnablePersistence(false);
configuration.setSecurityEnabled(false);
</pre>
-
+
<li>On EmbeddedServer: Create and start the server</li>
<pre class="prettyprint">
ActiveMQServer server = ActiveMQ.newActiveMQServer(configuration);
@@ -67,7 +67,7 @@ under the License.
<li>Create the session and producer</li>
<pre class="prettyprint">
session = sf.createSession();
-
+
ClientProducer producer = session.createProducer(queueName);
</pre>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
index 453e40a..31d0d7b 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactor
/**
*
- * This example shows how to run a ActiveMQ core client and server embedded in your
+ * This example shows how to run a ActiveMQ Artemis core client and server embedded in your
* own application
*/
public class EmbeddedRemoteExample
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/core/embedded/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/embedded/readme.html b/examples/core/embedded/readme.html
index 441a68b..c5c2141 100644
--- a/examples/core/embedded/readme.html
+++ b/examples/core/embedded/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Embedded Example</title>
+ <title>ActiveMQ Artemis Embedded 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,17 +27,17 @@ under the License.
<body onload="prettyPrint()">
<h1>Embedded Example</h1>
- <p>This example shows how to setup and run ActiveMQ embedded.</p>
- <p>ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.</p>
+ <p>This example shows how to setup and run ActiveMQ Artemis embedded.</p>
+ <p>ActiveMQ Artemis was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ Artemis as simple as instantiating a few objects.</p>
<p>In this example, we are using two jars:</p>
<ul>
<li>activemq-server.jar</li>
<li>netty.jar</li>
</ul>
-
- <p>ActiveMQ Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</p>
- <h2>Example step-by-step</h2>
+ <p>ActiveMQ Artemis Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</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 we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, ActiveMQServer, start it and operate on JMS regularly</p>
@@ -49,7 +49,7 @@ under the License.
configuration.setSecurityEnabled(false);
configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
</pre>
-
+
<li>Create and start the server</li>
<pre class="prettyprint">
ActiveMQServer server = ActiveMQ.newActiveMQServer(configuration);
@@ -73,7 +73,7 @@ under the License.
<li>Create the session and producer</li>
<pre class="prettyprint">
session = sf.createSession();
-
+
ClientProducer producer = session.createProducer(queueName);
</pre>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
index b1017cd..f7d01df 100644
--- a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
+++ b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers;
/**
*
- * This example shows how to run a ActiveMQ core client and server embedded in your
+ * This example shows how to run a ActiveMQ Artemis core client and server embedded in your
* own application
*/
public class EmbeddedExample
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/core/vertx-connector/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/readme.html b/examples/core/vertx-connector/readme.html
index 4f02416..a91735f 100644
--- a/examples/core/vertx-connector/readme.html
+++ b/examples/core/vertx-connector/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Vert.x Connector Service Example</title>
+ <title>ActiveMQ Artemis Vert.x Connector Service 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>Vert.x Connector Service Example</h1>
- <p>This example shows you how to configure ActiveMQ to use the Vert.x Connector Service.</p>
+ <p>This example shows you how to configure ActiveMQ Artemis to use the Vert.x Connector Service.</p>
- <p>ActiveMQ supports 2 types of Vert.x connector, incoming and outgoing.
+ <p>ActiveMQ Artemis supports 2 types of Vert.x connector, incoming and outgoing.
Incoming connector consumes from Vert.x event bus and forwards to a configurable address.
Outgoing connector consumes from a configurable address and forwards to a configurable Vert.x event bus.
</p>
@@ -37,8 +37,8 @@ under the License.
<p>In this example, an incoming connector and an outgoing connector are configured. A simple java Verticle
is deployed. The verticle registers a message handler on the outgoing connector's address ("outgoing.vertx.address").
A String message is sent to Vert.x event bus on the incoming connector's address("incoming.vertx.address").
- The message then will be forwarded to a ActiveMQ queue by the incoming connector. The outgoing connector listens to
- the ActiveMQ queue and forwards the message from ActiveMQ to Vert.x event bus on the outgoing connector's address.
+ The message then will be forwarded to a ActiveMQ Artemis queue by the incoming connector. The outgoing connector listens to
+ the ActiveMQ Artemis queue and forwards the message from ActiveMQ Artemis to Vert.x event bus on the outgoing connector's address.
The verticle finally receives the message from it's event bus.</p>
<p>For more information on Vert.x concept please visit the <a href="http://vertx.io/">Vertx site</a></p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/README.md
----------------------------------------------------------------------
diff --git a/examples/jms/README.md b/examples/jms/README.md
index 356fa6e..f0cd2af 100644
--- a/examples/jms/README.md
+++ b/examples/jms/README.md
@@ -1,4 +1,4 @@
-Running the ActiveMQ Examples
+Running the ActiveMQ Artemis Examples
============================
To run an individual example firstly cd into the example directory and run
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/aerogear/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html
index 781de3d..661b7d1 100644
--- a/examples/jms/aerogear/readme.html
+++ b/examples/jms/aerogear/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS AeroGear Example</title>
+ <title>ActiveMQ Artemis JMS AeroGear Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/application-layer-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/readme.html b/examples/jms/application-layer-failover/readme.html
index f64fd26..b9699bc 100644
--- a/examples/jms/application-layer-failover/readme.html
+++ b/examples/jms/application-layer-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Application-Layer Failover Example</title>
+ <title>ActiveMQ Artemis Application-Layer Failover Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,18 +27,18 @@ under the License.
<body onload="prettyPrint()">
<h1>Application-Layer Failover Example</h1>
- <p>ActiveMQ implements fully transparent <b>automatic</b> failover of connections from a live node to a backup node which requires
+ <p>ActiveMQ Artemis implements fully transparent <b>automatic</b> failover of connections from a live node to a backup node which requires
no special coding. This is described in a different example and requires server replication.</p>
- <p>However, ActiveMQ also supports <b>Application-Layer</b> failover which is useful in the case where replication is not enabled.</p>
- <p>With Application-Layer failover, it's up to the application to register a JMS ExceptionListener with ActiveMQ.
- This listener will then be called by ActiveMQ in the event that connection failure is detected.</p>
+ <p>However, ActiveMQ Artemis also supports <b>Application-Layer</b> failover which is useful in the case where replication is not enabled.</p>
+ <p>With Application-Layer failover, it's up to the application to register a JMS ExceptionListener with ActiveMQ Artemis.
+ This listener will then be called by ActiveMQ Artemis in the event that connection failure is detected.</p>
<p>User code in the ExceptionListener can then recreate any JMS Connection, Session, etc on another node and the application
can continue.</p>
<p>Application-Layer failover is an alternative approach to High Availabilty (HA).</p>
<p>Application-Layer failover differs from automatic failover in that some client side coding is required in order
to implement this. Also, with Application-Layer failover, since the old Session object dies and a new is created, any uncommitted
work in the old Session will be lost, and any unacknowledged messages might be redelivered.</p>
- <p>For more information on 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/artemis-ra-rar/src/main/resources/ra.xml
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-ra-rar/src/main/resources/ra.xml b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
index 75b14b1..c39a497 100644
--- a/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
+++ b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
@@ -8,8 +8,8 @@
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
version="1.5">
- <description>ActiveMQ 2.0 Resource Adapter</description>
- <display-name>ActiveMQ 2.0 Resource Adapter</display-name>
+ <description>ActiveMQ Artemis 2.0 Resource Adapter</description>
+ <display-name>ActiveMQ Artemis 2.0 Resource Adapter</display-name>
<vendor-name>Red Hat Middleware LLC</vendor-name>
<eis-type>JMS 1.1 Server</eis-type>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html
index f4e82f3..6b5bb01 100644
--- a/examples/jms/bridge/readme.html
+++ b/examples/jms/bridge/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Core Bridge Example</title>
+ <title>ActiveMQ Artemis Core Bridge Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -30,7 +30,7 @@ under the License.
<p>This example demonstrates a core bridge deployed on one server, which consumes messages from a
local queue and forwards them to an address on a second server.</p>
- <p>Core bridges are used to create message flows between any two ActiveMQ servers which are remotely separated.
+ <p>Core bridges are used to create message flows between any two ActiveMQ Artemis servers which are remotely separated.
Core bridges are resilient and will cope with temporary connection failure allowing them to be an ideal
choice for forwarding over unreliable connections, e.g. a WAN.</p>
<p>They can also be configured with an optional filter expression, and will only forward messages that
@@ -38,11 +38,11 @@ under the License.
<p>Furthermore they can be configured to use an optional Transformer class. A user-defined Transformer class
can be specified which is called at forwarding time. This gives the user the opportunity to transform
the message in some ways, e.g. changing its properties or body</p>
- <p>ActiveMQ also includes a <b>JMS Bridge</b>. This is similar to a core bridge, but uses the JMS API
+ <p>ActiveMQ Artemis also includes a <b>JMS Bridge</b>. This is similar to a core bridge, but uses the JMS API
and can be used to bridge between any two JMS 1.1 compliant messaging systems. The core bridge is limited to bridging
- between ActiveMQ instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in
+ between ActiveMQ Artemis instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in
a separate example.</p>
- <p>For more information on bridges, please see the ActiveMQ user manual.</p>
+ <p>For more information on bridges, please see the ActiveMQ Artemis user manual.</p>
<p>In this example we will demonstrate a simple sausage factory for aardvarks.</p>
<p>We have a JMS queue on server 0 named <code>sausage-factory</code>, and we have a
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/browser/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/browser/readme.html b/examples/jms/browser/readme.html
index 57ca9aa..b960ff4 100644
--- a/examples/jms/browser/readme.html
+++ b/examples/jms/browser/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS QueueBrowser Example</title>
+ <title>ActiveMQ Artemis JMS QueueBrowser Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS QueueBrowser Example</h1>
- <p>This example shows you how to use a JMS <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a> with ActiveMQ.<br />
+ <p>This example shows you how to use a JMS <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a> with ActiveMQ Artemis.<br />
Queues are a standard part of JMS, please consult the JMS 1.1 specification for full details.<br />
A QueueBrowser is used to look at messages on the queue without removing them.
It can scan the entire content of a queue or only messages matching a message selector.</p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/client-kickoff/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html
index 6d80ab9..f30598a 100644
--- a/examples/jms/client-kickoff/readme.html
+++ b/examples/jms/client-kickoff/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Client Kickoff Example</title>
+ <title>ActiveMQ Artemis Client Kickoff Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -30,13 +30,13 @@ under the License.
<p>This example shows how to kick off a client connected to ActiveMQ
using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p>
- <p>The example will connect to ActiveMQ. Using JMX, we will list the remote addresses connected to the
- server and close the corresponding connections. The client will be kicked off from ActiveMQ receiving
+ <p>The example will connect to ActiveMQ Artemis. Using JMX, we will list the remote addresses connected to the
+ server and close the corresponding connections. The client will be kicked off from ActiveMQ Artemis receiving
an exception that its JMS connection was interrupted.</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
@@ -46,7 +46,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).</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>
@@ -84,7 +84,7 @@ under the License.
<code>connection.start();</code>
</pre>
- <li>We create a MBean proxy to the ActiveMQServerControlMBean used to manage ActiveMQ server
+ <li>We create a MBean proxy to the ActiveMQServerControlMBean used to manage ActiveMQ Artemis server
(see <a href="../jmx/readme.html">JMX example</a> for a complete explanation of the different steps)</li>
<pre class="prettyprint">
<code>ObjectName on = ObjectNameBuilder.DEFAULT.getActiveMQServerObjectName();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
index ddeed59..278464a 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
@@ -36,7 +36,7 @@ import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.common.example.ActiveMQExample;
/**
- * An example that shows how to kick off a client connected to ActiveMQ by using JMX.
+ * An example that shows how to kick off a client connected to ActiveMQ Artemis by using JMX.
*/
public class ClientKickoffExample extends ActiveMQExample
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
index df642d1..af12f6a 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
@@ -35,7 +35,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/client-side-failoverlistener/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index a64e4b1..ad6abe0 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Client Side Failover Listener Example</title>
+ <title>ActiveMQ Artemis Client Side Failover Listener Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/client-side-load-balancing/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/readme.html b/examples/jms/client-side-load-balancing/readme.html
index 4ca4621..7cfc684 100644
--- a/examples/jms/client-side-load-balancing/readme.html
+++ b/examples/jms/client-side-load-balancing/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Client-Side Load-Balancing Example</title>
+ <title>ActiveMQ Artemis JMS Client-Side Load-Balancing Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -28,12 +28,12 @@ under the License.
<h1>JMS Client-Side Load-Balancing Example</h1>
<p>This example demonstrates how connnections created from a single JMS Connection factory can be created
- to different nodes of the cluster. In other words it demonstrates how ActiveMQ does <b>client side load balancing</b> of
+ to different nodes of the cluster. In other words it demonstrates how ActiveMQ Artemis does <b>client side load balancing</b> of
connections across the cluster.</p>
<p>The particular load-balancing policy can be chosen to be random, round-robin or user-defined. Please see the user
guide for more details of how to configure the specific load-balancing policy. In this example we will use
the default round-robin load balancing policy.</p>
- <p>The list of servers over which ActiveMQ will round-robin the connections can either be specified explicitly
+ <p>The list of servers over which ActiveMQ Artemis will round-robin the connections can either be specified explicitly
in the connection factory when instantiating it directly, when configuring it on the server or configured
to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP
discovery to obtain the list.</p>
@@ -41,7 +41,7 @@ under the License.
can be seen in the <code>broker.xml</code> file.</p>
<p>A JMS ConnectionFactory is deployed on each server specifying the discovery group that will be used by that
connection factory.</p>
- <p>For more information on 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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-durable-subscription/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/readme.html b/examples/jms/clustered-durable-subscription/readme.html
index 3af64f8..cd5dcce 100644
--- a/examples/jms/clustered-durable-subscription/readme.html
+++ b/examples/jms/clustered-durable-subscription/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Durable Subscription Example</title>
+ <title>ActiveMQ Artemis JMS Durable Subscription Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -29,7 +29,7 @@ under the License.
<p>This example demonstrates a clustered JMS durable subscription.
Normally durable subscriptions exist on a single node and can only have one subscriber at any one time,
- however, with ActiveMQ it's possible to create durable subscription instances with the same name and client-id
+ however, with ActiveMQ Artemis it's possible to create durable subscription instances with the same name and client-id
on different nodes of the cluster, and consume from them simultaneously.
This allows the work of processing messages from a durable subscription to be spread across the cluster in
a similar way to how JMS Queues can be load balanced across the cluster
@@ -56,7 +56,7 @@ under the License.
</cluster-connection>
</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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-grouping/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/readme.html b/examples/jms/clustered-grouping/readme.html
index 94da4f0..91aba99 100644
--- a/examples/jms/clustered-grouping/readme.html
+++ b/examples/jms/clustered-grouping/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Clustered Grouping Example</title>
+ <title>ActiveMQ Artemis JMS Clustered Grouping Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css">
</head>
<body>
@@ -75,7 +75,7 @@ under the License.
</code>
</pre>
- <p>For more information on ActiveMQ clustering and grouping see the clustering and grouping
+ <p>For more information on ActiveMQ Artemis clustering and grouping see the clustering and grouping
section of the user manual.</p>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-jgroups/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/readme.html b/examples/jms/clustered-jgroups/readme.html
index bbd448f..a88ce0d 100644
--- a/examples/jms/clustered-jgroups/readme.html
+++ b/examples/jms/clustered-jgroups/readme.html
@@ -19,13 +19,13 @@ under the License.
<html>
<head>
- <title>ActiveMQ Clustering with JGroups Example</title>
+ <title>ActiveMQ Artemis Clustering with JGroups Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
</head>
<body onload="prettyPrint()">
- <h1>ActiveMQ Clustering with JGroups Example</h1>
+ <h1>ActiveMQ Artemis Clustering with JGroups Example</h1>
<p>This example demonstrates the working of a two node cluster using JGroups as the underlying topology broadcasting/discovery
technique.</p>
@@ -34,7 +34,7 @@ under the License.
in a round-robin fashion.</p>
<p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
JNDI, these could be instantiated directly.</p>
- <p>To enable ActiveMQ to use JGroups you need to configure JGroups configuration file and make sure it is on the classpath
+ <p>To enable ActiveMQ Artemis to use JGroups you need to configure JGroups configuration file and make sure it is on the classpath
by placing in the configuration directory, the file test-jgroups-file_ping.xml is the configuration used in this
exaample</p>
<p>You then configure the jgroups file used by the broadcast and discovery groups in the configuration along with the
@@ -59,7 +59,7 @@ under the License.
</discovery-groups>
</code>
</pre>
- <p>For more information on ActiveMQ clustering in general, please see the clustering
+ <p>For more information on ActiveMQ Artemis clustering in general, please see the clustering
section of the user manual.</p>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>./build.sh</code> (or <code>build.bat</code> on windows) from this directory</i></p>
@@ -163,8 +163,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.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/readme.html b/examples/jms/clustered-queue/readme.html
index 2c70d80..be08324 100644
--- a/examples/jms/clustered-queue/readme.html
+++ b/examples/jms/clustered-queue/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Load Balanced Clustered Queue Example</title>
+ <title>ActiveMQ Artemis JMS Load Balanced Clustered Queue Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -31,7 +31,7 @@ under the License.
<p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
<p>We then send some messages via the producer, and we verify that <b>both</b> consumers receive the sent messages
in a round-robin fashion.</p>
- <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+ <p>In other words, ActiveMQ Artemis <b>load balances</b> the sent messages across all consumers on the cluster</p>
<p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
JNDI, these could be instantiated directly.</p>
<p>Here's the relevant snippet from the server configuration, which tells the server to form a cluster between the two nodes
@@ -48,7 +48,7 @@ under the License.
</cluster-connection>
</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>
@@ -152,8 +152,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.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-static-discovery/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/readme.html b/examples/jms/clustered-static-discovery/readme.html
index 8a10f8c..863557a 100644
--- a/examples/jms/clustered-static-discovery/readme.html
+++ b/examples/jms/clustered-static-discovery/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Load Balanced Static Clustered Queue Example</title>
+ <title>ActiveMQ Artemis JMS Load Balanced Static Clustered Queue Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -32,7 +32,7 @@ under the License.
<p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
<p>We then send some messages via the producer, and we verify that <b>both</b> consumers receive the sent messages
in a round-robin fashion.</p>
- <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+ <p>In other words, ActiveMQ Artemis <b>load balances</b> the sent messages across all consumers on the cluster</p>
<p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
JNDI, these could be instantiated directly.</p>
<p>Here's the relevant snippet from the server configuration, which tells the server to form a cluster between the two nodes
@@ -51,7 +51,7 @@ under the License.
</cluster-connection>
</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.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-static-oneway/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/readme.html b/examples/jms/clustered-static-oneway/readme.html
index aeff916..0941492 100644
--- a/examples/jms/clustered-static-oneway/readme.html
+++ b/examples/jms/clustered-static-oneway/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Load Balanced Static Clustered Queue Example</title>
+ <title>ActiveMQ Artemis JMS Load Balanced Static Clustered Queue Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -34,7 +34,7 @@ under the License.
<p>We then create a consumer on the queue on each node, and we create a producer on only one of the nodes.</p>
<p>We then send some messages via the producer, and we verify that <b>all</b> consumers receive the sent messages
in a round-robin fashion.</p>
- <p>In other words, ActiveMQ <b>load balances</b> the sent messages across all consumers on the cluster</p>
+ <p>In other words, ActiveMQ Artemis <b>load balances</b> the sent messages across all consumers on the cluster</p>
<p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. If you prefer not to use
JNDI, these could be instantiated directly.</p>
<p>Here's the relevant snippet from the server configuration, which tells the server to form a one way cluster between the three nodes
@@ -57,7 +57,7 @@ under the License.
</cluster-connection>
</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>
@@ -185,8 +185,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.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/clustered-topic/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/readme.html b/examples/jms/clustered-topic/readme.html
index 178f602..087fafc 100644
--- a/examples/jms/clustered-topic/readme.html
+++ b/examples/jms/clustered-topic/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Clustered Topic Example</title>
+ <title>ActiveMQ Artemis JMS Clustered Topic Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -48,7 +48,7 @@ under the License.
</cluster-connection>
</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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/colocated-failover-scale-down/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/readme.html b/examples/jms/colocated-failover-scale-down/readme.html
index e6710ac..46eeef6 100644
--- a/examples/jms/colocated-failover-scale-down/readme.html
+++ b/examples/jms/colocated-failover-scale-down/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Colocated Failover Scale Down Example</title>
+ <title>ActiveMQ Artemis JMS Colocated Failover Scale Down Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/colocated-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/readme.html b/examples/jms/colocated-failover/readme.html
index 128ffa7..9e787d5 100644
--- a/examples/jms/colocated-failover/readme.html
+++ b/examples/jms/colocated-failover/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Colocated Failover Example</title>
+ <title>ActiveMQ Artemis JMS Colocated Failover Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java b/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
index d47e996..dcc512f 100644
--- a/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
+++ b/examples/jms/common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
/**
- * Base class for ActiveMQ examples.
+ * Base class for ActiveMQ Artemis examples.
* <p>
* This takes care of starting and stopping the server as well as deploying any
* queue needed.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/consumer-rate-limit/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/readme.html b/examples/jms/consumer-rate-limit/readme.html
index 7c91ed7..2baefb3 100644
--- a/examples/jms/consumer-rate-limit/readme.html
+++ b/examples/jms/consumer-rate-limit/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Message Consumer Rate Limiting</title>
+ <title>ActiveMQ Artemis JMS Message Consumer Rate Limiting</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,9 +27,9 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Message Consumer Rate Limiting</h1>
- <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>
- <p>If this value is specified then ActiveMQ will ensure that messages are never consumed at a rate higher than
+ <p>If this value is specified then ActiveMQ Artemis will ensure that messages are never consumed at a rate higher than
the specified rate. This is a form of consumer <i>throttling</i>.</p>
<h2>Example step-by-step</h2>
<p>In this example we specify a <code>consumer-max-rate</code> of <code>10</code> messages per second in the <code>activemq-jms.xml</code>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/dead-letter/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/readme.html b/examples/jms/dead-letter/readme.html
index e91061f..36985e2 100644
--- a/examples/jms/dead-letter/readme.html
+++ b/examples/jms/dead-letter/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Dead Letter Example</title>
+ <title>ActiveMQ Artemis Dead Letter Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -34,7 +34,7 @@ under the License.
<p>To prevent this, messaging systems define dead letter messages: after a specified unsuccessful delivery attempts, the message is removed from the destination
and instead routed to a <em>dead letter address</em> where they can be consumed for further investigation.
<p>
- The example will show how to configure ActiveMQ to route a message to a dead letter address after 3 unsuccessful delivery attempts.<br />
+ The example will show how to configure ActiveMQ Artemis to route a message to a dead letter address after 3 unsuccessful delivery attempts.<br />
The example will send 1 message to a queue. We will deliver the message 3 times and rollback the session every time.<br />
On the 4th attempt, there won't be any message to consume: it will have been moved to a <em>dead letter address</em>.<br />
We will then consume this dead letter message.
@@ -49,7 +49,7 @@ under the License.
</code>
</pre>
<p>This configuration will moved dead letter messages from <code>exampleQueue</code> to the <code>deadLetterQueue</code>.</p>
- <p>ActiveMQ allows to specify either a <code>Queue</code> by prefixing the <code>dead-letter-address</code> with <code>jms.queue.</code>
+ <p>ActiveMQ Artemis allows to specify either a <code>Queue</code> by prefixing the <code>dead-letter-address</code> with <code>jms.queue.</code>
or a <code>Topic</code> by prefixing with <code>jms.topic.</code>.<br />
In this example, we will use a <code>Queue</code> to hold the dead letter messages.</p>
<p>The maximum attempts of delivery is <code>3</code>. Once this figure is reached, a message is considered a dead letter message and is moved to
@@ -156,7 +156,7 @@ under the License.
System.out.println("4th delivery from " + queue.getQueueName() + ": " + messageReceived);</code>
</pre>
- <p>We have configured ActiveMQ to send any dead letter messages to the <code>deadLetterQueue</code>.
+ <p>We have configured ActiveMQ Artemis to send any dead letter messages to the <code>deadLetterQueue</code>.
We will now consume messages from this queue and receives the <em>dead letter messages</em>.</p>
<li>We look up the JMS <em>dead letter queue</em> object from JNDI</li>
@@ -182,7 +182,7 @@ under the License.
<p>JMS does not specify the notion of dead letter destinations and messages. From JMS point of view, the message received from the dead letter queue
is a <strong>different</strong> message than the message removed from the queue after the unsuccessful delivery attempts:
the messages have the same content (properties and body) but their JMS headers differ.<br />
- ActiveMQ defines additional properties for messages received from a dead letter destination</p>
+ ActiveMQ Artemis defines additional properties for messages received from a dead letter destination</p>
<li>The message's destination is the dead letter queue</li>
<pre class="prettyprint">
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
index 30d8f60..6cf5da7 100644
--- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
+++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
@@ -121,7 +121,7 @@ public class DeadLetterExample extends ActiveMQExample
// The message received from the dead letter queue has the same content than the undelivered message but its
// JMS headers
// differ (from JMS point of view, it's not the same message).
- // ActiveMQ defines additional properties for messages received from the dead letter queue
+ // ActiveMQ Artemis defines additional properties for messages received from the dead letter queue
System.out.println();
// Step 21. the messageReceived's destination is now the dead letter queue.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/delayed-redelivery/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/readme.html b/examples/jms/delayed-redelivery/readme.html
index 81fb6ed..8613c02 100644
--- a/examples/jms/delayed-redelivery/readme.html
+++ b/examples/jms/delayed-redelivery/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Delayed Redelivery Example</title>
+ <title>ActiveMQ Artemis Delayed Redelivery Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>Delayed Redelivery Example</h1>
- <p>This example demonstrates how ActiveMQ can be configured to provide a delayed redelivery in the case
+ <p>This example demonstrates how ActiveMQ Artemis can be configured to provide a delayed redelivery in the case
where a message needs to be redelivered.</p>
<p>Delaying redelivery can often be useful in the case that clients regularly fail or roll-back. Without a delayed
redelivery, the system can get into a "thrashing" state, with delivery being attempted, the client rolling back, and
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
index 2aa4a62..f0197dc 100644
--- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
+++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
@@ -28,7 +28,7 @@ import javax.naming.InitialContext;
import org.apache.activemq.artemis.common.example.ActiveMQExample;
/**
- * This example demonstrates how ActiveMQ can be configured with a redelivery delay in the event a message
+ * This example demonstrates how ActiveMQ Artemis can be configured with a redelivery delay in the event a message
* is redelivered.
*
* Please see the readme.html for more information
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/divert/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index ec16cb8..6a5707f 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Divert Example</title>
+ <title>ActiveMQ Artemis Divert Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>Divert Example</h1>
- <p>ActiveMQ diverts allow messages to be transparently "diverted" from one address to another
+ <p>ActiveMQ Artemis diverts allow messages to be transparently "diverted" from one address to another
with just some simple configuration defined on the server side.</p>
<p>Diverts can be defined to be <b>exclusive</b> or <b>non-exclusive</b>.</p>
<p>With an <b>exclusive</b> divert the message is intercepted and does not get sent to the queues originally
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
index 9a66c1f..0d67bab 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
@@ -32,7 +32,7 @@ import javax.naming.InitialContext;
import org.apache.activemq.artemis.common.example.ActiveMQExample;
/**
- * This examples demonstrates the use of ActiveMQ "Diverts" to transparently divert or copy messages
+ * This examples demonstrates the use of ActiveMQ Artemis "Diverts" to transparently divert or copy messages
* from one address to another.
*
* Please see the readme.html for more information.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/durable-subscription/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/readme.html b/examples/jms/durable-subscription/readme.html
index ecec8b9..4379baa 100644
--- a/examples/jms/durable-subscription/readme.html
+++ b/examples/jms/durable-subscription/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ JMS Durable Subscription Example</title>
+ <title>ActiveMQ Artemis JMS Durable Subscription Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,7 +27,7 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Durable Subscription Example</h1>
- <p>This example demonstrates how to use a durable subscription with ActiveMQ.</p>
+ <p>This example demonstrates how to use a durable subscription with ActiveMQ Artemis.</p>
<p>Durable subscriptions are a standard part of JMS, please consult the JMS 1.1 specification for full details.</p>
<p>Unlike non durable subscriptions, the key function of durable subscriptions is that the messages contained in them
persist longer than the lifetime of the subscriber - i.e. they will accumulate messages sent to the topic even
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/embedded-simple/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/readme.html b/examples/jms/embedded-simple/readme.html
index 9b165f5..71672b9 100644
--- a/examples/jms/embedded-simple/readme.html
+++ b/examples/jms/embedded-simple/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Embedded JMS Server Example</title>
+ <title>ActiveMQ Artemis Embedded JMS Server Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,15 +27,15 @@ under the License.
<body onload="prettyPrint()">
<h1>Embedded JMS Server Example</h1>
- <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ along with ActiveMQ configuration files.</p>
+ <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ Artemis along with ActiveMQ Artemis configuration files.</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>Create ActiveMQ core configuration files and make sure they are within your classpath. By default, ActiveMQ
+ <li>Create ActiveMQ Artemis core configuration files and make sure they are within your classpath. By default, ActiveMQ
expects the configuration file name to be "broker.xml".</li>
- <li>Create an embedded ActiveMQ JMS server</li>
+ <li>Create an embedded ActiveMQ Artemis JMS server</li>
<pre class="prettyprint">
<code>EmbeddedJMS jmsServer = new EmbeddedJMS();</code>
</pre>
@@ -49,7 +49,7 @@ under the License.
jmsServer.setSecurityManager(new ActiveMQSecurityManagerImpl(securityConfig));</code>
</pre>
- <li>Start the embedded ActiveMQ JMS server</li>
+ <li>Start the embedded ActiveMQ Artemis JMS server</li>
<pre class="prettyprint">
<code>jmsServer.start()</code>
</pre>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index 98fc8b2..b39bd28 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -36,7 +36,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
/**
- * This example demonstrates how to run a ActiveMQ embedded with JMS
+ * This example demonstrates how to run a ActiveMQ Artemis embedded with JMS
*/
public class EmbeddedExample extends ActiveMQExample
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/embedded/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/readme.html b/examples/jms/embedded/readme.html
index 08bc611..b64ea4c 100644
--- a/examples/jms/embedded/readme.html
+++ b/examples/jms/embedded/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Embedded JMS Server Example</title>
+ <title>ActiveMQ Artemis Embedded JMS Server Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,8 +27,8 @@ under the License.
<body onload="prettyPrint()">
<h1>Embedded JMS Server Example</h1>
- <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ.</p>
- <p>ActiveMQ was designed using POJOs (Plain Old Java Objects) which means embedding ActiveMQ in your own application
+ <p>This examples shows how to setup and run an embedded JMS server using ActiveMQ Artemis.</p>
+ <p>ActiveMQ Artemis was designed using POJOs (Plain Old Java Objects) which means embedding ActiveMQ Artemis in your own application
is as simple as instantiating a few objects.</p>
<p>This example does not use any configuration files. The server is configured using POJOs and can be easily ported to any dependency injection framework.<br />
We will setup and run a full-fledged JMS server which binds its JMS resources to JNDI and can be accessed by remote clients.</p>
@@ -37,7 +37,7 @@ under the License.
<p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
<ol>
- <li>Create ActiveMQ core configuration, and set the properties accordingly</li>
+ <li>Create ActiveMQ Artemis core configuration, and set the properties accordingly</li>
<pre class="prettyprint">
<code>Configuration configuration = new ConfigurationImpl();
configuration.setPersistenceEnabled(false);
@@ -45,9 +45,9 @@ under the License.
configuration.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));</code>
Configuration configuration = new ConfigurationImpl();</pre>
- <li>Create the ActiveMQ core server</li>
+ <li>Create the ActiveMQ Artemis core server</li>
<pre class="prettyprint">
- <code>ActiveMQServer activemqServer = ActiveMQ.newActiveMQServer(configuration);</code>
+ <code>ActiveMQServer activemqServer = ActiveMQ Artemis.newActiveMQServer(configuration);</code>
</pre>
<li>Create the JMS configuration</li>
@@ -68,7 +68,7 @@ under the License.
jmsConfig.getQueueConfigurations().add(queueConfig);</code>
</pre>
- <li>Start the JMS Server using the ActiveMQ core server and the JMS configuration</li>
+ <li>Start the JMS Server using the ActiveMQ Artemis core server and the JMS configuration</li>
<pre class="prettyprint">
<code>JMSServerManager jmsServer = new JMSServerManagerImpl(activemqServer, jmsConfig);
jmsServer.start();</code>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index 35cfe5c..590472b 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -42,7 +42,7 @@ import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationI
import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
/**
- * This example demonstrates how to run a ActiveMQ embedded with JMS
+ * This example demonstrates how to run a ActiveMQ Artemis embedded with JMS
*/
public final class EmbeddedExample extends ActiveMQExample
{
@@ -58,7 +58,7 @@ public final class EmbeddedExample extends ActiveMQExample
try
{
- // Step 1. Create ActiveMQ core configuration, and set the properties accordingly
+ // Step 1. Create ActiveMQ Artemis core configuration, and set the properties accordingly
Configuration configuration = new ConfigurationImpl();
configuration.setPersistenceEnabled(false);
configuration.setJournalDirectory("target/data/journal");
@@ -90,7 +90,7 @@ public final class EmbeddedExample extends ActiveMQExample
.setBindings("queue/queue1");
jmsConfig.getQueueConfigurations().add(queueConfig);
- // Step 5. Start the JMS Server using the ActiveMQ core server and the JMS configuration
+ // Step 5. Start the JMS Server using the ActiveMQ Artemis core server and the JMS configuration
EmbeddedJMS jmsServer = new EmbeddedJMS();
jmsServer.setConfiguration(configuration);
jmsServer.setJmsConfiguration(jmsConfig);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/examples/jms/expiry/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/readme.html b/examples/jms/expiry/readme.html
index 534acfc..24b3ff7 100644
--- a/examples/jms/expiry/readme.html
+++ b/examples/jms/expiry/readme.html
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <title>ActiveMQ Message Expiration Example</title>
+ <title>ActiveMQ Artemis Message Expiration Example</title>
<link rel="stylesheet" type="text/css" href="../common/common.css" />
<link rel="stylesheet" type="text/css" href="../common/prettify.css" />
<script type="text/javascript" src="../common/prettify.js"></script>
@@ -27,10 +27,10 @@ under the License.
<body onload="prettyPrint()">
<h1>JMS Expiration Example</h1>
- <p>This example shows you how to configure ActiveMQ so messages are expipired after a certain time..</p>
+ <p>This example shows you how to configure ActiveMQ Artemis so messages are expipired after a certain time..</p>
<p>Messages can be retained in the messaging system for a limited period of time before being removed.
JMS specification states that clients should not receive messages that have been expired (but it does not guarantee this will not happen).</p>
- <p>ActiveMQ can assign a <em>expiry address</em> to a given queue so that when messages are expired, they are removed from the queue and
+ <p>ActiveMQ Artemis can assign a <em>expiry address</em> to a given queue so that when messages are expired, they are removed from the queue and
routed to an this address. These "expired" messages can later be consumed for further inspection.
<p>
The example will send 1 message with a short <em>time-to-live</em> to a queue. We will wait for the message to expire and checks that the message
@@ -46,7 +46,7 @@ under the License.
</code>
</pre>
<p>This configuration will moved expired messages from the <code>exampleQueue</code> to the <code>expiryQueue</code></p>
- <p>ActiveMQ allows to specify either a <code>Queue</code> by prefixing the <code>expiry-address</code> with <code>jms.queue.</code>
+ <p>ActiveMQ Artemis allows to specify either a <code>Queue</code> by prefixing the <code>expiry-address</code> with <code>jms.queue.</code>
or a <code>Topic</code> by prefixing with <code>jms.topic.</code>.<br />
In this example, we will use a <code>Queue</code> to hold the expired messages.</p>
<p>Since we want to consume messages from this expiryQueue, we also need to add a JNDI binding to perform a lookup.
@@ -128,7 +128,7 @@ under the License.
System.out.println("Received message from " + queue.getQueueName() + ": " + messageReceived);</code>
</pre>
- <p>However, we have configured ActiveMQ to send any expired messages to the <code>expiryQueue</code>.
+ <p>However, we have configured ActiveMQ Artemis to send any expired messages to the <code>expiryQueue</code>.
We will now consume messages from this expiry queue and receives the <em>expired</em> message.</p>
<li>We look up the JMS <em>expiry queue</em> object from JNDI</li>
@@ -154,7 +154,7 @@ under the License.
<p>JMS does not specify the notion of expiry queue. From JMS point of view, the message received from the expiry queue
is a <strong>different</strong> message than the message expired from the queue: the two messages have the same content (properties and body) but
their JMS headers differ.<br />
- 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</p>
<li>The expired message's destination is the expiry queue</li>
[6/6] activemq-artemis git commit: merge PR #254 - Ensure all
references to the project use ActiveMQ Artemis
Posted by an...@apache.org.
merge PR #254 - Ensure all references to the project use ActiveMQ Artemis
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d5f6aec0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d5f6aec0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d5f6aec0
Branch: refs/heads/master
Commit: d5f6aec0845e13b0f4bdbea260d4853c22255f90
Parents: 0854371 a17c828
Author: Andy Taylor <an...@gmail.com>
Authored: Wed May 13 14:28:47 2015 +0100
Committer: Andy Taylor <an...@gmail.com>
Committed: Wed May 13 14:28:47 2015 +0100
----------------------------------------------------------------------
RELEASING.md | 2 +-
.../apache/activemq/artemis/boot/Artemis.java | 2 +-
.../cli/commands/tools/XmlDataImporter.java | 2 +-
.../cli/commands/bin/artemis-service.xml | 2 +-
.../artemis/cli/commands/etc/artemis.profile | 2 +-
.../cli/commands/etc/artemis.profile.cmd | 2 +-
.../artemis/cli/commands/etc/broker.xml | 4 ++--
.../artemis/cli/commands/etc/logging.properties | 2 +-
artemis-cli/src/test/resources/broker-nojms.xml | 4 ++--
artemis-cli/src/test/resources/broker.xml | 4 ++--
.../artemis/api/core/ActiveMQBuffer.java | 2 +-
.../ActiveMQConnectionTimedOutException.java | 2 +-
.../api/core/ActiveMQDisconnectedException.java | 2 +-
.../artemis/api/core/ActiveMQException.java | 2 +-
.../api/core/ActiveMQIllegalStateException.java | 2 +-
.../core/ActiveMQInternalErrorException.java | 2 +-
.../api/core/ActiveMQNotConnectedException.java | 2 +-
.../ActiveMQUnsupportedPacketException.java | 2 +-
.../activemq/artemis/api/core/SimpleString.java | 2 +-
.../artemis/utils/ClassloadingUtil.java | 2 +-
.../activemq/artemis/utils/ReusableLatch.java | 2 +-
.../config/ActiveMQDefaultConfiguration.java | 8 ++++----
.../artemis/api/core/FilterConstants.java | 16 ++++++++--------
.../activemq/artemis/api/core/Interceptor.java | 4 ++--
.../api/core/JGroupsBroadcastEndpoint.java | 2 +-
.../api/core/JGroupsFileBroadcastEndpoint.java | 2 +-
.../JGroupsPropertiesBroadcastEndpoint.java | 2 +-
.../activemq/artemis/api/core/Message.java | 2 +-
.../api/core/TransportConfiguration.java | 2 +-
.../artemis/api/core/client/ActiveMQClient.java | 2 +-
.../artemis/api/core/client/ClientConsumer.java | 6 +++---
.../artemis/api/core/client/ClientMessage.java | 4 ++--
.../api/core/client/ClientSessionFactory.java | 2 +-
.../management/ActiveMQComponentControl.java | 2 +-
.../core/management/ActiveMQServerControl.java | 4 ++--
.../api/core/management/ManagementHelper.java | 10 +++++-----
.../api/core/management/NotificationType.java | 4 ++--
.../api/core/management/ObjectNameBuilder.java | 4 ++--
.../artemis/core/message/BodyEncoder.java | 10 +++++-----
.../artemis/core/message/impl/MessageImpl.java | 2 +-
.../protocol/core/CoreRemotingConnection.java | 2 +-
.../core/impl/ActiveMQSessionContext.java | 4 ++--
.../core/remoting/impl/ssl/SSLSupport.java | 2 +-
artemis-distribution/pom.xml | 2 +-
.../activemq/artemis/dto/package-info.java | 2 +-
.../artemis/api/jms/ActiveMQJMSClient.java | 2 +-
.../artemis/api/jms/ActiveMQJMSConstants.java | 2 +-
.../management/ConnectionFactoryControl.java | 2 +-
.../api/jms/management/DestinationControl.java | 2 +-
.../api/jms/management/JMSManagementHelper.java | 2 +-
.../api/jms/management/JMSServerControl.java | 2 +-
.../api/jms/management/SubscriptionInfo.java | 2 +-
.../jms/client/ActiveMQBytesMessage.java | 2 +-
.../artemis/jms/client/ActiveMQConnection.java | 2 +-
.../jms/client/ActiveMQConnectionFactory.java | 2 +-
.../jms/client/ActiveMQConnectionMetaData.java | 2 +-
.../artemis/jms/client/ActiveMQDestination.java | 2 +-
.../artemis/jms/client/ActiveMQJMSContext.java | 2 +-
.../artemis/jms/client/ActiveMQMapMessage.java | 2 +-
.../artemis/jms/client/ActiveMQMessage.java | 4 ++--
.../jms/client/ActiveMQMessageConsumer.java | 2 +-
.../jms/client/ActiveMQMessageProducer.java | 2 +-
.../jms/client/ActiveMQObjectMessage.java | 2 +-
.../artemis/jms/client/ActiveMQQueue.java | 2 +-
.../jms/client/ActiveMQQueueBrowser.java | 2 +-
.../artemis/jms/client/ActiveMQSession.java | 4 ++--
.../jms/client/ActiveMQStreamMessage.java | 2 +-
.../jms/client/ActiveMQTemporaryQueue.java | 2 +-
.../artemis/jms/client/ActiveMQTextMessage.java | 4 ++--
.../artemis/jms/client/ActiveMQTopic.java | 2 +-
.../jms/client/ActiveMQXAConnection.java | 2 +-
.../artemis/jms/client/SelectorTranslator.java | 6 +++---
.../jndi/ActiveMQInitialContextFactory.java | 2 +-
.../jms/bridge/QualityOfServiceMode.java | 2 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 +-
.../ActiveMQProtonRemotingConnection.java | 2 +-
.../protocol/proton/ProtonProtocolManager.java | 2 +-
.../converter/jms/ServerJMSMapMessage.java | 2 +-
.../converter/jms/ServerJMSTextMessage.java | 2 +-
.../openwire/OpenWireMessageConverter.java | 4 ++--
.../context/AbstractProtonContextSender.java | 4 ++--
.../server/ProtonServerSenderContext.java | 4 ++--
.../org/proton/plug/util/ReusableLatch.java | 2 +-
.../core/protocol/stomp/StompDecoder.java | 2 +-
.../protocol/stomp/StompFrameInterceptor.java | 4 ++--
.../ra/ActiveMQRAManagedConnectionFactory.java | 2 +-
.../activemq/artemis/ra/ActiveMQRAService.java | 2 +-
.../org/apache/activemq/artemis/ra/package.html | 2 +-
.../apache/activemq/artemis/rest/ActiveMQ.java | 2 +-
.../artemis/rest/util/HttpMessageHelper.java | 2 +-
.../src/main/resources/schema/artemis-rest.xsd | 12 ++++++------
.../artemis/core/config/Configuration.java | 8 ++++----
.../artemis/core/filter/impl/FilterImpl.java | 4 ++--
.../artemis/core/paging/PagingStore.java | 2 +-
.../core/paging/impl/PagingStoreImpl.java | 2 +-
.../core/security/impl/SecurityStoreImpl.java | 2 +-
.../artemis/core/server/ActiveMQServer.java | 4 ++--
.../core/server/ActiveMQServerLogger.java | 2 +-
.../core/server/embedded/EmbeddedActiveMQ.java | 2 +-
.../server/impl/AIOFileLockNodeManager.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 4 ++--
.../core/server/impl/ServiceRegistry.java | 2 +-
.../artemis/core/transaction/Transaction.java | 2 +-
.../spi/core/protocol/ProtocolManager.java | 2 +-
.../resources/schema/artemis-configuration.xsd | 4 ++--
.../artemis/core/filter/impl/FilterTest.java | 2 +-
.../xa/ActiveMQXAResourceWrapperImpl.java | 2 +-
.../xa/recovery/ActiveMQXAResourceRecovery.java | 4 ++--
.../xa/recovery/ActiveMQXAResourceWrapper.java | 2 +-
docs/design-guide/en/clustering.md | 2 +-
docs/quickstart-guide/en/README.md | 2 +-
docs/quickstart-guide/en/about.md | 10 +++++-----
docs/quickstart-guide/en/download.md | 4 ++--
docs/quickstart-guide/en/examples.md | 20 ++++++++++----------
docs/quickstart-guide/en/installation.md | 12 ++++++------
docs/quickstart-guide/en/introduction.md | 4 ++--
docs/quickstart-guide/en/running.md | 2 +-
docs/user-manual/en/README.md | 2 +-
docs/user-manual/en/architecture.md | 8 ++++----
docs/user-manual/en/configuration-index.md | 4 ++--
docs/user-manual/en/core-bridges.md | 2 +-
docs/user-manual/en/diverts.md | 2 +-
docs/user-manual/en/flow-control.md | 2 +-
docs/user-manual/en/ha.md | 8 ++++----
docs/user-manual/en/management.md | 8 ++++----
docs/user-manual/en/message-grouping.md | 2 +-
docs/user-manual/en/preface.md | 2 +-
docs/user-manual/en/rest.md | 4 ++--
docs/user-manual/en/using-jms.md | 2 +-
docs/user-manual/en/using-server.md | 2 +-
etc/findbugs-exclude.xml | 2 +-
examples/core/embedded-remote/readme.html | 14 +++++++-------
.../core/example/EmbeddedRemoteExample.java | 2 +-
examples/core/embedded/readme.html | 16 ++++++++--------
.../artemis/core/example/EmbeddedExample.java | 2 +-
examples/core/vertx-connector/readme.html | 10 +++++-----
examples/jms/README.md | 2 +-
examples/jms/aerogear/readme.html | 2 +-
.../jms/application-layer-failover/readme.html | 12 ++++++------
.../artemis-ra-rar/src/main/resources/ra.xml | 4 ++--
examples/jms/bridge/readme.html | 10 +++++-----
examples/jms/browser/readme.html | 4 ++--
examples/jms/client-kickoff/readme.html | 12 ++++++------
.../jms/example/ClientKickoffExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../client-side-failoverlistener/readme.html | 2 +-
.../jms/client-side-load-balancing/readme.html | 8 ++++----
.../clustered-durable-subscription/readme.html | 6 +++---
examples/jms/clustered-grouping/readme.html | 4 ++--
examples/jms/clustered-jgroups/readme.html | 12 ++++++------
examples/jms/clustered-queue/readme.html | 10 +++++-----
.../jms/clustered-static-discovery/readme.html | 10 +++++-----
.../jms/clustered-static-oneway/readme.html | 10 +++++-----
examples/jms/clustered-topic/readme.html | 4 ++--
.../colocated-failover-scale-down/readme.html | 2 +-
examples/jms/colocated-failover/readme.html | 2 +-
.../artemis/common/example/ActiveMQExample.java | 2 +-
examples/jms/consumer-rate-limit/readme.html | 6 +++---
examples/jms/dead-letter/readme.html | 10 +++++-----
.../artemis/jms/example/DeadLetterExample.java | 2 +-
examples/jms/delayed-redelivery/readme.html | 4 ++--
.../jms/example/DelayedRedeliveryExample.java | 2 +-
examples/jms/divert/readme.html | 4 ++--
.../artemis/jms/example/DivertExample.java | 2 +-
examples/jms/durable-subscription/readme.html | 4 ++--
examples/jms/embedded-simple/readme.html | 10 +++++-----
.../artemis/jms/example/EmbeddedExample.java | 2 +-
examples/jms/embedded/readme.html | 14 +++++++-------
.../artemis/jms/example/EmbeddedExample.java | 6 +++---
examples/jms/expiry/readme.html | 12 ++++++------
.../artemis/jms/example/ExpiryExample.java | 2 +-
examples/jms/http-transport/readme.html | 8 ++++----
.../instantiate-connection-factory/readme.html | 2 +-
examples/jms/interceptor/readme.html | 6 +++---
.../artemis/jms/example/InterceptorExample.java | 2 +-
examples/jms/jms-auto-closeable/readme.html | 2 +-
examples/jms/jms-bridge/readme.html | 12 ++++++------
.../artemis/jms/example/JMSBridgeExample.java | 2 +-
.../jms/jms-completion-listener/readme.html | 4 ++--
examples/jms/jms-context/readme.html | 4 ++--
examples/jms/jms-shared-consumer/readme.html | 2 +-
examples/jms/jmx/readme.html | 8 ++++----
.../artemis/jms/example/JMXExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
examples/jms/large-message/readme.html | 12 ++++++------
.../jms/example/LargeMessageExample.java | 2 +-
examples/jms/last-value-queue/readme.html | 2 +-
.../jms/management-notifications/readme.html | 10 +++++-----
examples/jms/management/readme.html | 10 +++++-----
.../artemis/jms/example/ManagementExample.java | 2 +-
examples/jms/message-counters/readme.html | 8 ++++----
examples/jms/message-group/readme.html | 4 ++--
examples/jms/message-group2/readme.html | 4 ++--
examples/jms/message-priority/readme.html | 2 +-
examples/jms/no-consumer-buffering/readme.html | 10 +++++-----
.../jms/example/NoConsumerBufferingExample.java | 2 +-
.../jms/non-transaction-failover/readme.html | 4 ++--
examples/jms/openwire/readme.html | 6 +++---
.../artemis/jms/example/OpenWireExample.java | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
examples/jms/paging/readme.html | 6 +++---
.../artemis/jms/example/PagingExample.java | 2 +-
examples/jms/perf/readme.html | 2 +-
examples/jms/pre-acknowledge/readme.html | 6 +++---
.../jms/example/PreacknowledgeExample.java | 2 +-
examples/jms/producer-rate-limit/readme.html | 6 +++---
examples/jms/proton-cpp/readme.html | 8 ++++----
.../artemis/jms/example/ProtonCPPExample.java | 2 +-
examples/jms/proton-j/readme.html | 8 ++++----
examples/jms/proton-ruby/readme.html | 6 +++---
.../queue-message-redistribution/readme.html | 14 +++++++-------
.../QueueMessageRedistributionExample.java | 2 +-
examples/jms/queue-requestor/readme.html | 4 ++--
examples/jms/queue-selector/readme.html | 2 +-
examples/jms/queue/readme.html | 4 ++--
examples/jms/reattach-node/readme.html | 6 +++---
.../jms/replicated-failback-static/readme.html | 4 ++--
examples/jms/replicated-failback/readme.html | 4 ++--
.../replicated-multiple-failover/readme.html | 4 ++--
.../replicated-transaction-failover/readme.html | 6 +++---
examples/jms/request-reply/readme.html | 2 +-
examples/jms/rest/dup-send/README.txt | 2 +-
examples/jms/rest/javascript-chat/README.txt | 2 +-
examples/jms/rest/jms-to-rest/README.txt | 2 +-
examples/jms/rest/push/README.txt | 4 ++--
examples/jms/scale-down/readme.html | 2 +-
examples/jms/scheduled-message/readme.html | 4 ++--
examples/jms/security/readme.html | 16 ++++++++--------
examples/jms/send-acknowledgements/readme.html | 4 ++--
.../example/SendAcknowledgementsExample.java | 2 +-
examples/jms/spring-integration/readme.html | 6 +++---
examples/jms/ssl-enabled/readme.html | 6 +++---
examples/jms/static-selector-jms/readme.html | 2 +-
examples/jms/static-selector/readme.html | 4 ++--
examples/jms/stomp-websockets/readme.html | 8 ++++----
examples/jms/stomp/readme.html | 8 ++++----
examples/jms/stomp1.1/readme.html | 8 ++++----
examples/jms/stomp1.2/readme.html | 8 ++++----
examples/jms/stop-server-failover/readme.html | 4 ++--
examples/jms/symmetric-cluster/readme.html | 10 +++++-----
.../jms/example/SymmetricClusterExample.java | 2 +-
examples/jms/temp-queue/readme.html | 4 ++--
examples/jms/topic-hierarchies/readme.html | 6 +++---
.../jms/topic-selector-example1/readme.html | 2 +-
.../jms/topic-selector-example2/readme.html | 2 +-
examples/jms/topic/readme.html | 4 ++--
examples/jms/transaction-failover/readme.html | 6 +++---
examples/jms/transactional/readme.html | 4 ++--
examples/jms/xa-heuristic/readme.html | 6 +++---
examples/jms/xa-receive/readme.html | 4 ++--
examples/jms/xa-send/readme.html | 6 +++---
examples/soak/normal/README | 2 +-
tests/config/logging.properties | 2 +-
tests/config/logging.properties.trace | 2 +-
.../clientcrash/ClientCrashTest.java | 2 +-
.../integration/clientcrash/ClientExitTest.java | 2 +-
.../server/SuppliedThreadPoolTest.java | 2 +-
.../ssl/CoreClientOverOneWaySSLTest.java | 4 ++--
.../ssl/CoreClientOverTwoWaySSLTest.java | 4 ++--
.../NettyConnectorWithHTTPUpgradeTest.java | 4 ++--
.../jms/tests/ConnectionFactoryTest.java | 4 ++--
.../artemis/jms/tests/MessageConsumerTest.java | 2 +-
.../artemis/jms/tests/PersistenceTest.java | 8 ++++----
.../activemq/artemis/jms/tests/QueueTest.java | 2 +-
.../jms/conform/connection/ConnectionTest.java | 2 +-
.../tests/soak/client/ClientAbstract.java | 2 +-
266 files changed, 551 insertions(+), 551 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5f6aec0/artemis-distribution/pom.xml
----------------------------------------------------------------------
[4/6] activemq-artemis git commit: Ensure all references to the
project use ActiveMQ Artemis
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 47b4807..6d221e1 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -48,7 +48,7 @@ import org.apache.activemq.artemis.utils.UUID;
/**
- * ActiveMQ implementation of a JMS Message.
+ * ActiveMQ Artemis implementation of a JMS Message.
* <br>
* JMS Messages only live on the client side - the server only deals with MessageImpl
* instances
@@ -271,7 +271,7 @@ public class ActiveMQMessage implements javax.jms.Message
else
{
// Some providers, like WSMQ do automatic conversions between native byte[] correlation id
- // and String correlation id. This makes it impossible for ActiveMQ to guarantee to return the correct
+ // and String correlation id. This makes it impossible for ActiveMQ Artemis to guarantee to return the correct
// type as set by the user
// So we allow the behaviour to be overridden by a system property
// https://jira.jboss.org/jira/browse/HORNETQ-356
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index 95e14a5..ba18375 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
/**
- * ActiveMQ implementation of a JMS MessageConsumer.
+ * ActiveMQ Artemis implementation of a JMS MessageConsumer.
*/
public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscriber
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index b4300e3..f6da663 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -43,7 +43,7 @@ import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
import org.apache.activemq.artemis.utils.UUID;
import org.apache.activemq.artemis.utils.UUIDGenerator;
/**
- * ActiveMQ implementation of a JMS MessageProducer.
+ * ActiveMQ Artemis implementation of a JMS MessageProducer.
*/
public class ActiveMQMessageProducer implements MessageProducer, QueueSender, TopicPublisher
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 16547f6..c993a2a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
/**
- * ActiveMQ implementation of a JMS ObjectMessage.
+ * ActiveMQ Artemis implementation of a JMS ObjectMessage.
* <br>
* Don't used ObjectMessage if you want good performance!
* <p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
index 47f7a98..f958d79 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
@@ -21,7 +21,7 @@ import javax.jms.Queue;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
- * ActiveMQ implementation of a JMS Queue.
+ * ActiveMQ Artemis implementation of a JMS Queue.
* <br>
* This class can be instantiated directly.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
index 2a518d3..20ee863 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
@@ -30,7 +30,7 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientSession;
/**
- * ActiveMQ implementation of a JMS QueueBrowser.
+ * ActiveMQ Artemis implementation of a JMS QueueBrowser.
*/
public final class ActiveMQQueueBrowser implements QueueBrowser
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 2bd5572..b46118d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -61,7 +61,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery;
import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery;
/**
- * ActiveMQ implementation of a JMS Session.
+ * ActiveMQ Artemis implementation of a JMS Session.
* <br>
* Note that we *do not* support JMS ASF (Application Server Facilities) optional
* constructs such as ConnectionConsumer
@@ -307,7 +307,7 @@ public class ActiveMQSession implements QueueSession, TopicSession
{
if (destination != null && !(destination instanceof ActiveMQDestination))
{
- throw new InvalidDestinationException("Not a ActiveMQ Destination:" + destination);
+ throw new InvalidDestinationException("Not a ActiveMQ Artemis Destination:" + destination);
}
try
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index d0a7345..3e573f3 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -42,7 +42,7 @@ import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadSho
import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadString;
/**
- * ActiveMQ implementation of a JMS StreamMessage.
+ * ActiveMQ Artemis implementation of a JMS StreamMessage.
*/
public final class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMessage
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
index c06dd9a..cf22e88 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
@@ -20,7 +20,7 @@ import javax.jms.TemporaryQueue;
/**
- * ActiveMQ implementation of a JMS TemporaryQueue.
+ * ActiveMQ Artemis implementation of a JMS TemporaryQueue.
* <br>
* This class can be instantiated directly.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index e1c857e..e9bdf14 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -30,7 +30,7 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
/**
- * ActiveMQ implementation of a JMS TextMessage.
+ * ActiveMQ Artemis implementation of a JMS TextMessage.
* <br>
* This class was ported from SpyTextMessage in JBossMQ.
*/
@@ -61,7 +61,7 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
}
/**
- * A copy constructor for non-ActiveMQ JMS TextMessages.
+ * A copy constructor for non-ActiveMQ Artemis JMS TextMessages.
*/
public ActiveMQTextMessage(final TextMessage foreign, final ClientSession session) throws JMSException
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
index 9976b67..fda6782 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
@@ -21,7 +21,7 @@ import javax.jms.Topic;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
- * ActiveMQ implementation of a JMS Topic.
+ * ActiveMQ Artemis implementation of a JMS Topic.
* <br>
* This class can be instantiated directly.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
index 4e890a6..14e63ff 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
@@ -27,7 +27,7 @@ import javax.jms.XATopicSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
/**
- * ActiveMQ implementation of a JMS XAConnection.
+ * ActiveMQ Artemis implementation of a JMS XAConnection.
* <p>
* The flat implementation of {@link XATopicConnection} and {@link XAQueueConnection} is per design,
* following common practices of JMS 1.1.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
index ebaf952..23b4bf6 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
@@ -21,12 +21,12 @@ import java.util.List;
/**
*
- * This class converts a JMS selector expression into a ActiveMQ core filter expression.
+ * This class converts a JMS selector expression into a ActiveMQ Artemis core filter expression.
*
- * JMS selector and ActiveMQ filters use the same syntax but have different identifiers.
+ * JMS selector and ActiveMQ Artemis filters use the same syntax but have different identifiers.
*
* We basically just need to replace the JMS header and property Identifier names
- * with the corresponding ActiveMQ field and header Identifier names.
+ * with the corresponding ActiveMQ Artemis field and header Identifier names.
*
* We must be careful not to substitute any literals, or identifiers whose name contains the name
* of one we want to substitute.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
index dc6c85c..d83888a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
/**
- * A factory of the ActiveMQ InitialContext which contains
+ * A factory of the ActiveMQ Artemis InitialContext which contains
* {@link javax.jms.ConnectionFactory} instances as well as a child context called
* <i>destinations</i> which contain all of the current active destinations, in
* child context depending on the QoS such as transient or durable and queue or
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
index 0da768d..8979220 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
@@ -42,7 +42,7 @@ package org.apache.activemq.artemis.jms.bridge;
*
* This QoS mode ensures messages will reach the destination from the source
* once and only once. (Sometimes this mode is known as "exactly once"). If both
- * the source and the destination are on the same ActiveMQ server
+ * the source and the destination are on the same ActiveMQ Artemis server
* instance then this can be achieved by sending and acknowledging the messages
* in the same local transaction. If the source and destination are on different
* servers this is achieved by enlisting the sending and consuming sessions in a
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 2650a9b..c8d7e13 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1843,7 +1843,7 @@ public final class JMSBridgeImpl implements JMSBridge
if (val instanceof byte[] == false)
{
- //Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ message it might have such props
+ //Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ Artemis message it might have such props
msg.setObjectProperty(propName, entry.getValue());
}
else if (msg instanceof ActiveMQMessage)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
index 24a28a1..459d9d8 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.proton.plug.AMQPConnectionContext;
/**
- * This is a Server's Connection representation used by ActiveMQ.
+ * This is a Server's Connection representation used by ActiveMQ Artemis.
*/
public class ActiveMQProtonRemotingConnection extends AbstractRemotingConnection
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java
index ef40eeb..b992078 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java
@@ -41,7 +41,7 @@ import org.proton.plug.AMQPServerConnectionContext;
import org.proton.plug.context.server.ProtonServerConnectionContextFactory;
/**
- * A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ resources
+ * A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ Artemis resources
*/
public class ProtonProtocolManager implements ProtocolManager<Interceptor>, NotificationListener
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
index 11b5b13..9c1e3f5 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
@@ -34,7 +34,7 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
/**
- * ActiveMQ implementation of a JMS MapMessage.
+ * ActiveMQ Artemis implementation of a JMS MapMessage.
*/
public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMessage
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
index 05aa81a..3cfc251 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
@@ -28,7 +28,7 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
/**
- * ActiveMQ implementation of a JMS TextMessage.
+ * ActiveMQ Artemis implementation of a JMS TextMessage.
* <br>
* This class was ported from SpyTextMessage in JBossMQ.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
index 421b1a2..09af871 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -103,7 +103,7 @@ public class OpenWireMessageConverter implements MessageConverter
return null;
}
- //convert an ActiveMQ message to coreMessage
+ //convert an ActiveMQ Artemis message to coreMessage
public static void toCoreMessage(ServerMessageImpl coreMessage, Message messageSend, WireFormat marshaller) throws IOException
{
String type = messageSend.getType();
@@ -400,7 +400,7 @@ public class OpenWireMessageConverter implements MessageConverter
case CommandTypes.ACTIVEMQ_MESSAGE:
return org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE;
default:
- throw new IllegalStateException("Unknown ActiveMQ message type: " + amqType);
+ throw new IllegalStateException("Unknown ActiveMQ Artemis message type: " + amqType);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
index 9cd60a3..80f09ed 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
@@ -28,7 +28,7 @@ import org.proton.plug.util.CreditsSemaphore;
import org.proton.plug.util.NettyWritable;
/**
- * A this is a wrapper around a ActiveMQ ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
+ * A this is a wrapper around a ActiveMQ Artemis ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
*/
public abstract class AbstractProtonContextSender extends ProtonInitializable implements ProtonDeliveryHandler
{
@@ -79,7 +79,7 @@ public abstract class AbstractProtonContextSender extends ProtonInitializable im
@Override
/*
- * handle an incoming Ack from Proton, basically pass to ActiveMQ to handle
+ * handle an incoming Ack from Proton, basically pass to ActiveMQ Artemis to handle
* */
public abstract void onMessage(Delivery delivery) throws ActiveMQAMQPException;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
index dbaf4b9..3a49c71 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
@@ -85,7 +85,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
}
/**
- * create the actual underlying ActiveMQ Server Consumer
+ * create the actual underlying ActiveMQ Artemis Server Consumer
*/
@Override
public void initialise() throws Exception
@@ -252,7 +252,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
/**
- * handle an out going message from ActiveMQ, send via the Proton Sender
+ * handle an out going message from ActiveMQ Artemis, send via the Proton Sender
*/
public int deliverMessage(Object message, int deliveryCount) throws Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java
index 2a3fabe..8ba0bc3 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java
@@ -27,7 +27,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
* <p/>
* <p>It could be used for sync points when one process is feeding the latch while another will wait when everything is done. (e.g. waiting IO completions to finish)</p>
* <p/>
- * <p>On ActiveMQ we have the requirement of increment and decrement a counter until the user fires a ready handler (commit). At that point we just act as a regular countDown.</p>
+ * <p>On ActiveMQ Artemis we have the requirement of increment and decrement a counter until the user fires a ready handler (commit). At that point we just act as a regular countDown.</p>
* <p/>
* <p>Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.</p>
* <p/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
index 3c4f744..93d2dbc 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
@@ -371,7 +371,7 @@ public class StompDecoder
// trim off leading whitespace from header values.
// The STOMP spec examples seem to imply that whitespace should be trimmed although it is not
// explicit in the spec
- // ActiveMQ + StompConnect also seem to trim whitespace from header values.
+ // ActiveMQ Artemis + StompConnect also seem to trim whitespace from header values.
// Trimming is problematic though if the user has set a header with a value which deliberately
// has
// leading whitespace since
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
index ee8755f..7c340c8 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
@@ -19,9 +19,9 @@ package org.apache.activemq.artemis.core.protocol.stomp;
import org.apache.activemq.artemis.api.core.BaseInterceptor;
/**
- * This class is a simple way to intercepting client calls on ActiveMQ using STOMP protocol.
+ * This class is a simple way to intercepting client calls on ActiveMQ Artemis using STOMP protocol.
* <p>
- * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
+ * To add an interceptor to ActiveMQ Artemis server, you have to modify the server configuration file
* {@literal broker.xml}.<br>
*/
public interface StompFrameInterceptor extends BaseInterceptor<StompFrame>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index f722bfc..ec1151e 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
/**
- * ActiveMQ ManagedConnectionFactory
+ * ActiveMQ Artemis ManagedConnectionFactory
*/
public final class ActiveMQRAManagedConnectionFactory implements ManagedConnectionFactory, ResourceAdapterAssociation
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
index 3c7f95f..b21eaea 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
@@ -24,7 +24,7 @@ import javax.management.ObjectName;
/**
- * A ActiveMQRAService ensures that ActiveMQ Resource Adapter will be stopped *before* the ActiveMQ server.
+ * A ActiveMQRAService ensures that ActiveMQ Artemis Resource Adapter will be stopped *before* the ActiveMQ Artemis server.
* https://jira.jboss.org/browse/HORNETQ-339
*/
public class ActiveMQRAService
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
index 0960900..de1602c 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
@@ -22,7 +22,7 @@
</head>
<body bgcolor="white">
- <h1>ActiveMQ Resource Adaptor</h1>
+ <h1>ActiveMQ Artemis Resource Adaptor</h1>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
index 514079f..adb742d 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
@@ -178,7 +178,7 @@ public class ActiveMQ
}
/**
- * Was this ActiveMQ message generated from a REST call?
+ * Was this ActiveMQ Artemis message generated from a REST call?
*
* @param msg
* @return
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java
index d75ef18..879d654 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java
@@ -114,7 +114,7 @@ public class HttpMessageHelper
}
else
{
- // assume posted as a JMS or ActiveMQ object message
+ // assume posted as a JMS or ActiveMQ Artemis object message
size = message.getBodyBuffer().readInt();
byte[] body = new byte[size];
message.getBodyBuffer().readBytes(body);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/resources/schema/artemis-rest.xsd b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
index de52b74..eebe777 100644
--- a/artemis-rest/src/main/resources/schema/artemis-rest.xsd
+++ b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
@@ -24,8 +24,8 @@
<xsd:element name="server-in-vm-id" type="xsd:string" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
- The ActiveMQ REST implementation uses the IN-VM transport to communicate
- with ActiveMQ. It uses the default server id, which is "0".
+ The ActiveMQ Artemis REST implementation uses the IN-VM transport to communicate
+ with ActiveMQ Artemis. It uses the default server id, which is "0".
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -33,7 +33,7 @@
<xsd:annotation>
<xsd:documentation>
By default, all links (URLs) are published using custom headers.
- You can instead have the ActiveMQ REST implementation publish links
+ You can instead have the ActiveMQ Artemis REST implementation publish links
using the Link Header specification instead if you desire.
</xsd:documentation>
</xsd:annotation>
@@ -73,7 +73,7 @@
<xsd:element name="producer-session-pool-size" type="xsd:int" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
- The REST implementation pools ActiveMQ sessions for sending messages.
+ The REST implementation pools ActiveMQ Artemis sessions for sending messages.
This is the size of the pool. That number of sessions will be created
at startup time.
</xsd:documentation>
@@ -106,8 +106,8 @@
<xsd:element name="consumer-window-size" type="xsd:int" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
- For consumers, this config option is the same as the ActiveMQ one of the
- same name. It will be used by sessions created by the ActiveMQ REST
+ For consumers, this config option is the same as the ActiveMQ Artemis one of the
+ same name. It will be used by sessions created by the ActiveMQ Artemis REST
implementation.
</xsd:documentation>
</xsd:annotation>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index 4accdb3..309c813 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings;
/**
- * A Configuration is used to configure ActiveMQ servers.
+ * A Configuration is used to configure ActiveMQ Artemis servers.
*/
public interface Configuration
{
@@ -187,7 +187,7 @@ public interface Configuration
/**
* Sets the domain used by JMX MBeans (provided JMX management is enabled).
* <p/>
- * Changing this JMX domain is required if multiple ActiveMQ servers are run inside
+ * Changing this JMX domain is required if multiple ActiveMQ Artemis servers are run inside
* the same JVM and all servers are using the same MBeanServer.
*/
Configuration setJMXDomain(String domain);
@@ -837,14 +837,14 @@ public interface Configuration
boolean isMaskPassword();
/*
- * Whether or not that ActiveMQ should use all protocols available on the classpath. If false only the core protocol will
+ * Whether or not that ActiveMQ Artemis should use all protocols available on the classpath. If false only the core protocol will
* be set, any other protocols will need to be set directly on the ActiveMQServer
* */
Configuration setResolveProtocols(boolean resolveProtocols);
/*
* @see #setResolveProtocols()
- * @return whether ActiveMQ should resolve and use any Protocols available on the classpath
+ * @return whether ActiveMQ Artemis should resolve and use any Protocols available on the classpath
* Default value is {@value org.apache.activemq.artemis.api.config.org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}.
* */
boolean isResolveProtocols();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index ccd0ee3..3632e4e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -29,9 +29,9 @@ import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
import org.apache.activemq.artemis.core.server.ServerMessage;
/**
-* This class implements a ActiveMQ filter
+* This class implements a ActiveMQ Artemis filter
*
-* ActiveMQ filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
+* ActiveMQ Artemis filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
*
* Valid identifiers that can be used are:
*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
index 49949d5..bf18ffa 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
@@ -106,7 +106,7 @@ public interface PagingStore extends ActiveMQComponent
* The file will still exist until Page.delete is called,
* So, case the system is reloaded the same Page will be loaded back if delete is not called.
*
- * @throws Exception Note: This should still be part of the interface, even though ActiveMQ only uses through the
+ * @throws Exception Note: This should still be part of the interface, even though ActiveMQ Artemis only uses through the
*/
Page depage() throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index d727701..f2ddcf6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -663,7 +663,7 @@ public class PagingStoreImpl implements PagingStore
returnPage.delete(null);
// This will trigger this address to exit the page mode,
- // and this will make ActiveMQ start using the journal again
+ // and this will make ActiveMQ Artemis start using the journal again
return null;
}
else
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
index cb55f1e..dad13e6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
@@ -38,7 +38,7 @@ import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.TypedProperties;
/**
- * The ActiveMQ SecurityStore implementation
+ * The ActiveMQ Artemis SecurityStore implementation
*/
public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryChangeListener
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index bbc66b5..18a3ce1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -49,7 +49,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.utils.ExecutorFactory;
/**
- * This interface defines the internal interface of the ActiveMQ Server exposed to other components
+ * This interface defines the internal interface of the ActiveMQ Artemis Server exposed to other components
* of the server.
* <p>
* This is not part of our public API.
@@ -91,7 +91,7 @@ public interface ActiveMQServer extends ActiveMQComponent
NodeManager getNodeManager();
/**
- * Returns the resource to manage this ActiveMQ server.
+ * Returns the resource to manage this ActiveMQ Artemis server.
* @throws IllegalStateException if the server is not properly started.
*/
ActiveMQServerControlImpl getActiveMQServerControl();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index e746022..57edd11 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -322,7 +322,7 @@ public interface ActiveMQServerLogger extends BasicLogger
void divertBindingNotExists(SimpleString bindingName);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ Artemis User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT)
void clusterSecurityRisk();
@LogMessage(level = Logger.Level.WARN)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
index c2b22b0..311c25e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
@@ -27,7 +27,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
/**
- * Helper class to simplify bootstrap of ActiveMQ server. Bootstraps from classpath-based config files.
+ * Helper class to simplify bootstrap of ActiveMQ Artemis server. Bootstraps from classpath-based config files.
*/
public class EmbeddedActiveMQ
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
index b5bd927..a5e50fe 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
@@ -23,7 +23,7 @@ import java.nio.channels.FileLock;
import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
/**
- * This is using the ActiveMQ Libaio Native to perform calls to flock on a Linux system. At the
+ * This is using the ActiveMQ Artemis Libaio Native to perform calls to flock on a Linux system. At the
* current version of RHEL there's a bug on GFS2 and because of that fctl is not functional what
* will cause issues on Failover over Shared Storage.
* <p/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 7058168..ad743c7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -134,7 +134,7 @@ import org.apache.activemq.artemis.utils.SecurityFormatter;
import org.apache.activemq.artemis.utils.VersionLoader;
/**
- * The ActiveMQ server implementation
+ * The ActiveMQ Artemis server implementation
*/
public class ActiveMQServerImpl implements ActiveMQServer
{
@@ -1651,7 +1651,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
}
/**
- * Sets up ActiveMQ Executor Services.
+ * Sets up ActiveMQ Artemis Executor Services.
*/
private void initializeExecutorServices()
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java
index dcb1137..85030b8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java
@@ -34,7 +34,7 @@ public class ServiceRegistry
private ScheduledExecutorService scheduledExecutorService;
- /* We are using a List rather than HashMap here as ActiveMQ allows multiple instances of the same class to be added
+ /* We are using a List rather than HashMap here as ActiveMQ Artemis allows multiple instances of the same class to be added
* to the interceptor list
*/
private Map<String, Interceptor> incomingInterceptors;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
index 38c43bf..abfb981 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.impl.RefsOperation;
/**
- * A ActiveMQ internal transaction
+ * A ActiveMQ Artemis internal transaction
*/
public interface Transaction
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
index 989fb16..ecbe6e2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java
@@ -48,7 +48,7 @@ public interface ProtocolManager<P extends BaseInterceptor>
boolean isProtocol(byte[] array);
/**
- * Gets the Message Converter towards ActiveMQ.
+ * Gets the Message Converter towards ActiveMQ Artemis.
* Notice this being null means no need to convert
*
* @return
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index 4f26c76..b86b0b1 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -38,7 +38,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the
+ If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available on the
classpath. If false then only the core protocol will be available, unless in Embedded mode where users
can inject their own Protocol Managers.
</xsd:documentation>
@@ -192,7 +192,7 @@
<xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+ the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
</xsd:documentation>
</xsd:annotation>
</xsd:element>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
index d94beee..92c032c 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
@@ -29,7 +29,7 @@ import org.junit.Before;
import org.junit.Test;
/**
- * Tests the compliance with the ActiveMQ Filter syntax.
+ * Tests the compliance with the ActiveMQ Artemis Filter syntax.
*/
public class FilterTest extends SilentTestCase
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
----------------------------------------------------------------------
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
index 92ac75a..bd7a66e 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
@@ -36,7 +36,7 @@ public class ActiveMQXAResourceWrapperImpl implements ActiveMQXAResourceWrapper
/**
* Creates a new XAResourceWrapper. PRODUCT_NAME, productVersion and jndiName are useful for log output in the
- * Transaction Manager. For ActiveMQ only the resourceManagerID is required to allow Transaction Manager to recover
+ * Transaction Manager. For ActiveMQ Artemis only the resourceManagerID is required to allow Transaction Manager to recover
* from relevant recovery scenarios.
*
* @param xaResource
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
----------------------------------------------------------------------
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
index de1eef6..3f9b08c 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
@@ -34,13 +34,13 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration;
* value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/>
* </pre>
* <p>
- * you'll need something like this if the ActiveMQ Server is remote
+ * you'll need something like this if the ActiveMQ Artemis Server is remote
* <pre>
* <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
* value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/>
* </pre>
* <p>
- * you'll need something like this if the ActiveMQ Server is remote and has failover configured
+ * you'll need something like this if the ActiveMQ Artemis Server is remote and has failover configured
* <pre>
* <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
* value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
----------------------------------------------------------------------
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
index 9ce285b..8bbeecc 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
@@ -37,7 +37,7 @@ import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
* Mainly from org.jboss.server.XAResourceWrapper from the JBoss AS server module
*
* The reason why we don't use that class directly is that it assumes on failure of connection
- * the RM_FAIL or RM_ERR is thrown, but in ActiveMQ we throw XA_RETRY since we want the recovery manager to be able
+ * the RM_FAIL or RM_ERR is thrown, but in ActiveMQ Artemis we throw XA_RETRY since we want the recovery manager to be able
* to retry on failure without having to manually retry
*/
public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureListener
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/design-guide/en/clustering.md
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/clustering.md b/docs/design-guide/en/clustering.md
index 235c0d9..d02bf09 100644
--- a/docs/design-guide/en/clustering.md
+++ b/docs/design-guide/en/clustering.md
@@ -20,4 +20,4 @@ Topology Discovery
blah blah blah, topology etc
-
+
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/README.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/README.md b/docs/quickstart-guide/en/README.md
index d1b4e1f..e647459 100644
--- a/docs/quickstart-guide/en/README.md
+++ b/docs/quickstart-guide/en/README.md
@@ -1,4 +1,4 @@
-ActiveMQ Quick Start Manual
+ActiveMQ Artemis Quick Start Manual
====================
How to get started with ActiveMQ
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/about.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/about.md b/docs/quickstart-guide/en/about.md
index 4d25f94..96eaedf 100644
--- a/docs/quickstart-guide/en/about.md
+++ b/docs/quickstart-guide/en/about.md
@@ -3,20 +3,20 @@ About ActiveMQ
What is ActiveMQ?
-- ActiveMQ is an open source project to build a multi-protocol,
+- ActiveMQ Artemis is an open source project to build a multi-protocol,
embeddable, very high performance, clustered, asynchronous messaging
system.
-- For answers to more questions about what ActiveMQ is and what it
+- For answers to more questions about what ActiveMQ Artemis is and what it
isn't please visit the [FAQs wiki
page](http://www.jboss.org/community/wiki/ActiveMQGeneralFAQs).
Why use ActiveMQ? Here are just a few of the reasons:
-- 100% open source software. ActiveMQ is licenced using the Apache
+- 100% open source software. ActiveMQ Artemis is licenced using the Apache
Software License v2.0 to minimise barriers to adoption.
-- ActiveMQ is designed with usability in mind.
+- ActiveMQ Artemis is designed with usability in mind.
- Written in Java. Runs on any platform with a Java 6+ runtime, that's
everything from Windows desktops to IBM mainframes.
@@ -30,7 +30,7 @@ Why use ActiveMQ? Here are just a few of the reasons:
messaging system, and others you won't find anywhere else.
- Elegant, clean-cut design with minimal third party dependencies. Run
- ActiveMQ stand-alone, run it in integrated in your favourite JEE
+ ActiveMQ Artemis stand-alone, run it in integrated in your favourite JEE
application server, or run it embedded inside your own product. It's
up to you.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/download.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/download.md b/docs/quickstart-guide/en/download.md
index 7b3c08f..6004bf4 100644
--- a/docs/quickstart-guide/en/download.md
+++ b/docs/quickstart-guide/en/download.md
@@ -1,7 +1,7 @@
Download
========
-The official ActiveMQ project page is <http://activemq.org/>.
+The official ActiveMQ Artemis project page is <http://activemq.org/>.
Software Download
=================
@@ -28,7 +28,7 @@ Project Information
- Follow us on [twitter](http://twitter.com/activemq)
-- ActiveMQ Git repository is <https://github.com/activemq/activemq>
+- ActiveMQ Artemis Git repository is <https://github.com/activemq/activemq>
- All release tags are available from
<https://github.com/activemq/activemq/tags>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/examples.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/examples.md b/docs/quickstart-guide/en/examples.md
index 2844de9..f050a9c 100644
--- a/docs/quickstart-guide/en/examples.md
+++ b/docs/quickstart-guide/en/examples.md
@@ -44,7 +44,7 @@ Type the command `mvn verify` and you should see the following output:
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
- [INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT
+ [INFO] Building ActiveMQ Artemis JMS Queue Example 2.3.0.BETA-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jms-queue-example ---
@@ -85,13 +85,13 @@ Type the command `mvn verify` and you should see the following output:
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.deployers.impl.FileConfigurationParser parseMainConfig
WARN: AMQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start
- INFO: AMQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/paging)
+ INFO: AMQ221000: live server is starting with configuration ActiveMQ Artemis Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/paging)
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
INFO: AMQ221006: Waiting to obtain live lock
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager <init>
INFO: AMQ221013: Using NIO Journal
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl initialisePart1
- WARN: AMQ222007: Security risk! ActiveMQ is running with the default cluster admin user and default password. Please see the ActiveMQ user guide, cluster chapter, for instructions on how to change this.
+ WARN: AMQ222007: Security risk! ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the ActiveMQ Artemis user guide, cluster chapter, for instructions on how to change this.
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode
INFO: AMQ221034: Waiting to obtain live lock
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode
@@ -103,7 +103,7 @@ Type the command `mvn verify` and you should see the following output:
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
INFO: AMQ221007: Server is now live
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start
- INFO: AMQ221001: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
+ INFO: AMQ221001: ActiveMQ Artemis Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
[INFO]
[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ activemq-jms-queue-example ---
Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext
@@ -120,7 +120,7 @@ Type the command `mvn verify` and you should see the following output:
Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop
WARN: AMQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor]
Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl stop
- INFO: AMQ221002: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped
+ INFO: AMQ221002: ActiveMQ Artemis Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
@@ -129,7 +129,7 @@ Type the command `mvn verify` and you should see the following output:
[INFO] Final Memory: 11M/456M
[INFO] ------------------------------------------------------------------------
-Congratulations! You have successfully run your first ActiveMQ example.
+Congratulations! You have successfully run your first ActiveMQ Artemis example.
Try some of the others.
The Java EE Examples
@@ -157,7 +157,7 @@ In the shell window you should see something like the following output:
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
- [INFO] Building ActiveMQ JEE MDB Example 2.3.0.BETA-SNAPSHOT
+ [INFO] Building ActiveMQ Artemis JEE MDB Example 2.3.0.BETA-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jee-mdb-bmt-example ---
@@ -220,7 +220,7 @@ In the shell window you should see something like the following output:
10:58:05,831 INFO [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA
10:58:05,943 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080
10:58:05,966 INFO [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started
- 10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
+ 10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Artemis Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
10:58:05,996 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock
10:58:06,037 INFO [org.apache.activemq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal
10:58:06,122 INFO [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started
@@ -233,7 +233,7 @@ In the shell window you should see something like the following output:
10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:61616 for CORE protocol
10:58:08,793 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol
10:58:08,795 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Server is now live
- 10:58:08,797 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) ActiveMQ Server version 2.2.13.Final (AMQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
+ 10:58:08,797 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) ActiveMQ Artemis Server version 2.2.13.Final (AMQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
10:58:08,822 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory
10:58:08,824 INFO [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:/RemoteConnectionFactory
10:58:08,825 INFO [org.jboss.as.messaging] (MSC service thread 1-10) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
@@ -241,7 +241,7 @@ In the shell window you should see something like the following output:
10:58:08,836 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:/queue/test
10:58:08,840 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/queues/testQueue
10:58:08,859 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-9) JBAS010406: Registered connection factory java:/JmsXA
- 10:58:08,866 INFO [org.apache.activemq.ra.ActiveMQResourceAdapter] (MSC service thread 1-9) ActiveMQ resource adaptor started
+ 10:58:08,866 INFO [org.apache.activemq.ra.ActiveMQResourceAdapter] (MSC service thread 1-9) ActiveMQ Artemis resource adaptor started
10:58:08,867 INFO [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatoractivemq-ra
10:58:08,870 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-5) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA]
10:58:08,898 INFO [org.jboss.as.server.deployment] (MSC service thread 1-10) JBAS015876: Starting deployment of "ONT001-1.0.war"
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/installation.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/installation.md b/docs/quickstart-guide/en/installation.md
index 7b3d8d5..86fa8b8 100644
--- a/docs/quickstart-guide/en/installation.md
+++ b/docs/quickstart-guide/en/installation.md
@@ -1,20 +1,20 @@
Installation
============
-This section describes how to install ActiveMQ.
+This section describes how to install ActiveMQ Artemis.
Prerequisites
=============
> **Note**
>
-> ActiveMQ only runs on Java 7 or later.
+> ActiveMQ Artemis only runs on Java 7 or later.
-By default, ActiveMQ server runs with 1GiB of memory. If your computer
+By default, ActiveMQ Artemis server runs with 1GiB of memory. If your computer
has less memory, or you want to run it with more available RAM, modify
the value in `bin/run.sh` accordingly.
-For persistence, ActiveMQ uses its own fast journal, which you can
+For persistence, ActiveMQ Artemis uses its own fast journal, which you can
configure to use libaio (which is the default when running on Linux) or
Java NIO. In order to use the libaio module on Linux, you'll need to
install libaio, if it's not already installed.
@@ -58,7 +58,7 @@ structure:
|___ schemas
-- `bin` -- binaries and scripts needed to run ActiveMQ.
+- `bin` -- binaries and scripts needed to run ActiveMQ Artemis.
- `docs` -- guides and javadocs for ActiveMQ
@@ -69,5 +69,5 @@ structure:
- `licenses` -- licenses for ActiveMQ
-- `schemas` -- XML Schemas used to validate ActiveMQ configuration
+- `schemas` -- XML Schemas used to validate ActiveMQ Artemis configuration
files
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/introduction.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/introduction.md b/docs/quickstart-guide/en/introduction.md
index 98f7a43..6014a21 100644
--- a/docs/quickstart-guide/en/introduction.md
+++ b/docs/quickstart-guide/en/introduction.md
@@ -2,10 +2,10 @@ Getting Started
===============
This short guide explains how to download, install and quickly get
-started with ActiveMQ.
+started with ActiveMQ Artemis.
After downloading and installing we highly recommend you run the
-examples to get acquainted with ActiveMQ. We ship with over 70 examples
+examples to get acquainted with ActiveMQ Artemis. We ship with over 70 examples
demonstrating most of the features.
This guide is not intended to be a replacement for the user manual. The
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/quickstart-guide/en/running.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/running.md b/docs/quickstart-guide/en/running.md
index 5bd483a..b760d5d 100644
--- a/docs/quickstart-guide/en/running.md
+++ b/docs/quickstart-guide/en/running.md
@@ -5,7 +5,7 @@ Creating a Broker Instance
A broker instance is the directory containing all the configuration and runtime
data, such as logs and data files, associated with a broker process. It is recommended that
you do *not* create the instance directory under `${ARTEMIS_HOME}`. This separation is
-encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
+encouraged so that you can more easily upgrade when the next version of ActiveMQ Artemis is released.
On Unix systems, it is a common convention to store this kind of runtime data under
the `/var/lib` directory. For example, to create an instance at '/var/lib/mybroker', run
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/README.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/README.md b/docs/user-manual/en/README.md
index 99d869c..1c01617 100644
--- a/docs/user-manual/en/README.md
+++ b/docs/user-manual/en/README.md
@@ -1,4 +1,4 @@
-
+
Apache ActiveMQ Artemis User Manual
====================
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/architecture.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/architecture.md b/docs/user-manual/en/architecture.md
index b20efec..b966f9c 100644
--- a/docs/user-manual/en/architecture.md
+++ b/docs/user-manual/en/architecture.md
@@ -57,7 +57,7 @@ The server always just deals with core API interactions.
A schematic illustrating this relationship is shown in figure 3.1 below:
-
+
Figure 3.1 shows two user applications interacting with an Apache ActiveMQ Artemis
server. User Application 1 is using the JMS API, while User Application
@@ -119,7 +119,7 @@ talking directly to the Apache ActiveMQ Artemis server. This is not recommended
you'll most likely end up creating a new connection and session every
time you want to interact from the EJB, which is an anti-pattern.
-
+
For more information on using the JCA adaptor, please see [Application Server Integration and Java EE](appserver-integration.md).
@@ -137,7 +137,7 @@ ConnectionFactory instances from any server side JMS
configuration. It also provides a simple management API for
creating and destroying Queues and Topics
which can be accessed via JMX or the connection. It is a separate
-service to the ActiveMQ core server, since the core server is JMS
+service to the ActiveMQ Artemis core server, since the core server is JMS
agnostic. If you don't want to deploy any JMS Queue or Topic via
server side XML configuration and don't require a JMS management
API on the server side then you can disable this service.
@@ -147,6 +147,6 @@ for bootstrapping the Broker.
The stand-alone server architecture is shown in figure 3.3 below:
-
+
For more information on server configuration files see [Server Configuration](configuration-index.md)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/docs/user-manual/en/configuration-index.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md
index 2ffa93e..6de46ee 100644
--- a/docs/user-manual/en/configuration-index.md
+++ b/docs/user-manual/en/configuration-index.md
@@ -72,7 +72,7 @@ Name | Description
[page-max-concurrent-io](paging.md "24.3. Paging Mode") | The max number of concurrent reads allowed on paging. Default=5
[paging-directory](paging.md "24.2. Configuration") | the directory to store paged messages in. Default=data/paging
[persist-delivery-count-before-delivery](undelivered-messages.md "21.3. Delivery Count Persistence") | True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled. Default=false
-[persistence-enabled](persistence.md "15.6. Configuring ActiveMQ for Zero Persistence") | true means that the server will use the file based journal for persistence. Default=true
+[persistence-enabled](persistence.md "15.6. Configuring ActiveMQ Artemis for Zero Persistence") | true means that the server will use the file based journal for persistence. Default=true
[persist-id-cache](duplicate-detection.md "37.2. Configuring the Duplicate ID Cache") | true means that ID's are persisted to the journal. Default=true
[queues](queue-attributes.md "25.1. Predefined Queues") | [a list of queue to be created](#queue-type)
[remoting-incoming-interceptors](intercepting-operations.md "Chapter 47. Intercepting Operations") | A list of interceptor
@@ -354,7 +354,7 @@ Apache ActiveMQ Artemis will load this property and initialize the class with a
parameter map containing the "key"-\>"value" pair. If `passwordCodec` is
not specified, the built-in decoder is used.
-### Masking passwords in ActiveMQ ResourceAdapters and MDB activation configurations
+### Masking passwords in ActiveMQ Artemis ResourceAdapters and MDB activation configurations
Both ra.xml and MDB activation configuration have a 'password' property
that can be masked. They are controlled by the following two optional
[2/6] activemq-artemis git commit: Ensure all references to the
project use ActiveMQ Artemis
Posted by an...@apache.org.
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 – the <em>Source</em> server. It will be configured with a JMS Topic bound to JNDI under <code>source/topic</code>
<li>Server #1 – 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.
</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><management-address>activemq.management</management-address></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>
<acceptor name="proton-acceptor">tcp://localhost:5672?protocols=AMQP</acceptor>
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.
</address-setting>
</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>