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:49:12 UTC

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

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-30-release.xml
----------------------------------------------------------------------
diff --git a/activemq-30-release.xml b/activemq-30-release.xml
index cdf760c..703dc1d 100644
--- a/activemq-30-release.xml
+++ b/activemq-30-release.xml
@@ -1,24 +1,21 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>a new 'discovery' transport <a shape="rect" href="uri-protocols.xml">protocol</a> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li><li>more test cases and fixes of the <a shape="rect" href="jca-container.xml">JCA Container</a></li><li>various performance enhancements and bug fixes</li></ul>
+<ul><li>a new 'discovery' transport <link><page ri:content-title="URI Protocols"></page><link-body>protocol</link-body></link> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li><li>more test cases and fixes of the <link><page ri:content-title="JCA Container"></page></link></li><li>various performance enhancements and bug fixes</li></ul>
 
 
 
-<h2 id="ActiveMQ3.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.zip" rel="nofollow">activemq-3.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.zip" rel="nofollow">activemq-3.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.0.tar.gz" rel="nofollow">activemq-3.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.tar.gz" rel="nofollow">activemq-3.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.zip">activemq-3.0.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.zip">activemq-3.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.tar.gz">activemq-3.0.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.tar.gz">activemq-3.0-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11500&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11500&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="f214b00e-ab9d-4881-8e53-a6c15a42c09b" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11500&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-21-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 2.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-31-release.xml
----------------------------------------------------------------------
diff --git a/activemq-31-release.xml b/activemq-31-release.xml
index 94fcb91..a2042cb 100644
--- a/activemq-31-release.xml
+++ b/activemq-31-release.xml
@@ -1,26 +1,23 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>New <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> support to make it easy to create cross language clients such as for Ruby or Perl etc. (Python, C and .Net coming soon)</li><li>XPath based selectors and demand based publishing, making it easy to implement <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> on top of ActiveMQ</li><li>a pooling JMS ConnectionFactory for better support of the Spring JMSTemplate outside of a JCA container</li><li>improved JNDI support to allow easy dynamic creation of Queues and Topics, to handle different connection settings and to reuse standard JNDI properties</li><li>Increased support for the number of <a shape="rect" href="jdbc-support.xml">databases and JDBC drivers</a> to include
+<ul><li>New <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> support to make it easy to create cross language clients such as for Ruby or Perl etc. (Python, C and .Net coming soon)</li><li>XPath based selectors and demand based publishing, making it easy to implement <a shape="rect" href="http://servicemix.org/WS+Notification">WS-Notification</a> on top of ActiveMQ</li><li>a pooling JMS ConnectionFactory for better support of the Spring JMSTemplate outside of a JCA container</li><li>improved JNDI support to allow easy dynamic creation of Queues and Topics, to handle different connection settings and to reuse standard JNDI properties</li><li>Increased support for the number of <link><page ri:content-title="JDBC Support"></page><link-body>databases and JDBC drivers</link-body></link> to include
 	<ul><li>Apache Derby</li><li>Oracle</li><li>Sybase</li><li>DB2</li><li>SQLServer</li><li>Postgresql</li><li>MySQL</li><li>Axion</li><li>HSQL</li></ul>
 	</li><li>improved authentication at the connection and destination level</li><li>More flexible prefetch policy configurations for more control over queue dispatching and performance tuning</li><li>improved support for priority message ordering</li><li>cleaner servlet integration</li><li>better XA integration to allow outbound producers to reuse inbound JMS sessions</li><li>improved support for WebSphere and JBoss</li><li>easier journal file size and checkpoint period configuration</li><li>jabber transport</li><li>various performance enhancements and bug fixes</li></ul>
 
 
 
