You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2017/12/14 14:48:40 UTC

[16/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delay-and-schedule-message-delivery.xml
----------------------------------------------------------------------
diff --git a/delay-and-schedule-message-delivery.xml b/delay-and-schedule-message-delivery.xml
index d6885a6..5c8e1ad 100644
--- a/delay-and-schedule-message-delivery.xml
+++ b/delay-and-schedule-message-delivery.xml
@@ -1,13 +1,10 @@
-<div class="wiki-content maincontent"><p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. <br clear="none"> An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Check your Message Properties</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The message property <code>scheduledJobId&#160;</code>is reserved for use by the Job Scheduler. If this property is set before sending, the message will be sent immediately and not scheduled. Also, <span>after a scheduled message is received, the property </span><span><cod
 e>scheduledJobId</code>&#160;will be set on the received message so </span>keep this in mind if using something like a Camel Route which might automatically copy properties over when re-sending a message.</p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_DELAY</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The time in milliseconds that a message will wait before being scheduled to be delivered by the broker</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_PERIOD</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td><td colspan="1" rowspan="1" 
 class="confluenceTd"><p>The time in milliseconds to wait after the start time to wait before scheduling the message again</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_REPEAT</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>int</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of times to repeat scheduling a message for delivery</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_CRON</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use a Cron entry to set the schedule</p></td></tr></tbody></table></div><p>For the connivence of Java JMS clients - there's an interface with the property names used for scheduling at <em><strong>org.apache.activemq.ScheduledMessage</strong></em>.</p><p>For example, to have a message scheduled for delivery in 60 seconds - you would need to set the <em>AMQ_SCHEDULED_DELAY</em> pro
 perty:</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
+<div class="wiki-content maincontent"><p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <link><page ri:content-title="Xml Configuration"></page></link>. <br clear="none"> An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p><structured-macro ac:macro-id="9d386966-fbbb-49f5-afcd-e4fc705a19ed" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Check your Message Properties</parameter><rich-text-body><p>The message property <code>scheduledJobId&#160;</code>is reserved for use by the Job Scheduler. If this property is set before sending, the message will be sent immediately and not scheduled. Also, <span>after a scheduled message is received, the property </span><span><code>scheduledJobId</code>&#160;will be set on the received message so </span>keep this i
 n mind if using something like a Camel Route which might automatically copy properties over when re-sending a message.</p></rich-text-body></structured-macro><table><tbody><tr><th colspan="1" rowspan="1"><p>Property name</p></th><th colspan="1" rowspan="1"><p>type</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_DELAY</p></td><td colspan="1" rowspan="1"><p>long</p></td><td colspan="1" rowspan="1"><p>The time in milliseconds that a message will wait before being scheduled to be delivered by the broker</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_PERIOD</p></td><td colspan="1" rowspan="1"><p>long</p></td><td colspan="1" rowspan="1"><p>The time in milliseconds to wait after the start time to wait before scheduling the message again</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_REPEAT</p></td><td colspan="1" rowspan="1"><p>int</p></td><td colspan="1" rowspan="1"><p>The number of times to rep
 eat scheduling a message for delivery</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_CRON</p></td><td colspan="1" rowspan="1"><p>String</p></td><td colspan="1" rowspan="1"><p>Use a Cron entry to set the schedule</p></td></tr></tbody></table><p>For the connivence of Java JMS clients - there's an interface with the property names used for scheduling at <em><strong>org.apache.activemq.ScheduledMessage</strong></em>.</p><p>For example, to have a message scheduled for delivery in 60 seconds - you would need to set the <em>AMQ_SCHEDULED_DELAY</em> property:</p><structured-macro ac:macro-id="c68d7805-8bf6-4833-b600-9a20ee84ca98" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
         long time = 60 * 1000;
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, time);
         producer.send(message);
-]]></script>
-</div></div><p>You can set a message to wait with an initial delay, and the repeat delivery 10 times, waiting 10 seconds between each re-delivery:</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
+</plain-text-body></structured-macro><p>You can set a message to wait with an initial delay, and the repeat delivery 10 times, waiting 10 seconds between each re-delivery:</p><structured-macro ac:macro-id="912377b9-7446-4d59-ab20-80cea8490783" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
         long delay = 30 * 1000;
         long period = 10 * 1000;
         int repeat = 9;
@@ -15,22 +12,17 @@
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_PERIOD, period);
         message.setIntProperty(ScheduledMessage.AMQ_SCHEDULED_REPEAT, repeat);
         producer.send(message);
-]]></script>
-</div></div><p>You can also use <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Cron" rel="nofollow">CRON</a> to schedule a message, for example, if you want a message scheduled to be delivered every hour, you would need to set the CRON entry to be - <em>0 * * * *</em> - e.g.</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
-        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, &quot;0 * * * *&quot;);
+</plain-text-body></structured-macro><p>You can also use <a shape="rect" href="http://en.wikipedia.org/wiki/Cron">CRON</a> to schedule a message, for example, if you want a message scheduled to be delivered every hour, you would need to set the CRON entry to be - <em>0 * * * *</em> - e.g.</p><structured-macro ac:macro-id="a4d4b451-b5a5-4c05-b608-6034275960a5" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
+        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, "0 * * * *");
         producer.send(message);
