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. */
