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:36 UTC

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

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-contribute.xml
----------------------------------------------------------------------
diff --git a/how-can-i-contribute.xml b/how-can-i-contribute.xml
index dbc4eb9..3f34ff5 100644
--- a/how-can-i-contribute.xml
+++ b/how-can-i-contribute.xml
@@ -1,17 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIcontribute-HowcanIcontributetoApacheActiveMQ?">How can I contribute to Apache ActiveMQ?</h2>
+<div class="wiki-content maincontent"><h2>How can I contribute to Apache ActiveMQ?</h2>
 
-There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!<p>Try surf the documentation - if somethings confusing or not clear, let us know. Download the code &amp; try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?</p><p>Want to do some hacking on ActiveMQ? Try surfing to our <a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/AMQ">issue tracker</a> for open issues or features that need to be implemented, take ownership of an issue and try fix it.</p><h2 id="HowcanIcontribute-Gettingintouch">Getting in touch</h2><p>There are various ways of communicating with the ActiveMQ community.</p><ul class="alternate"><li>join us on the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> or subscribe to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> and take part in any conversations</li><li><p>pop by on <span>in
  <a shape="rect" href="irc.xml">irc</a> and say hi</span></p></li><li>add some comments to the <a shape="rect" href="navigation.xml">wiki</a></li></ul><h2 id="HowcanIcontribute-Ifyoufindabugorproblem">If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a></p><p>If you can create a JUnit test case then your issue is more likely to be resolved quicker.<br clear="none"> e.g. take a look at some of the existing <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master">unit tests cases</a></p><p>Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem <strong>stays fixed</strong> in future releases.</p><h2 id="HowcanIcontribute-Ifyouwanttohelpoutwiththedocumentation"
 >If you want to help out with the documentation</h2><p>If you want to contribute to the ActiveMQ documentation you should first subscribe our <a shape="rect" class="external-link" href="mailto:dev-subscribe@activemq.apache.org" rel="nofollow">dev@</a>&#160;where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the <a shape="rect" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ">ActiveMQ wiki</a> and fill in and submit an ICLA to the ASF (see the&#160;<a shape="rect" href="becoming-a-committer.xml">Committer Guide</a>). Then ask on the dev@ list to be granted edit rights and an admin will do so fairly quickly. If you want to just contribute the content, please submit the content on the dev@ list or create an issue and attach it there. <strong>All</strong> contributions are highly appreciated.</p><h2 id="HowcanIcontribute-Workingonthecode">Working on the code</h2><p>Grab the <a shape="rect" href="source.xml">So
 urce</a> from git</p><p>Build the project.</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[export MAVEN_OPTS=&quot;-Xmx512M -XX:MaxPermSize=128M&quot;
-mvn -Dtest=false install
-]]></script>
-</div></div><p>PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.</p><p>Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.</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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>Then import the projects into your workspace.</p><h2 id="HowcanIcontribute-Creatingpatches">Creating patches</h2><p>We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.</p><p>Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -&gt; Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -&gt; Share... first to enable the Subversion options).</p><p>If you're a command line person try the following to create the patch</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[diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><p>or</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[git diff Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><h2 id="HowcanIcontribute-Submittingpatches">Submitting patches</h2><p>The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> or <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>.</p><h2 id="HowcanIcontribute-Becomingacommmitter">Becoming a commmitter</h2><p>Once you've got involved as above, we may well invite you to be a committer. See <a shape="rect" href="becoming-a-committer.xml">Becoming a committer</a> for more details.</p><h2 id="HowcanIcontribute-Usingtheissuetracker">Using the issue tracker</h2><p>Before you can raise an issue in the issue tracker you need to register with it. This is quick &amp; painless.</p><p>If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, p
 lease mail the&#160;<a shape="rect" class="external-link" href="mailto:dev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a> mail list with the email address you used to register with the issue tracker and we'll add you to the group.</p><p>Why not dive in the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a>, and try tackle some of our outstanding issues?</p><h2 id="HowcanIcontribute-Becomingacommitter">Becoming a committer</h2><p>The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the <a shape="rect" href="becoming-a-committer.xml">Committer Guide</a></p></div>
+<structured-macro ac:macro-id="6092c4fa-bda2-400b-b3d2-ddfb8e0596b2" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Contributing"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-enable-detailed-logging.xml
----------------------------------------------------------------------
diff --git a/how-can-i-enable-detailed-logging.xml b/how-can-i-enable-detailed-logging.xml
index a376434..d938d0f 100644
--- a/how-can-i-enable-detailed-logging.xml
+++ b/how-can-i-enable-detailed-logging.xml
@@ -1,30 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIenabledetailedlogging-HowcanIenabledetailedlogging">How can I enable detailed logging</h2>
+<div class="wiki-content maincontent"><h2>How can I enable detailed logging</h2>
 
-<p>We use <a shape="rect" class="unresolved" href="#">slf4j</a> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
+<p>We use <link><page ri:content-title="www.slf4j.org"></page><link-body>slf4j</link-body></link> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
 By default we ship with log4j but feel free to make your own choice.</p>
 