-]]></script>
-</div></div><p>CRON scheduling takes priority over using message delay - however, if a repeat and period is set with a CRON entry, the ActiveMQ scheduler will schedule delivery of the message for every time the CRON entry fires. Easier to explain with an example. Supposing that you want a message to be delivered 10 times, with a one second delay between each message - and you wanted this to happen every hour - you'd do this:</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
-        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, &quot;0 * * * *&quot;);
+</plain-text-body></structured-macro><p>CRON scheduling takes priority over using message delay - however, if a repeat and period is set with a CRON entry, the ActiveMQ scheduler will schedule delivery of the message for every time the CRON entry fires. Easier to explain with an example. Supposing that you want a message to be delivered 10 times, with a one second delay between each message - and you wanted this to happen every hour - you'd do this:</p><structured-macro ac:macro-id="6a9d7e73-9d13-44b2-80e0-63ca1b8130b3" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
+        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, "0 * * * *");
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, 1000);
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_PERIOD, 1000);
         message.setIntProperty(ScheduledMessage.AMQ_SCHEDULED_REPEAT, 9);
         producer.send(message);
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delete-inactive-destinations.xml
----------------------------------------------------------------------
diff --git a/delete-inactive-destinations.xml b/delete-inactive-destinations.xml
index 6273c34..14bff40 100644
--- a/delete-inactive-destinations.xml
+++ b/delete-inactive-destinations.xml
@@ -1,16 +1,12 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Inactive Destination</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">An 'inactive' destination is one that has had no messages pending and no consumers connected for some configured period of time.</div></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">By default the broker does <em>not</em> check for inactive destinations. This as governed by the default values for the following options: <strong><code>schedulePeriodForDestinationPurge="0"</code></strong> and&#160;<strong><code>gcInactiveDestinations="false"</code></strong>.</div></div><p>However, the broker can be confi
 gured to purge inactive destinations. To do so requires using specially configured destination policy entries in combination with the broker attribute: <strong><code>schedulePeriodForDestinationPurge &gt; 0</code></strong>.</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;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; schedulePeriodForDestinationPurge=&quot;10000&quot;&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="fcf7d983-a1c8-45c4-97f5-e84d80c6cb5e" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Inactive Destination</parameter><rich-text-body>An 'inactive' destination is one that has had no messages pending and no consumers connected for some configured period of time.</rich-text-body></structured-macro><structured-macro ac:macro-id="44b9356b-6be3-4fbf-87d6-7c0840678f48" ac:name="info" ac:schema-version="1"><rich-text-body>By default the broker does <em>not</em> check for inactive destinations. This as governed by the default values for the following options: <strong><code>schedulePeriodForDestinationPurge="0"</code></strong> and&#160;<strong><code>gcInactiveDestinations="false"</code></strong>.</rich-text-body></structured-macro><p>However, the broker can be configured to purge inactive destinations. To do so requires using specially configured destination policy entries in combination with the broker att
 ribute: <strong><code>schedulePeriodForDestinationPurge &gt; 0</code></strong>.</p><p>Example:</p><structured-macro ac:macro-id="6500de46-5edd-41a6-8032-baf0dc981af5" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;broker xmlns="http://activemq.apache.org/schema/core" schedulePeriodForDestinationPurge="10000"&gt;
 
   &lt;destinationPolicy&gt;
      &lt;policyMap&gt;
         &lt;policyEntries&gt;
-           &lt;policyEntry queue=&quot;&gt;&quot; gcInactiveDestinations=&quot;true&quot; inactiveTimoutBeforeGC=&quot;30000&quot;/&gt;
+           &lt;policyEntry queue="&gt;" gcInactiveDestinations="true" inactiveTimoutBeforeGC="30000"/&gt;
         &lt;/policyEntries&gt;
      &lt;/policyMap&gt;
   &lt;/destinationPolicy&gt;
       
-&lt;/broker&gt;]]></script>
-</div></div><p>In this example the broker will check for inactive destinations every&#160;<strong><code>10</code></strong> seconds, as determined by <strong><code>schedulePeriodForDestinationPurge="10000"</code></strong>. When a destination purge is triggered the broker will delete any queue that has been empty for longer than <strong><code>inactiveTimoutBeforeGC="30000"</code></strong> milliseconds (default: <strong><code>60000</code></strong> milliseconds) and for which <strong><code>gcInactiveDestinations="true"</code></strong> is set on its corresponding destination policy entry.</p><p>When a destination is removed the broker will log a message like:</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[INFO  Queue                          - TEST.QUEUE Inactive for longer than 30000 ms - removing ...]]></script>
-</div></div><p>&#160;</p><p>&#160;</p></div>
+&lt;/broker&gt;</plain-text-body></structured-macro><p>In this example the broker will check for inactive destinations every&#160;<strong><code>10</code></strong> seconds, as determined by <strong><code>schedulePeriodForDestinationPurge="10000"</code></strong>. When a destination purge is triggered the broker will delete any queue that has been empty for longer than <strong><code>inactiveTimoutBeforeGC="30000"</code></strong> milliseconds (default: <strong><code>60000</code></strong> milliseconds) and for which <strong><code>gcInactiveDestinations="true"</code></strong> is set on its corresponding destination policy entry.</p><p>When a destination is removed the broker will log a message like:</p><structured-macro ac:macro-id="af51b539-e8e4-4614-88fb-8c56e9030c99" ac:name="code" ac:schema-version="1"><plain-text-body>INFO  Queue                          - TEST.QUEUE Inactive for longer than 30000 ms - removing ...</plain-text-body></structured-macro><p>&#160;</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delphi-and-freepascal.xml
----------------------------------------------------------------------
diff --git a/delphi-and-freepascal.xml b/delphi-and-freepascal.xml
index 2741618..5b991fc 100644
--- a/delphi-and-freepascal.xml
+++ b/delphi-and-freepascal.xml
@@ -1,14 +1,14 @@
-<div class="wiki-content maincontent"><h1 id="DelphiandFreePascal-DelphiandFreePascalClient">Delphi and FreePascal Client</h1>
+<div class="wiki-content maincontent"><h1>Delphi and FreePascal Client</h1>
 <p>Habari ActiveMQ Client is a library for Delphi(tm) and Free Pascal. With Habari, applications can connect to Apache ActiveMQ servers, subscribe to queues and topics, send and receive messages and objects, and work with transactions.</p>
 
-<h3 id="DelphiandFreePascal-SupportedCommunicationLibraries">Supported Communication Libraries</h3>
+<h3>Supported Communication Libraries</h3>
 <ul><li>Internet Direct (Indy) 10.2</li><li>Synapse</li><li>OverByte ICS V6 (limited feature set)</li><li>TClientSocket (limited feature set)</li></ul>
 
 
-<h3 id="DelphiandFreePascal-ProjectStatus">Project Status</h3>
+<h3>Project Status</h3>
 <p>Habari ActiveMQ Client 1.0 has been released on March 5, 2008. Demo applications, API documentation and source code examples are available for download. <br clear="none">
-The API documentation is available at <a shape="rect" class="external-link" href="http://www.mikejustin.com/habari/docs/html/index.html" rel="nofollow">http://www.mikejustin.com/habari/docs/html/index.html</a></p>
+The API documentation is available at <a shape="rect" href="http://www.mikejustin.com/habari/docs/html/index.html">http://www.mikejustin.com/habari/docs/html/index.html</a></p>
 
