activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [20/51] [abbrv] [partial] activemq-web git commit: Add body.storage type
Date Thu, 14 Dec 2017 14:48:44 GMT
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configurable-ioexception-handling.xml
----------------------------------------------------------------------
diff --git a/configurable-ioexception-handling.xml b/configurable-ioexception-handling.xml
index 259577a..fda6c6c 100644
--- a/configurable-ioexception-handling.xml
+++ b/configurable-ioexception-handling.xml
@@ -1,20 +1,16 @@
-<div class="wiki-content maincontent"><p>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2 id="ConfigurableIOExceptionHandling-DefaultIOExceptionhandler">Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messa
 ges). All file-based persistent stores are capable of surviving these kind of errors.</p><h3 id="ConfigurableIOExceptionHandling-ConfiguringDefaultIOExceptionhandler">Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;bean id=&quot;ioExceptionHandler&quot; class=&quot;org.apache.activemq.util.DefaultIOExceptionHandler&quot;&gt;
-        &lt;property name=&quot;ignoreAllErrors&quot;&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
+<div class="wiki-content maincontent"><p>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2>Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messages). All file-based persistent stores are capable of surviving
  these kind of errors.</p><h3>Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</p><structured-macro ac:macro-id="225b34f9-76e5-47c3-8046-3b66e7ace910" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>    &lt;bean id="ioExceptionHandler" class="org.apache.activemq.util.DefaultIOExceptionHandler"&gt;
+        &lt;property name="ignoreAllErrors"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
 
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; ioExceptionHandler=&quot;#ioExceptionHandler&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" ioExceptionHandler="#ioExceptionHandler"&gt;
       ...
     &lt;/broker&gt;
-]]></script>
-</div></div><p>Handler configuration properties:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property</p></th><th colspan="1" rowspan="1" class="confluenceTh">Since</th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreAllErrors</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>true</code> all errors are ignored and the broker remains running.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreNoSpaceErrors</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p><
 /td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>false</code> 'no disk space' errors are treated the same as other errors causing the broker to be stopped.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>noSpaceMessage</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>space</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The string used to match against the exception's message. When matched a 'no disk space' error results.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>ignoreSQLExceptions</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <code>true</code> all SQLExceptions are ignored by the handler allowing them to be han
 dled by the persistence adapter's locker. When <code>false</code> the exception handler processes the exception.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>sqlExceptionMessage</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>""</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The SQLException phrase to match when ignoring SQLExceptions. Only matched exceptions are ignored. All SQLExceptions match the default empty string.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>stopStartConnectors</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>true</code> transport connectors are stopped (clien
 t connections are refused), however, the broker will remain running. The transport connectors will be restarted following a successful persistence adapter checkpoint. All exceptions are ignored whilst the transport connectors are stopped. This option ensures that the broker does not need to be manually restarted in the event of a DB restart, for example.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>resumeCheckSleepPeriod</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>5sec</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The interval between persistence adapter checkpoints. Typically used in conjunction with <code>stopStartConnectors</code>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);">systemExitOnShutdown</span></p></td><td colspan="1" rowspan="1" class="conf
 luenceTd">5.13</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd"><span style="color: rgb(0,0,0);">before stopping the broker, set the broker attribute <span style="line-height: 1.42857;">systemExitOnShutdown to this value to potentially force a jvm exit. </span></span></td></tr></tbody></table></div><p><span style="color: rgb(0,0,0);">The default configuration will try to find a specified string in the exception message to determine whether it is a 'no disk space' error. On most platforms (at least those we have tested), you'll find the word 'space' in it. Of course, you can customize this to your platform by using <code style="line-height: 1.42857;">noSpaceMessage</code> property.</span></p><p>Note: as of ActiveMQ 5.11 the <code>JDBCIOExceptionHandler</code> has been deprecated. It has been replaced by the <code>org.apache.activemq.util.LeaseLockerIOExceptionHandler</code> that will work with any persistence adapter that
  supports pluggable storage lockers whether or not a locker is in use.</p><p><span style="color: rgb(102,0,51);">Writing your own handler</span></p><p>In case this handler doesn't work for you, you can write your own. For example you might want to change the way how you detect full disk and execute some external command, like <code>df</code> on Linux to be sure.</p><p>All you have to do is implement the <code>org.apache.activemq.util.IOExceptionHandler</code> interface then configure the broker to use it:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;bean id=&quot;ioExceptionHandler&quot; class=&quot;com.mycompany.MyIOExceptionHandler&quot;&gt;