-<h2 id="ActiveMQ3.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.zip" rel="nofollow">activemq-3.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.zip" rel="nofollow">activemq-3.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.1.tar.gz" rel="nofollow">activemq-3.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.tar.gz" rel="nofollow">activemq-3.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.zip">activemq-3.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.zip">activemq-3.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.tar.gz">activemq-3.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.tar.gz">activemq-3.1-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11501&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11501&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="734eb27c-b8f6-4715-b880-1907d691ed20" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;fixfor=11501&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=100&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-30-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.0 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-32-release.xml
----------------------------------------------------------------------
diff --git a/activemq-32-release.xml b/activemq-32-release.xml
index b526bfc..f26e103 100644
--- a/activemq-32-release.xml
+++ b/activemq-32-release.xml
@@ -1,23 +1,20 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>Improved <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
+<ul><li>Improved <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
 
 
-<h2 id="ActiveMQ3.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.zip" rel="nofollow">activemq-3.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.zip" rel="nofollow">activemq-3.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.2.tar.gz" rel="nofollow">activemq-3.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.tar.gz" rel="nofollow">activemq-3.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.zip">activemq-3.2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.zip">activemq-3.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.tar.gz">activemq-3.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.tar.gz">activemq-3.2-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11610&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11610&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="b8c785ae-8206-49dd-b5c9-8d7c264d7dfd" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;fixfor=11610&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-31-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-321-release.xml
----------------------------------------------------------------------
diff --git a/activemq-321-release.xml b/activemq-321-release.xml
index 9fab03b..cd87bc5 100644
--- a/activemq-321-release.xml
+++ b/activemq-321-release.xml
@@ -1,19 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This release is a bug fix release and users of previous versions of 3.2 are encouraged to upgrade to this version.</p>
 
-<h2 id="ActiveMQ3.2.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.zip" rel="nofollow">activemq-3.2.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.zip" rel="nofollow">activemq-3.2.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/a
 ctivemq-3.2.1.tar.gz" rel="nofollow">activemq-3.2.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.tar.gz" rel="nofollow">activemq-3.2.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.zip">activemq-3.2.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.zip">activemq-3.2.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.tar.gz">activemq-3.2.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.tar.gz">activemq-3.2.1-src.tar.gz
 </a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11715&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11715&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="03b2865f-ddfe-4560-861a-5df69548bb43" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11715&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-32-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.2 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-322-release.xml
----------------------------------------------------------------------
diff --git a/activemq-322-release.xml b/activemq-322-release.xml
index ca99bc9..19fbb7e 100644
--- a/activemq-322-release.xml
+++ b/activemq-322-release.xml
@@ -1,19 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This release is a bug fix release and users of previous versions of 3.2 are encouraged to upgrade to this version.</p>
 
-<h2 id="ActiveMQ3.2.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.zip" rel="nofollow">activemq-3.2.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.zip" rel="nofollow">activemq-3.2.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/a
 ctivemq-3.2.2.tar.gz" rel="nofollow">activemq-3.2.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.tar.gz" rel="nofollow">activemq-3.2.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.zip">activemq-3.2.2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.zip">activemq-3.2.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.tar.gz">activemq-3.2.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.tar.gz">activemq-3.2.2-src.tar.gz
 </a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11723&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11723&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="8e517002-3efb-4615-8af9-0e710c7488b0" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11723&amp;status=5&amp;status=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-321-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.2.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-m4-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-m4-release.xml b/activemq-40-m4-release.xml
index cba8dfc..ed4ee9c 100644
--- a/activemq-40-m4-release.xml
+++ b/activemq-40-m4-release.xml
@@ -1,18 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ4.0M4Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
-<p>This is the first milestone release of 4.x since the move to Apache so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>This is the first milestone release of 4.x since the move to Apache so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
-<p>This release of ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This release of ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h2 id="ActiveMQ4.0M4Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.zip">activemq-4.0-M4.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.zip">activemq-4.0-M4-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incuba
 tor-activemq/distributions/activemq-4.0-M4.tar.gz">activemq-4.0-M4.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.tar.gz">activemq-4.0-M4-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.zip">activemq-4.0-M4.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.zip">activemq-4.0-M4-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.tar.gz">activemq-4.0-M4.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubat
 or-activemq/distributions/activemq-4.0-M4-src.tar.gz">activemq-4.0-M4-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0M4Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11726" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11726">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div></div>
+<structured-macro ac:macro-id="8d93ac92-0500-4bfe-942f-1385b04c0286" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11726&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-rc2-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-rc2-release.xml b/activemq-40-rc2-release.xml
index 1e1dd82..0370233 100644
--- a/activemq-40-rc2-release.xml
+++ b/activemq-40-rc2-release.xml
@@ -1,30 +1,27 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ4.0RC2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This is the second release candiate release of 4.0.</p>
 
-<p>This release of ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This release of ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h3 id="ActiveMQ4.0RC2Release-Warnings">Warnings</h3>
+<h3>Warnings</h3>
 
 <p>When upgrading from a previous release you are advised to clear down the journal files and persistent database first before upgrading to this jar as the binary format of messages is not compatible with 3.x or earlier 4.x releases.</p>
 