-<h3 id="DelphiandFreePascal-ProjectHomePage">Project Home Page</h3>
-<p><a shape="rect" class="external-link" href="http://www.mikejustin.com/" rel="nofollow">http://www.mikejustin.com/</a></p></div>
+<h3>Project Home Page</h3>
+<p><a shape="rect" href="http://www.mikejustin.com/">http://www.mikejustin.com/</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/design-documents.xml
----------------------------------------------------------------------
diff --git a/design-documents.xml b/design-documents.xml
index 1b2e0c5..e15f1ca 100644
--- a/design-documents.xml
+++ b/design-documents.xml
@@ -1,2 +1,3 @@
-<div class="wiki-content maincontent"><ul><li><a shape="rect" href="slow-consumers.xml">Slow Consumers</a></li><li><a shape="rect" href="durable-queue-memory-management.xml">Durable Queue Memory Management</a></li><li><a shape="rect" href="supporting-io-streams.xml">Supporting IO Streams</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.xml">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.xml">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.xml">REST protocols</a></li></ul></div>
+<div class="wiki-content maincontent"><ul><li><link><page ri:content-title="Slow Consumers"></page></link></li><li><link><page ri:content-title="Durable Queue Memory Management"></page></link></li><li><link><page ri:content-title="Supporting IO Streams"></page></link></li><li><link><page ri:content-title="Message Redelivery and DLQ Handling"></page></link></li><li><link><page ri:content-title="Multicast Transport"></page></link></li><li><link><page ri:content-title="Proposed C Client Architecture"></page></link></li><li><link><page ri:content-title="REST protocols"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destination-features.xml
----------------------------------------------------------------------
diff --git a/destination-features.xml b/destination-features.xml
index d9996a7..d7e7e4f 100644
--- a/destination-features.xml
+++ b/destination-features.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="composite-destinations.xml">Composite Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.xml">Configure Startup Destinations</a></li><li><a shape="rect" href="delete-inactive-destinations.xml">Delete Inactive Destinations</a></li><li><a shape="rect" href="destination-options.xml">Destination Options</a></li><li><a shape="rect" href="mirrored-queues.xml">Mirrored Queues</a></li><li><a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a></li><li><a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a></li><li><a shape="rect" href="wildcards.xml">Wildcards</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="9c003b57-9b0d-42d5-b9a7-84b09f429720" ac:name="children" ac:schema-version="1"><parameter ac:name="">all</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destination-options.xml
----------------------------------------------------------------------
diff --git a/destination-options.xml b/destination-options.xml
index ec098d5..5eaba8a 100644
--- a/destination-options.xml
+++ b/destination-options.xml
@@ -1,6 +1,4 @@
-<div class="wiki-content maincontent"><h3 id="DestinationOptions-Background">Background</h3><p>Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JMS API. The options are encoded using URL query syntax in the destination name that the consumer is created on.</p><h3 id="DestinationOptions-ConsumerOptions">Consumer Options</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 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>consumer.dispatchAsync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker <a shape="rect" href="consumer-dispatch-async.xml">dispatch messa
 ges asynchronously</a> to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.exclusive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></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><code>consumer.maximumPendingMessageLimit</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use to control if messages for non-durable topics are dropped if a <a shape="rect" href="slow-consumer-handling.xml">slow consumer</a> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.noLocal</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenc
 eTd"><p>Same as the&#160;<strong><code>noLocal</code></strong> 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><code>consumer.prefetchSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>n/a</code></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><code>consumer.priority</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></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><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.retroactive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</
 code></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><code>consumer.selector</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JMS Selector used with the consumer.</p></td></tr></tbody></table></div><h3 id="DestinationOptions-Example">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[queue = new ActiveMQQueue(&quot;TEST.QUEUE?consumer.dispatchAsync=false&amp;consumer.prefetchSize=10&quot;);
+<div class="wiki-content maincontent"><h3>Background</h3><p>Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JMS API. The options are encoded using URL query syntax in the destination name that the consumer is created on.</p><h3>Consumer Options</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></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>consumer.dispatchAsync</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should the broker <link><page ri:content-title="Consumer Dispatch Async"></page><plain-text-link-body>dispatch messages asynchronously</plain-text-link-body></link> to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.exclusive</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td 
 colspan="1" rowspan="1"><p>Is this an <link><page ri:content-title="Exclusive Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.maximumPendingMessageLimit</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Use to control if messages for non-durable topics are dropped if a <link><page ri:content-title="Slow Consumer Handling"></page><plain-text-link-body>slow consumer</plain-text-link-body></link> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.noLocal</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Same as the&#160;<strong><code>noLocal</code></strong> 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><code>consumer.prefetchSize</code></p></td><td colspan="1" rowspan="1"><p><code>n/a</code></p></td><td colspan="1" rowspan="1"><p>The num
 ber of message the consumer will <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch</plain-text-link-body></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.priority</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></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><tr><td colspan="1" rowspan="1"><p><code>consumer.retroactive</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></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><code>consumer.selector</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>JMS Selector used with the consumer.</p></td></tr></tbody></table><h3>Example</h3><structured-macro ac:macro-id="3ee1935a-0d33-41b2-b125-
 7b032eae301b" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>queue = new ActiveMQQueue("TEST.QUEUE?consumer.dispatchAsync=false&amp;consumer.prefetchSize=10");
 consumer = session.createConsumer(queue);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destinations-plugin.xml
----------------------------------------------------------------------
diff --git a/destinations-plugin.xml b/destinations-plugin.xml
index 04d03eb..8018c9f 100644
--- a/destinations-plugin.xml
+++ b/destinations-plugin.xml
@@ -1,6 +1,4 @@
-<div class="wiki-content maincontent"><p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</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;plugins&gt;
-            &lt;destinationsPlugin location=&quot;/workspace/destinations&quot;/&gt;
-        &lt;/plugins&gt;]]></script>
-</div></div><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p></div>
+<div class="wiki-content maincontent"><p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</p><structured-macro ac:macro-id="3fd8e4f9-55b1-482d-a0d5-506278d29dee" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>        &lt;plugins&gt;
+            &lt;destinationsPlugin location="/workspace/destinations"/&gt;
+        &lt;/plugins&gt;</plain-text-body></structured-macro><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developer-forum.xml
----------------------------------------------------------------------
diff --git a/developer-forum.xml b/developer-forum.xml
index e1b0bd3..d2fa78b 100644
--- a/developer-forum.xml
+++ b/developer-forum.xml
@@ -1,5 +1,5 @@
-<div class="wiki-content maincontent"><p>
-<a shape="rect" id="nabblelink" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html">ActiveMQ - Dev</a>
-<script src="http://activemq.2283324.n4.nabble.com/embed/f2368404"></script>
-</p><p></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="979c14ec-231e-4310-b1c9-4f97fd543ff8" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;a id="nabblelink" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html"&gt;ActiveMQ - Dev&lt;/a&gt;
+&lt;script src="http://activemq.2283324.n4.nabble.com/embed/f2368404"&gt;&lt;/script&gt;
+</plain-text-body></structured-macro></p><p></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developer-guide.xml
----------------------------------------------------------------------
diff --git a/developer-guide.xml b/developer-guide.xml
index c194982..3008545 100644
--- a/developer-guide.xml
+++ b/developer-guide.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The following documents might be interesting</p><ul><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="release-plans.xml">Release Plans</a></li><li><a shape="rect" href="release-guide.xml">Release Guide</a></li><li><a shape="rect" href="design-documents.xml">Design Documents</a></li><li><a shape="rect" href="changes-in-40.xml">Changes in 4.0</a></li><li><a shape="rect" href="apache-activemq-board-reports.xml">Apache ActiveMQ Board Reports</a></li><li><a shape="rect" href="maven-snapshot-repository-in-your-pom.xml">Maven SNAPSHOT Repository in your POM</a></li></ul><h3 id="DeveloperGuide-Codewalkthrough">Code walkthrough</h3><ul class="alternate"><li><a shape="rect" href="code-overview.xml">Code Overview</a></li><li><a shape="rect" href="wire-protocol.xml">Wire Protocol</a></li><li><a shape="rect" href="developing-plugins.xml">Developing Plugins</a></li></ul></div>
+<div class="wiki-content maincontent"><p>The following documents might be interesting</p><ul><li><link><page ri:content-title="Building"></page></link></li><li><link><page ri:content-title="Release Plans"></page></link></li><li><link><page ri:content-title="Release Guide"></page></link></li><li><link><page ri:content-title="Design Documents"></page></link></li><li><link><page ri:content-title="Changes in 4.0"></page></link></li><li><link><page ri:content-title="Apache ActiveMQ Board Reports"></page></link></li><li><link><page ri:content-title="Maven SNAPSHOT Repository in your POM"></page></link></li></ul><h3>Code walkthrough</h3><ul class="alternate"><li><link><page ri:content-title="Code Overview"></page></link></li><li><link><page ri:content-title="Wire Protocol"></page></link></li><li><link><page ri:content-title="Developing Plugins"></page></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developers.xml
----------------------------------------------------------------------
diff --git a/developers.xml b/developers.xml
index afe7f55..6daa975 100644
--- a/developers.xml
+++ b/developers.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="becoming-a-committer.xml">Becoming a committer</a></li><li><a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a></li><li><a shape="rect" href="board-reports.xml">Board Reports</a><ul class="childpages-macro"><li><a shape="rect" href="2007-april.xml">2007 April</a></li></ul></li><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="code-overview.xml">Code Overview</a></li><li><a shape="rect" href="developer-guide.xml">Developer Guide</a><ul class="childpages-macro"><li><a shape="rect" href="design-documents.xml">Design Documents</a><ul class="childpages-macro"><li><a shape="rect" href="class-diagrams-for-activemq-40-m4-source-code.xml">Class Diagrams for activemq-4.0-M4 source code</a></li><li><a shape="rect" href="durable-queue-memory-management.xml">Durable Queue Memory Management</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml
 ">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.xml">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.xml">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.xml">REST protocols</a></li><li><a shape="rect" href="slow-consumers.xml">Slow Consumers</a></li><li><a shape="rect" href="supporting-io-streams.xml">Supporting IO Streams</a></li></ul></li><li><a shape="rect" href="developing-plugins.xml">Developing Plugins</a></li><li><a shape="rect" href="maven-snapshot-repository-in-your-pom.xml">Maven SNAPSHOT Repository in your POM</a></li><li><a shape="rect" href="release-plans.xml">Release Plans</a><ul class="childpages-macro"><li><a shape="rect" href="40-rc-1-guide.xml">4.0 RC 1 Guide</a></li><li><a shape="rect" href="how-you-can-help-release.xml">How you can help release</a></li><li><a shape="rect" href="release-info.xml">Release Info</a></li></ul></li></ul></li><li><a shape="r
 ect" href="ideas.xml">Ideas</a><ul class="childpages-macro"><li><a shape="rect" href="restful-queue.xml">RESTful Queue</a></li></ul></li><li><a shape="rect" href="integration-tests.xml">Integration Tests</a><ul class="childpages-macro"><li><a shape="rect" href="example-testing-scenario.xml">Example Testing Scenario</a></li></ul></li><li><a shape="rect" href="jmeter-performance-tests.xml">JMeter Performance Tests</a></li><li><a shape="rect" href="jmeter-system-tests.xml">JMeter System Tests</a></li><li><a shape="rect" href="junit-reports.xml">JUnit Reports</a></li><li><a shape="rect" href="release-guide.xml">Release Guide</a></li><li><a shape="rect" href="sandbox.xml">Sandbox</a></li><li><a shape="rect" href="source.xml">Source</a></li><li><a shape="rect" href="source-xref.xml">Source XRef</a></li><li><a shape="rect" href="svn.xml">SVN</a></li><li><a shape="rect" href="test-source-xref.xml">Test Source XRef</a></li><li><a shape="rect" href="wire-protocol.xml">Wire Protocol</a></li></
 ul> </div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="deb1db17-86c2-4189-adb5-f9ba39674adb" ac:name="children" ac:schema-version="1"><parameter ac:name="depth">4</parameter></structured-macro> </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developing-activemq.xml