-        &lt;property name=&quot;ignoreAllErrors&quot;&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
+</plain-text-body></structured-macro><p>Handler configuration properties:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Property</p></th><th colspan="1" rowspan="1">Since</th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ignoreAllErrors</code></p></td><td colspan="1" rowspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When <code>true</code> all errors are ignored and the broker remains running.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ignoreNoSpaceErrors</code></p></td><td colspan="1" rowspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>When <code>false</code> 'no disk space' errors are treated the same as other errors causing the broker to be stopped.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>noSpaceMessage</code></p></td><td colspan="1" r
 owspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>space</code></p></td><td colspan="1" rowspan="1"><p>The string used to match against the exception's message. When matched a 'no disk space' error results.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>ignoreSQLExceptions</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>If <code>true</code> all SQLExceptions are ignored by the handler allowing them to be handled by the persistence adapter's locker. When <code>false</code> the exception handler processes the exception.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>sqlExceptionMessage</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>""</code></p></td><td colspan="1" rowspan="1"><p>The SQLException phrase to match when ignoring SQLExceptions. Only matched exce
 ptions are ignored. All SQLExceptions match the default empty string.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>stopStartConnectors</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When <code>true</code> transport connectors are stopped (client connections are refused), however, the broker will remain running. The transport connectors will be restarted following a successful persistence adapter checkpoint. All exceptions are ignored whilst the transport connectors are stopped. This option ensures that the broker does not need to be manually restarted in the event of a DB restart, for example.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>resumeCheckSleepPeriod</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>5sec</code></p></td><td colspan="1" rowspan="1"><
 p>The interval between persistence adapter checkpoints. Typically used in conjunction with <code>stopStartConnectors</code>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);">systemExitOnShutdown</span></p></td><td colspan="1" rowspan="1">5.13</td><td colspan="1" rowspan="1">false</td><td colspan="1" rowspan="1"><span style="color: rgb(0,0,0);">before stopping the broker, set the broker attribute <span style="line-height: 1.42857;">systemExitOnShutdown to this value to potentially force a jvm exit. </span></span></td></tr></tbody></table><p><span style="color: rgb(0,0,0);">The default configuration will try to find a specified string in the exception message to determine whether it is a 'no disk space' error. On most platforms (at least those we have tested), you'll find the word 'space' in it. Of course, you can customize this to your platform by using <code style="line-height: 1.42857;">noSpaceMessage</code> property.</span></p><p>Note: as of ActiveM
 Q 5.11 the <code>JDBCIOExceptionHandler</code> has been deprecated. It has been replaced by the <code>org.apache.activemq.util.LeaseLockerIOExceptionHandler</code> that will work with any persistence adapter that supports pluggable storage lockers whether or not a locker is in use.</p><p><span style="color: rgb(102,0,51);">Writing your own handler</span></p><p>In case this handler doesn't work for you, you can write your own. For example you might want to change the way how you detect full disk and execute some external command, like <code>df</code> on Linux to be sure.</p><p>All you have to do is implement the <code>org.apache.activemq.util.IOExceptionHandler</code> interface then configure the broker to use it:</p><structured-macro ac:macro-id="dc77904e-f88b-45af-a7ba-f3356f7f0c7c" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>    &lt;bean id="ioExceptionHandler" class="com.mycompany.MyIOExceptionHandler"&gt;
+        &lt;property name="ignoreAllErrors"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
 
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; ioExceptionHandler=&quot;#ioExceptionHandler&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" ioExceptionHandler="#ioExceptionHandler"&gt;
       ...
     &lt;/broker&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuration.xml
----------------------------------------------------------------------
diff --git a/configuration.xml b/configuration.xml
index eb26111..4fe0acb 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -3,5 +3,5 @@
 
 <p>Questions on configuring ActiveMQ's JMS client or the Message Broker</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-enable-detailed-logging.xml">How can I enable detailed logging</a></li><li><a shape="rect" href="how-does-xbean-compare-to-spring-2.xml">How does XBean compare to Spring 2</a></li><li><a shape="rect" href="how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml">How do I configure 10s of 1000s of Queues in a single broker</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml">How do I configure ActiveMQ to hold 100s of millions of Queue Messages</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-use-aio-server-transport.xml">How do I configure ActiveMQ to use AIO server transport</a></li><li><a shape="rect" href="how-do-i-configure-automatic-reconnection.xml">How do I configure automatic reconnection</a></li><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.xml">How do I configure distributed queues or topics</a></li><
 li><a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml">How do I define a local address and local port for TCP or SSL</a></li><li><a shape="rect" href="how-do-i-disable-persistence.xml">How do I disable persistence</a></li><li><a shape="rect" href="how-do-i-run-activemq-under-the-kaffe-jvm.xml">How do I run ActiveMQ under the Kaffe JVM</a></li><li><a shape="rect" href="how-to-configure-a-new-database.xml">How to configure a new database</a></li><li><a shape="rect" href="how-to-deploy-activemq-ra-versionrar-to-weblogic.xml">How to deploy activemq-ra-version.rar to weblogic</a></li><li><a shape="rect" href="how-to-disable-multicast-discovery.xml">How to disable multicast discovery</a></li></ul></div>
+<structured-macro ac:macro-id="4be0647a-0a3a-460c-b754-4e9757b58610" ac:name="children" ac:schema-version="1"><parameter ac:name="all">true</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configure-startup-destinations.xml
----------------------------------------------------------------------
diff --git a/configure-startup-destinations.xml b/configure-startup-destinations.xml
index dcd4263..de224c8 100644
--- a/configure-startup-destinations.xml
+++ b/configure-startup-destinations.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>Typically in Apache ActiveMQ we <a shape="rect" href="how-do-i-create-new-destinations.xml">create destinations on demand</a> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>.</p><parameter ac:name="title">4.1 Feature</parameter><rich-text-body><p>Note this feature is available from 4.1 onwards. If you try this XML on older versions of ActiveMQ you will get an exception about the 'destinations' property not being writable.</p></rich-text-body><h3 id="ConfigureStartupDestinations-Example">Example</h3><p>The following <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml">example</a> shows how you can configure a number of destinations to be available at
  startup.<plain-text-body>
+<div class="wiki-content maincontent"><p>Typically in Apache ActiveMQ we <link><page ri:content-title="How do I create new destinations"></page><plain-text-link-body>create destinations on demand</plain-text-link-body></link> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <link><page ri:content-title="Xml Configuration"></page></link>.</p><parameter ac:name="title">4.1 Feature</parameter><rich-text-body><p>Note this feature is available from 4.1 onwards. If you try this XML on older versions of ActiveMQ you will get an exception about the 'destinations' property not being writable.</p></rich-text-body><h3>Example</h3><p>The following <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml">example</a> shows how you can configure a number of destinations to be available at startup
 .<plain-text-body>
 &lt;broker xmlns="http://activemq.apache.org/schema/core"&gt;
 
     &lt;destinations&gt;

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configure-version-5-brokers.xml
----------------------------------------------------------------------
diff --git a/configure-version-5-brokers.xml b/configure-version-5-brokers.xml
index 2db2822..39437a9 100644
--- a/configure-version-5-brokers.xml
+++ b/configure-version-5-brokers.xml
@@ -1,28 +1,27 @@
-<div class="wiki-content maincontent"><h3 id="Configureversion5Brokers-Overview">Overview</h3><p>There is an updates XML syntax for configuring message brokers - <a shape="rect" class="external-link" href="http://activemq.apache.org/schema/core/activemq-core-5.0-SNAPSHOT.xsd">see here</a></p><p>So we decided that using XML would make this configuration much easier. we use <a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> to perform the XML configuration.</p><p>For details of the XML see the <a shape="rect" href="xml-reference.xml">Xml Reference</a></p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful with broker names and URIs</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape
 ="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html" rel="nofollow">do not allow things like underscores</a> in them etc.</p></div></div><h2 id="Configureversion5Brokers-Examples">Examples</h2><p>The default ActiveMQ configuration: <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">current default config</a>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans
-  xmlns=&quot;http://www.springframework.org/schema/beans&quot;
-  xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-  xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd&quot;&gt;
+<div class="wiki-content maincontent"><h3>Overview</h3><p>There is an updates XML syntax for configuring message brokers - <a shape="rect" href="http://activemq.apache.org/schema/core/activemq-core-5.0-SNAPSHOT.xsd">see here</a></p><p>So we decided that using XML would make this configuration much easier. we use <a shape="rect" href="http://xbean.org/">XBean</a> to perform the XML configuration.</p><p>For details of the XML see the <link><page ri:content-title="Xml Reference"></page></link></p><structured-macro ac:macro-id="8bc30f12-46ab-4d0b-b5a7-c915427e4b4b" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Be careful with broker names and URIs</parameter><rich-text-body><p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html">do not allow things like underscores</a> in them etc.</p></rich-text-body></structured-macro><h2>Examples
 </h2><p>The default ActiveMQ configuration: <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">current default config</a>.</p><structured-macro ac:macro-id="79ddd82e-0753-4eaf-87e4-2f3d0904296c" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
     &lt;!-- Allows us to use system properties as variables in this configuration file --&gt;
-    &lt;bean class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;&gt;
-        &lt;property name=&quot;locations&quot;&gt;
+    &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
+        &lt;property name="locations"&gt;
             &lt;value&gt;file:${activemq.conf}/credentials.properties&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
    &lt;!-- Allows accessing the server log --&gt;
-    &lt;bean id=&quot;logQuery&quot; class=&quot;io.fabric8.insight.log.log4j.Log4jLogQuery&quot;
-          lazy-init=&quot;false&quot; scope=&quot;singleton&quot;
-          init-method=&quot;start&quot; destroy-method=&quot;stop&quot;&gt;
+    &lt;bean id="logQuery" class="io.fabric8.insight.log.log4j.Log4jLogQuery"
+          lazy-init="false" scope="singleton"
+          init-method="start" destroy-method="stop"&gt;
     &lt;/bean&gt;
     &lt;!--
         The &lt;broker&gt; element is used to configure the ActiveMQ broker.
     --&gt;
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.data}&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}"&gt;
         &lt;destinationPolicy&gt;
             &lt;policyMap&gt;
               &lt;policyEntries&gt;
-                &lt;policyEntry topic=&quot;&gt;&quot; &gt;
+                &lt;policyEntry topic="&gt;" &gt;
                     &lt;!-- The constantPendingMessageLimitStrategy is used to prevent
                          slow topic consumers to block producers and affect other consumers
                          by limiting the number of messages that are retained
@@ -30,7 +29,7 @@
                          http://activemq.apache.org/slow-consumer-handling.html
                     --&gt;
                   &lt;pendingMessageLimitStrategy&gt;
-                    &lt;constantPendingMessageLimitStrategy limit=&quot;1000&quot;/&gt;
+                    &lt;constantPendingMessageLimitStrategy limit="1000"/&gt;
                   &lt;/pendingMessageLimitStrategy&gt;
                 &lt;/policyEntry&gt;
               &lt;/policyEntries&gt;
@@ -44,7 +43,7 @@
             http://activemq.apache.org/jmx.html
         --&gt;
         &lt;managementContext&gt;
-            &lt;managementContext createConnector=&quot;false&quot;/&gt;
+            &lt;managementContext createConnector="false"/&gt;
         &lt;/managementContext&gt;
         &lt;!--
             Configure message persistence for the broker. The default persistence
@@ -53,7 +52,7 @@
             http://activemq.apache.org/persistence.html
         --&gt;
         &lt;persistenceAdapter&gt;
-            &lt;kahaDB directory=&quot;${activemq.data}/kahadb&quot;/&gt;
+            &lt;kahaDB directory="${activemq.data}/kahadb"/&gt;
         &lt;/persistenceAdapter&gt;
 
           &lt;!--
@@ -64,13 +63,13 @@
           &lt;systemUsage&gt;
             &lt;systemUsage&gt;
                 &lt;memoryUsage&gt;
-                    &lt;memoryUsage percentOfJvmHeap=&quot;70&quot; /&gt;
+                    &lt;memoryUsage percentOfJvmHeap="70" /&gt;
                 &lt;/memoryUsage&gt;
                 &lt;storeUsage&gt;
-                    &lt;storeUsage limit=&quot;100 gb&quot;/&gt;
+                    &lt;storeUsage limit="100 gb"/&gt;
                 &lt;/storeUsage&gt;
                 &lt;tempUsage&gt;
-                    &lt;tempUsage limit=&quot;50 gb&quot;/&gt;
+                    &lt;tempUsage limit="50 gb"/&gt;
                 &lt;/tempUsage&gt;
             &lt;/systemUsage&gt;
         &lt;/systemUsage&gt;
@@ -81,15 +80,15 @@
         --&gt;
         &lt;transportConnectors&gt;
             &lt;!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB --&gt;
-            &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;stomp&quot; uri=&quot;stomp://0.0.0.0:61613?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;mqtt&quot; uri=&quot;mqtt://0.0.0.0:1883?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;ws&quot; uri=&quot;ws://0.0.0.0:61614?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
+            &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="stomp" uri="stomp://0.0.0.0:61613?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="mqtt" uri="mqtt://0.0.0.0:1883?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="ws" uri="ws://0.0.0.0:61614?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
         &lt;/transportConnectors&gt;
         &lt;!-- destroy the spring context on shutdown to stop jetty --&gt;
         &lt;shutdownHooks&gt;
-            &lt;bean xmlns=&quot;http://www.springframework.org/schema/beans&quot; class=&quot;org.apache.activemq.hooks.SpringContextHook&quot; /&gt;
+            &lt;bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" /&gt;
         &lt;/shutdownHooks&gt;
     &lt;/broker&gt;
     &lt;!--
