You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2017/12/15 14:55:30 UTC
[11/14] activemq-artemis git commit: ARTEMIS-1562 Refactor example
documentation
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/scale-down/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/ha/scale-down/readme.html b/examples/features/ha/scale-down/readme.html
deleted file mode 100644
index 4786db3..0000000
--- a/examples/features/ha/scale-down/readme.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <title>ActiveMQ Artemis JMS Scale Down Example</title>
- <link rel="stylesheet" type="text/css" href="../../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../../common/prettify.css" />
- <script type="text/javascript" src="../../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Colocated Failover Shared Store Example</h1>
-
- <pre>To run the example, simply type <b>mvn verify</b> from this directory.</pre>
-
-
- <p>This example demonstrates how you can configure a live server to scale down messages to another live server on shutdown.
- <p>This example starts 2 live servers each one with a connector configured for the other live server.</p>
- <p>The second live server is killed and its messages are scaled down to the first server on shutdown.</p>
- <p>The following shows how to configure the live servers to scale down to one another.</p>
- <pre class="prettyprint">
- <code>
- <ha-policy>
- <live-only>
- <scale-down>
- <connectors>
- <connector-ref>server0-connector</connector-ref>
- </connectors>
- </scale-down>
- </live-only>
- </ha-policy>
- </code>
- </pre>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml
index 8f64759..1be0a4f 100644
--- a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>./data/bindings</bindings-directory>
@@ -105,7 +103,7 @@ under the License.
</security-settings>
- <addresses>
+ <addresses>
<address name="exampleQueue">
<anycast>
<queue name="exampleQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml
index ea95693..23437bf 100644
--- a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>./data/bindings</bindings-directory>
@@ -96,7 +94,7 @@ under the License.
</security-setting>
</security-settings>
- <addresses>
+ <addresses>
<address name="exampleQueue">
<anycast>
<queue name="exampleQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/stop-server-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/stop-server-failover/pom.xml b/examples/features/ha/stop-server-failover/pom.xml
index 4ea900f..3abccbf 100644
--- a/examples/features/ha/stop-server-failover/pom.xml
+++ b/examples/features/ha/stop-server-failover/pom.xml
@@ -155,7 +155,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/stop-server-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/ha/stop-server-failover/readme.html b/examples/features/ha/stop-server-failover/readme.html
deleted file mode 100644
index 9486cd6..0000000
--- a/examples/features/ha/stop-server-failover/readme.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Failover Without Transactions Example</h1>
-
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
-
- <p>This example demonstrates two servers coupled as a live-backup pair for high availability (HA), and a client
- connection failing over from live to backup when the live server is crashed.</p>
- <p>Failover behavior differs whether the JMS session is transacted or not.</p>
- <p>When a <em>non-transacted</em> JMS session is used, once and only once delivery is not guaranteed
- 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 Artemis failover and HA, and clustering in general, please see the clustering
- section of the user manual.</p>
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/transaction-failover/pom.xml b/examples/features/ha/transaction-failover/pom.xml
index df482e9..a46a767 100644
--- a/examples/features/ha/transaction-failover/pom.xml
+++ b/examples/features/ha/transaction-failover/pom.xml
@@ -97,7 +97,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/transaction-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/ha/transaction-failover/readme.html b/examples/features/ha/transaction-failover/readme.html
deleted file mode 100644
index 15f119f..0000000
--- a/examples/features/ha/transaction-failover/readme.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Failover With Transaction Example</h1>
-
- <pre>To run the example, simply type <b>mvn verify</b> from this directory.</pre>
-
-
- <p>This example demonstrates two servers coupled as a live-backup pair for high availability (HA), and a client
- connection failing over from live to backup when the live server is crashed.</p>
- <p>Failover behavior differs whether the JMS session is transacter or not.</p>
- <p>When a <em>transacted</em> JMS session is used, once-and-only once delivery is guaranteed.</p>
- <ul>
- <li>if the failover occurs while there is an in-flight transaction, the transaction will be flagged as <em>rollback only</em>. In that case, the JMS client
- 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 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>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml
index 4c691a2..8617372 100644
--- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>../data/bindings</bindings-directory>
@@ -86,7 +84,7 @@ under the License.
</security-setting>
</security-settings>
- <addresses>
+ <addresses>
<address name="exampleQueue">
<anycast>
<queue name="exampleQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml
index 2500a14..450405f 100644
--- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>../data/bindings</bindings-directory>
@@ -86,7 +84,7 @@ under the License.
</security-setting>
</security-settings>
- <addresses>
+ <addresses>
<address name="exampleQueue">
<anycast>
<queue name="exampleQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml
index ae011eb..39d111f 100644
--- a/examples/features/perf/perf/pom.xml
+++ b/examples/features/perf/perf/pom.xml
@@ -61,9 +61,17 @@ under the License.
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>server</id>
@@ -165,5 +173,16 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/perf/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/perf/perf/readme.html b/examples/features/perf/perf/readme.html
deleted file mode 100644
index ab2d50e..0000000
--- a/examples/features/perf/perf/readme.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <title>ActiveMQ Artemis JMS Queue Selector Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Simple Performance</h1>
-
- <p>To start the server run <code>mvn verify -Pserver</code></p>
-
- <p>To start the listener run <code>mvn -Plistener verify</code></p>
-
- <p>To start the sender run <code>mvn -Psender verify</code></p>
-
- <p>To configure the clients simply edit the <code>perf.properties</code> or <code>client.jndi.properties</code> in the
- <code>src/main/resources</code> directory</p>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/soak/README
----------------------------------------------------------------------
diff --git a/examples/features/perf/soak/README b/examples/features/perf/soak/README
deleted file mode 100644
index b69a1ac..0000000
--- a/examples/features/perf/soak/README
+++ /dev/null
@@ -1,85 +0,0 @@
-****************************************************
-* Soak Test For Manual Reconnection of JMS Clients *
-****************************************************
-
-Running the Soak Tests
-=======================
-
-Run The Server Standalone
-==========================
-
-Use the Profile server
- mvn -Pserver verify
-
-That will create a server under ./target/server0
-
-
-You can define the property server.dir under the same Profile to create other servers. or you could do it manually if desired using the regular ./artemis create
-
- $ mvn -Dserver.dir=server1 -Pserver verify
-
-server1 should contain a copy of configuration equivalent to that found under the server0 director with different
-settings.
-
-To run a server with the same configuration but on a different host. Check out this source on the host machine and
-change:
-* activemq.remoting.netty.host property in broker.xml
-* bindAddress and rmiBindAddress properties in activemq-beans.xml
-
- $ mvn verify -P server
-
-
-To run the server just start it manually
-
-Configure Server Dump
-=====================
-
-The server can "dump" info at regular interval. In broker.xml, set
-
- <server-dump-interval>10000</server-dump-interval>
-
-to have infos every 10s:
-
-**** Server Dump ****
-date: Mon Aug 17 18:19:07 CEST 2009
-free memory: 500,79 MiB
-max memory: 1,95 GiB
-total memory: 507,13 MiB
-available memory: 99,68%
-total paging memory: 0,00 B
-# of thread: 19
-# of conns: 0
-********************
-
-Run The Clients
-===============
-
-The clients can be run separate from the server using:
-
- $ mvn verify -Premote
-
-Parameters are specified in soak.properties.
-
-The duration of the tests is configured by duration-in-minutes (defaults to 2 minutes, set to
--1 to run the test indefinitely).
-
-To configure the soak properties different to the defaults for the clients, use the system property
-To specify the JNDI server to connect to, use the system property jndi.address
-
- $ mvn verify -Premote -Dsoak.props=<path to properties> -Pjndi.address=jnp:remote.host:1099
-
-Every 1000th message, the clients will display their recent activity:
-
-INFO: received 10000 messages in 5,71s (total: 55s)
-
-At the end of the run, the sender and receiver will sum up their activity:
-
-INFO: Received 223364 messages in 2,01 minutes
-
-Kill The Server And Check Manual Reconnection
-==============================================
-
-You can kill the server (ctl+c or kill -9), the clients are configured to reconnect
-indefinitely to the same single server (even in case of clean shutdown)
-Once the server restarts, all the clients will resume their activities after reconnecting
-to the server.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/soak/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/perf/soak/pom.xml b/examples/features/perf/soak/pom.xml
index 360c2c4..f6a6595 100644
--- a/examples/features/perf/soak/pom.xml
+++ b/examples/features/perf/soak/pom.xml
@@ -44,6 +44,15 @@ under the License.
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>server</id>
@@ -157,6 +166,16 @@ under the License.
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/soak/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/perf/soak/readme.md b/examples/features/perf/soak/readme.md
new file mode 100644
index 0000000..efc93b7
--- /dev/null
+++ b/examples/features/perf/soak/readme.md
@@ -0,0 +1,70 @@
+# Soak Test For Manual Reconnection of JMS Clients *
+
+## Run The Server Standalone
+
+Use the Profile server
+
+ mvn -Pserver verify
+
+That will create a broker under ./target/server0
+
+You can define the property server.dir under the same Profile to create other servers. or you could do it manually if desired using the regular ./artemis create
+
+ mvn -Dserver.dir=server1 -Pserver verify
+
+server1 should contain a copy of configuration equivalent to that found under the server0 director with different
+settings.
+
+To run a broker with the same configuration but on a different host. Check out this source on the host machine and
+change:
+
+* `activemq.remoting.netty.host` property in broker.xml
+
+ mvn verify -P server
+
+To run the broker just start it manually
+
+## Configure Server Dump
+
+The broker can "dump" info at regular interval. In broker.xml, set
+
+ <server-dump-interval>10000</server-dump-interval>
+
+to have infos every 10s:
+
+ **** Server Dump ****
+ date: Mon Aug 17 18:19:07 CEST 2009
+ free memory: 500,79 MiB
+ max memory: 1,95 GiB
+ total memory: 507,13 MiB
+ available memory: 99,68%
+ total paging memory: 0,00 B
+ # of thread: 19
+ # of conns: 0
+ ********************
+
+## Run The Clients
+
+The clients can be run separate from the broker using:
+
+ mvn verify -Premote
+
+Parameters are specified in soak.properties.
+
+The duration of the tests is configured by duration-in-minutes (defaults to 2 minutes, set to -1 to run the test indefinitely).
+
+To configure the soak properties different to the defaults for the clients, use the system property to specify the JNDI broker to connect to, use the system property `jndi.address`:
+
+ mvn verify -Premote -Dsoak.props=<path to properties> -Pjndi.address=jnp:remote.host:1099
+
+Every 1000th message, the clients will display their recent activity:
+
+ INFO: received 10000 messages in 5,71s (total: 55s)
+
+At the end of the run, the sender and receiver will sum up their activity:
+
+ INFO: Received 223364 messages in 2,01 minutes
+
+## Kill The Server And Check Manual Reconnection
+
+You can kill the broker (ctl+c or kill -9), the clients are configured to reconnect indefinitely to the same single broker (even in case of clean shutdown) Once the broker restarts, all the clients will resume their activities after reconnecting to the server.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/perf/soak/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/perf/soak/server0/broker.xml b/examples/features/perf/soak/server0/broker.xml
index 7fc57d3..a36bd1a 100644
--- a/examples/features/perf/soak/server0/broker.xml
+++ b/examples/features/perf/soak/server0/broker.xml
@@ -16,8 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<connectors>
<connector name="netty-connector">tcp://localhost:61616?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</connector>
@@ -35,7 +35,7 @@ under the License.
<server-dump-interval>30000</server-dump-interval>
- <addresses>
+ <addresses>
<address name="soakQueue">
<anycast>
<queue name="jms.queue.soakQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/README.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/README.md b/examples/features/standard/README.md
index e9d9e36..c26876f 100644
--- a/examples/features/standard/README.md
+++ b/examples/features/standard/README.md
@@ -7,7 +7,7 @@ To run an individual example firstly cd into the example directory and run
mvn verify
```
-Most examples offer a way to start them without creating and starting the server (say if you want to do it manually)
+Most examples offer a way to start them without creating and starting the broker (say if you want to do it manually)
```sh
mvn verify -PnoServer
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/bridge/pom.xml b/examples/features/standard/bridge/pom.xml
index e525763..1e58fdf 100644
--- a/examples/features/standard/bridge/pom.xml
+++ b/examples/features/standard/bridge/pom.xml
@@ -160,7 +160,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/bridge/readme.html b/examples/features/standard/bridge/readme.html
deleted file mode 100644
index 698c6c2..0000000
--- a/examples/features/standard/bridge/readme.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>Core Bridge Example</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <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 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
- match that filter.</p>
- <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 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 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 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
- JMS queue on server 1 named <code>mincing-machine</code></p>
- <p>We want to forward any messages that are sent to the <code>sausage-factory</code> queue on server 0, to the <code>mincing-machine</code>
- on server 1.</p>
- <p>We only want to make aardvark sausages, so we only forward messages where the property "name" is set
- to "aardvark". It is known that other things, such are Sasquatches are also sent to the <code>sausage-factory</code> and we
- want to reject those.</p>
- <p>Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using
- Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".</p>
- <p>Here's a snippet from <code>broker.xml</code> showing the bridge configuration</p>
- <pre class="prettyprint">
- <code>
- <bridge name="my-bridge">
- <queue-name>jms.queue.sausage-factory</queue-name>
- <forwarding-address>jms.queue.mincing-machine</forwarding-address>
- <filter string="name='aardvark'"/>
- <transformer-class-name>org.apache.activemq.artemis.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <static-connectors>
- <connector-ref>remote-connector</connector-ref>
- </static-connectors>
- </bridge>
- </code>
- </pre>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/bridge/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/bridge/readme.md b/examples/features/standard/bridge/readme.md
new file mode 100644
index 0000000..66fcb75
--- /dev/null
+++ b/examples/features/standard/bridge/readme.md
@@ -0,0 +1,38 @@
+# Core Bridge Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+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.
+
+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.
+
+They can also be configured with an optional filter expression, and will only forward messages that match that filter.
+
+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
+
+ActiveMQ Artemis also includes a **JMS Bridge**. 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 Artemis instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in a separate example.
+
+For more information on bridges, please see the ActiveMQ Artemis user manual.
+
+In this example we will demonstrate a simple sausage factory for aardvarks.
+
+We have a JMS queue on broker 0 named `sausage-factory`, and we have a JMS queue on broker 1 named `mincing-machine`
+
+We want to forward any messages that are sent to the `sausage-factory` queue on broker 0, to the `mincing-machine` on broker 1.
+
+We only want to make aardvark sausages, so we only forward messages where the property `name` is set to `aardvark`. It is known that other things, such are Sasquatches are also sent to the `sausage-factory` and we want to reject those.
+
+Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using Aardvarks with green hats, so on the way we are going transform the property `hat` from `green` to `blue`.
+
+Here's a snippet from `broker.xml` showing the bridge configuration
+
+ <bridge name="my-bridge">
+ <queue-name>jms.queue.sausage-factory</queue-name>
+ <forwarding-address>jms.queue.mincing-machine</forwarding-address>
+ <filter string="name='aardvark'"/>
+ <transformer-class-name>org.apache.activemq.artemis.jms.example.HatColourChangeTransformer</transformer-class-name>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <static-connectors>
+ <connector-ref>remote-connector</connector-ref>
+ </static-connectors>
+ </bridge>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml
index afb3cd6..50471ba 100644
--- a/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml
@@ -16,7 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
@@ -72,7 +73,7 @@ under the License.
<permission roles="guest" type="send"/>
</security-setting>
</security-settings>
- <addresses>
+ <addresses>
<address name="sausage-factory">
<anycast>
<queue name="sausage-factory"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml b/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml
index 8952c62..c260d7c 100644
--- a/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
- <core xmlns="urn:activemq:core">
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd"> <core xmlns="urn:activemq:core">
<bindings-directory>./data/messaging/bindings</bindings-directory>
@@ -47,7 +45,7 @@ under the License.
<permission roles="guest" type="send"/>
</security-setting>
</security-settings>
- <addresses>
+ <addresses>
<address name="mincing-machine">
<anycast>
<queue name="mincing-machine"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/broker-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/broker-plugin/pom.xml b/examples/features/standard/broker-plugin/pom.xml
index 1c89064..0cd1da5 100644
--- a/examples/features/standard/broker-plugin/pom.xml
+++ b/examples/features/standard/broker-plugin/pom.xml
@@ -120,7 +120,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/broker-plugin/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/broker-plugin/readme.html b/examples/features/standard/broker-plugin/readme.html
deleted file mode 100644
index e76ae08..0000000
--- a/examples/features/standard/broker-plugin/readme.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>Broker Plugin Example</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <p>AMQP Messages should be by definition immutable at the server's. So, we don't recommend changing message contents.
- However if you require you can use this example as a basis for adding properties on making changes</p>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/broker-plugin/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/broker-plugin/readme.md b/examples/features/standard/broker-plugin/readme.md
new file mode 100644
index 0000000..8862e73
--- /dev/null
+++ b/examples/features/standard/broker-plugin/readme.md
@@ -0,0 +1,5 @@
+# Broker Plugin Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+AMQP Messages should be by definition immutable at the server's. So, we don't recommend changing message contents. However if you require you can use this example as a basis for adding properties on making changes
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/browser/pom.xml b/examples/features/standard/browser/pom.xml
index b6bdfe2..af2274e 100644
--- a/examples/features/standard/browser/pom.xml
+++ b/examples/features/standard/browser/pom.xml
@@ -103,7 +103,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/browser/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/browser/readme.html b/examples/features/standard/browser/readme.html
deleted file mode 100644
index 9f9e01a..0000000
--- a/examples/features/standard/browser/readme.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS QueueBrowser Example</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <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>
- <p>
- The example will send 2 messages on a queue, use a QueueBrowser to browse
- the queue (looking at the message without removing them) and finally consume the 2 messages
- </p>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/browser/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/browser/readme.md b/examples/features/standard/browser/readme.md
new file mode 100644
index 0000000..4f9cf31
--- /dev/null
+++ b/examples/features/standard/browser/readme.md
@@ -0,0 +1,11 @@
+# JMS QueueBrowser Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+This example shows you how to use a JMS [QueueBrowser](http://java.sun.com/javaee/5/docs/api/javax/jms/QueueBrowser.html) with ActiveMQ Artemis.
+
+Queues are a standard part of JMS, please consult the JMS 1.1 specification for full details.
+
+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.
+
+The example will send 2 messages on a queue, use a QueueBrowser to browse the queue (looking at the message without removing them) and finally consume the 2 messages.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/cdi/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/cdi/readme.md b/examples/features/standard/cdi/readme.md
index 7e981ca..3cf4c68 100644
--- a/examples/features/standard/cdi/readme.md
+++ b/examples/features/standard/cdi/readme.md
@@ -17,7 +17,7 @@
# under the License.
#
-->
-# ActiveMQ Artemis CDI Integration Example
+# CDI Example
This is a simple example that demonstrates how to use CDI to integrate with ActiveMQ Artemis on the client side. It is designed mainly for connecting to a remote broker rather than embedding within your application.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/client-kickoff/pom.xml b/examples/features/standard/client-kickoff/pom.xml
index 5b51591..4d3d2d3 100644
--- a/examples/features/standard/client-kickoff/pom.xml
+++ b/examples/features/standard/client-kickoff/pom.xml
@@ -105,7 +105,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/client-kickoff/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/client-kickoff/readme.html b/examples/features/standard/client-kickoff/readme.html
deleted file mode 100644
index 67d17db..0000000
--- a/examples/features/standard/client-kickoff/readme.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>Client Kickoff Example</h1>
-
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <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 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 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
- -Dcom.sun.management.jmxremote.port=3000
- -Dcom.sun.management.jmxremote.ssl=false
- -Dcom.sun.management.jmxremote.authenticate=false</code>
- </pre>
- <p>These properties are explained in the Java <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html#gdenl">management guide</a>
- (please note that for this example, we will disable user authentication for simplicity).</p>
- <p>With these properties, ActiveMQ Artemis server will be manageable remotely using standard JMX URL on port <code>3000</code>.</p>
- </p>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/client-kickoff/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/client-kickoff/readme.md b/examples/features/standard/client-kickoff/readme.md
new file mode 100644
index 0000000..b822df9
--- /dev/null
+++ b/examples/features/standard/client-kickoff/readme.md
@@ -0,0 +1,22 @@
+# Client Kickoff Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+This example shows how to kick off a client connected to ActiveMQ using [JMX](http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/)
+
+The example will connect to ActiveMQ Artemis. Using JMX, we will list the remote addresses connected to the broker and close the corresponding connections. The client will be kicked off from ActiveMQ Artemis receiving an exception that its JMS connection was interrupted.
+
+## Example configuration
+
+ActiveMQ Artemis exposes its managed resources by default on the platform MBeanServer.
+
+To access this MBeanServer remotely, the Java Virtual machine must be started with system properties:
+
+ -Dcom.sun.management.jmxremote
+ -Dcom.sun.management.jmxremote.port=3000
+ -Dcom.sun.management.jmxremote.ssl=false
+ -Dcom.sun.management.jmxremote.authenticate=false
+
+These properties are explained in the Java [management guide](http://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html#gdenl) (please note that for this example, we will disable user authentication for simplicity).
+
+With these properties, ActiveMQ Artemis broker will be manageable remotely using standard JMX URL on port `3000`.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml
index 455eabe..9530a31 100644
--- a/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml
@@ -16,9 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>./data/bindings</bindings-directory>
@@ -36,7 +35,5 @@ under the License.
<acceptors>
<acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
- <addresses/>
</core>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/consumer-rate-limit/pom.xml b/examples/features/standard/consumer-rate-limit/pom.xml
index 791063c..6357f20 100644
--- a/examples/features/standard/consumer-rate-limit/pom.xml
+++ b/examples/features/standard/consumer-rate-limit/pom.xml
@@ -102,7 +102,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/consumer-rate-limit/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/consumer-rate-limit/readme.html b/examples/features/standard/consumer-rate-limit/readme.html
deleted file mode 100644
index 415de00..0000000
--- a/examples/features/standard/consumer-rate-limit/readme.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Message Consumer Rate Limiting</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <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 configuring the connection factory. See <code>jndi.properties</code>.</p>
- <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>jndi.properties</code>
- file when configuring the connection factory:</p>
- <pre class="prettyprint">
- <code>
-connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerMaxRate=10
- </code>
- </pre>
- <p>We then simply consume as many messages as we can in 10 seconds and note how many messages are actually consumed.</p>
- <p>We note that the number of messages consumed per second never exceeds the specified value of <code>10</code> messages per second.</p>
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/consumer-rate-limit/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/consumer-rate-limit/readme.md b/examples/features/standard/consumer-rate-limit/readme.md
new file mode 100644
index 0000000..923c068
--- /dev/null
+++ b/examples/features/standard/consumer-rate-limit/readme.md
@@ -0,0 +1,17 @@
+# JMS Message Consumer Rate Limiting
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+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 configuring the connection factory. See `jndi.properties`.
+
+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 _throttling_.
+
+## Example step-by-step
+
+In this example we specify a `consumer-max-rate` of `10` messages per second in the `jndi.properties` file when configuring the connection factory:
+
+ connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerMaxRate=10
+
+We then simply consume as many messages as we can in 10 seconds and note how many messages are actually consumed.
+
+We note that the number of messages consumed per second never exceeds the specified value of `10` messages per second.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/dead-letter/pom.xml b/examples/features/standard/dead-letter/pom.xml
index 288f06d..a67975a 100644
--- a/examples/features/standard/dead-letter/pom.xml
+++ b/examples/features/standard/dead-letter/pom.xml
@@ -103,7 +103,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/dead-letter/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/dead-letter/readme.html b/examples/features/standard/dead-letter/readme.html
deleted file mode 100644
index e293936..0000000
--- a/examples/features/standard/dead-letter/readme.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>Dead Letter Example</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <p>This example shows you how to define and deal with dead letter messages.</p>
- <p>Messages can be delivered unsuccessfully (e.g. if the transacted session used to consume them is rolled back).
- Such a message goes back to the JMS destination ready to be redelivered.
- However, this means it is possible for a message to be delivered again and again without any success and remain in the destination, clogging the system.</p>
- <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 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.
- </p>
- <h2>Example setup</h2>
- <p><em>Dead letter addresses</em> and <em>maximum delivery attempts</em> are defined in the configuration file <a href="src/main/resources/activemq/server0/broker.xml">broker.xml</a>:</p>
- <pre class="prettyprint">
- <code><address-setting match="jms.queue.exampleQueue">
- <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
- <max-delivery-attempts>3</max-delivery-attempts>
- </address-setting>
- </code>
- </pre>
- <p>This configuration will moved dead letter messages from <code>exampleQueue</code> to the <code>deadLetterQueue</code>.</p>
- <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
- the <code>deadLetterQueue</code>.
- <p>Since we want to consume messages from this deadLetterQueue, we also need to add a JNDI binding to perform a lookup.
- This is configured in <a href="src/main/resources/activemq/server0/activemq-jms.xml">activemq-jms.xml</a></p>
- <pre class="prettyprint">
- <code><queue name="deadLetterQueue">
- <entry name="/queue/deadLetterQueue"/>
- </queue></code>
- </pre>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/dead-letter/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/dead-letter/readme.md b/examples/features/standard/dead-letter/readme.md
new file mode 100644
index 0000000..68a5adc
--- /dev/null
+++ b/examples/features/standard/dead-letter/readme.md
@@ -0,0 +1,32 @@
+# Dead Letter Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+This example shows you how to define and deal with dead letter messages.
+
+Messages can be delivered unsuccessfully (e.g. if the transacted session used to consume them is rolled back). Such a message goes back to the JMS destination ready to be redelivered. However, this means it is possible for a message to be delivered again and again without any success and remain in the destination, clogging the system.
+
+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 _dead letter address_ where they can be consumed for further investigation.
+
+The example will show how to configure ActiveMQ Artemis to route a message to a dead letter address after 3 unsuccessful delivery attempts.
+
+The example will send 1 message to a queue. We will deliver the message 3 times and rollback the session every time.
+
+On the 4th attempt, there won't be any message to consume: it will have been moved to a _dead letter address_.
+
+We will then consume this dead letter message.
+
+## Example setup
+
+_Dead letter addresses_ and _maximum delivery attempts_ are defined in the configuration file [broker.xml](src/main/resources/activemq/server0/broker.xml):
+
+ <address-setting match="exampleQueue">
+ <dead-letter-address>deadLetterQueue</dead-letter-address>
+ <max-delivery-attempts>3</max-delivery-attempts>
+ </address-setting>
+
+This configuration will moved dead letter messages from `exampleQueue` to the `deadLetterQueue`.
+
+ActiveMQ Artemis allows to specify either an address or a queue. In this example, we will use a queue to hold the dead letter messages.
+
+The maximum attempts of delivery is `3`. Once this figure is reached, a message is considered a dead letter message and is moved to the `deadLetterQueue`.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml
index f3675a7..b01abf6 100644
--- a/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>./data/bindings</bindings-directory>
@@ -57,7 +55,7 @@ under the License.
</address-setting>
</address-settings>
- <addresses>
+ <addresses>
<address name="deadLetterQueue">
<anycast>
<queue name="deadLetterQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/pom.xml b/examples/features/standard/delayed-redelivery/pom.xml
index 6d225ba..4f9737d 100644
--- a/examples/features/standard/delayed-redelivery/pom.xml
+++ b/examples/features/standard/delayed-redelivery/pom.xml
@@ -103,7 +103,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/delayed-redelivery/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/readme.html b/examples/features/standard/delayed-redelivery/readme.html
deleted file mode 100644
index e535c47..0000000
--- a/examples/features/standard/delayed-redelivery/readme.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
- <head>
- <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>
- </head>
- <body onload="prettyPrint()">
- <h1>Delayed Redelivery Example</h1>
- <pre>To run the example, simply type <b>mvn verify</b> from this directory, <br>or <b>mvn -PnoServer verify</b> if you want to start and create the server manually.</pre>
-
- <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
- delivery being re-attempted ad infinitum in quick succession, using up valuable CPU and network resources.</p>
- <p>Re-delivery occurs when the session is closed with unacknowledged messages. The unacknowledged messages will
- be redelivered.</p>
- <p>By providing a redelivery delay, it can be specified that a delay of, say, 10 seconds is implemented between rollback
- and redelivery. The specific delay is configurable on both a global and per destination level, by using wild-card
- matching on the address settings.</p>
-
- <h2>Example setup</h2>
- <p>Redelivery delay is specified in the configuration file <a href="src/main/resources/activemq/server0/broker.xml">broker.xml</a>:</p>
- <p>In this example we set the redelivery delay to 5 seconds for the specific example queue. We could set redelivery delay on
- on multiple queues by specifying a wild-card in the match, e.g. <code>match="jms.#"</code> would apply the settings
- to all JMS queues and topics.</p>
- <p>We then consume a message in a transacted session, and rollback, and note that the message is not redelivered until
- after 5 seconds.</p>
- <pre class="prettyprint">
- <code><address-setting match="jms.queue.exampleQueue">
- <redelivery-delay>5000</redelivery-delay>
- </address-setting>
- </code>
- </pre>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/delayed-redelivery/readme.md
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/readme.md b/examples/features/standard/delayed-redelivery/readme.md
new file mode 100644
index 0000000..cd3b529
--- /dev/null
+++ b/examples/features/standard/delayed-redelivery/readme.md
@@ -0,0 +1,23 @@
+# Delayed Redelivery Example
+
+To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually.
+
+This example demonstrates how ActiveMQ Artemis can be configured to provide a delayed redelivery in the case where a message needs to be redelivered.
+
+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 delivery being re-attempted ad infinitum in quick succession, using up valuable CPU and network resources.
+
+Re-delivery occurs when the session is closed with unacknowledged messages. The unacknowledged messages will be redelivered.
+
+By providing a redelivery delay, it can be specified that a delay of, say, 10 seconds is implemented between rollback and redelivery. The specific delay is configurable on both a global and per destination level, by using wild-card matching on the address settings.
+
+## Example setup
+
+Redelivery delay is specified in the configuration file [broker.xml](src/main/resources/activemq/server0/broker.xml):
+
+In this example we set the redelivery delay to 5 seconds for the specific example queue. We could set redelivery delay on on multiple queues by specifying a wild-card in the match, e.g. `match="jms.#"` would apply the settings to all JMS queues and topics.
+
+We then consume a message in a transacted session, and rollback, and note that the message is not redelivered until after 5 seconds.
+
+ <address-setting match="exampleQueue">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-setting>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java b/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
index e70fd6c..9d69154 100644
--- a/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
+++ b/examples/features/standard/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
@@ -29,7 +29,7 @@ import javax.naming.InitialContext;
* 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
+ * Please see the readme for more information
*/
public class DelayedRedeliveryExample {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
index d86844b..cf83c7d 100644
--- a/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>./data/bindings</bindings-directory>
@@ -56,7 +54,7 @@ under the License.
</address-setting>
</address-settings>
- <addresses>
+ <addresses>
<address name="deadLetterQueue">
<anycast>
<queue name="deadLetterQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/divert/pom.xml b/examples/features/standard/divert/pom.xml
index 9745afd..c8fa81a 100644
--- a/examples/features/standard/divert/pom.xml
+++ b/examples/features/standard/divert/pom.xml
@@ -152,7 +152,23 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>markdown-page-generator-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file