----------------------------------------------------------------------
diff --git a/developing-activemq.xml b/developing-activemq.xml
index f551956..505bc26 100644
--- a/developing-activemq.xml
+++ b/developing-activemq.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent"><p>Questions for developers wishing to extend or enhance Apache ActiveMQ</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-add-a-new-type-of-transport.xml">How can I add a new type of transport</a></li><li><a shape="rect" href="how-can-i-contribute.xml">How can I contribute</a></li><li><a shape="rect" href="how-do-i-add-my-own-plugins.xml">How do I add my own plugins</a></li><li><a shape="rect" href="how-do-i-debug-activemq-from-my-ide.xml">How do I debug ActiveMQ from my IDE</a></li></ul></div>
+<structured-macro ac:macro-id="f2073f3c-4db5-47be-ae49-cba901b84bce" 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/developing-plugins.xml
----------------------------------------------------------------------
diff --git a/developing-plugins.xml b/developing-plugins.xml
index b2e0216..125e78a 100644
--- a/developing-plugins.xml
+++ b/developing-plugins.xml
@@ -1,37 +1,31 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <a shape="rect" href="interceptors.xml">Interceptors</a> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection.</p><h3 id="DevelopingPlugins-DependencyInjection">Dependency Injection</h3><p>Some folks favour using constructor based injection as it removes the need to have a separate lifecycle <em>start()</em> method - others find using property based injection is a little more flexible and easier to map to XML configuration files. We'll leave that choice up to you. For complex to create objects you could consider writing a FactoryBean. For more details on writing POJOs with Spring see their <a shape="rect" class="external-link" href="http://www.springframework.org/documentation" rel="nofollow">documentation</a>.</p>
 <h3 id="DevelopingPlugins-CustomXML">Custom XML</h3><p>With ActiveMQ you can use regular Spring.xml syntax to configure things. However to produce neater XML that is easier to read and edit we use <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/">XBean</a> to autogenerate support for <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/custom-xml.html">Custom XML</a>.</p><p>If you wish your POJO to have its own custom XML you may wish to follow the following source examples for working nicely with XBean. Basically you add an XBean annotation in the javadoc comments to tell XBean how to map the POJO to custom XML. This should look something like</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[/**
- * @org.apache.xbean.XBean element=&quot;foo&quot;
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <link><page ri:content-title="Interceptors"></page></link> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection.</p><h3>Dependency Injection</h3><p>Some folks favour using constructor based injection as it removes the need to have a separate lifecycle <em>start()</em> method - others find using property based injection is a little more flexible and easier to map to XML configuration files. We'll leave that choice up to you. For complex to create objects you could consider writing a FactoryBean. For more details on writing POJOs with Spring see their <a shape="rect" href="http://www.springframework.org/documentation">documentation</a>.</p><h3>Custom XML</h3><p>With ActiveMQ you can use regular Spring.xml syntax to c
 onfigure things. However to produce neater XML that is easier to read and edit we use <a shape="rect" href="http://geronimo.apache.org/xbean/">XBean</a> to autogenerate support for <a shape="rect" href="http://geronimo.apache.org/xbean/custom-xml.html">Custom XML</a>.</p><p>If you wish your POJO to have its own custom XML you may wish to follow the following source examples for working nicely with XBean. Basically you add an XBean annotation in the javadoc comments to tell XBean how to map the POJO to custom XML. This should look something like</p><structured-macro ac:macro-id="18ed826e-ea03-4094-8041-ea885c64973f" ac:name="code" ac:schema-version="1"><plain-text-body>/**
+ * @org.apache.xbean.XBean element="foo"
  */
 public class MyExtension {
 ...
 }
-]]></script>
-</div></div><p>You can omit the element configuration. For more details on the available annotation options see <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/xbean-ant-task.html">here</a></p><p>If you are submitting your plugin to the ActiveMQ project then it will end up being included in the maven build step to create the XBean artifacts as part of the jar (in the META-INF/services area).</p><p>However if you are writing an external plugin to ActiveMQ then you will need to add the maven-xbean-plugin to your Maven 2 build. Refer to the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-spring/pom.xml">activemq-spring/pom.xml</a> as an example of using this plugin.</p><h3 id="DevelopingPlugins-ConfiguringpluginswithoutcustomXML">Configuring plugins without custom XML</h3><p>If you want to configure plugins that does not implement custom XML, you can define plugins as "regular" Spring beans and r
 eference them in broker's <code>plugins</code> attribute. For example,</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 useJmx=&quot;true&quot; xmlns=&quot;http://activemq.apache.org/schema/core&quot; plugins=&quot;#loggingPlugin&quot;&gt;