@@ -97,9 +96,8 @@
         The web consoles requires by default login, you can disable this in the jetty.xml file
         Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
     --&gt;
-    &lt;import resource=&quot;jetty.xml&quot;/&gt;
+    &lt;import resource="jetty.xml"/&gt;
 &lt;/beans&gt;
 
-]]></script>
-</div></div><p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p></div>
+</plain-text-body></structured-macro><p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/configuring-activemq-cpp.xml b/configuring-activemq-cpp.xml
index 5c4127b..8d4cf8b 100644
--- a/configuring-activemq-cpp.xml
+++ b/configuring-activemq-cpp.xml
@@ -1,49 +1,46 @@
 <div class="wiki-content maincontent"><p>The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP.  All configuration is achieved via URI-encoded parameters, either on the connection or destinations.  Through the URIs, you can configure virtually every facet of your ActiveMQ-CPP client.  The tables below show the comprehensive set of parameters.</p>
 
 
-<h2 id="ConfiguringActiveMQCPP-ConnectionURIParameters"><strong>Connection URI Parameters</strong></h2>
+<h2><strong>Connection URI Parameters</strong></h2>
 
-<h4 id="ConfiguringActiveMQCPP-ExampleConfiguration">Example Configuration</h4>
+<h4>Example Configuration</h4>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f8ac92f6-d75e-4a5f-8c13-6ae42fd8a7c3" ac:name="code" ac:schema-version="1"><plain-text-body>
 cf = new ActiveMQConnectionFactory(
-    &quot;tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true&quot;);
-]]></script>
-</div></div>
+    "tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true");
+</plain-text-body></structured-macro>
 
 
-<h3 id="ConfiguringActiveMQCPP-SocketOptions"><strong>Socket Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inputBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of bytes in the buffered input stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outputBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of bytes in the buffered output stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soLinger</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="conf
 luenceTd"><p>Socket SOLinger value</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soKeepAlive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket SOKeepAlive value</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soReceiveBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket receive buffer. If -1, use OS default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soSendBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket send buffer. If -1, use OS default.</p></td></tr></tbody></table></div>
+<h3><strong>Socket Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>inputBufferSize</p></td><td colspan="1" rowspan="1"><p>10000</p></td><td colspan="1" rowspan="1"><p>The number of bytes in the buffered input stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1"><p>outputBufferSize</p></td><td colspan="1" rowspan="1"><p>10000</p></td><td colspan="1" rowspan="1"><p>The number of bytes in the buffered output stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1"><p>soLinger</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>Socket SOLinger value</p></td></tr><tr><td colspan="1" rowspan="1"><p>soKeepAlive</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Socket SOKeepAlive value</p></td></tr><tr><td colspan="1" rowspan="1"><p>soReceiveBufferSize</p></td><td colspan="1" rows
 pan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Socket receive buffer. If -1, use OS default.</p></td></tr><tr><td colspan="1" rowspan="1"><p>soSendBufferSize</p></td><td colspan="1" rowspan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Socket send buffer. If -1, use OS default.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-TransportOptions"><strong>Transport Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>commandTracingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, enables tracing of incoming and outgoing transport commands</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tcpTracingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, enables tracing of raw network IO (in hex)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useAsyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rows
 pan="1" class="confluenceTd"><p>If true, enables asynchronous sending of messages.</p></td></tr></tbody></table></div>
+<h3><strong>Transport Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>commandTracingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables tracing of incoming and outgoing transport commands</p></td></tr><tr><td colspan="1" rowspan="1"><p>tcpTracingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables tracing of raw network IO (in hex)</p></td></tr><tr><td colspan="1" rowspan="1"><p>useAsyncSend</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables asynchronous sending of messages.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-TransactionOptions"><strong>Transaction Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>transaction.maxRedeliveryCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum number of redelivery attempts.</p></td></tr></tbody></table></div>
+<h3><strong>Transaction Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>transaction.maxRedeliveryCount</p></td><td colspan="1" rowspan="1"><p>5</p></td><td colspan="1" rowspan="1"><p>Maximum number of redelivery attempts.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-WireFormatProtocolOptions"><strong>Wire Format Protocol Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>openwire</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Selects the wire format to use.  Out of the box, can be either stomp or openwire.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.stackTraceEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.cacheEnabled</p
 ></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.tcpNoDelayEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.sizePrefixDisabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should serialized messages include a payload length prefix?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluence
 Td"><p>wireFormat.tightEncodingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should wire size be optimized over CPU usage? Only used by the openwire protocol.</p></td></tr></tbody></table></div>
+<h3><strong>Wire Format Protocol Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>wireFormat</p></td><td colspan="1" rowspan="1"><p>openwire</p></td><td colspan="1" rowspan="1"><p>Selects the wire format to use.  Out of the box, can be either stomp or openwire.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.stackTraceEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.cacheEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.tcpNoDelay
 Enabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.sizePrefixDisabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should serialized messages include a payload length prefix?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.tightEncodingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should wire size be optimized over CPU usage? Only used by the openwire protocol.</p></td></tr></tbody></table>
 
 
-<h2 id="ConfiguringActiveMQCPP-DestinationURIParameters"><strong>Destination URI Parameters</strong></h2>
+<h2><strong>Destination URI Parameters</strong></h2>
 
-<h4 id="ConfiguringActiveMQCPP-ExampleConfiguration.1">Example Configuration</h4>
+<h4>Example Configuration</h4>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-d = session-&gt;createTopic(&quot;com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true&quot;);
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="60e75886-3975-4e30-af58-247e9b0a740f" ac:name="code" ac:schema-version="1"><plain-text-body>
+d = session-&gt;createTopic("com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true");
+</plain-text-body></structured-macro>
 