-<h3 id="ActiveMQ4.0RC2Release-Whathaschanged">What has changed</h3>
+<h3>What has changed</h3>
 
-<p>The 4.x branch of ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>The 4.x branch of ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
 
-<h2 id="ActiveMQ4.0RC2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.zip">activemq-4.0-RC2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.zip">activemq-4.0-RC2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/in
 cubator-activemq/distributions/activemq-4.0-RC2.tar.gz">activemq-4.0-RC2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.tar.gz">activemq-4.0-RC2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.zip">activemq-4.0-RC2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.zip">activemq-4.0-RC2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.tar.gz">activemq-4.0-RC2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/i
 ncubator-activemq/distributions/activemq-4.0-RC2-src.tar.gz">activemq-4.0-RC2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0RC2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11750">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11750">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="3568981f-91dc-4af7-ad4b-a49717f05b55" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11750&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=1000&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-m4-release.xml">ActiveMQ 4.0 M4 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 M4 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-release.xml b/activemq-40-release.xml
index b39faa8..773face 100644
--- a/activemq-40-release.xml
+++ b/activemq-40-release.xml
@@ -1,53 +1,44 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ4.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
-<p>This is the 4.0 release of Apache ActiveMQ. This release of Apache ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This is the 4.0 release of Apache ActiveMQ. This release of Apache ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h3 id="ActiveMQ4.0Release-Warnings">Warnings</h3>
+<h3>Warnings</h3>
 
 <p>When upgrading from a previous release you are advised to clear down the journal files and persistent database first before upgrading to this jar as the binary format of messages is not compatible with 3.x or earlier 4.0 milestone releases. </p>
 
-<h3 id="ActiveMQ4.0Release-Knownissues">Known issues</h3>
+<h3>Known issues</h3>
 
-<p>Some folks have found issues with acknowledgements, particularly when using auto-ack mode. This has been fixed in 4.0.1 which will be released shortly. Until then we recommend you disable <a shape="rect" href="connection-configuration-uri.xml">optimizeAcknowledge</a>. e.g. connect via</p>
+<p>Some folks have found issues with acknowledgements, particularly when using auto-ack mode. This has been fixed in 4.0.1 which will be released shortly. Until then we recommend you disable <link><page ri:content-title="Connection Configuration URI"></page><link-body>optimizeAcknowledge</link-body></link>. e.g. connect via</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="1c57366d-fb90-4fe9-b78b-95402c62f258" ac:name="code" ac:schema-version="1"><plain-text-body>
 tcp://localhost:61616?jms.optimizeAcknowledge=false
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The source distributions do not build as is anymore due to changes in the way the maven repo is now setup at Apache.  You must first apply the following <a shape="rect" href="activemq-40-release.data/amq4-build.patch?version=1&amp;modificationDate=1150318678000&amp;api=v2" data-linked-resource-id="3263" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="amq4-build.patch" data-linked-resource-content-type="text/x-patch" data-linked-resource-container-id="36141" data-linked-resource-container-version="12">patch</a> before doing the build.  You will need to download the patch and apply it using the patch command.</p>
+<p>The source distributions do not build as is anymore due to changes in the way the maven repo is now setup at Apache.  You must first apply the following <link><attachment ri:filename="amq4-build.patch"></attachment><link-body>patch</link-body></link> before doing the build.  You will need to download the patch and apply it using the patch command.</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="91f79a80-5459-4350-a9df-c59951da64a7" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd ${path-to-activemq-source-distro}
 patch -p 0 &lt; ${path-to-amq4-build.patch}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="ActiveMQ4.0Release-Whathaschanged">What has changed</h3>
+<h3>What has changed</h3>
 
-<p>The 4.x branch of Apache ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>The 4.x branch of Apache ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
 
-<h2 id="ActiveMQ4.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.zip">incubator-activemq-4.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.zip">incubator-activemq-4.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http:
 //people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.tar.gz">incubator-activemq-4.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.tar.gz">incubator-activemq-4.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.zip">incubator-activemq-4.0.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.zip">incubator-activemq-4.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.tar.gz">incubator-activemq-4.0.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="r
 ect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.tar.gz">incubator-activemq-4.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="497437e5-e037-401e-a9dd-847fdc296bd3" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;pid=10520&amp;fixfor=11660">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;pid=10520&amp;fixfor=11660">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="8b7fb8e1-5345-4ccd-b51b-6c43b7304faf" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11660&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-rc2-release.xml">ActiveMQ 4.0 RC2 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 RC2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-401-release.xml