+</plain-text-body></structured-macro><p>You can omit the element configuration. For more details on the available annotation options see <a shape="rect" href="http://geronimo.apache.org/xbean/xbean-ant-task.html">here</a></p><p>If you are submitting your plugin to the ActiveMQ project then it will end up being included in the maven build step to create the XBean artifacts as part of the jar (in the META-INF/services area).</p><p>However if you are writing an external plugin to ActiveMQ then you will need to add the maven-xbean-plugin to your Maven 2 build. Refer to the <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-spring/pom.xml">activemq-spring/pom.xml</a> as an example of using this plugin.</p><h3>Configuring plugins without custom XML</h3><p>If you want to configure plugins that does not implement custom XML, you can define plugins as "regular" Spring beans and reference them in broker's <code>plugins</code> attribute. For example,</p><st
 ructured-macro ac:macro-id="1dd35da6-a1b9-41af-ab9b-43fe546563b6" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker useJmx="true" xmlns="http://activemq.apache.org/schema/core" plugins="#loggingPlugin"&gt;
  ...
 &lt;/broker&gt;
 
-&lt;bean id=&quot;loggingPlugin&quot; 
-      class=&quot;org.apache.activemq.broker.util.LoggingBrokerPlugin&quot;
+&lt;bean id="loggingPlugin" 
+      class="org.apache.activemq.broker.util.LoggingBrokerPlugin"
 /&gt;
 
-]]></script>
-</div></div><p>Not that this mechanism will not work in case that you have some XBean plugins configured inside the <code>&lt;plugins/&gt;</code> tag. In that case you must define the plugin inside that tag as well (with the appropriate schema definition). For example,</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;plugins&gt;
+</plain-text-body></structured-macro><p>Not that this mechanism will not work in case that you have some XBean plugins configured inside the <code>&lt;plugins/&gt;</code> tag. In that case you must define the plugin inside that tag as well (with the appropriate schema definition). For example,</p><structured-macro ac:macro-id="8a2615a4-df89-4e27-9b6b-523392c4aad0" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;plugins&gt;
     &lt;simpleAuthenticationPlugin&gt;
       &lt;users&gt;
-        &lt;authenticationUser username=&quot;system&quot; password=&quot;manager&quot;
-          groups=&quot;users,admins&quot;/&gt;
-        &lt;authenticationUser username=&quot;user&quot; password=&quot;password&quot;
-          groups=&quot;users&quot;/&gt;
-        &lt;authenticationUser username=&quot;guest&quot; password=&quot;password&quot; groups=&quot;guests&quot;/&gt;
+        &lt;authenticationUser username="system" password="manager"
+          groups="users,admins"/&gt;
+        &lt;authenticationUser username="user" password="password"
+          groups="users"/&gt;
+        &lt;authenticationUser username="guest" password="password" groups="guests"/&gt;
       &lt;/users&gt;
     &lt;/simpleAuthenticationPlugin&gt;  
-    &lt;bean xmlns=&quot;http://www.springframework.org/schema/beans&quot; 
-          id=&quot;loggingPlugin&quot; 
-          class=&quot;org.apache.activemq.broker.util.LoggingBrokerPlugin&quot;
+    &lt;bean xmlns="http://www.springframework.org/schema/beans" 
+          id="loggingPlugin" 
+          class="org.apache.activemq.broker.util.LoggingBrokerPlugin"
     /&gt;
 &lt;/plugins&gt;  