-<h3 id="ConfiguringActiveMQCPP-GeneralOptions"><strong>General Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.prefetchSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of message the consumer will <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Use to control if messages are dropped if a <a shape="rect" href="slow-consumer-handling.xml">slow consumer</a> situation exists.</p></td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"><p>consumer.noLocal </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Same as the noLocal flag on a Topic consumer.  Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.dispatchAsync </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the broker <a shape="rect" href="consumer-dispatch-async.xml">dispatch messages asynchronously</a>  to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Is this a <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>con
 sumer.selector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> null </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JMS Selector used with the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.exclusive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Is this an <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.priority</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Allows you to configure a <a shape="rect" href="consumer-priority.xml">Consumer Priority</a>.</p></td></tr></tbody></table></div>
+<h3><strong>General Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>consumer.prefetchSize</p></td><td colspan="1" rowspan="1"><p> 1000 </p></td><td colspan="1" rowspan="1"><p> The number of message the consumer will <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>prefetch</link-body></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Use to control if messages are dropped if a <link><page ri:content-title="Slow Consumer Handling"></page><link-body>slow consumer</link-body></link> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.noLocal </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Same as the noLocal flag on a Topic consumer.
   Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.dispatchAsync </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the broker <link><page ri:content-title="Consumer Dispatch Async"></page><link-body>dispatch messages asynchronously</link-body></link>  to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1"><p> false</p></td><td colspan="1" rowspan="1"><p> Is this a <link><page ri:content-title="Retroactive Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.selector</p></td><td colspan="1" rowspan="1"><p> null </p></td><td colspan="1" rowspan="1"><p> JMS Selector used with the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.exclusive</p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Is this an <link><page ri:content-title="Exclusiv
 e Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.priority</p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Allows you to configure a <link><page ri:content-title="Consumer Priority"></page></link>.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-OpenWire-onlyOptions"><strong>OpenWire-only Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.browser</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.networkSubscription</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.optimizedAcknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Enables an optimised acknowledgement mode where mes
 sages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.noRangeAcks</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p>producer.dispatchAsyc</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
+<h3><strong>OpenWire-only Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>consumer.browser</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.networkSubscription</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.optimizedAcknowledge</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p> Enables an optimised acknowledgement mode where messages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></t
 d></tr><tr><td colspan="1" rowspan="1"><p>consumer.noRangeAcks</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.dispatchAsyc</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr></tbody></table>
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-brokers.xml
----------------------------------------------------------------------
diff --git a/configuring-brokers.xml b/configuring-brokers.xml
index 5744e7e..dc656cd 100644
--- a/configuring-brokers.xml
+++ b/configuring-brokers.xml
@@ -1,42 +1,40 @@
 <div class="wiki-content maincontent">
-<h3 id="ConfiguringBrokers-Overview">Overview</h3>
+<h3>Overview</h3>
 
 <p>In ActiveMQ 4, we are using a new xml format to configure the broker.</p>
 
 
-<h3 id="ConfiguringBrokers-Syntax">Syntax</h3>
+<h3>Syntax</h3>
 
 <p>The following xsd describes the syntax of the broker configuration file.</p>
 
-<p><a shape="rect" href="configuring-brokers.data/activemq-4.0.xsd?version=1&amp;modificationDate=1133701454000&amp;api=v2" data-linked-resource-id="3253" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-4.0.xsd" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="36158" data-linked-resource-container-version="6">activemq-4.0.xsd</a></p>
+<p><link><attachment ri:filename="activemq-4.0.xsd"></attachment></link></p>
 
 <p>And here is the reference documentation for that xsd file.</p>
 
-<p><a shape="rect" href="configuring-brokers.data/activemq-4.0.xsd.html?version=1&amp;modificationDate=1133701442000&amp;api=v2" data-linked-resource-id="3286" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-4.0.xsd.html" data-nice-type="HTML Document" data-linked-resource-content-type="text/html" data-linked-resource-container-id="36158" data-linked-resource-container-version="6">activemq-4.0.xsd.html</a></p>
+<p><link><attachment ri:filename="activemq-4.0.xsd.html"></attachment></link></p>
 
-<h3 id="ConfiguringBrokers-Example">Example</h3>
+<h3>Example</h3>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;beans xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
+<structured-macro ac:macro-id="678b9187-119f-47cf-ada5-eb85cee61646" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
 
-  &lt;broker useJmx=&quot;true&quot;&gt;
+  &lt;broker useJmx="true"&gt;
   
     &lt;persistenceAdapter&gt;
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;../data&quot;/&gt;
+      &lt;journaledJDBC journalLogFiles="5" dataDirectory="../data"/&gt;
     &lt;/persistenceAdapter&gt;
   
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;discovery:tcp://localhost:61616&quot;/&gt;
+      &lt;transportConnector uri="discovery:tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
     
     &lt;networkConnectors&gt;
-      &lt;networkConnector uri=&quot;multicast&quot;/&gt;
+      &lt;networkConnector uri="multicast"/&gt;
     &lt;/networkConnectors&gt;
     
   &lt;/broker&gt;
   
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-transports.xml
----------------------------------------------------------------------
diff --git a/configuring-transports.xml b/configuring-transports.xml
index 3f9e271..07e83cb 100644
--- a/configuring-transports.xml
+++ b/configuring-transports.xml
@@ -1,30 +1,24 @@
-<div class="wiki-content maincontent"><h2 id="ConfiguringTransports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong><code>failover:</code></strong> or&#160;<strong><code>static:</code></strong> URIs, do not put any whitespace around the <strong><code>','</code> </strong>symbol.</p></div></div><h3 id="ConfiguringTransports-TheAUTOTransport">The AUTO Transport</h3><p>Sta
 rting with 5.13.0 ActiveMQ has support for automatic wire protocol detection over TCP, SSL, NIO, and NIO SSL. &#160;OpenWire, STOMP, AMQP, and MQTT are supported. &#160;For details see the <a shape="rect" href="auto.xml">AUTO </a>Transport Reference.</p><h3 id="ConfiguringTransports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a></p><h3 id="ConfiguringTransports-TheAMQPTrans
 port">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.xml">AMQP</a> Transport Reference.</p><h3 id="ConfiguringTransports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a>. Its a light weight publish/subscribe messaging transport. See the <a shape="rect" href="mqtt.xml">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringTransports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.xml">TCP Transport Reference</a></p><h3 id="ConfiguringTransports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I
 /O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broker's XML configuration file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
