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>