-]]></script>
-</div></div><h3 id="DevelopingPlugins-Examples">Examples</h3><p>The easiest way to get a feel for how to extend ActiveMQ is maybe to look at some concrete examples of features and how those are implemented and configured. Here are some examples</p><ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><a shape="rect" href="security.xml">Security</a> has an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">Author
 izationPlugin</a></li><li>The <a shape="rect" href="message-redelivery-and-dlq-handling.xml#MessageRedeliveryandDLQHandling-TheDiscardingDLQPlugin">Discarding DLQ Plugin</a> is used to discard messages from the DLQ.</li></ul></div>
+</plain-text-body></structured-macro><h3>Examples</h3><p>The easiest way to get a feel for how to extend ActiveMQ is maybe to look at some concrete examples of features and how those are implemented and configured. Here are some examples</p><ul><li><a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><link><page ri:content-title="Security"></page></link> has an <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">AuthorizationPlugin</a></li><li>The <link ac:anchor="The Discarding DLQ P
 lugin"><page ri:content-title="Message Redelivery and DLQ Handling"></page><plain-text-link-body>Discarding DLQ Plugin</plain-text-link-body></link> is used to discard messages from the DLQ.</li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discovery-transport-reference.xml
----------------------------------------------------------------------
diff --git a/discovery-transport-reference.xml b/discovery-transport-reference.xml
index 04533fd..7a5ed9a 100644
--- a/discovery-transport-reference.xml
+++ b/discovery-transport-reference.xml
@@ -1,42 +1,39 @@
-<div class="wiki-content maincontent"><h3 id="DiscoveryTransportReference-TheDiscoveryTransport">The Discovery Transport</h3>
+<div class="wiki-content maincontent"><h3>The Discovery Transport</h3>
 
-<p>The Discovery transport works just like the <a shape="rect" href="failover-transport-reference.xml">Failover</a> transport, except that it uses a discovery agent to locate the list of uri to connect to.  The Discovery transport is also used by the <a shape="rect" href="fanout-transport-reference.xml">Fanout</a> transport for discovering brokers to send a fanout message to.</p>
+<p>The Discovery transport works just like the <link><page ri:content-title="Failover Transport Reference"></page><link-body>Failover</link-body></link> transport, except that it uses a discovery agent to locate the list of uri to connect to.  The Discovery transport is also used by the <link><page ri:content-title="Fanout Transport Reference"></page><link-body>Fanout</link-body></link> transport for discovering brokers to send a fanout message to.</p>
 
-<h4 id="DiscoveryTransportReference-ConfigurationSyntax">Configuration Syntax</h4>
+<h4>Configuration Syntax</h4>
 
 <p><strong>discovery:(discoveryAgentURI)?transportOptions</strong><br clear="none">
 or<br clear="none">
 <strong>discovery:discoveryAgentURI</strong></p>
 
-<p>Note that to be able to use <a shape="rect" href="discovery.xml">Discovery</a> to find brokers, the brokers need to have the multicast discovery agent enabled on the broker. </p>
+<p>Note that to be able to use <link><page ri:content-title="Discovery"></page></link> to find brokers, the brokers need to have the multicast discovery agent enabled on the broker. </p>
 
-<p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?view=co">example</a> of using discovery. Its basically something like the following (see the <strong>discoveryUri</strong>)</p>
+<p>To configure discovery in a Broker you should use the <link><page ri:content-title="Xml Configuration"></page></link>. Here is an <a shape="rect" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?view=co">example</a> of using discovery. Its basically something like the following (see the <strong>discoveryUri</strong>)</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 name=&quot;foo&quot;&gt;
+<structured-macro ac:macro-id="aaf47c6c-4495-4851-b8a2-4d450e232d07" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;broker name="foo"&gt;
   &lt;transportConnectors&gt;
-    &lt;transportConnector uri=&quot;tcp://localhost:0&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
+    &lt;transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/&gt;
   &lt;/transportConnectors&gt;
 
   ...
 &lt;/broker&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<h5 id="DiscoveryTransportReference-TransportOptions">Transport Options</h5>
+<h5>Transport Options</h5>
 
-<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 Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>reconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How long to wait for discovery</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How long to wait before the first reconnect attempt to a discovered url</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should an exponential backoff be used btween reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>2</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The exponent used in the exponential backoff attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1" class="
 confluenceTd"><p>group</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> an identifier for the group to partition multi cast traffic among collaborating peers; the group forms part of the shared identity of a discovery datagram (since 5.2) </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></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>reconnectDelay</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>How long to wait for discovery</p></td></tr><tr><td colspan="1" rowspan="1"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>How long to wait before the first reconnect attempt to a discovered url</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should an exponential backoff be used btween reconnect attempts<
 /p></td></tr><tr><td colspan="1" rowspan="1"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1"><p>2</p></td><td colspan="1" rowspan="1"><p>The exponent used in the exponential backoff attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1"><p>group</p></td><td colspan="1" rowspan="1"><p>default</p></td><td colspan="1" rowspan="1"><p> an identifier for the group to partition multi cast traffic among collaborating peers; the group forms part of the shared identity of a discovery datagram (since 5.2) </p></td></tr></tbody></table>
 
 