+<div class="wiki-content maincontent"><h2>Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><structured-macro ac:macro-id="0f5649b8-41ab-477a-8bd2-7060071af7bd" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Be careful about whitespace</parameter><rich-text-body><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong><code>failover:</code></strong> or&#160;<strong><code>static:</code></strong> URIs, do not put any whitespace around the <strong><code>','</code> </strong>symbol.</p></rich-text-body></structured-macro><h3>The AUTO Transport</h3><p>Starting with 5.13.0 ActiveMQ has support for automatic wire protocol detection over TCP, SSL, NIO, and NIO SSL. &#160;OpenWire, STOMP, AMQP, and MQTT are suppor
 ted. &#160;For details see the <link><page ri:content-title="AUTO"></page><plain-text-link-body>AUTO </plain-text-link-body></link>Transport Reference.</p><h3>The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <link><page ri:content-title="VM Transport Reference"></page></link></p><h3>The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <link><page ri:content-title="AMQP"></page></link> Transport Reference.</p><h3>The MQTT Transport<
 /h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" href="http://mqtt.org/">MQTT</a>. Its a light weight publish/subscribe messaging transport. See the <link><page ri:content-title="MQTT"></page></link> Transport Reference for details.</p><h3>The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <link><page ri:content-title="TCP Transport Reference"></page></link></p><h3>The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" href="http://en.wikipedia.org/wiki/New_I/O">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" href="http://java.sys-con.com/read/46658.htm">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broker's XML configuration file.</p><structured-macro ac:macro-id
 ="b963ed56-8d6d-409a-baee-d4a2ad19b668" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker&gt;
   ...
   &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;nio&quot; uri=&quot;nio://0.0.0.0:61616&quot;/&gt;  
+    &lt;transportConnector name="nio" uri="nio://0.0.0.0:61616"/&gt;  
   &lt;/&lt;transportConnectors&gt;
   ...
 &lt;/broker&gt;
-]]></script>
-</div></div><p>Trying to use nio transport url on the client side will instantiate the regular TCP transport. For more information see the <a shape="rect" href="nio-transport-reference.xml">NIO Transport Reference</a></p><h3 id="ConfiguringTransports-TheSSLTransport">The SSL Transport</h3><p>This allows you to talk over TCP using SSL. For more information see the <a shape="rect" href="ssl-transport-reference.xml">SSL Transport Reference</a></p><h3 id="ConfiguringTransports-TheNIOSSLTransport">The NIO SSL Transport</h3><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Availability</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Implementing SSL transport over NIO. This allows you to connect large number of SSL clients to a single broker instance. It's server side transport-option only</p><div clas
 s="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
+</plain-text-body></structured-macro><p>Trying to use nio transport url on the client side will instantiate the regular TCP transport. For more information see the <link><page ri:content-title="NIO Transport Reference"></page></link></p><h3>The SSL Transport</h3><p>This allows you to talk over TCP using SSL. For more information see the <link><page ri:content-title="SSL Transport Reference"></page></link></p><h3>The NIO SSL Transport</h3><structured-macro ac:macro-id="2aa11976-d3d9-4a7a-98ff-b7ea8fb7f1f3" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Availability</parameter><rich-text-body><p>Available since 5.6</p></rich-text-body></structured-macro><p>Implementing SSL transport over NIO. This allows you to connect large number of SSL clients to a single broker instance. It's server side transport-option only</p><structured-macro ac:macro-id="65251e10-4456-410d-8bc8-a74670275b2d" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker&gt;
   ...
   &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;nio+ssl&quot; uri=&quot;nio+ssl://0.0.0.0:61616&quot;/&gt;  
+    &lt;transportConnector name="nio+ssl" uri="nio+ssl://0.0.0.0:61616"/&gt;  
   &lt;/&lt;transportConnectors&gt;
   ...
 &lt;/broker&gt;