-<p>If you've got log4j.jar on your classpath you can use a log4j.properties file to configure the logging levels. See the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/log4j.properties">log4j.properties example</a> for the kind of thing you'll need.</p>
+<p>If you've got log4j.jar on your classpath you can use a log4j.properties file to configure the logging levels. See the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/log4j.properties">log4j.properties example</a> for the kind of thing you'll need.</p>
 
 <p>e.g. adding the following to your log4j.properties will enable tracing of ActiveMQ code:</p>
 
 <p>in 4.x</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[
+<structured-macro ac:macro-id="ddc0a6c6-949f-4615-9978-88251129510c" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.apache.activemq=INFO
 log4j.logger.org.apache.activemq.spring=WARN
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>in 3.x</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[
+<structured-macro ac:macro-id="47d1fb82-e709-4a6c-9d6a-bb2429076cbc" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.activemq=TRACE
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HowcanIenabledetailedlogging-Gettinghelponlog4j">Getting help on log4j</h3>
+<h3>Getting help on log4j</h3>
 
-<p>If you are new to log4j please see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual</a></p></div>
+<p>If you are new to log4j please see the <a shape="rect" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml b/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
index 7f162b6..df0c927 100644
--- a/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
+++ b/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIgetalistofthetopicsandqueuesinabroker-HowcanIgetalistofthetopicsandqueuesinabroker?">How can I get a list of the topics and queues in a broker?</h2>
+<div class="wiki-content maincontent"><h2>How can I get a list of the topics and queues in a broker?</h2>
 
-<p>As of 5.1.0 you can use the new <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.</p>
+<p>As of 5.1.0 you can use the new <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.</p>
 
-<p>You can use <a shape="rect" href="jmx.xml">JMX</a> to browse the available topics and queues in a broker together with the connectors and connections along with their statistics etc.</p>
+<p>You can use <link><page ri:content-title="JMX"></page></link> to browse the available topics and queues in a broker together with the connectors and connections along with their statistics etc.</p>
 
-<p>Or you can access statistics <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a>.</p>
+<p>Or you can access statistics <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link>.</p>
 
-<p>Finally you could just use the <a shape="rect" href="web-console.xml">Web Console</a></p></div>
+<p>Finally you could just use the <link><page ri:content-title="Web Console"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-help.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-help.xml b/how-can-i-get-help.xml
index 396d244..4ea6bbc 100644
--- a/how-can-i-get-help.xml
+++ b/how-can-i-get-help.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIgethelp-GettingHelp">Getting Help</h2><p>If you are experiencing problems using ActiveMQ then please report your problem to our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ">Issue Tracker</a>. You may also find it useful to discuss your issues with the community on the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> or join one of our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>.</p><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">Issue Tracker</a></li><li><a shape="rect" href="discussion-forums.xml">Discussion Forums</a></li><li><a shape="rect" href="mailing-lists.xml">Mailing Lists</a></li><li><a shape="rect" href="faq.xml">FAQ</a></li></ul><h3 id="HowcanIgethelp-Howtogethelp">How to get help</h3><p>Before you report a problem you might want to read the <a shape="rect" href="faq.xml">FAQ</a>.<br clear="none"
 > Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution.</p><ul><li>Which <a shape="rect" class="external-link" href="http://activemq.apache.org/download.html">version</a> of ActiveMQ</li><li>What platform of Java (e.g., Java SE 6 with JRE/<a shape="rect" class="unresolved" href="#">JDK</a> 1.6.0 or J2SE 5 with JRE/<a shape="rect" class="unresolved" href="#">JDK</a> 1.5.0)</li><li>Any particular application/web server or container being used - if so what version?</li><li>Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.</li><li>Log output (e.g., <code>data/activemq.log</code>) can be useful too; sometimes <a shape="rect" href="how-do-i-cha
 nge-the-logging.xml">enabling DEBUG logging</a> can help</li><li>Your code &amp; configuration files are often useful</li></ul><h3 id="HowcanIgethelp-Howtogethelpfaster">How to get help faster</h3><p>We can help you much quicker if you try the following</p><ul><li>Provide us with a JUnit test case that demonstrates your issue. e.g. if you think you've found a bug, can you create a test case to demonstrate the bug?</li><li><a shape="rect" href="contributing.xml">Submit a patch</a> fixing the bug! (We also buy you beer when we meet you if you submit bug fixes <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)"> )</li><li>For memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if it's huge) to the JIRA we can normally fix things much faster. e.g. 
 you could run <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/share/jmap.html" rel="nofollow">jmap</a>/<a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/technotes/tools/share/jhat.html" rel="nofollow">jhat</a>, JProfiler or YourKit on your code and send us the output. To find memory leaks it's quicker to resolve if you can tell us what classes are taking up all of the RAM; we can normally figure out what's wrong from that.</li></ul><h2 id="HowcanIgethelp-CommercialSupport">Commercial Support</h2><p>This is an open source project, so the amount of time we have available to help resolve your issue is often limited as all help is provided on a volunteer basis. If you want to get priority help, need to get up to speed quickly, require some training or mentoring, or need full 24 x 7 production support you should contact a commercial company specializing in ActiveMQ support such as...</p><ul><li><a shape="rect" class="ex
 ternal-link" href="https://apifocal.com" rel="nofollow">apifocal</a>&#160;is a Professional Services company. Headquartered near Washington, DC, USA, APIfocal&#160;provides consulting and training for leveraging the Apache Integration stack and commercial ESBs at large scale, adding automation and devops capabilities.</li><li><a shape="rect" class="external-link" href="http://mediadriver.com" rel="nofollow">Media Driver</a> provides consulting services and management tools for Apache ActiveMQ and the Apache Integration stack for both the commercial and public sector. &#160;We bring a full suite of project delivery services including business and technical analysis, proof of concepts, architectural guidance, best practice integration, and project management. &#160;Media Driver offers training classes for developers and administrators, as well as middleware management software.</li><li><a shape="rect" class="external-link" href="http://www.openlogic.com/" rel="nofollow">Rogue Wave / O
 penLogic</a>&#160;<span style="line-height: 1.4285715;">has a dedicated team of OSS experts offering&#160;</span><span style="line-height: 1.4285715;">round-the-clock Production Support with competitive SLAs for&#160;</span><span style="line-height: 1.4285715;">troubleshooting ActiveMQ issues and outages. Rogue&#160;</span><span style="line-height: 1.4285715;">Wave offers a comprehensive week-long instructor-led training program for&#160;</span><span style="line-height: 1.4285715;">developers and admins. Rogue Wave OpenLogic also provides Architecture&#160;</span><span style="line-height: 1.4285715;">and Design Consulting, and a Developer Support contract to assist in the&#160;</span><span style="line-height: 1.4285715;">development of messaging applications.</span></li><li><a shape="rect" class="external-link" href="http://www.redhat.com/products/jbossenterprisemiddleware/amq/" rel="nofollow">Red Hat</a>&#160;offers JBoss A-MQ, a supported distribution of Apache ActiveMQ, that incl
 ude Enterprise Developer and Production Support, and offer training and consultancy for enterprise deployments.</li><li><a shape="rect" class="external-link" href="http://www.savoirtech.com" rel="nofollow">Savoir Technologies, Inc</a> provides enterprise consulting, training and support for ActiveMQ and a host of other Apache service containers. Savoir can provide best practice mentoring for developing with ActiveMQ, as well as architectural/design reviews, troubleshooting and SOA infrastructure implementations. Savoir's staff includes some of the contributors of ActiveMQ who are on the ground consulting and are familiar with real world implementations and issues.</li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/" rel="nofollow">Total Transaction Management (TTM)</a> provides ActiveMQ consulting and support, as well as security and <a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AM
 on.php/" rel="nofollow">monitoring</a> add-on products and <a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">reference guide</a> for ActiveMQ.</li><li><a shape="rect" class="external-link" href="http://tomitribe.com" rel="nofollow">Tomitribe</a>&#160;are experts in Tomcat and ActiveMQ integration, champions of Open Source and Java EE. &#160;Tomitribe offers consulting, training and support for TomEE, Tomcat, ActiveMQ, CXF and more.</li><li><a shape="rect" class="external-link" href="http://www.tytoease.com/activemq" rel="nofollow">TytoEASE</a> offers support, consulting and training on enterprise ready open source projects including ActiveMQ.&#160; &#160;Support offerings are at three levels with guaranteed SLA's. The company's consulting work is short term to help troubleshoot, fine-tune, do architectural reviews or help with initial design.&#160; TytoEASE's focus is on the Enterprise with how custom
 ers integrate open source with their current technologies.</li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="f2f78dc4-e6c3-4cfe-bb52-7f9da4f178fd" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Support"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-the-source-code-from-subversion.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-the-source-code-from-subversion.xml b/how-can-i-get-the-source-code-from-subversion.xml
index 927a7cb..e9ea712 100644
--- a/how-can-i-get-the-source-code-from-subversion.xml
+++ b/how-can-i-get-the-source-code-from-subversion.xml
@@ -1,13 +1,3 @@
 <div class="wiki-content maincontent">
-<h1 id="HowcanIgetthesourcecodefromsubversion-ActiveMQ5">ActiveMQ 5</h1><h2 id="HowcanIgetthesourcecodefromsubversion-WebBrowsingofthegitRepo">Web Browsing of the git Repo</h2><p>To browse via the web:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git">https://git-wip-us.apache.org/repos/asf?p=activemq.git</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-CheckingoutfromthegitRepo">Checking out from the git Repo</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq.git">https://git-wip-us.apache.org/repos/asf/activemq.git</a></p>
-</div></div><p>Only project developers can commit to the git repo via this method. SSH must be installed on your client machine. Enter your site password when prompted.</p><h2 id="HowcanIgetthesourcecodefromsubversion-Buildingthecode">Building the code</h2><p>To then build the code, see <a shape="rect" href="building.xml">Building</a>.</p><p>&#160;</p><h1 id="HowcanIgetthesourcecodefromsubversion-ActiveMQArtemis">ActiveMQ Artemis</h1><h2 id="HowcanIgetthesourcecodefromsubversion-WebBrowsingoftheASFgitRepo">Web Browsing of the ASF git Repo</h2><p>To browse via the web:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git">https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-BrowsingtheGithubRepo">Browsing the Github Repo&#160;</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">https://github.com/apache/activemq-artemis</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-CheckingoutfromtheGithubRepo">Checking out from the Github Repo</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">https://github.com/apache/activemq-artemis</a></p>
-</div></div><p><strong>Committers:</strong> Please follow the instructions for properly configuring the&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/SUMMARY.md" rel="nofollow">Instructions for Core Contributors/Hacking Guide</a></p><p><strong>Contributors:</strong> Please create a&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">pull request</a> to contribute changes to the source code.&#160;</p><h2 id="HowcanIgetthesourcecodefromsubversion-Buildingthecode.1">Building the code</h2><p>To then build the code, take a look at&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/building.md" rel="nofollow">Building the distribution</a></p></div>
+<structured-macro ac:macro-id="e2378983-65b6-4f96-968f-ccb50c499e06" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Source"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-make-activemq-faster.xml
----------------------------------------------------------------------
diff --git a/how-can-i-make-activemq-faster.xml b/how-can-i-make-activemq-faster.xml
index 6a2e768..7602045 100644
--- a/how-can-i-make-activemq-faster.xml
+++ b/how-can-i-make-activemq-faster.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>See the <a shape="rect" href="performance.xml">Performance</a> page for information about the performance of ActiveMQ and it's tuning parameters.</p></div>
+<div class="wiki-content maincontent"><p>See the <link><page ri:content-title="Performance"></page></link> page for information about the performance of ActiveMQ and it's tuning parameters.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-monitor-activemq.xml
----------------------------------------------------------------------
diff --git a/how-can-i-monitor-activemq.xml b/how-can-i-monitor-activemq.xml
index b455827..c7f219a 100644
--- a/how-can-i-monitor-activemq.xml
+++ b/how-can-i-monitor-activemq.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="HowcanImonitorActiveMQ-HowcanImonitorActiveMQ">How can I monitor ActiveMQ</h2><p>Starting with ActiveMQ 5.8.0&#160;<a shape="rect" class="external-link" href="http://www.jolokia.org/" rel="nofollow">Jolokia</a> is bundled which provides a&#160;RESTful interface to ActiveMQ's JMX capabilities. An open source third party tool that connects via Jolokia is&#160;<a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawt.io</a>, an HTML-5 web console with an ActiveMQ plugin that is at least worth being familiar with as&#160;<span style="line-height: 1.4285715;">ActiveMQ and hawt.io share developers.</span></p><p>In ActiveMQ 4.x you can monitor the broker to see what destinations are being used, their activity along with connections and subscriptions using the following tools</p><ul><li><a shape="rect" href="jmx.xml">JMX</a> and a JMX console such as <a shape="rect" class="external-link" href="http://java.sun.com/developer
 /technicalArticles/J2SE/jconsole.html" rel="nofollow">jConsole</a></li><li>The <a shape="rect" href="web-console.xml">Web Console</a></li><li>the <a shape="rect" href="advisory-message.xml">Advisory Message</a> feature (using JMS messages to monitor the system)</li><li>The <a shape="rect" href="command-agent.xml">Command Agent</a>; ActiveMQ.Agent topic that you query for status</li><li>The <a shape="rect" href="visualisation.xml">Visualisation</a> plug-in</li><li>The <a shape="rect" class="external-link" href="http://activemq.apache.org/statisticsplugin.html">Statistics</a> plug-in (from 5.3)</li></ul><h3 id="HowcanImonitorActiveMQ-ThirdPartyTools">Third Party Tools</h3><ul><li><a shape="rect" class="external-link" href="https://github.com/jmxtrans/jmxtrans" rel="nofollow">jmxtrans</a> which can be used to continuously query ActiveMQ via JMX and write to a chosen output. For instance, write to a graphite database file which can then be used to graph trends over time and be queried b
 y Nagios to alarm should your thresholds be exceeded.</li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php" rel="nofollow">ActiveMQ Monitor (AMon)</a></li><li><a shape="rect" class="external-link" href="http://sourceforge.net/projects/activemqbrowser/" rel="nofollow">Apache ActiveMQBrowser</a></li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/confluence/display/HJMS/Home" rel="nofollow">HermesJMS</a></li><li><a shape="rect" class="external-link" href="http://www.soapui.org/JMS/working-with-jms-messages.html" rel="nofollow">HermesJMS/soapUI</a></li><li><a shape="rect" class="external-link" href="http://www.hyperic.com/products/open-source-systems-monitoring" rel="nofollow">Hyperic HQ</a> and <a shape="rect" class="external-link" href="http://www.hyperic.com/products/enterprise-systems-monitoring" rel="nofollow">Hyperic HQ Enterprise</a></li><li><a shape="rect" class="externa
 l-link" href="http://fusesource.com/products/fuse-hq/" rel="nofollow">FuseHQ</a> (based on Hyperic HQ Enterprise)</li><li><a shape="rect" class="external-link" href="http://www.itko.com/products/jms.jsp" rel="nofollow">iTKO LISA Test</a></li><li><a shape="rect" class="external-link" href="https://cwiki.apache.org/GMOxDOC11/geronimo-administration-console.html#GeronimoAdministrationConsole-JMSServer">Geronimo Administration Console</a> (JMS Resources)</li><li><a shape="rect" class="external-link" href="https://mediadriver.com/software/" rel="nofollow">Media Driver Integrated Console</a> can manage and monitor ActiveMQ, IBM MQ and Tibco EMS</li></ul><h3 id="HowcanImonitorActiveMQ-SeeAlso">See Also</h3><ul><li><a shape="rect" href="how-can-i-monitor-the-connection-with-the-broker.xml">How can I monitor the connection with the broker</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>How can I monitor ActiveMQ</h2><p>Starting with ActiveMQ 5.8.0&#160;<a shape="rect" href="http://www.jolokia.org/">Jolokia</a> is bundled which provides a&#160;RESTful interface to ActiveMQ's JMX capabilities. An open source third party tool that connects via Jolokia is&#160;<a shape="rect" href="http://hawt.io/">hawt.io</a>, an HTML-5 web console with an ActiveMQ plugin that is at least worth being familiar with as&#160;<span style="line-height: 1.4285715;">ActiveMQ and hawt.io share developers.</span></p><p>In ActiveMQ 4.x you can monitor the broker to see what destinations are being used, their activity along with connections and subscriptions using the following tools</p><ul><li><link><page ri:content-title="JMX"></page></link> and a JMX console such as <a shape="rect" href="http://java.sun.com/developer/technicalArticles/J2SE/jconsole.html">jConsole</a></li><li>The <link><page ri:content-title="Web Console"></page></link></li><li>the <l
 ink><page ri:content-title="Advisory Message"></page></link> feature (using JMS messages to monitor the system)</li><li>The <link><page ri:content-title="Command Agent"></page></link>; ActiveMQ.Agent topic that you query for status</li><li>The <link><page ri:content-title="Visualisation"></page></link> plug-in</li><li>The <a shape="rect" href="http://activemq.apache.org/statisticsplugin.html">Statistics</a> plug-in (from 5.3)</li></ul><h3>Third Party Tools</h3><ul><li><a shape="rect" href="https://github.com/jmxtrans/jmxtrans">jmxtrans</a> which can be used to continuously query ActiveMQ via JMX and write to a chosen output. For instance, write to a graphite database file which can then be used to graph trends over time and be queried by Nagios to alarm should your thresholds be exceeded.</li><li><a shape="rect" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php">ActiveMQ Monitor (AMon)</a></li><li><a shape="rect" href="http://sourceforge.net/
 projects/activemqbrowser/">Apache ActiveMQBrowser</a></li><li><a shape="rect" href="http://www.hermesjms.com/confluence/display/HJMS/Home">HermesJMS</a></li><li><a shape="rect" href="http://www.soapui.org/JMS/working-with-jms-messages.html">HermesJMS/soapUI</a></li><li><a shape="rect" href="http://www.hyperic.com/products/open-source-systems-monitoring">Hyperic HQ</a> and <a shape="rect" href="http://www.hyperic.com/products/enterprise-systems-monitoring">Hyperic HQ Enterprise</a></li><li><a shape="rect" href="http://fusesource.com/products/fuse-hq/">FuseHQ</a> (based on Hyperic HQ Enterprise)</li><li><a shape="rect" href="http://www.itko.com/products/jms.jsp">iTKO LISA Test</a></li><li><a shape="rect" href="https://cwiki.apache.org/GMOxDOC11/geronimo-administration-console.html#GeronimoAdministrationConsole-JMSServer">Geronimo Administration Console</a> (JMS Resources)</li><li><a shape="rect" href="https://mediadriver.com/software/">Media Driver Integrated Console</a> can manage an
 d monitor ActiveMQ, IBM MQ and Tibco EMS</li></ul><h3>See Also</h3><ul><li><link><page ri:content-title="How can I monitor the connection with the broker"></page></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-monitor-the-connection-with-the-broker.xml
----------------------------------------------------------------------
diff --git a/how-can-i-monitor-the-connection-with-the-broker.xml b/how-can-i-monitor-the-connection-with-the-broker.xml
index 3a12fda..58a8080 100644
--- a/how-can-i-monitor-the-connection-with-the-broker.xml
+++ b/how-can-i-monitor-the-connection-with-the-broker.xml
@@ -1,11 +1,12 @@
-<div class="wiki-content maincontent"><h2 id="HowcanImonitortheconnectionwiththebroker-HowcanImonitortheconnectionwiththebroker">How can I monitor the connection with the broker</h2>
+<div class="wiki-content maincontent"><h2>How can I monitor the connection with the broker</h2>
 
-<p>You can monitor the status of the connection with the broker via the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html#addTransportListener%28org.apache.activemq.transport.TransportListener">addTransportListener() method on the ActiveMQConnection</a>. </p>
+<p>You can monitor the status of the connection with the broker via the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html#addTransportListener%28org.apache.activemq.transport.TransportListener">addTransportListener() method on the ActiveMQConnection</a>. </p>
 
-<p>This method takes a <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> which is notified as the connection is established &amp; dropped. It also allows you to work with the <a shape="rect" href="failover-transport-reference.xml">Failover Transport</a> yet still know the status of the connection.</p>
+<p>This method takes a <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> which is notified as the connection is established &amp; dropped. It also allows you to work with the <link><page ri:content-title="Failover Transport Reference"></page><link-body>Failover Transport</link-body></link> yet still know the status of the connection.</p>
 
 
-<h3 id="HowcanImonitortheconnectionwiththebroker-SeeAlso">See Also</h3>
+<h3>See Also</h3>
 
-<ul><li><a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a></li></ul></div>
+<ul><li><link><page ri:content-title="How can I monitor ActiveMQ"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-see-what-destinations-are-used.xml
----------------------------------------------------------------------
diff --git a/how-can-i-see-what-destinations-are-used.xml b/how-can-i-see-what-destinations-are-used.xml
index f54208e..e069008 100644
--- a/how-can-i-see-what-destinations-are-used.xml
+++ b/how-can-i-see-what-destinations-are-used.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The easiest way is to use <a shape="rect" href="jmx.xml">JMX</a> by pointing your JMX console or JConsole at the broker JVM.</p><p>You can also get all of the active destinations from the broker using Java code via <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinations%28org.apache.activemq.command.ActiveMQDestination%29">getDestinations()</a>.</p><p>You can also get a Map of all the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Destination.html">Destination</a> objects indexed by ActiveMQDestination via <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinationMap%28%29">getDestinationMap()</a>. This allows you to look at the individual destination details such as the queue de
 pths and so forth</p></div>
+<div class="wiki-content maincontent"><p>The easiest way is to use <link><page ri:content-title="JMX"></page></link> by pointing your JMX console or JConsole at the broker JVM.</p><p>You can also get all of the active destinations from the broker using Java code via <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinations%28org.apache.activemq.command.ActiveMQDestination%29">getDestinations()</a>.</p><p>You can also get a Map of all the <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Destination.html">Destination</a> objects indexed by ActiveMQDestination via <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinationMap%28%29">getDestinationMap()</a>. This allows you to look at the individual destination details such as the queue depths and so forth</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-support-auto-reconnection.xml
----------------------------------------------------------------------
diff --git a/how-can-i-support-auto-reconnection.xml b/how-can-i-support-auto-reconnection.xml
index 0ca8b41..1fcdcb7 100644
--- a/how-can-i-support-auto-reconnection.xml
+++ b/how-can-i-support-auto-reconnection.xml
@@ -1,19 +1,17 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIsupportautoreconnection-HowcanIsupportautoreconnection?">How can I support auto reconnection?</h2>
+<div class="wiki-content maincontent"><h2>How can I support auto reconnection?</h2>
 
 <p>Networks are unreliable and sockets do get dropped from time to time (it could be a network glitch, dodgy router, firewall, or someone could even just restart a broker).</p>
 
 <p>You often want a JMS client to automatically handle the fact that the connection to the broker was lost such that the JMS client either reconnnects to the same broker when it becomes available, or reconnects to another broker in the cluster.</p>
 
-<p>Its easy to perform auto-reconnection. In Apache ActiveMQ using the <a shape="rect" href="failover-transport-reference.xml">failover transport</a> in which the JMS client (connection) will automatically reconnect to the broker if there is a socket exception. </p>
+<p>Its easy to perform auto-reconnection. In Apache ActiveMQ using the <link><page ri:content-title="Failover Transport Reference"></page><link-body>failover transport</link-body></link> in which the JMS client (connection) will automatically reconnect to the broker if there is a socket exception. </p>
 
 <p>Just use the following connection URI (setting the brokerURL in the ActiveMQConnectionFactory)</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[
+<structured-macro ac:macro-id="b7cbcc04-7a5f-4161-8a80-f101a8c31ead" ac:name="code" ac:schema-version="1"><plain-text-body>
 failover:tcp://host:port 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<p>You can use a list of URIs to specify which machines to connect to and use discovery to find the brokers to connect to. More details on this see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p></div>
+<p>You can use a list of URIs to specify which machines to connect to and use discovery to find the brokers to connect to. More details on this see <link><page ri:content-title="Configuring Transports"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-support-priority-queues.xml
----------------------------------------------------------------------
diff --git a/how-can-i-support-priority-queues.xml b/how-can-i-support-priority-queues.xml
index 71a8dd3..b0c5d41 100644
--- a/how-can-i-support-priority-queues.xml
+++ b/how-can-i-support-priority-queues.xml
@@ -1,59 +1,51 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIsupportpriorityqueues-HowcanIsupportpriorityqueues?">How can I support priority queues?</h2>
+<div class="wiki-content maincontent"><h2>How can I support priority queues?</h2>
 
-<h3 id="HowcanIsupportpriorityqueues-UseMessagePriority">Use Message Priority</h3>
+<h3>Use Message Priority</h3>
 
 <p>A common requirement is to support priority consumption; so high priority messages are consumed before low priority.</p>
 
-<p>In version 5.4 priority queues are supported. Both the message cursors and the message stores (KahaDB and JDBC) support message priority. The support is disabled by default so it needs to be be enabled using <a shape="rect" href="per-destination-policies.xml">per destination policies</a> through xml configuration, in the example below, 'prioritizedMessages' is enabled for all queues. </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[
+<p>In version 5.4 priority queues are supported. Both the message cursors and the message stores (KahaDB and JDBC) support message priority. The support is disabled by default so it needs to be be enabled using <link><page ri:content-title="per destination policies"></page></link> through xml configuration, in the example below, 'prioritizedMessages' is enabled for all queues. </p>
+<structured-macro ac:macro-id="d0404155-3918-434f-b576-8f72b792b667" ac:name="code" ac:schema-version="1"><plain-text-body>
  &lt;destinationPolicy&gt;
    &lt;policyMap&gt;
      &lt;policyEntries&gt;
-       &lt;policyEntry queue=&quot;&gt;&quot; prioritizedMessages=&quot;true&quot;/&gt;
+       &lt;policyEntry queue="&gt;" prioritizedMessages="true"/&gt;
     ...
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The full range of priority values (0-9) are supported by the <a shape="rect" href="jdbc-support.xml">JDBC</a> message store. For <a shape="rect" href="kahadb.xml">KahaDB</a> three priority categories are supported, Low (&lt; 4), Default (= 4) and High (&gt; 4).</p>
+<p>The full range of priority values (0-9) are supported by the <link><page ri:content-title="jdbc support"></page><link-body>JDBC</link-body></link> message store. For <link><page ri:content-title="KahaDB"></page></link> three priority categories are supported, Low (&lt; 4), Default (= 4) and High (&gt; 4).</p>
 
 <p>Since the message cursors (and client side) implement strict ordering of priorities, it's possible to observe strict priority ordering if message dispatching can happen from the cache and not have to hit the disk (i.e., your consumers are fast enough to keep up with producers), or if you're using non-persistent messages that never have to flush to disk (using the FilePendingMessageCursor). However, once you hit a situation where consumers are slow, or producers are just significantly faster, you'll observe that the cache will fill up (possibly with lower priority messages) while higher priority messages get stuck on disk and not available until they're paged in. In this case, you can make a decision to tradeoff optimized message dispatching for priority enforcement. You can disable the cache, message expiration check, and lower you consumer prefetch to 1 to ensure getting the high priority messages from the store ahead of lower priority messages Note, this sort of tradeoff can ha
 ve significant performance implications, so you must test your scenarios thoroughly. :</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[
+<structured-macro ac:macro-id="11e4935d-0104-4709-a871-c3467bedb529" ac:name="code" ac:schema-version="1"><plain-text-body>
  &lt;destinationPolicy&gt;
    &lt;policyMap&gt;
      &lt;policyEntries&gt;
-       &lt;policyEntry queue=&quot;&gt;&quot; prioritizedMessages=&quot;true&quot; useCache=&quot;false&quot; expireMessagesPeriod=&quot;0&quot; queuePrefetch=&quot;1&quot; /&gt;
+       &lt;policyEntry queue="&gt;" prioritizedMessages="true" useCache="false" expireMessagesPeriod="0" queuePrefetch="1" /&gt;
     ...
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HowcanIsupportpriorityqueues-Alternativestrategies">Alternative strategies</h3>
-<h4 id="HowcanIsupportpriorityqueues-UseSelectors">Use Selectors</h4>
+<h3>Alternative strategies</h3>
+<h4>Use Selectors</h4>
 
 <p>You can have say 100 consumers using a selector to find the high priority stuff</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[
+<structured-macro ac:macro-id="ce5db972-0df5-47c1-92be-39bf60b456f7" ac:name="code" ac:schema-version="1"><plain-text-body>
 JMSPriority &gt; 6
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>then have 50 consumers doing average or above</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[
+<structured-macro ac:macro-id="0fc1e06f-98b9-4e33-8552-2e3bd2cfa13e" ac:name="code" ac:schema-version="1"><plain-text-body>
 JMSPriority &gt;= 4
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Then say 10 consumers consuming all messages (so all priorities). Then this way you'll have a pool of threads always processing high priority messages - giving you very efficient priority based dispatching of messages without ActiveMQ having to batch up messages and reorder them before dispatching them.</p>
 
-<h4 id="HowcanIsupportpriorityqueues-UseResequencer">Use Resequencer</h4>
+<h4>Use Resequencer</h4>
 
 <p>You can reorder messages on some input queue A and send them to queue B in sorted order to avoid having to change your clients. This avoids the need to use selectors in your application as shown above.</p>
 
-<p>To do this use the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/resequencer.html">Resequencer</a> from the <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a></p></div>
+<p>To do this use the <a shape="rect" href="http://activemq.apache.org/camel/resequencer.html">Resequencer</a> from the <link><page ri:content-title="Enterprise Integration Patterns"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-use-different-network-protocols.xml
----------------------------------------------------------------------
diff --git a/how-can-i-use-different-network-protocols.xml b/how-can-i-use-different-network-protocols.xml
index cb25761..ef8bed5 100644
--- a/how-can-i-use-different-network-protocols.xml
+++ b/how-can-i-use-different-network-protocols.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>For easy configuration, ActiveMQ supports a configurable URL to denote the connection mechanism to other clients. There is an example of how to do this along with a description of the available protocols in the <a shape="rect" href="uri-protocols.xml">Protocols overview</a></p></div>
+<p>For easy configuration, ActiveMQ supports a configurable URL to denote the connection mechanism to other clients. There is an example of how to do this along with a description of the available protocols in the <link><page ri:content-title="URI Protocols"></page><link-body>Protocols overview</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-distributed-queues-work.xml
----------------------------------------------------------------------
diff --git a/how-do-distributed-queues-work.xml b/how-do-distributed-queues-work.xml
index 08ed62a..9949e03 100644
--- a/how-do-distributed-queues-work.xml
+++ b/how-do-distributed-queues-work.xml
@@ -1,32 +1,32 @@
-<div class="wiki-content maincontent"><p>There are various <a shape="rect" href="topologies.xml">Topologies</a> that you can employ with ActiveMQ, where clients are connected to message brokers in various ways like</p>
+<div class="wiki-content maincontent"><p>There are various <link><page ri:content-title="Topologies"></page></link> that you can employ with ActiveMQ, where clients are connected to message brokers in various ways like</p>
 
 <ul><li>peer based</li><li>client server</li><li>hub and spoke</li></ul>
 
 
-<p>Each client communicates with a broker using some kind of <a shape="rect" href="cross-language-clients.xml">client library and network protocol</a>. </p>
+<p>Each client communicates with a broker using some kind of <link><page ri:content-title="Cross Language Clients"></page><link-body>client library and network protocol</link-body></link>. </p>
 
 <p>To create distributed queues or topics we need to have the message brokers communicate with each other. There are two different types of broker to broker communication...</p>
 
-<h2 id="Howdodistributedqueueswork-Master/SlaveforHighAvailability">Master/Slave for High Availability</h2>
+<h2>Master/Slave for High Availability</h2>
 
-<p>A <a shape="rect" href="masterslave.xml">Master/Slave Cluster</a> is used for <a shape="rect" href="ha.xml">HA</a>. Basically it means that all messages are replicated across each broker in the master/slave cluster. If the Master goes down, the clients can automatically failover to a slave which will have all the messages already, so each message is highly available. The Slave(s) provide a hot standby broker which will always be in sync ready to take over if the master goes away due to hardware failure etc.</p>
+<p>A <link><page ri:content-title="MasterSlave"></page><link-body>Master/Slave Cluster</link-body></link> is used for <link><page ri:content-title="HA"></page></link>. Basically it means that all messages are replicated across each broker in the master/slave cluster. If the Master goes down, the clients can automatically failover to a slave which will have all the messages already, so each message is highly available. The Slave(s) provide a hot standby broker which will always be in sync ready to take over if the master goes away due to hardware failure etc.</p>
 
 <p>Master/Slave works by having some form of replication; each message is owned by every broker in the logical cluster. A master/slave cluster then acts as one logical message broker which could then be connected via store and forward to other brokers (as we'll see in the next section).</p>
 
-<h3 id="Howdodistributedqueueswork-DistributedQueuesandTopics">Distributed Queues and Topics</h3>
+<h3>Distributed Queues and Topics</h3>
 
 <p>In Master/Slave, queues and topics are all replicated between each broker in the cluster (so often to a master and maybe a single slave). So each broker in the cluster has exactly the same messages available at any time so if a master fails, clients failover to a slave and you don't loose a message.</p>
 
-<h2 id="Howdodistributedqueueswork-Storeandforwardnetworksofbrokers">Store and forward networks of brokers</h2>
+<h2>Store and forward networks of brokers</h2>
 
-<p>A <a shape="rect" href="networks-of-brokers.xml">Store and Forward Network of Brokers</a> means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time. When a JMS producer sends a message to a JMS consumer, it may travel through several brokers to reach its final destination. ActiveMQ uses <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> so that local JMS consumers are always higher priority than remote brokers in a store and forward network.</p>
+<p>A <link><page ri:content-title="Networks of Brokers"></page><link-body>Store and Forward Network of Brokers</link-body></link> means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time. When a JMS producer sends a message to a JMS consumer, it may travel through several brokers to reach its final destination. ActiveMQ uses <link><page ri:content-title="Consumer Priority"></page></link> so that local JMS consumers are always higher priority than remote brokers in a store and forward network.</p>
 
-<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>Note though that a store and forward network is not a solution for message <a shape="rect" href="ha.xml">HA</a>; if a broker fails in a Store and Forward network, the messages owned by that broker remain inside the broker's persistent store until the broker comes back online. If you need <a shape="rect" href="ha.xml">HA</a> of messages then you need to use Master/Slave described above.</p></div></div>
+<structured-macro ac:macro-id="170ca14d-b8a6-4564-be68-bd68a0f854bc" ac:name="info" ac:schema-version="1"><parameter ac:name="">Store and Forward is not HA</parameter><rich-text-body>
+<p>Note though that a store and forward network is not a solution for message <link><page ri:content-title="HA"></page></link>; if a broker fails in a Store and Forward network, the messages owned by that broker remain inside the broker's persistent store until the broker comes back online. If you need <link><page ri:content-title="HA"></page></link> of messages then you need to use Master/Slave described above.</p></rich-text-body></structured-macro>
 
 <p>Store and forward is often used in large networks where producers are on one LAN and consumers are on another LAN and you wish to use a broker on each LAN as a kind of network concentrator to minimise chattiness over the WAN between them (and to minimise the number of connections required across the WAN too). Similar uses of store and forward can be found when using firewalls or SSL across certain networks etc. One other use case for store and forward networks is if your OS does not support many sockets (and you can't reconfigure that) you could use a store and forward network to connect massive numbers of clients together in one logical network.</p>
 
-<h3 id="Howdodistributedqueueswork-DistributedQueuesinStore/Forward">Distributed Queues in Store/Forward</h3>
+<h3>Distributed Queues in Store/Forward</h3>
 <p>When we publish a message on a queue, it is stored in the persistent store of the broker that the publisher is communicating. Then if that broker is configured to store/foward to other brokers and clients, the broker will send it to <em>one</em> of these clients (which could be a node or a broker depending on the dispatch algorithm). This dispatch algorithm continues until the message is finally dispatched and consumed by a client.</p>
 
 <p>At any point in time the message will only exist in one broker's store until its consumed. Note that messages are only distributed onto other brokers if there is a consumer on those brokers.</p>
@@ -34,10 +34,11 @@
 <p>e.g. if we had broker A, B, C and a publisher on a queue on A. If we have consumers on the queue on A and B then messages for the queue will be spread across both brokers A and B; some messages going to B, some being consumed on A, none going to C. If a consumer on the queue starts <br clear="none">
 on C, then messages will flow there too. If the consumer stops then no more messages will be dispatched to C.</p>
 
-<h2 id="Howdodistributedqueueswork-DistributedTopicsinStore/Forward">Distributed Topics in Store/Forward</h2>
+<h2>Distributed Topics in Store/Forward</h2>
 <p>For topics the above algorithm is followed except, every interested client receives a copy of the message - plus ActiveMQ will check for loops (to avoid a message flowing infinitely around a ring of brokers).</p>
 
-<h3 id="Howdodistributedqueueswork-SeeAlso">See Also</h3>
+<h3>See Also</h3>
 
-<ul><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="masterslave.xml">MasterSlave</a></li><li><a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I configure distributed queues or topics"></page></link></li><li><link><page ri:content-title="MasterSlave"></page></link></li><li><link><page ri:content-title="Networks of Brokers"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-durable-queues-and-topics-work.xml
----------------------------------------------------------------------
diff --git a/how-do-durable-queues-and-topics-work.xml b/how-do-durable-queues-and-topics-work.xml
index ce50c4d..c4dacaa 100644
--- a/how-do-durable-queues-and-topics-work.xml
+++ b/how-do-durable-queues-and-topics-work.xml
@@ -10,5 +10,5 @@
 
 <p>So for durable topic subscription, the JMS provider needs to be able to identify S when it shuts down and later on in the future reconnects, so it can know what messages to send to it while it was not running. JMS specification dictates that the identification of S is done by a combination of the clientID and the durable subscriber name. This is so that the JMS connection S uses can have many different durable subscriptions on different topics or on the same topic with different selectors - yet the JMS provider can know which message for which subscription to keep around for it.</p>
 
-<p>So setting the clientID on a JMS connection is vital (along with using a sensible durable consumer name) for durable topic subscription. Its not an issue for other <a shape="rect" href="qos.xml">QoS</a></p></div>
+<p>So setting the clientID on a JMS connection is vital (along with using a sensible durable consumer name) for durable topic subscription. Its not an issue for other <link><page ri:content-title="QoS"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-c.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-c.xml b/how-do-i-access-activemq-from-c.xml
index a1db78a..15d8c1e 100644
--- a/how-do-i-access-activemq-from-c.xml
+++ b/how-do-i-access-activemq-from-c.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>See the <a shape="rect" href="c-integration.xml">C Integration</a> page for the available options.</p></div>
+<p>See the <link><page ri:content-title="C Integration"></page></link> page for the available options.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-csharp-or-dotnet.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-csharp-or-dotnet.xml b/how-do-i-access-activemq-from-csharp-or-dotnet.xml
index c755e54..7a3b862 100644
--- a/how-do-i-access-activemq-from-csharp-or-dotnet.xml
+++ b/how-do-i-access-activemq-from-csharp-or-dotnet.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<div class="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div></div>
+<structured-macro ac:macro-id="c77675b8-b961-4f54-b311-d7206e0d6d0d" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="dot Net"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-ruby-perl-python-php.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-ruby-perl-python-php.xml b/how-do-i-access-activemq-from-ruby-perl-python-php.xml
index 75ad58e..e899d23 100644
--- a/how-do-i-access-activemq-from-ruby-perl-python-php.xml
+++ b/how-do-i-access-activemq-from-ruby-perl-python-php.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Use <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> which is a simple to implement client protocol for working with ActiveMQ and other messaging systems.</p></div>
+<p>Use <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> which is a simple to implement client protocol for working with ActiveMQ and other messaging systems.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-add-my-own-plugins.xml
----------------------------------------------------------------------
diff --git a/how-do-i-add-my-own-plugins.xml b/how-do-i-add-my-own-plugins.xml
index 90bd8d4..bf12f95 100644
--- a/how-do-i-add-my-own-plugins.xml
+++ b/how-do-i-add-my-own-plugins.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>See <a shape="rect" href="developing-plugins.xml">Developing Plugins</a> for how to add your own functionality into Apache ActiveMQ</p></div>
+<div class="wiki-content maincontent"><p>See <link><page ri:content-title="Developing Plugins"></page></link> for how to add your own functionality into Apache ActiveMQ</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-avoid-maven-downloading-latest-jars.xml
----------------------------------------------------------------------
diff --git a/how-do-i-avoid-maven-downloading-latest-jars.xml b/how-do-i-avoid-maven-downloading-latest-jars.xml
index 106876f..8af0743 100644
--- a/how-do-i-avoid-maven-downloading-latest-jars.xml
+++ b/how-do-i-avoid-maven-downloading-latest-jars.xml
@@ -1,15 +1,11 @@
 <div class="wiki-content maincontent">
 <p>You can use the -o switch (for offline mode) to avoid maven auto-downloading new snapshot jars (e.g. the Geronimo jars at the time of writing).</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[
+<structured-macro ac:macro-id="6dd5d712-dd1e-4985-b705-e469d0c5769b" ac:name="code" ac:schema-version="1"><plain-text-body>
 maven -o
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>or to run a server  go to the \assembly module and run</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[
+<structured-macro ac:macro-id="306141b6-06de-44f5-8fd1-ecc0dab0ab1c" ac:name="code" ac:schema-version="1"><plain-text-body>
 maven -o server
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-bridge-different-jms-providers.xml
----------------------------------------------------------------------
diff --git a/how-do-i-bridge-different-jms-providers.xml b/how-do-i-bridge-different-jms-providers.xml
index 23b7ecf..4947f45 100644
--- a/how-do-i-bridge-different-jms-providers.xml
+++ b/how-do-i-bridge-different-jms-providers.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>To bridge from ActiveMQ to another JMS provider use the <a shape="rect" href="jms-to-jms-bridge.xml">JMS bridge</a>. </p>
+<div class="wiki-content maincontent"><p>To bridge from ActiveMQ to another JMS provider use the <link><page ri:content-title="jms to jms bridge"></page><link-body>JMS bridge</link-body></link>. </p>
 
-<p>To bridge to another kind of transport completely, use <a shape="rect" class="external-link" href="http://camel.apache.org">Camel</a> or <a shape="rect" class="external-link" href="http://servicemix.apache.org">ServiceMix</a></p></div>
+<p>To bridge to another kind of transport completely, use <a shape="rect" href="http://camel.apache.org">Camel</a> or <a shape="rect" href="http://servicemix.apache.org">ServiceMix</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-build-but-disable-the-unit-tests.xml
----------------------------------------------------------------------
diff --git a/how-do-i-build-but-disable-the-unit-tests.xml b/how-do-i-build-but-disable-the-unit-tests.xml
index 74346b3..ce1e503 100644
--- a/how-do-i-build-but-disable-the-unit-tests.xml
+++ b/how-do-i-build-but-disable-the-unit-tests.xml
@@ -1,12 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIbuildbutdisabletheunittests-HowdoIbuildbutdisabletheunittests">How do I build but disable the unit tests</h2>
+<div class="wiki-content maincontent"><h2>How do I build but disable the unit tests</h2>
 
-<p>The test cases in ActiveMQ can take a very long time to run! <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)"></p>
+<p>The test cases in ActiveMQ can take a very long time to run! <emoticon ac:name="smile"></emoticon></p>
 
 <p>To disable this you can try the following</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[
+<structured-macro ac:macro-id="a89a4ffe-28f9-4290-86b1-bbb13431bbc4" ac:name="code" ac:schema-version="1"><plain-text-body>
 mvn install -Dmaven.test.skip=true
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-dispatch-policy.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-dispatch-policy.xml b/how-do-i-change-dispatch-policy.xml
index e14c15a..d0de7e0 100644
--- a/how-do-i-change-dispatch-policy.xml
+++ b/how-do-i-change-dispatch-policy.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><p>This is much simpler and more powerful in ActiveMQ 4.0 - you can configure different <a shape="rect" href="dispatch-policies.xml">Dispatch Policies</a> directly. </p>
+<div class="wiki-content maincontent"><p>This is much simpler and more powerful in ActiveMQ 4.0 - you can configure different <link><page ri:content-title="Dispatch Policies"></page></link> directly. </p>
 
-<p>For now in ActiveMQ 3.x we have a <a shape="rect" href="what-is-the-prefetch-limit-for.xml">PrefetchPolicy configuration</a>. This allows a certain number of messages to be dispatched to a consumer before they are acknowledged. This feature is to achieve high performance; the higher the value the less likely it is that a client has to wait for messages to arrive before processing the message and so the higher the throughput.</p>
+<p>For now in ActiveMQ 3.x we have a <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>PrefetchPolicy configuration</link-body></link>. This allows a certain number of messages to be dispatched to a consumer before they are acknowledged. This feature is to achieve high performance; the higher the value the less likely it is that a client has to wait for messages to arrive before processing the message and so the higher the throughput.</p>
 
 <p>e.g. under heavy load of a busy system you probably want to dispatch 1000 or so messages to a consumer, so as soon as its ready to receive a message, there are a bunch of them in memory waiting to be used - rather than having a slow request-response RPC each time.</p>
 
@@ -8,16 +8,15 @@
 
 <p>In ActiveMQ 3.x or later a work around for this issue is to reconfigure the PrefetchPolicy on the ConnectionFactory/Connection so that the broker only prefetches a single message per consumer; though this will greatly reduce the performance and throughput of the system.</p>
 
-<h3 id="HowdoIchangedispatchpolicy-ConfiguringthedispatchpolicyinActiveMQ4.x">Configuring the dispatch policy in ActiveMQ 4.x</h3>
+<h3>Configuring the dispatch policy in ActiveMQ 4.x</h3>
 
 <p>In AMQ 4.x, the dispatch policy can now be configured on the xml configuration file (ie. activemq.xml)<br clear="none">
 ie.</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[
+<structured-macro ac:macro-id="b215a33e-7bd9-4d85-83b6-523f38286caa" ac:name="code" ac:schema-version="1"><plain-text-body>
 &lt;destinationPolicy&gt;
    &lt;policyMap&gt;&lt;policyEntries&gt; 
-      &lt;policyEntry topic=&quot;COMMAND.&gt;&quot;&gt;
+      &lt;policyEntry topic="COMMAND.&gt;"&gt;
          &lt;dispatchPolicy&gt;
            &lt;strictOrderDispatchPolicy /&gt;
          &lt;/dispatchPolicy&gt;
@@ -27,6 +26,5 @@ ie.</p>
       &lt;/policyEntry&gt;
    &lt;/policyEntries&gt;&lt;/policyMap&gt;
 &lt;/destinationPolicy&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-the-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-the-logging.xml b/how-do-i-change-the-logging.xml
index 7fa1bd1..3397942 100644
--- a/how-do-i-change-the-logging.xml
+++ b/how-do-i-change-the-logging.xml
@@ -1,37 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIchangethelogging-HowdoIchangethelogging">How do I change the logging</h2>
+<div class="wiki-content maincontent"><h2>How do I change the logging</h2>
 
-<p>We use <a shape="rect" class="unresolved" href="#">slf4j</a> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
+<p>We use <link><page ri:content-title="www.slf4j.org"></page><link-body>slf4j</link-body></link> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
 
 <p>You can disable the ActiveMQ logging by editing the <strong>conf/log4j.properties</strong> file to disable all INFO level logging for activemq by adding this line</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[
+<structured-macro ac:macro-id="7662763d-89e4-4530-a809-80b4837b9ac5" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.apache.activemq=WARN
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>or to disable stdout logging all together change this line</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[
+<structured-macro ac:macro-id="329e6a3c-02be-4370-a6d9-ae07172450c1" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, stdout, out
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>to</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[
+<structured-macro ac:macro-id="5bfdd37d-318b-4c45-87c0-76fc34ea3276" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, out
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="HowdoIchangethelogging-HowDoIChangetheLoggingatRuntime?">How Do I Change the Logging at Runtime? </h2>
+<h2>How Do I Change the Logging at Runtime? </h2>
 
 <p>The default logging level in ActiveMQ is INFO. This can be seen by starting up the default ActiveMQ binary in a terminal. In doing so, you will see the output shown below: </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[
+<structured-macro ac:macro-id="f615105d-e205-4750-b028-693bb3957169" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ ./bin/activemq
 ACTIVEMQ_HOME: /Users/bsnyder/amq/apache-activemq-5.1.0
 ACTIVEMQ_BASE: /Users/bsnyder/amq/apache-activemq-5.1.0
@@ -56,25 +49,23 @@ INFO  BrokerService                  - ActiveMQ JMS Message Broker (localhost, I
 INFO  log                            - Logging to org.slf4j.impl.JCLLoggerAdapter(org.mortbay.log) via org.mortbay.log.Slf4jLog
 INFO  log                            - jetty-6.1.9
 INFO  WebConsoleStarter              - ActiveMQ WebConsole initialized.
-INFO  /admin                         - Initializing Spring FrameworkServlet &#39;dispatcher&#39;
+INFO  /admin                         - Initializing Spring FrameworkServlet 'dispatcher'
 INFO  log                            - ActiveMQ Console at http://0.0.0.0:8161/admin
 INFO  log                            - ActiveMQ Web Demos at http://0.0.0.0:8161/demo
 INFO  log                            - RESTful file access application at http://0.0.0.0:8161/fileserver
 INFO  log                            - Started SelectChannelConnector@0.0.0.0:8161
 INFO  FailoverTransport              - Successfully connected to tcp://localhost:61616
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>But stopping ActiveMQ to change the logging level is not always feasible. There are many cases where the logging level and other configuration details may need to be changed at runtime. Using a JMX tool such as jconsole, the logging configuration file can be changed and reloaded without shutting down ActiveMQ. </p>
 
 <p>To change the ActiveMQ logging level from INFO to DEBUG while ActiveMQ is running, start up jconsole, point to the ActiveMQ instance and navigate to the Broker object's Operations tab as shown below: </p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-do-i-change-the-logging.data/reloadLog4jProperties1.png" data-image-src="/confluence/download/attachments/35929/reloadLog4jProperties1.png?version=2&amp;modificationDate=1224001802000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="9148" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="reloadLog4jProperties1.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35929" data-linked-resource-container-version="7"></span> </p>
+<p><image><attachment ri:filename="reloadLog4jProperties1.png"></attachment></image> </p>
 
 <p>To enable debug level logging in ActiveMQ, edit the <code>conf/log4j.properties</code> file that is part of the ActiveMQ binary distribution to disable INFO level logging and enable DEBUG level logging from 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[
+<structured-macro ac:macro-id="69566c36-e040-447f-b6a7-c3b605598339" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, stdout, out
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
@@ -84,13 +75,11 @@ log4j.logger.org.apache.xbean.spring=WARN
 # comment out the above lines and uncomment the next.
 
 #log4j.rootLogger=DEBUG, out, stdout
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>to 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[
+<structured-macro ac:macro-id="3d1df33e-61ff-437d-8f1f-6f8966109da9" ac:name="code" ac:schema-version="1"><plain-text-body>
 #log4j.rootLogger=INFO, stdout, out
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
@@ -100,19 +89,17 @@ log4j.logger.org.apache.xbean.spring=WARN
 # comment out the above lines and uncomment the next.
 
 log4j.rootLogger=DEBUG, out, stdout
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Notice that the line <code>log4j.rootLogger=INFO, stdout, out</code> has been commented out and the line <code>log4j.rootLogger=DEBUG, out, stdout</code> has been uncommented. Save this change and then, in jconsole, click the button named <strong>reloadLog4jProperties</strong> as shown below: </p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-do-i-change-the-logging.data/reloadLog4jProperties2.png" data-image-src="/confluence/download/attachments/35929/reloadLog4jProperties2.png?version=2&amp;modificationDate=1224001802000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="9147" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="reloadLog4jProperties2.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35929" data-linked-resource-container-version="7"></span> </p>
+<p><image><attachment ri:filename="reloadLog4jProperties2.png"></attachment></image> </p>
 
 <p>After clicking the <strong>reloadLog4jProperties</strong> button, the dialog pops up stating, 'Method successfully invoked'. This just lets you know that the <code>reloadLog4jProperties</code> method was invoked to reload the <code>conf/log4j.properties</code> file. Now notice in the terminal where ActiveMQ is running that the logging that is being output is now DEBUG: </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[
+<structured-macro ac:macro-id="4254803e-e312-467b-819b-c303a0be9254" ac:name="code" ac:schema-version="1"><plain-text-body>
 INFO  WebConsoleStarter              - ActiveMQ WebConsole initialized.
-INFO  /admin                         - Initializing Spring FrameworkServlet &#39;dispatcher&#39;
+INFO  /admin                         - Initializing Spring FrameworkServlet 'dispatcher'
 INFO  log                            - ActiveMQ Console at http://0.0.0.0:8161/admin
 INFO  log                            - ActiveMQ Web Demos at http://0.0.0.0:8161/demo
 INFO  log                            - RESTful file access application at http://0.0.0.0:8161/fileserver
@@ -134,8 +121,7 @@ DEBUG TransportConnection            - Connection Stopped: /127.0.0.1:56512
 DEBUG InactivityMonitor              - 9999 ms elapsed since last write check.
 DEBUG InactivityMonitor              - 10000 ms elapsed since last write check.
 DEBUG InactivityMonitor              - 29999 ms elapsed since last read check.
-]]></script>
-</div></div> 
+</plain-text-body></structured-macro> 
 
 <p>Disabling DEBUG level logging and enabling INFO level logging is done by editing the <code>log4j.properties</code> file and clicking the <strong>reloadLog4jProperties</strong> button again. </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml b/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
index 6a9e0e4..1cb7992 100644
--- a/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
+++ b/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
@@ -1,5 +1,3 @@
-<div class="wiki-content maincontent"><p>Embedded brokers create an ActiveMQ directory under the current working directory to store it's persistent message data. To change the location of the directory used by the message store, set the <strong>activemq.store.dir</strong> system property to the directory you want it to use.</p><p>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[java -Dactivemq.store.dir=/temp your.Application
-]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><p>Embedded brokers create an ActiveMQ directory under the current working directory to store it's persistent message data. To change the location of the directory used by the message store, set the <strong>activemq.store.dir</strong> system property to the directory you want it to use.</p><p>Example:</p><structured-macro ac:macro-id="1086a0e9-3648-4f5a-aa24-ce29a6c1cd3b" ac:name="code" ac:schema-version="1"><plain-text-body>java -Dactivemq.store.dir=/temp your.Application
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-compile-from-the-source.xml
----------------------------------------------------------------------
diff --git a/how-do-i-compile-from-the-source.xml b/how-do-i-compile-from-the-source.xml
index b3bac0c..d97d72e 100644
--- a/how-do-i-compile-from-the-source.xml
+++ b/how-do-i-compile-from-the-source.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIcompilefromthesource-HowdoIcompilefromthesourcecode?">How do I compile from the source code?</h2>
+<div class="wiki-content maincontent"><h2>How do I compile from the source code?</h2>
 
-<p>See the <a shape="rect" href="building.xml">Building</a> page</p></div>
+<p>See the <link><page ri:content-title="Building"></page></link> page</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml b/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
index 7207486..01b03cd 100644
--- a/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
+++ b/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
@@ -1,11 +1,2 @@
-<div class="wiki-content maincontent"><p>Scaling to tens of thousands of Queues in a single broker is relatively straightforward - but requires some configuration changes from the default.</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-ReducingThreads">Reducing Threads</h2><p>With the default configuration, ActiveMQ is configured to use a dispatch thread per Queue - you can use set the optimizedDispatch property on the destination policy entry - see <a shape="rect" href="per-destination-policies.xml">configuring Queues</a>.</p><p>ActiveMQ can optionally use internally a thread pool to control dispatching of messages - but as a lot of deployment operating systems are good at handling a large number of threads, this is off by default. To enable this option, either set the ACTIVEMQ_OPTS to disable dedicated task runners in the start up script, INSTALL_DIR/bin/activemq -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[ACTIVEMQ_OPTS=&quot;-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=false&quot;  
-]]></script>
-</div></div><p>or you can set ACTIVEMQ_OPTS in /etc/activemq.conf.</p><p><strong>Note:</strong> From ActiveMQ 5.6 onwards the dedicated task runner is disabled by default (see 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-3667?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/improvement.png">AMQ-3667</a>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
-).</p><p>To reduce the number of threads used for the transport - take a look at using the NIO transport - see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p><p>Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml">example</a> of this in use in one of the provided sample broker configuration files.</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-ReducingMemoryConsumption">Reducing Memory Consumption</h2><p>Reduce the memory used per thread - see <a shape="rect" href="javalangoutofmemory.xml">reducing memory consumption</a></p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-Reducenumberoffiledescriptors">Reduce number of file descriptors</h2><p>ActiveMQ uses the amqPersistenceAdapter by default for persistent messages. Unfortunately, this persistence adapter (as well as the kahaPersistenceAdapter) opens a file descriptor for each que
 ue. When creating large numbers of queues, you'll quickly run into the limit for your OS.</p><p>You can either choose another <a shape="rect" href="persistence.xml">persistence option</a></p><p>or - try out the new <a shape="rect" href="kahadb.xml">KahaDB</a> in version 5.3 and higher</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-Increasethelimitonfiledescriptorsperprocess">Increase the limit on file descriptors per process</h2><p>Try <a shape="rect" class="external-link" href="http://tinyurl.com/o9qs2f" rel="nofollow">googling for the OS you are using</a></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="636bff55-db89-48bb-be51-893e883ae03e" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Scaling Queues"></page></link></parameter></structured-macro></p></div>