-<h5 id="DiscoveryTransportReference-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>discovery:(multicast://default)?initialReconnectDelay=100
-</pre>
-</div></div>
+<structured-macro ac:macro-id="9b5b8676-087a-4fb5-a1a5-b5fa176682fc" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+discovery:(multicast://default)?initialReconnectDelay=100
+</plain-text-body></structured-macro>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Applying parameters to discovered transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <a shape="rect" href="tcp-transport-reference.xml">TCP</a> transport, even though this parameter is not a Discovery transport option.</p></div></div></div>
+<structured-macro ac:macro-id="a04821a9-8498-4d06-a5e0-f047d1b800e3" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Applying parameters to discovered transports</parameter><rich-text-body>
+<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <link><page ri:content-title="TCP Transport Reference"></page><link-body>TCP</link-body></link> transport, even though this parameter is not a Discovery transport option.</p></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discovery.xml
----------------------------------------------------------------------
diff --git a/discovery.xml b/discovery.xml
index 042a018..e393f9f 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -1,18 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="Discovery-DiscoveryAgents">Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" class="external-link" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></p><p>There are currently two kinds of discovery agent.</p><h3 id="Discovery-Multicast">Multicast</h3><p>The Discovery transport uses our own Multicast based 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="Discovery-Zeroconf">Zeroconf</h3><p><a shape="rect" href="zeroconf.xml">ZeroConf</a> is a standard discovery 
 specification that uses UDP / multicast to discovery devices. Its used by Apple's Rendezvous services.<br clear="none"> We use the <a shape="rect" class="external-link" href="http://jmdns.sf.net/" rel="nofollow">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><div class="code panel pdl" st
 yle="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[zeroconf:_activemq_development.
-]]></script>
-</div></div><p>This will use Zeroconf to find an available broker and one will be randomly chosen &amp; things will auto-failover on disconnect if there are several brokers running.</p><h3 id="Discovery-LDAPDiscovery">LDAP Discovery</h3><p>ActiveMQ supports the use of LDAP for discovery of brokers.</p><p>Please see <a shape="rect" href="ldap-broker-discovery-mechanism.xml">LDAP Broker Discovery Mechanism</a> for more details.</p><h2 id="Discovery-Tryingoutdiscovery">Trying out discovery</h2><p>If you run the following commands in separate shells you'll have 2 brokers auto-discovering themselves and 2 clients using fixed-URLs</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[maven -o server -Dconfig=src/test/org/activemq/usecases/receiver-zeroconf.xml
+<div class="wiki-content maincontent"><h2>Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <link><page ri:content-title="Networks of Brokers"></page></link></p><p>There are currently two kinds of discovery agent.</p><h3>Multicast</h3><p>The Discovery transport uses our own Multicast based 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>Zeroconf</h3><p><link><page ri:content-title="ZeroConf"></page></link> is a standard discovery specification that uses UDP / multicast to discovery devices. Its used by Apple's Rendezvous services.<br clear="non
 e"> We use the <a shape="rect" href="http://jmdns.sf.net/">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <link><page ri:content-title="Xml Configuration"></page></link>. Here is an <a shape="rect" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <link><page ri:content-title="Networks of Brokers"></page></link>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><structured-macro ac:macro-id="f1747328-7dfc-4d75-beaa-110c0513fbed" ac:name="code" ac:schema-version="1"><plain-text-body>zeroconf:_activemq_development.
+</plain-text-body></structured-macro><p>This will use Zeroconf to find an available broker and one will be randomly chosen &amp; things will auto-failover on disconnect if there are several brokers running.</p><h3>LDAP Discovery</h3><p>ActiveMQ supports the use of LDAP for discovery of brokers.</p><p>Please see <link><page ri:content-title="LDAP Broker Discovery Mechanism"></page></link> for more details.</p><h2>Trying out discovery</h2><p>If you run the following commands in separate shells you'll have 2 brokers auto-discovering themselves and 2 clients using fixed-URLs</p><structured-macro ac:macro-id="11d9cbdf-33c7-4f54-b9b6-ebb80e6fdcc8" ac:name="code" ac:schema-version="1"><plain-text-body>maven -o server -Dconfig=src/test/org/activemq/usecases/receiver-zeroconf.xml
 maven -o server -Dconfig=src/test/org/activemq/usecases/sender-zeroconf.xml
 maven -o consumer -Durl=tcp://localhost:62002
 maven -o producer -Durl=tcp://localhost:62001
-]]></script>
-</div></div><p>If you want the clients to use discovery to find brokers, run either of the two 'server' statements above (or both) then run the producer/consumer as follows</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[maven -o consumer -Durl=zeroconf:_activemq.broker.development.
+</plain-text-body></structured-macro><p>If you want the clients to use discovery to find brokers, run either of the two 'server' statements above (or both) then run the producer/consumer as follows</p><structured-macro ac:macro-id="d61f046e-320e-45b1-8e46-119e1e612211" ac:name="code" ac:schema-version="1"><plain-text-body>maven -o consumer -Durl=zeroconf:_activemq.broker.development.
 maven -o producer  -Durl=zeroconf:_activemq.broker.development.
-]]></script>
-</div></div><p>The transport URL is of the format</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[    zeroconf:&lt;serviceName&gt;
-]]></script>
-</div></div><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2 id="Discovery-DiscoveryandSecurity">Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p></div>
+</plain-text-body></structured-macro><p>The transport URL is of the format</p><structured-macro ac:macro-id="fae97634-2d5e-41b9-9ae6-ed05d453676d" ac:name="code" ac:schema-version="1"><plain-text-body>    zeroconf:&lt;serviceName&gt;
+</plain-text-body></structured-macro><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2>Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discussion-forums.xml
----------------------------------------------------------------------
diff --git a/discussion-forums.xml b/discussion-forums.xml
index 2c8ebdb..adb6a94 100644
--- a/discussion-forums.xml
+++ b/discussion-forums.xml
@@ -1,13 +1,13 @@
-<div class="wiki-content maincontent"><p>Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.xml">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>Before posting you might want to read the <link><page ri:content-title="Tips for getting help"></page></link>.</p>
 
-<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">Nabble forums</a> which also work with our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
+<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" href="http://activemq.2283324.n4.nabble.com/">Nabble forums</a> which also work with our <link><page ri:content-title="Mailing Lists"></page></link> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
 
-<h3 id="DiscussionForums-ActiveMQForums"><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">ActiveMQ Forums</a></h3>
+<h3><a shape="rect" href="http://activemq.2283324.n4.nabble.com/">ActiveMQ Forums</a></h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html" rel="nofollow">ActiveMQ User Forum</a></li><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html" rel="nofollow">ActiveMQ Developer Forum</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html">ActiveMQ User Forum</a></li><li><a shape="rect" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html">ActiveMQ Developer Forum</a></li></ul>
 
 
-<h3 id="DiscussionForums-MailingLists">Mailing Lists</h3>
+<h3>Mailing Lists</h3>
 