----------------------------------------------------------------------
diff --git a/activemq-401-release.xml b/activemq-401-release.xml
index 8fa6915..424306c 100644
--- a/activemq-401-release.xml
+++ b/activemq-401-release.xml
@@ -1,29 +1,30 @@
-<div class="wiki-content maincontent"><p>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="e8c22b09-3bcf-4961-9bc2-8f0c7641feae" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;!--
+{warning:title=The Release is still in progress}
+You are previewing the release page for unreleased version of ActiveMQ.  The download links on the page below will not work until it is offically released.
 
-</p>
+Until the release is approved you could try the current build: http://people.apache.org/~chirino/incubator-activemq-4.0.1-RC1/maven1/incubator-activemq/distributions/
+{warning} 
+--&gt;
+</plain-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ4.0.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This is a minor bug fix release.  All previous installations of Apache ActiveMQ 4.0 are recommended to upgrade to this release.</p>
 
-<h2 id="ActiveMQ4.0.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip">incubator-activemq-4.0.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip.asc">incubator-activemq-4.0.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip">incubator-activemq-4.0.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip.asc">incubator-activemq-4.0.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz">incubator-activemq-4.0.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz.asc">incub
 ator-activemq-4.0.1.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz">incubator-activemq-4.0.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz.asc">incubator-activemq-4.0.1-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip">incubator-activemq-4.0.1.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip.asc">incubator-activemq-4.0.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip">incubator-activemq-4.0.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apac
 he.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip.asc">incubator-activemq-4.0.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz">incubator-activemq-4.0.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz.asc">incubator-activemq-4.0.1.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz">incubator-activemq-4.0.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distr
 ibutions/incubator-activemq-4.0.1-src.tar.gz.asc">incubator-activemq-4.0.1-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="c6de6663-a103-4b0e-b354-a8397b6f9cd2" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0.1
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11780&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11780&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="c00ff1c9-4ae1-4d1f-a4b6-242420b352fd" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11780&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-release.xml">ActiveMQ 4.0 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-402-release.xml
----------------------------------------------------------------------
diff --git a/activemq-402-release.xml b/activemq-402-release.xml
index 4ed31d0..20e725b 100644
--- a/activemq-402-release.xml
+++ b/activemq-402-release.xml
@@ -1,25 +1,20 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ4.0.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor bug fix release.  All previous installations of Apache ActiveMQ 4.0.1 are recommended to upgrade to this release.</p>
 
-<h2 id="ActiveMQ4.0.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip">incubator-activemq-4.0.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip.asc">incubator-activemq-4.0.2.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip">incubator-activemq-4.0.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip.asc">incubator-activemq-4.0.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz">incubator-activemq-4.0.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz.asc">incub
 ator-activemq-4.0.2.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz">incubator-activemq-4.0.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz.asc">incubator-activemq-4.0.2-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip">incubator-activemq-4.0.2.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip.asc">incubator-activemq-4.0.2.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip">incubator-activemq-4.0.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apac
 he.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip.asc">incubator-activemq-4.0.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz">incubator-activemq-4.0.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz.asc">incubator-activemq-4.0.2.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz">incubator-activemq-4.0.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distr
 ibutions/incubator-activemq-4.0.2-src.tar.gz.asc">incubator-activemq-4.0.2-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="9fa8cc37-c891-4e8d-a3e3-ca1d15c70e78" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0.2 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11783&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11783&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="0f3fb5c8-0599-412e-905b-bd2abd34969e" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11783&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-401-release.xml">ActiveMQ 4.0.1 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-410-release.xml
----------------------------------------------------------------------
diff --git a/activemq-410-release.xml b/activemq-410-release.xml
index 9d61949..56d8f4c 100644
--- a/activemq-410-release.xml
+++ b/activemq-410-release.xml
@@ -1,11 +1,8 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="7eb0ee22-25e8-40c4-93e7-7b231d410e59" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></url></image></p></rich-text-body></structured-macro>
 
-
-
-
-<div style="min-height:200px">
-<h2 id="ActiveMQ4.1.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<structured-macro ac:macro-id="c53e9a16-861b-44a4-9315-41722329fbd8" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
+<h2>New and Noteworthy</h2>
 
 <p>This is release contains several major enhancements such as:</p>
 