-]]></script>
-</div></div><p>Trying to use <code>nio+ssl</code> transport url on the client side will instantiate the regular SSL transport.</p><h3 id="ConfiguringTransports-ThePeerTransport">The Peer Transport</h3><p>The Peer transport provides a peer-to-peer network with ActiveMQ. What actually happens is the peer transport uses the VM transport to create and connect to a local embedded broker but which configures the embedded broker to establish network connections to other peer embedded brokers.</p><p>For more information see the <a shape="rect" href="peer-transport-reference.xml">Peer Transport Reference</a></p><h3 id="ConfiguringTransports-TheUDPTransport">The UDP Transport</h3><p>This allows you to talk over UDP.</p><p>For more information see the <a shape="rect" href="udp-transport-reference.xml">UDP Transport Reference</a></p><h3 id="ConfiguringTransports-TheMulticastTransport">The Multicast Transport</h3><p>This allows you to talk over Multicast.</p><p>For more information see the <a sh
 ape="rect" href="multicast-transport-reference.xml">Multicast Transport Reference</a></p><h3 id="ConfiguringTransports-TheHTTPandHTTPSTransport">The HTTP and HTTPS Transport</h3><p>This allows the ActiveMQ client and broker to tunnel over HTTP. If the client is not JMS you might want to look at <a shape="rect" href="rest.xml">REST</a> or <a shape="rect" href="ajax.xml">Ajax</a> support instead.</p><p>For more information see the <a shape="rect" href="http-and-https-transports-reference.xml">HTTP and HTTPs Transports Reference</a></p><h3 id="ConfiguringTransports-TheWebSocketsTransport">The WebSockets Transport</h3><p>This transport uses the new HTML5 WebSockets to exchange messages with the broker. For more information see the <a shape="rect" href="websockets.xml">WebSockets</a> Transport Reference</p><h3 id="ConfiguringTransports-TheStompTransport">The Stomp Transport</h3><p>A plain text transport that can be used with many languages. See&#160;<a shape="rect" href="stomp.xml">Stomp
 </a> for more details.</p><h2 id="ConfiguringTransports-GeneralPurposeURIs">General Purpose URIs</h2><p>You can configure other features via the URI syntax as follows...</p><h3 id="ConfiguringTransports-ConnectionConfigurationURI">Connection Configuration URI</h3><p>Any Apache ActiveMQ JMS connection can be configured using the URL or explicitly setting properties on the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves.</p><p>For more information see <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a></p><h3 id="ConfiguringTransports-DestinationOptions">Destination Options</h3><p>You can configure various consum
 er related options using <a shape="rect" href="destination-options.xml">Destination Options</a> which allow you to configure destinations using URI syntax.</p><h3 id="ConfiguringTransports-BrokerConfigurationURI">Broker Configuration URI</h3><p>You can use a <a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a> to configure an embedded broker, either using the BrokerFactory helper class from Java or using the activemq shell script. For more details see <a shape="rect" href="run-broker.xml">How to Run a Broker</a></p><h3 id="ConfiguringTransports-ConfiguringWireFormats">Configuring Wire Formats</h3><p>Any transport which involves marshalling messages onto some kind of network transport like TCP or UDP will typically use the <a shape="rect" href="openwire.xml">OpenWire</a> format. This is configurable to customize how things appear on the wire.</p><p>For more information see <a shape="rect" href="configuring-wire-formats.xml">Configuring Wire Formats</a></p>
 <h2 id="ConfiguringTransports-HighLevelProtocolURIs">High Level Protocol URIs</h2><p>The following higher level protocols can be configured via URI</p><h3 id="ConfiguringTransports-TheFailoverTransport">The Failover Transport</h3><p>The Failover transport layers reconnect logic on top of any of the other transports. This is what used to be the Reliable transport in ActiveMQ 3. Its configuration syntax allows you to specify any number of composite URIs. The Failover transport randomly chooses one of the composite URIs and attempts to establish a connection to it. If it does not succeed or if it subsequently fails, a new connection is established to one of the other URIs in the list.</p><p>For more information see the <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></p><h3 id="ConfiguringTransports-TheFanoutTransport">The Fanout Transport</h3><p>The Fanout transport layers reconnect and replicate logic on top of any of the other transports. It i
 s used replicate commands to multiple brokers.</p><p>For more information see the <a shape="rect" href="fanout-transport-reference.xml">Fanout Transport Reference</a></p><h2 id="ConfiguringTransports-UsingDiscovery">Using Discovery</h2><p>Often when using transports like TCP you want to use <a shape="rect" href="discovery.xml">Discovery</a> to locate the available brokers. This is different from using, say, <a shape="rect" href="multicast-transport-reference.xml">Multicast</a> - as the actual main communication is over TCP but multicast is purely used to discover the location of brokers.</p><h3 id="ConfiguringTransports-TheDiscoveryTransport">The Discovery Transport</h3><p>The Discovery transport works just like the reliable transport, except that it uses a discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport Reference</a></p><h3 id="ConfiguringTransports-TheZeroConfT
 ransport">The ZeroConf Transport</h3><p>The ZeroConf transport provides <a shape="rect" href="discovery.xml">Discovery</a> and it works like the <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport</a> but rather than using our own multicast based discovery mechanism (which allows you to configure the exact multicast address and port, etc.), the <a shape="rect" href="zeroconf.xml">ZeroConf</a> transport is used instead.</p><p>For more information see the <a shape="rect" href="zeroconf-transport-reference.xml">ZeroConf Transport Reference</a></p><h3 id="ConfiguringTransports-Serversideoptions">Server side options</h3><p>There are a number of options that can be used for changing behavior on the server for the&#160;<strong><code>TransportConnector</code></strong> in the ActiveMQ broker configuration. These are:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colsp
 an="1" rowspan="1" class="confluenceTh"><p>default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: red;"> <code>allowLinkStealing</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This is enabled for default for MQTT transport.</p><p>Link Stealing is where the last of two or more connections with the same id (clientID for JMS) is deemed the valid connection and the older one is closed by the broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>discoveryURI</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If set, the multicast discovery address for client connections to find the broker.</p></td></tr><tr><td colspan="1" rowspan="1" 
 class="confluenceTd"><p><code>enableStatusMonitor</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will monitor connections to determine if they are blocked.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>name</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the&#160;<strong><code>TransportConnector</code></strong> instance.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>rebalanceClusterClients</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will automatically re-balance clients across the cluster on changes of topology.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClients</code></p></td>
 <td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If enabled, will update client connections (if they use the&#160;<strong><code>failover://</code></strong> transport) of changes to the broker cluster.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClientsOnRemove</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will update clients if a broker is removed from the cluster.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterFilter</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Comma separated list of regular expressions. Brokers with a name matching the pattern will be included for client updates.</p></td></tr><tr><td colspan="1" rowspan
 ="1" class="confluenceTd"><p><code>uri</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The bind address for the transport.</p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>Note</strong>: properties in <span style="color: rgb(255,0,0);">red</span> are version 5.10 (and higher) options only.</p></div></div><p>Example configuration:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
-   &lt;!-- ... --&gt;
+</plain-text-body></structured-macro><p>Trying to use <code>nio+ssl</code> transport url on the client side will instantiate the regular SSL transport.</p><h3>The Peer Transport</h3><p>The Peer transport provides a peer-to-peer network with ActiveMQ. What actually happens is the peer transport uses the VM transport to create and connect to a local embedded broker but which configures the embedded broker to establish network connections to other peer embedded brokers.</p><p>For more information see the <link><page ri:content-title="Peer Transport Reference"></page></link></p><h3>The UDP Transport</h3><p>This allows you to talk over UDP.</p><p>For more information see the <link><page ri:content-title="UDP Transport Reference"></page></link></p><h3>The Multicast Transport</h3><p>This allows you to talk over Multicast.</p><p>For more information see the <link><page ri:content-title="Multicast Transport Reference"></page></link></p><h3>The HTTP and HTTPS Transport</h3><p>This allows the 
 ActiveMQ client and broker to tunnel over HTTP. If the client is not JMS you might want to look at <link><page ri:content-title="REST"></page></link> or <link><page ri:content-title="Ajax"></page></link> support instead.</p><p>For more information see the <link><page ri:content-title="HTTP and HTTPs Transports Reference"></page></link></p><h3>The WebSockets Transport</h3><p>This transport uses the new HTML5 WebSockets to exchange messages with the broker. For more information see the <link><page ri:content-title="WebSockets"></page></link> Transport Reference</p><h3>The Stomp Transport</h3><p>A plain text transport that can be used with many languages. See&#160;<link><page ri:content-title="Stomp"></page></link> for more details.</p><h2>General Purpose URIs</h2><p>You can configure other features via the URI syntax as follows...</p><h3>Connection Configuration URI</h3><p>Any Apache ActiveMQ JMS connection can be configured using the URL or explicitly setting properties on the <a sha
 pe="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves.</p><p>For more information see <link><page ri:content-title="Connection Configuration URI"></page></link></p><h3>Destination Options</h3><p>You can configure various consumer related options using <link><page ri:content-title="Destination Options"></page></link> which allow you to configure destinations using URI syntax.</p><h3>Broker Configuration URI</h3><p>You can use a <link><page ri:content-title="Broker Configuration URI"></page></link> to configure an embedded broker, either using the BrokerFactory helper class from Java or using the activemq shell script. For more details see <link><page ri:content-title="Run Broker"></page><plain-text-link
 -body>How to Run a Broker</plain-text-link-body></link></p><h3>Configuring Wire Formats</h3><p>Any transport which involves marshalling messages onto some kind of network transport like TCP or UDP will typically use the <link><page ri:content-title="OpenWire"></page></link> format. This is configurable to customize how things appear on the wire.</p><p>For more information see <link><page ri:content-title="Configuring Wire Formats"></page></link></p><h2>High Level Protocol URIs</h2><p>The following higher level protocols can be configured via URI</p><h3>The Failover Transport</h3><p>The Failover transport layers reconnect logic on top of any of the other transports. This is what used to be the Reliable transport in ActiveMQ 3. Its configuration syntax allows you to specify any number of composite URIs. The Failover transport randomly chooses one of the composite URIs and attempts to establish a connection to it. If it does not succeed or if it subsequently fails, a new connection is 
 established to one of the other URIs in the list.</p><p>For more information see the <link><page ri:content-title="Failover Transport Reference"></page></link></p><h3>The Fanout Transport</h3><p>The Fanout transport layers reconnect and replicate logic on top of any of the other transports. It is used replicate commands to multiple brokers.</p><p>For more information see the <link><page ri:content-title="Fanout Transport Reference"></page></link></p><h2>Using Discovery</h2><p>Often when using transports like TCP you want to use <link><page ri:content-title="Discovery"></page></link> to locate the available brokers. This is different from using, say, <link><page ri:content-title="Multicast Transport Reference"></page><plain-text-link-body>Multicast</plain-text-link-body></link> - as the actual main communication is over TCP but multicast is purely used to discover the location of brokers.</p><h3>The Discovery Transport</h3><p>The Discovery transport works just like the reliable trans
 port, except that it uses a discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <link><page ri:content-title="Discovery Transport Reference"></page></link></p><h3>The ZeroConf Transport</h3><p>The ZeroConf transport provides <link><page ri:content-title="Discovery"></page></link> and it works like the <link><page ri:content-title="Discovery Transport Reference"></page><plain-text-link-body>Discovery Transport</plain-text-link-body></link> but rather than using our own multicast based discovery mechanism (which allows you to configure the exact multicast address and port, etc.), the <link><page ri:content-title="ZeroConf"></page></link> transport is used instead.</p><p>For more information see the <link><page ri:content-title="ZeroConf Transport Reference"></page></link></p><h3>Server side options</h3><p>There are a number of options that can be used for changing behavior on the server for the&#160;<strong><code>TransportConnector</code></stro
 ng> in the ActiveMQ broker configuration. These are:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p><span style="color: red;"> <code>allowLinkStealing</code><br clear="none"></span></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>This is enabled for default for MQTT transport.</p><p>Link Stealing is where the last of two or more connections with the same id (clientID for JMS) is deemed the valid connection and the older one is closed by the broker.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>discoveryURI</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>If set, the multicast discovery address for client connections to find the broker.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>enableStatusMonitor</co
 de></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Will monitor connections to determine if they are blocked.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>name</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>The name of the&#160;<strong><code>TransportConnector</code></strong> instance.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>rebalanceClusterClients</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Will automatically re-balance clients across the cluster on changes of topology.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterClients</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If enabled, will update client connections (if they use the&#160;<strong><code>failover://</code></strong> transport) of changes to the broker cluster.</
 p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterClientsOnRemove</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Will update clients if a broker is removed from the cluster.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterFilter</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>Comma separated list of regular expressions. Brokers with a name matching the pattern will be included for client updates.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>uri</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>The bind address for the transport.</p></td></tr></tbody></table><structured-macro ac:macro-id="cc529423-17f8-4ab2-9dcb-305406ab27d0" ac:name="info" ac:schema-version="1"><rich-text-body><p><strong>Note</strong>: properties in <span style="color: rgb(255,0,0);">red</span> are version 5.10
  (and higher) options only.</p></rich-text-body></structured-macro><p>Example configuration:</p><structured-macro ac:macro-id="7fbeb1d3-9c38-479d-b367-c1d8231f6bf8" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;broker&gt;
+&#160;&#160; &lt;!-- ... --&gt;
 
-   &lt;transportConnectors&gt;
-     &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616&quot; enableStatusMonitor=&quot;true&quot;/&gt; 
-   &lt;/&lt;transportConnectors&gt;
+&#160;&#160; &lt;transportConnectors&gt;
+&#160;&#160;&#160;&#160; &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616" enableStatusMonitor="true"/&gt; 
+&#160;&#160; &lt;/&lt;transportConnectors&gt;
 
-   &lt;!-- ... --&gt;
-&lt;/broker&gt;]]></script>
-</div></div></div>
+&#160;&#160; &lt;!-- ... --&gt;
+&lt;/broker&gt;</plain-text-body></structured-macro></div>
 


Mime
View raw message