-<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> are kept in sync so its your choice which you use.</p></div>
+<p>If you prefer to use a mailing list instead then check out our <link><page ri:content-title="Mailing Lists"></page></link>. Note that the Forums and <link><page ri:content-title="Mailing Lists"></page></link> are kept in sync so its your choice which you use.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/dispatch-policies.xml
----------------------------------------------------------------------
diff --git a/dispatch-policies.xml b/dispatch-policies.xml
index c2adcfd..9b425d2 100644
--- a/dispatch-policies.xml
+++ b/dispatch-policies.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="DispatchPolicies-DispatchPolicies">Dispatch Policies</h1><h2 id="DispatchPolicies-Dispatchpoliciesforqueues">Dispatch policies for queues</h2><p>Plug-able dispatch policies only apply to topics. For Queues, dispatch is more static, you can choose round robin (the default) or strict order. Before discussing dispatch policies its worth first understanding <a shape="rect" href="what-is-the-prefetch-limit-for.xml">the purpose of the prefetch value</a>.</p><p>The out of the box configuration of ActiveMQ is designed for high performance and high throughput messaging where there are lots of messages that need to be dispatched to consumers as quickly as possible. So the default prefetch values are fairly large and the default dispatch policy will try and fill the prefetch buffers as quickly as possible.</p><p>However with messaging there are many use cases and sometimes the default configuration is not ideal to your use case; when you send a sma
 ll number of messages, they tend to all go to one consumer unless you've lots of messages. If you have a large number of consumers and a relatively high <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch value</a> and you have a small number of messages that each message takes quite a while to process then the default dispatch policy might result in increasing the amount of time it takes to process all the messages (since the load balancing is not fair for small numbers of messages).</p><p>For queues, you can define whether the dispatch will occur in a round-robin fashion (default behaviour) or if one consumer's prefetch buffer will be exhausted before the dispatch process selects the next consumer along (strictOrderDispatch).<br clear="none"> The latter behaviour is enabled by setting the "strictOrderDispatch" attribute on the &lt;policyEntry /&gt; element. E.g.:</p><plain-text-body>&lt;policyEntry queue="&gt;" strictOrderDispatch="false" /&gt; </plain-text-body><p>
 Consumer priorities are observed, so if you have several consumers with different <a shape="rect" class="external-link" href="http://activemq.apache.org/consumer-priority.html">priorities</a>, the one with the highest priority will be flooded first until it can take no more, then the next one along, etc.</p><p>From version 5.14.0 - the&#160;strictOrderDispatch=true option will ensure strict order for redispatched messages when there is a single consumer.&#160;</p><h2 id="DispatchPolicies-DispatchpoliciesforTopics">Dispatch policies for Topics</h2><p>There are more options for topics because the dispatch policy is plug-able. Any implementation of org.apache.activemq.broker.region.policy.DispatchPolicy will work.<br clear="none"> The default org.apache.activemq.broker.region.policy.SimpleDispatchPolicy does what one would expect and delivers messages to all subscribers. An example of a more advanced implementation is the org.apache.activemq.broker.region.policy.PriorityNetworkDispatch
 Policy which will only dispatch to the highest priority network consumer. This is useful in a loop network topology where there is more than route to a consumer.</p><p>Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml">example of destination policy configuration</a>.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;destinationPolicy&gt;
+<div class="wiki-content maincontent"><h1>Dispatch Policies</h1><h2>Dispatch policies for queues</h2><p>Plug-able dispatch policies only apply to topics. For Queues, dispatch is more static, you can choose round robin (the default) or strict order. Before discussing dispatch policies its worth first understanding <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>the purpose of the prefetch value</plain-text-link-body></link>.</p><p>The out of the box configuration of ActiveMQ is designed for high performance and high throughput messaging where there are lots of messages that need to be dispatched to consumers as quickly as possible. So the default prefetch values are fairly large and the default dispatch policy will try and fill the prefetch buffers as quickly as possible.</p><p>However with messaging there are many use cases and sometimes the default configuration is not ideal to your use case; when you send a small number of messages, they
  tend to all go to one consumer unless you've lots of messages. If you have a large number of consumers and a relatively high <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch value</plain-text-link-body></link> and you have a small number of messages that each message takes quite a while to process then the default dispatch policy might result in increasing the amount of time it takes to process all the messages (since the load balancing is not fair for small numbers of messages).</p><p>For queues, you can define whether the dispatch will occur in a round-robin fashion (default behaviour) or if one consumer's prefetch buffer will be exhausted before the dispatch process selects the next consumer along (strictOrderDispatch).<br clear="none"> The latter behaviour is enabled by setting the "strictOrderDispatch" attribute on the &lt;policyEntry /&gt; element. E.g.:</p><plain-text-body>&lt;policyEntry queue="&gt;" strictOrderDispatch="f
 alse" /&gt; </plain-text-body><p>Consumer priorities are observed, so if you have several consumers with different <a shape="rect" href="http://activemq.apache.org/consumer-priority.html">priorities</a>, the one with the highest priority will be flooded first until it can take no more, then the next one along, etc.</p><p>From version 5.14.0 - the&#160;strictOrderDispatch=true option will ensure strict order for redispatched messages when there is a single consumer.&#160;</p><h2>Dispatch policies for Topics</h2><p>There are more options for topics because the dispatch policy is plug-able. Any implementation of org.apache.activemq.broker.region.policy.DispatchPolicy will work.<br clear="none"> The default org.apache.activemq.broker.region.policy.SimpleDispatchPolicy does what one would expect and delivers messages to all subscribers. An example of a more advanced implementation is the org.apache.activemq.broker.region.policy.PriorityNetworkDispatchPolicy which will only dispatch to th
 e highest priority network consumer. This is useful in a loop network topology where there is more than route to a consumer.</p><p>Here is an <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml">example of destination policy configuration</a>.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;destinationPolicy&gt;
   &lt;policyMap&gt;
 	&lt;policyEntries&gt;
 	  &lt;policyEntry topic="FOO.&gt;"&gt;

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/does-activemq-support-clustering.xml
----------------------------------------------------------------------
diff --git a/does-activemq-support-clustering.xml b/does-activemq-support-clustering.xml
index a2de10a..693fef9 100644
--- a/does-activemq-support-clustering.xml
+++ b/does-activemq-support-clustering.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>Yes, though there are various kinds of clustering. See <a shape="rect" href="clustering.xml">this page on details</a></p></div>
+<p>Yes, though there are various kinds of clustering. See <link><page ri:content-title="Clustering"></page><link-body>this page on details</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/does-activemq-support-my-sql-database.xml
----------------------------------------------------------------------
diff --git a/does-activemq-support-my-sql-database.xml b/does-activemq-support-my-sql-database.xml
index 4eae899..26312be 100644
--- a/does-activemq-support-my-sql-database.xml
+++ b/does-activemq-support-my-sql-database.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Quite possibly <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)">. See the <a shape="rect" href="jdbc-support.xml">JDBC Support</a> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <a shape="rect" href="persistence.xml">Persistence</a></p></div>
+<p>Quite possibly <emoticon ac:name="smile"></emoticon>. See the <link><page ri:content-title="JDBC Support"></page></link> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <link><page ri:content-title="Persistence"></page></link></p></div>