@@ -14,28 +11,20 @@
 
 <p>It also contains a slew of bug fixes that are tracked in the change log.</p>
 
-<h2 id="ActiveMQ4.1.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip">apache-activemq-4.1.0-incubator.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip.asc">incubator-activemq-4.1.0.zip.asc</a></p></td></tr><tr><td colspan="1" rows
 pan="1" class="confluenceTd"><p>Binary for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz">apache-activemq-4.1.0-incubator.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz.asc">incubator-activemq-4.1.0.tar.gz.asc</a></p></td></tr></tbody></table></div>
-
-</div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip">apache-activemq-4.1.0-incubator.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip.asc">incubator-activemq-4.1.0.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-act
 ivemq-4.1.0-incubator.tar.gz">apache-activemq-4.1.0-incubator.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz.asc">incubator-activemq-4.1.0.tar.gz.asc</a></p></td></tr></tbody></table>
 
+</rich-text-body></structured-macro>
 
-
-
-<h2 id="ActiveMQ4.1.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="555f21ec-222c-48eb-924c-4afaccbc4b25" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.0 
-]]></script>
-</div></div>
-
-<h2 id="ActiveMQ4.1.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11691&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+</plain-text-body></structured-macro>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11691&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
+<structured-macro ac:macro-id="e45b257b-5f8b-4949-b9f8-d1e7da3d4e24" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11691&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-<p>Also see the previous <a shape="rect" href="activemq-402-release.xml">ActiveMQ 4.0.2 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-411-release.xml
----------------------------------------------------------------------
diff --git a/activemq-411-release.xml b/activemq-411-release.xml
index 86a3e88..9a04fe5 100644
--- a/activemq-411-release.xml
+++ b/activemq-411-release.xml
@@ -1,59 +1,46 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="41cfe7e2-77b3-4f0a-b9bb-a34cb5af876b" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></url></image></p></rich-text-body></structured-macro>
 
-
-
-
-<div style="min-height:200px">
-<h2 id="ActiveMQ4.1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<structured-macro ac:macro-id="b324427f-3e30-4c8c-b056-1a7aaacb22f3" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
+<h2>New and Noteworthy</h2>
 
 <p>Contains slew of bug fixes that are tracked in the change log.</p>
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
+<h2>Getting the Binary Distributions</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip">apache-activemq-4.1.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip.asc">apache-activemq-4.1.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"
 ><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz">apache-activemq-4.1.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz.asc">apache-activemq-4.1.1.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip">apache-activemq-4.1.1.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip.asc">apache-activemq-4.1.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz">apache-activemq-4.1.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache
 -activemq/4.1.1/apache-activemq-4.1.1.tar.gz.asc">apache-activemq-4.1.1.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
+<h2>Getting the Binaries using Maven 2</h2>
 
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
+<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</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="31b69de9-6a99-471d-809c-0f83c4c47c48" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;4.1.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div>
-</div>
-
+</plain-text-body></structured-macro>
+</rich-text-body></structured-macro>
 
+<h2>Getting the Source Code</h2>
 
+<h3>Source Distributions</h3>
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheSourceCode">Getting the Source Code</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip">apache-activemq-4.1.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip.asc">apache-activemq-4.1.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz">apache-activemq-4.1.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/
 dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz.asc">apache-activemq-4.1.1-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
-<h3 id="ActiveMQ4.1.1Release-SourceDistributions">Source Distributions</h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip">apache-activemq-4.1.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip.asc">apache-activemq-4.1.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz">apache-activemq-4.1.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz.asc">apache-activemq-4.1.1-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h3>SVN Tag Checkout</h3>
 
-
-<h3 id="ActiveMQ4.1.1Release-SVNTagCheckout">SVN Tag Checkout</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[
+<structured-macro ac:macro-id="34c1cfa9-0ea8-4d66-9f01-2c2cf172511f" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.1
-]]></script>
-</div></div>
-
-<h2 id="ActiveMQ4.1.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11800&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+</plain-text-body></structured-macro>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11800&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
+<structured-macro ac:macro-id="d8bdcfa0-84ce-4997-b564-8b0b7d7c4444" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11800&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>
 
-<p>Also see the previous <a shape="rect" href="activemq-410-release.xml">ActiveMQ 4.1.0 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.1.0 Release"></page></link></p></div>