activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956584 [16/37] - in /websites/production/activemq/content: ./ 2004/04/13/ 2004/05/26/ 2004/06/23/ 2004/06/25/ 2004/08/17/ 2004/08/23/ 2004/10/07/ 2004/11/02/ 2004/12/20/ 2005/02/03/ 2005/02/25/ 2005/04/11/ 2005/06/06/ 2005/07/04/ 2005/07/1...
Date Wed, 01 Jul 2015 20:13:56 GMT
Modified: websites/production/activemq/content/consumer-priority.html
==============================================================================
--- websites/production/activemq/content/consumer-priority.html (original)
+++ websites/production/activemq/content/consumer-priority.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="ConsumerPriority-Background">Background</h3>
+<div class="wiki-content maincontent"><h3 id="ConsumerPriority-Background">Background</h3>
 
 <p>As well as having a pluggable dispatch policy (e.g. round robin etc), we now support consumer priorities.</p>
 
@@ -100,7 +100,7 @@ consumer = session.createConsumer(queue)
 
 <p>The range for assigning priority numbers is from 0 to 127, with 127 being the highest priority and 0 being the default priority.<br clear="none">
 The way it works is that the broker will simply order any queue consumers according to their priorities and send messages to the highest priority consumers first. <br clear="none">
-Once a particular consumer has its prefetch buffer filled up, the broker will begin to dispatch messages to consumers of lower priorities. </p>
+Once a particular consumer has its prefetch buffer filled up, the broker will begin to dispatch messages to consumers of lower priorities. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/containers.html
==============================================================================
--- websites/production/activemq/content/containers.html (original)
+++ websites/production/activemq/content/containers.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>This page lists the various containers that Apache ActiveMQ works inside</p>
+<div class="wiki-content maincontent"><p>This page lists the various containers that Apache ActiveMQ works inside</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.html">BlazeDS</a></li><li><a shape="rect" href="geronimo.html">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.html">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" href="jca-container.html">JCA Container</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.html">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.html">OSGi Integration</a></li><li><a shape="rect" href="resource-adapter.html">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-g
 enericjmsra.html">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="sun-jndi.html">Sun JNDI</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="zos.html">zOS</a></li></ul>
+<ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.html">BlazeDS</a></li><li><a shape="rect" href="geronimo.html">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.html">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" href="jca-container.html">JCA Container</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.html">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.html">OSGi Integration</a></li><li><a shape="rect" href="resource-adapter.html">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-g
 enericjmsra.html">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="sun-jndi.html">Sun JNDI</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="zos.html">zOS</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/contributing.html
==============================================================================
--- websites/production/activemq/content/contributing.html (original)
+++ websites/production/activemq/content/contributing.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!</p><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 the our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/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="Contributing-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.html">Discussion Forums</a> or subscribe to the <a shape="rect" href="mailing-lists.html">Mailing Lists</a> and take part in any conversations</li><li><p>pop by on
  <span>in <a shape="rect" href="irc.html">irc</a> and say hi</span></p></li><li>add some comments to the <a shape="rect" href="navigation.html">wiki</a></li></ul><h2 id="Contributing-Ifyoufindabugorproblem">If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/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://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/">unit tests cases</a></p><p>Then we can add your issue to Subversion 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="Contributing-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.html">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="Contributing-Workingonthecode">Working on the code</h2><p>Grab the <a shape="rect" href="source.html">Source</a> from git</p><p>Build the project.</p><div class="code panel pdl" style="bo
 rder-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!</p><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 the our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/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="Contributing-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.html">Discussion Forums</a> or subscribe to the <a shape="rect" href="mailing-lists.html">Mailing Lists</a> and take part in 
 any conversations</li><li><p>pop by on <span>in <a shape="rect" href="irc.html">irc</a> and say hi</span></p></li><li>add some comments to the <a shape="rect" href="navigation.html">wiki</a></li></ul><h2 id="Contributing-Ifyoufindabugorproblem">If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/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://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/">unit tests cases</a></p><p>Then we can add your issue to Subversion 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="Contributing-Ifyouwanttohelpoutwiththedocumentation">If you want to help out with the document
 ation</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.html">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="Contributing-Workingonthecode">Working on the code</h2><p>Grab the <a shape="rect" href="source.html">Source</a> from git</p><p>Build the project.</p
 ><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">export MAVEN_OPTS=-Xmx512M -XX:MaxPermSize=128M
 mvn -Dtest=false install
 </pre>
@@ -94,7 +94,7 @@ mvn -Dtest=false install
 </div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git diff Main.java &gt;&gt; patchfile.txt
 </pre>
-</div></div><h2 id="Contributing-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.html">Mailing Lists</a> or <a shape="rect" href="discussion-forums.html">Discussion Forums</a>.</p><h2 id="Contributing-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.html">Becoming a committer</a> for more details.</p><h2 id="Contributing-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, please mail t
 he&#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="Contributing-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.html">Committer Guide</a></p>
+</div></div><h2 id="Contributing-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.html">Mailing Lists</a> or <a shape="rect" href="discussion-forums.html">Discussion Forums</a>.</p><h2 id="Contributing-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.html">Becoming a committer</a> for more details.</p><h2 id="Contributing-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, please mail t
 he&#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="Contributing-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.html">Committer Guide</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/could-not-find-packetreader-for-packet-type-unknown-packet-type.html
==============================================================================
--- websites/production/activemq/content/could-not-find-packetreader-for-packet-type-unknown-packet-type.html (original)
+++ websites/production/activemq/content/could-not-find-packetreader-for-packet-type-unknown-packet-type.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="CouldnotfindPacketReaderforpackettype-UNKNOWNPACKETTYPE-Error">Error</h3>
+<div class="wiki-content maincontent"><h3 id="CouldnotfindPacketReaderforpackettype-UNKNOWNPACKETTYPE-Error">Error</h3>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
@@ -93,7 +93,7 @@ Could not find PacketReader for packet t
 
 <p>You are probably using different versions of ActiveMQ jars on the client and the broker. Try using the same jars on each node and the problem should go away.</p>
 
-<p>Once 4.0 is GA we will be freezing the wire format version then increasing it for every future GA release - so the error message you get going forward should be more explicit</p>
+<p>Once 4.0 is GA we will be freezing the wire format version then increasing it for every future GA release - so the error message you get going forward should be more explicit</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cross-language-clients.html
==============================================================================
--- websites/production/activemq/content/cross-language-clients.html (original)
+++ websites/production/activemq/content/cross-language-clients.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Apache ActiveMQ is a message broker written in Java together with a full JMS client. However Apache ActiveMQ is designed to communicate over a number of protocols such as <a shape="rect" href="amqp.html">AMQP</a>,<a shape="rect" href="stomp.html">Stomp</a> and <a shape="rect" href="openwire.html">OpenWire</a> together with supporting a number of different language specific clients.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is a message broker written in Java together with a full JMS client. However Apache ActiveMQ is designed to communicate over a number of protocols such as <a shape="rect" href="amqp.html">AMQP</a>,<a shape="rect" href="stomp.html">Stomp</a> and <a shape="rect" href="openwire.html">OpenWire</a> together with supporting a number of different language specific clients.</p>
 
 <h2 id="CrossLanguageClients-LanguageClients">Language Clients</h2>
 
@@ -96,7 +96,7 @@
 
 
 
-<ul><li><a shape="rect" href="connectivity.html">Connectivity</a></li></ul>
+<ul><li><a shape="rect" href="connectivity.html">Connectivity</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/delay-and-schedule-message-delivery.html
==============================================================================
--- websites/production/activemq/content/delay-and-schedule-message-delivery.html (original)
+++ websites/production/activemq/content/delay-and-schedule-message-delivery.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <a shape="rect" href="xml-configuration.html">xml configuration</a>. <br clear="none">
+<div class="wiki-content maincontent"><p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <a shape="rect" href="xml-configuration.html">xml configuration</a>. <br clear="none">
 An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p>
 
 <div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_DELAY</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> long </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>  The time in milliseconds that a message will wait before being scheduled to be delivered by the broker</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_PERIOD </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The time in milliseconds to wait after the start time to wait before scheduling the message again</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_REPEA
 T </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>int </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of times to repeat scheduling a message for delivery</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_CRON </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Use a Cron entry to set the schedule </p></td></tr></tbody></table></div>
@@ -144,7 +144,7 @@ An ActiveMQ client can take advantage of
 </pre>
 </div></div>
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/delete-inactive-destinations.html
==============================================================================
--- websites/production/activemq/content/delete-inactive-destinations.html (original)
+++ websites/production/activemq/content/delete-inactive-destinations.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Sometimes you might want to delete destinations that are inactive for a period of time. Since ActiveMQ version <strong>5.4.0</strong>, it's possible to do that using destination policy entries and broker attribute schedulePeriodForDestinationPurge &gt; 0.</p>
+<div class="wiki-content maincontent"><p>Sometimes you might want to delete destinations that are inactive for a period of time. Since ActiveMQ version <strong>5.4.0</strong>, it's possible to do that using destination policy entries and broker attribute schedulePeriodForDestinationPurge &gt; 0.</p>
 
 <p>For example a configuration like</p>
 
@@ -109,7 +109,7 @@
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">INFO  Queue                          - TEST.QUEUE Inactive for longer than 30000 ms - removing ...</pre>
 </div></div>
 
-<p>in the log file.</p>
+<p>in the log file.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/delphi-and-freepascal.html
==============================================================================
--- websites/production/activemq/content/delphi-and-freepascal.html (original)
+++ websites/production/activemq/content/delphi-and-freepascal.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="DelphiandFreePascal-DelphiandFreePascalClient">Delphi and FreePascal Client</h1>
+<div class="wiki-content maincontent"><h1 id="DelphiandFreePascal-DelphiandFreePascalClient">Delphi and FreePascal Client</h1>
 <p>Habari ActiveMQ Client is a library for Delphi(tm) and Free Pascal. With Habari, applications can connect to Apache ActiveMQ servers, subscribe to queues and topics, send and receive messages and objects, and work with transactions.</p>
 
 <h3 id="DelphiandFreePascal-SupportedCommunicationLibraries">Supported Communication Libraries</h3>
@@ -84,7 +84,7 @@
 The API documentation is available at <a shape="rect" class="external-link" href="http://www.mikejustin.com/habari/docs/html/index.html" rel="nofollow">http://www.mikejustin.com/habari/docs/html/index.html</a></p>
 
 <h3 id="DelphiandFreePascal-ProjectHomePage">Project Home Page</h3>
-<p><a shape="rect" class="external-link" href="http://www.mikejustin.com/" rel="nofollow">http://www.mikejustin.com/</a></p>
+<p><a shape="rect" class="external-link" href="http://www.mikejustin.com/" rel="nofollow">http://www.mikejustin.com/</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/design-documents.html
==============================================================================
--- websites/production/activemq/content/design-documents.html (original)
+++ websites/production/activemq/content/design-documents.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Slow Consumers
-	<ul><li><a shape="rect" href="durable-queue-memory-management.html">Durable Queue Memory Management</a></li><li><a shape="rect" href="supporting-io-streams.html">Supporting IO Streams</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.html">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.html">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.html">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.html">REST protocols</a></li></ul>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" href="slow-consumers.html">Slow Consumers</a></li><li><a shape="rect" href="durable-queue-memory-management.html">Durable Queue Memory Management</a></li><li><a shape="rect" href="supporting-io-streams.html">Supporting IO Streams</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.html">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.html">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.html">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.html">REST protocols</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/destination-features.html
==============================================================================
--- websites/production/activemq/content/destination-features.html (original)
+++ websites/production/activemq/content/destination-features.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Composite Destinations<ul><li><a shape="rect" href="configure-startup-destinations.html">Configure Startup Destinations</a></li><li><a shape="rect" href="delete-inactive-destinations.html">Delete Inactive Destinations</a></li><li><a shape="rect" href="destination-options.html">Destination Options</a></li><li><a shape="rect" href="mirrored-queues.html">Mirrored Queues</a></li><li><a shape="rect" href="per-destination-policies.html">Per Destination Policies</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="wildcards.html">Wildcards</a></li></ul>
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="composite-destinations.html">Composite Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.html">Configure Startup Destinations</a></li><li><a shape="rect" href="delete-inactive-destinations.html">Delete Inactive Destinations</a></li><li><a shape="rect" href="destination-options.html">Destination Options</a></li><li><a shape="rect" href="mirrored-queues.html">Mirrored Queues</a></li><li><a shape="rect" href="per-destination-policies.html">Per Destination Policies</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="wildcards.html">Wildcards</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/destination-options.html
==============================================================================
--- websites/production/activemq/content/destination-options.html (original)
+++ websites/production/activemq/content/destination-options.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="DestinationOptions-Background">Background</h3>
+<div class="wiki-content maincontent"><h3 id="DestinationOptions-Background">Background</h3>
 
 <p>Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JMS API.  The options are encoded using URL query syntax in the destination name that the consumer is created on.</p>
 
@@ -98,7 +98,7 @@ queue = new ActiveMQQueue("TEST.QUEUE?co
 consumer = session.createConsumer(queue);
 </pre>
 </div></div>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/destinations-plugin.html
==============================================================================
--- websites/production/activemq/content/destinations-plugin.html (original)
+++ websites/production/activemq/content/destinations-plugin.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,11 +81,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">        &lt;plugins&gt;
             &lt;destinationsPlugin location="/workspace/destinations"/&gt;
         &lt;/plugins&gt;</pre>
-</div></div><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p>
+</div></div><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/developer-forum.html
==============================================================================
--- websites/production/activemq/content/developer-forum.html (original)
+++ websites/production/activemq/content/developer-forum.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,10 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p></p><p>
+<div class="wiki-content maincontent"><p>
 <a shape="rect" id="nabblelink" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html">ActiveMQ - Dev</a>
 <script src="http://activemq.2283324.n4.nabble.com/embed/f2368404"></script>
-</p><p></p>
+</p><p></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/developer-guide.html
==============================================================================
--- websites/production/activemq/content/developer-guide.html (original)
+++ websites/production/activemq/content/developer-guide.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>The following documents might be interesting</p>
+<div class="wiki-content maincontent"><p>The following documents might be interesting</p>
 <ul><li><a shape="rect" href="building.html">Building</a></li><li><a shape="rect" href="release-plans.html">Release Plans</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li><li><a shape="rect" href="design-documents.html">Design Documents</a></li><li><a shape="rect" href="changes-in-40.html">Changes in 4.0</a></li><li><a shape="rect" href="apache-activemq-board-reports.html">Apache ActiveMQ Board Reports</a></li></ul>
 
 
 <h3 id="DeveloperGuide-Codewalkthrough">Code walkthrough</h3>
 
-<ul class="alternate"><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a shape="rect" href="developing-plugins.html">Developing Plugins</a></li></ul>
+<ul class="alternate"><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a shape="rect" href="developing-plugins.html">Developing Plugins</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/developers.html
==============================================================================
--- websites/production/activemq/content/developers.html (original)
+++ websites/production/activemq/content/developers.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Becoming a committer<ul><li><a shape="rect" href="benchmark-tests.html">Benchmark Tests</a></li><li><a shape="rect" href="board-reports.html">Board Reports</a><ul class="childpages-macro"><li><a shape="rect" href="2007-april.html">2007 April</a></li></ul></li><li><a shape="rect" href="building.html">Building</a></li><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="developer-guide.html">Developer Guide</a><ul class="childpages-macro"><li><a shape="rect" href="design-documents.html">Design Documents</a><ul class="childpages-macro"><li><a shape="rect" href="class-diagrams-for-activemq-40-m4-source-code.html">Class Diagrams for activemq-4.0-M4 source code</a></li><li><a shape="rect" href="durable-queue-memory-management.html">Durable Queue Memory Management</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.html">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.html">Multicast Transp
 ort</a></li><li><a shape="rect" href="proposed-c-client-architecture.html">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.html">REST protocols</a></li><li><a shape="rect" href="slow-consumers.html">Slow Consumers</a></li><li><a shape="rect" href="supporting-io-streams.html">Supporting IO Streams</a></li></ul></li><li><a shape="rect" href="developing-plugins.html">Developing Plugins</a></li><li><a shape="rect" href="release-plans.html">Release Plans</a><ul class="childpages-macro"><li><a shape="rect" href="40-rc-1-guide.html">4.0 RC 1 Guide</a></li><li><a shape="rect" href="how-you-can-help-release.html">How you can help release</a></li><li><a shape="rect" href="release-info.html">Release Info</a></li></ul></li></ul></li><li><a shape="rect" href="ideas.html">Ideas</a><ul class="childpages-macro"><li><a shape="rect" href="restful-queue.html">RESTful Queue</a></li></ul></li><li><a shape="rect" href="integration-tests.html">Integration Tests</a><ul class
 ="childpages-macro"><li><a shape="rect" href="example-testing-scenario.html">Example Testing Scenario</a></li></ul></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter Performance Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System Tests</a></li><li><a shape="rect" href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li><li><a shape="rect" href="sandbox.html">Sandbox</a></li><li><a shape="rect" href="source.html">Source</a></li><li><a shape="rect" href="source-xref.html">Source XRef</a></li><li><a shape="rect" href="svn.html">SVN</a></li><li><a shape="rect" href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li></ul> 
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="becoming-a-committer.html">Becoming a committer</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark Tests</a></li><li><a shape="rect" href="board-reports.html">Board Reports</a><ul class="childpages-macro"><li><a shape="rect" href="2007-april.html">2007 April</a></li></ul></li><li><a shape="rect" href="building.html">Building</a></li><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="developer-guide.html">Developer Guide</a><ul class="childpages-macro"><li><a shape="rect" href="design-documents.html">Design Documents</a><ul class="childpages-macro"><li><a shape="rect" href="class-diagrams-for-activemq-40-m4-source-code.html">Class Diagrams for activemq-4.0-M4 source code</a></li><li><a shape="rect" href="durable-queue-memory-management.html">Durable Queue Memory Management</a></li><li><a shape="rect" href="message-redelivery-and-dlq-ha
 ndling.html">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.html">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.html">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.html">REST protocols</a></li><li><a shape="rect" href="slow-consumers.html">Slow Consumers</a></li><li><a shape="rect" href="supporting-io-streams.html">Supporting IO Streams</a></li></ul></li><li><a shape="rect" href="developing-plugins.html">Developing Plugins</a></li><li><a shape="rect" href="release-plans.html">Release Plans</a><ul class="childpages-macro"><li><a shape="rect" href="40-rc-1-guide.html">4.0 RC 1 Guide</a></li><li><a shape="rect" href="how-you-can-help-release.html">How you can help release</a></li><li><a shape="rect" href="release-info.html">Release Info</a></li></ul></li></ul></li><li><a shape="rect" href="ideas.html">Ideas</a><ul class="childpages-macro"><li><a shape="rect" href="restful
 -queue.html">RESTful Queue</a></li></ul></li><li><a shape="rect" href="integration-tests.html">Integration Tests</a><ul class="childpages-macro"><li><a shape="rect" href="example-testing-scenario.html">Example Testing Scenario</a></li></ul></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter Performance Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System Tests</a></li><li><a shape="rect" href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li><li><a shape="rect" href="sandbox.html">Sandbox</a></li><li><a shape="rect" href="source.html">Source</a></li><li><a shape="rect" href="source-xref.html">Source XRef</a></li><li><a shape="rect" href="svn.html">SVN</a></li><li><a shape="rect" href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li></ul> </div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/developing-activemq.html
==============================================================================
--- websites/production/activemq/content/developing-activemq.html (original)
+++ websites/production/activemq/content/developing-activemq.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Questions for developers wishing to extend or enhance Apache ActiveMQ</p>
+<div class="wiki-content maincontent"><p>Questions for developers wishing to extend or enhance Apache ActiveMQ</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-add-a-new-type-of-transport.html">How can I add a new type of transport</a></li><li><a shape="rect" href="how-can-i-contribute.html">How can I contribute</a></li><li><a shape="rect" href="how-do-i-add-my-own-plugins.html">How do I add my own plugins</a></li><li><a shape="rect" href="how-do-i-debug-activemq-from-my-ide.html">how do I debug ActiveMQ from my IDE?</a></li></ul>
+<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-add-a-new-type-of-transport.html">How can I add a new type of transport</a></li><li><a shape="rect" href="how-can-i-contribute.html">How can I contribute</a></li><li><a shape="rect" href="how-do-i-add-my-own-plugins.html">How do I add my own plugins</a></li><li><a shape="rect" href="how-do-i-debug-activemq-from-my-ide.html">how do I debug ActiveMQ from my IDE?</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/developing-plugins.html
==============================================================================
--- websites/production/activemq/content/developing-plugins.html (original)
+++ websites/production/activemq/content/developing-plugins.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <a shape="rect" href="interceptors.html">Interceptors</a> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection. </p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <a shape="rect" href="interceptors.html">Interceptors</a> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection. </p>
 
 <h3 id="DevelopingPlugins-DependencyInjection">Dependency Injection</h3>
 
@@ -154,7 +154,7 @@ public class MyExtension {
 
 <p>The easiest way to get a feel for how to extend ActiveMQ is maybe to look at some concrete examples of features and how those are implemented and configured. Here are some examples</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><a shape="rect" href="security.html">Security</a> has an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">AuthorizationPlugin</a></li><li>The <a shape="rect" href="message-redelivery-and-dlq-handling.html">Discarding DLQ Plugin</a> is used to discard messages from the DLQ.</li></ul>
+<ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><a shape="rect" href="security.html">Security</a> has an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">AuthorizationPlugin</a></li><li>The <a shape="rect" href="message-redelivery-and-dlq-handling.html">Discarding DLQ Plugin</a> is used to discard messages from the DLQ.</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/discovery-transport-reference.html
==============================================================================
--- websites/production/activemq/content/discovery-transport-reference.html (original)
+++ websites/production/activemq/content/discovery-transport-reference.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="DiscoveryTransportReference-TheDiscoveryTransport">The Discovery Transport</h3>
+<div class="wiki-content maincontent"><h3 id="DiscoveryTransportReference-TheDiscoveryTransport">The Discovery Transport</h3>
 
 <p>The Discovery transport works just like the <a shape="rect" href="failover-transport-reference.html">Failover</a> transport, except that it uses a discovery agent to locate the list of uri to connect to.  The Discovery transport is also used by the <a shape="rect" href="fanout-transport-reference.html">Fanout</a> transport for discovering brokers to send a fanout message to.</p>
 
@@ -121,7 +121,7 @@ or<br clear="none">
 </div></div>
 
 <div class="confluence-information-macro confluence-information-macro-information"><p class="title">Applying parameters to discovered transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <a shape="rect" href="tcp-transport-reference.html">TCP</a> transport, even though this parameter is not a Discovery transport option.</p></div></div>
+<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <a shape="rect" href="tcp-transport-reference.html">TCP</a> transport, even though this parameter is not a Discovery transport option.</p></div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/discovery.html
==============================================================================
--- websites/production/activemq/content/discovery.html (original)
+++ websites/production/activemq/content/discovery.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="Discovery-DiscoveryAgents">Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" class="external-link" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a></p><p>There are currently two kinds of discovery agent.</p><h3 id="Discovery-Multicast">Multicast</h3><p>The Discovery transport uses our own Multicast based discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <a shape="rect" href="discovery-transport-reference.html">Discovery Transport Reference</a>.</p><h3 id="Discovery-Zeroconf">Zeroconf</h3><p><a shape="rect" href="zeroconf.html">ZeroConf</a> is a standard discovery specification that uses UDP / multi
 cast to discovery devices. Its used by Apple's Rendezvous services.<br clear="none"> We use the <a shape="rect" class="external-link" href="http://jmdns.sf.net/" rel="nofollow">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><div class="code panel pdl" style="border-width: 1px;"><div cla
 ss="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="Discovery-DiscoveryAgents">Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" class="external-link" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a></p><p>There are currently two kinds of discovery agent.</p><h3 id="Discovery-Multicast">Multicast</h3><p>The Discovery transport uses our own Multicast based discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <a shape="rect" href="discovery-transport-reference.html">Discovery Transport Reference</a>.</p><h3 id="Discovery-Zeroconf">Zeroconf</h3><p><a shape="rect" href="zeroconf.html">ZeroConf</a> is a standard discove
 ry specification that uses UDP / multicast to discovery devices. Its used by Apple's Rendezvous services.<br clear="none"> We use the <a shape="rect" class="external-link" href="http://jmdns.sf.net/" rel="nofollow">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><div class="code panel pd
 l" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">zeroconf:_activemq_development.
 </pre>
 </div></div><p>This will use Zeroconf to find an available broker and one will be randomly chosen &amp; things will auto-failover on disconnect if there are several brokers running.</p><h3 id="Discovery-LDAPDiscovery">LDAP Discovery</h3><p>ActiveMQ supports the use of LDAP for discovery of brokers.</p><p>Please see <a shape="rect" href="ldap-broker-discovery-mechanism.html">LDAP Broker Discovery Mechanism</a> for more details.</p><h2 id="Discovery-Tryingoutdiscovery">Trying out discovery</h2><p>If you run the following commands in separate shells you'll have 2 brokers auto-discovering themselves and 2 clients using fixed-URLs</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -97,7 +97,7 @@ maven -o producer  -Durl=zeroconf:_activ
 </div></div><p>The transport URL is of the format</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">    zeroconf:&lt;serviceName&gt;
 </pre>
-</div></div><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2 id="Discovery-DiscoveryandSecurity">Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p>
+</div></div><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2 id="Discovery-DiscoveryandSecurity">Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/discussion-forums.html
==============================================================================
--- websites/production/activemq/content/discussion-forums.html (original)
+++ websites/production/activemq/content/discussion-forums.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.html">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.html">Tips for getting help</a>.</p>
 
 <p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">Nabble forums</a> which also work with our <a shape="rect" href="mailing-lists.html">Mailing Lists</a> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
 
@@ -83,7 +83,7 @@
 
 <h3 id="DiscussionForums-MailingLists">Mailing Lists</h3>
 
-<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="mailing-lists.html">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="mailing-lists.html">Mailing Lists</a> are kept in sync so its your choice which you use.</p>
+<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="mailing-lists.html">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="mailing-lists.html">Mailing Lists</a> are kept in sync so its your choice which you use.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/dispatch-policies.html
==============================================================================
--- websites/production/activemq/content/dispatch-policies.html (original)
+++ websites/production/activemq/content/dispatch-policies.html Wed Jul  1 20:13:48 2015
@@ -62,7 +62,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -83,7 +83,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="DispatchPolicies-DispatchPolicies">Dispatch Policies</h1>
+<div class="wiki-content maincontent"><h1 id="DispatchPolicies-DispatchPolicies">Dispatch Policies</h1>
 
 <h2 id="DispatchPolicies-Dispatchpoliciesforqueues">Dispatch policies for queues</h2>
 
@@ -165,7 +165,7 @@ The default org.apache.activemq.broker.r
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/does-activemq-support-clustering.html
==============================================================================
--- websites/production/activemq/content/does-activemq-support-clustering.html (original)
+++ websites/production/activemq/content/does-activemq-support-clustering.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Yes, though there are various kinds of clustering. See <a shape="rect" href="clustering.html">this page on details</a></p>
+<div class="wiki-content maincontent">
+
+
+<p>Yes, though there are various kinds of clustering. See <a shape="rect" href="clustering.html">this page on details</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/does-activemq-support-my-sql-database.html
==============================================================================
--- websites/production/activemq/content/does-activemq-support-my-sql-database.html (original)
+++ websites/production/activemq/content/does-activemq-support-my-sql-database.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Quite possibly <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)">. See the <a shape="rect" href="jdbc-support.html">JDBC Support</a> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <a shape="rect" href="persistence.html">Persistence</a></p>
+<div class="wiki-content maincontent">
+<p>Quite possibly <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)">. See the <a shape="rect" href="jdbc-support.html">JDBC Support</a> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <a shape="rect" href="persistence.html">Persistence</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/dot-net.html
==============================================================================
--- websites/production/activemq/content/dot-net.html (original)
+++ websites/production/activemq/content/dot-net.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div>
+<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>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/download-archives.html
==============================================================================
--- websites/production/activemq/content/download-archives.html (original)
+++ websites/production/activemq/content/download-archives.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="DownloadArchives-Downloadarchives">Download archives</h2>
+<div class="wiki-content maincontent"><h2 id="DownloadArchives-Downloadarchives">Download archives</h2>
 
 <p>You can use the Apache Archives to download all the ActiveMQ releases.</p>
 <ul class="alternate"><li><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/">http://archive.apache.org/dist/activemq/apache-activemq/</a> - ActiveMQ releases</li></ul>
@@ -84,7 +84,7 @@
 <p>All time Apache ActiveMQ releases notes:</p>
 
 <ul class="childpages-macro"><li><a shape="rect" href="activemq-11-release.html">ActiveMQ 1.1 Release</a></li><li><a shape="rect" href="activemq-12-release.html">ActiveMQ 1.2 Release</a></li><li><a shape="rect" href="activemq-13-release.html">ActiveMQ 1.3 Release</a></li><li><a shape="rect" href="activemq-14-release.html">ActiveMQ 1.4 Release</a></li><li><a shape="rect" href="activemq-15-release.html">ActiveMQ 1.5 Release</a></li><li><a shape="rect" href="activemq-20-release.html">ActiveMQ 2.0 Release</a></li><li><a shape="rect" href="activemq-21-release.html">ActiveMQ 2.1 Release</a></li><li><a shape="rect" href="activemq-30-release.html">ActiveMQ 3.0 Release</a></li><li><a shape="rect" href="activemq-31-release.html">ActiveMQ 3.1 Release</a></li><li><a shape="rect" href="activemq-321-release.html">ActiveMQ 3.2.1 Release</a></li><li><a shape="rect" href="activemq-322-release.html">ActiveMQ 3.2.2 Release</a></li><li><a shape="rect" href="activemq-32-release.html">ActiveMQ 3.2 Releas
 e</a></li><li><a shape="rect" href="activemq-401-release.html">ActiveMQ 4.0.1 Release</a></li><li><a shape="rect" href="activemq-402-release.html">ActiveMQ 4.0.2 Release</a></li><li><a shape="rect" href="activemq-40-m4-release.html">ActiveMQ 4.0 M4 Release</a></li><li><a shape="rect" href="activemq-40-rc2-release.html">ActiveMQ 4.0 RC2 Release</a></li><li><a shape="rect" href="activemq-40-release.html">ActiveMQ 4.0 Release</a></li><li><a shape="rect" href="activemq-410-release.html">ActiveMQ 4.1.0 Release</a></li><li><a shape="rect" href="activemq-411-release.html">ActiveMQ 4.1.1 Release</a></li><li><a shape="rect" href="activemq-412-release.html">ActiveMQ 4.1.2 Release</a></li><li><a shape="rect" href="activemq-500-release.html">ActiveMQ 5.0.0 Release</a></li><li><a shape="rect" href="activemq-510-release.html">ActiveMQ 5.1.0 Release</a></li><li><a shape="rect" href="activemq-5100-release.html">ActiveMQ 5.10.0 Release</a></li><li><a shape="rect" href="activemq-5101-release.html">Ac
 tiveMQ 5.10.1 Release</a></li><li><a shape="rect" href="activemq-5102-release.html">ActiveMQ 5.10.2 Release</a></li><li><a shape="rect" href="activemq-5110-release.html">ActiveMQ 5.11.0 Release</a></li><li><a shape="rect" href="activemq-5111-release.html">ActiveMQ 5.11.1 Release</a></li><li><a shape="rect" href="activemq-520-release.html">ActiveMQ 5.2.0 Release</a></li><li><a shape="rect" href="activemq-530-release.html">ActiveMQ 5.3.0 Release</a></li><li><a shape="rect" href="activemq-531-release.html">ActiveMQ 5.3.1 Release</a></li><li><a shape="rect" href="activemq-532-release.html">ActiveMQ 5.3.2 Release</a></li><li><a shape="rect" href="activemq-540-release.html">ActiveMQ 5.4.0 Release</a></li><li><a shape="rect" href="activemq-541-release.html">ActiveMQ 5.4.1 Release</a></li><li><a shape="rect" href="activemq-542-release.html">ActiveMQ 5.4.2 Release</a></li><li><a shape="rect" href="activemq-543-release.html">ActiveMQ 5.4.3 Release</a></li><li><a shape="rect" href="activemq-55
 0-release.html">ActiveMQ 5.5.0 Release</a></li><li><a shape="rect" href="activemq-551-release.html">ActiveMQ 5.5.1 Release</a></li><li><a shape="rect" href="activemq-560-release.html">ActiveMQ 5.6.0 Release</a></li><li><a shape="rect" href="activemq-570-release.html">ActiveMQ 5.7.0 Release</a></li><li><a shape="rect" href="activemq-580-release.html">ActiveMQ 5.8.0 Release</a></li><li><a shape="rect" href="activemq-590-release.html">ActiveMQ 5.9.0 Release</a></li><li><a shape="rect" href="activemq-591-release.html">ActiveMQ 5.9.1 Release</a></li><li><a shape="rect" href="in-progress.html">In Progress</a></li></ul>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/download.html
==============================================================================
--- websites/production/activemq/content/download.html (original)
+++ websites/production/activemq/content/download.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,10 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="Download-LatestReleases">Latest Releases</h2><div class="sectionColumnWrapper"><div class="sectionMacro"><div class="sectionMacroRow"><div class="columnMacro" style="width:20%;min-width:20%;max-width:20%;"><div style="padding-right:20px;float:left;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div></div><div class="columnMacro" style="width:80%;min-width:80%;max-width:80%;"><div style="min-height:200px"><p>The latest stable release is the <a shape="rect" href="activemq-5111-release.html">ActiveMQ 5.11.1 Release</a></p></div></div></div></div></div><h2 id="Download-Gettingpastreleases">Getting past releases</h2><p>See the <a shape="rect" href="download-archives.html">Download Archives</a> for all time 
 releases.</p><p></p><h2 id="Download-ReleasesInProgress">Releases In Progress</h2>
+<div class="wiki-content maincontent"><h2 id="Download-LatestReleases">Latest Releases</h2><div class="sectionColumnWrapper"><div class="sectionMacro"><div class="sectionMacroRow"><div class="columnMacro" style="width:20%;min-width:20%;max-width:20%;"><div style="padding-right:20px;float:left;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div></div><div class="columnMacro" style="width:80%;min-width:80%;max-width:80%;"><div style="min-height:200px"><p>The latest stable release is the <a shape="rect" href="activemq-5111-release.html">ActiveMQ 5.11.1 Release</a></p></div></div></div></div></div><h2 id="Download-Gettingpastreleases">Getting past releases</h2><p>See the <a shape="rect" href="download-archives.htm
 l">Download Archives</a> for all time releases.</p><p></p><h2 id="Download-ReleasesInProgress">Releases In Progress</h2>
 
 <p>The following releases are currently in progress</p>
-<h3 id="Download-SNAPSHOTBinaries">SNAPSHOT Binaries</h3><p>The current development of Apache ActiveMQ can be downloaded as binaries from the Apache Maven snapshot repository.<br clear="none"> The binaries is located at <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a>.</p><h2 id="Download-MavenRepositories">Maven Repositories</h2><p>All ActiveMQ releases are available from the <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/releases/org/apache/activemq/">Maven central repository</a>.</p><p>If you want to run against a more recent SNAPSHOT, use the repositories listed below:</p><h3 id="Download-MavenRepositories.1">Maven Repositories</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluen
 ceTh"><p>Repository</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Apache ActiveMQ SNAPSHOTS</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/snapshots/">https://repository.apache.org/content/repositories/snapshots/</a></p></td></tr></tbody></table></div>
+<h3 id="Download-SNAPSHOTBinaries">SNAPSHOT Binaries</h3><p>The current development of Apache ActiveMQ can be downloaded as binaries from the Apache Maven snapshot repository.<br clear="none"> The binaries is located at <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a>.</p><h2 id="Download-MavenRepositories">Maven Repositories</h2><p>All ActiveMQ releases are available from the <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/releases/org/apache/activemq/">Maven central repository</a>.</p><p>If you want to run against a more recent SNAPSHOT, use the repositories listed below:</p><h3 id="Download-MavenRepositories.1">Maven Repositories</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluen
 ceTh"><p>Repository</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Apache ActiveMQ SNAPSHOTS</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/snapshots/">https://repository.apache.org/content/repositories/snapshots/</a></p></td></tr></tbody></table></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/downloading-activemq-cpp.html
==============================================================================
--- websites/production/activemq/content/downloading-activemq-cpp.html (original)
+++ websites/production/activemq/content/downloading-activemq-cpp.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>ActiveMQ CPP distributions are source-only.  To get the source bundle for a particular release, go <a shape="rect" href="download.html">here</a>.  Follow the instructions here only if you want the bleeding edge from trunk.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ CPP distributions are source-only.  To get the source bundle for a particular release, go <a shape="rect" href="download.html">here</a>.  Follow the instructions here only if you want the bleeding edge from trunk.</p>
 
 <h2 id="DownloadingActiveMQCPP-WebBrowsingofSVN">Web Browsing of SVN</h2>
 
@@ -99,7 +99,7 @@
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/dr.html
==============================================================================
--- websites/production/activemq/content/dr.html (original)
+++ websites/production/activemq/content/dr.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <p>Disaster Recovery.</p>
 
-<p>Typically this means having multiple data centres configured such that if there is a major catastrophy and an entire data centre is lost, messages are replicated to another location so the systems can continue running.</p>
+<p>Typically this means having multiple data centres configured such that if there is a major catastrophy and an entire data centre is lost, messages are replicated to another location so the systems can continue running.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/durable-queue-memory-management.html
==============================================================================
--- websites/production/activemq/content/durable-queue-memory-management.html (original)
+++ websites/production/activemq/content/durable-queue-memory-management.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>The current 3.x code can have issues with massive queues with un-acknowledged messages; its complex due to consumption from multiple points in the queue, consumers coming &amp; going, selectors matching only certain points in the queue etc.</p>
 
 <p>This page outlines design the design proposal.</p>
@@ -106,7 +107,7 @@
 
 <p>As the PendingCache grows, the HeadQueueCache shrinks. HeadQueueCache is only used for new consumers arriving. On startup this will stick around a while until lots of messages start being delivered to consumers where it'll shrink back to zero if there is sufficient dispatching.</p>
 
-<p>Under heavy load, the HeadQueueCache will be pretty much empty unless new consumers come along.</p>
+<p>Under heavy load, the HeadQueueCache will be pretty much empty unless new consumers come along.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/encrypted-passwords.html
==============================================================================
--- websites/production/activemq/content/encrypted-passwords.html (original)
+++ websites/production/activemq/content/encrypted-passwords.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>As of ActiveMQ 5.4.1 you can encrypt your passwords and safely store them in configuration files. To encrypt the password, you can use the newly added <code>encrypt</code> command like:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>As of ActiveMQ 5.4.1 you can encrypt your passwords and safely store them in configuration files. To encrypt the password, you can use the newly added <code>encrypt</code> command like:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ bin/activemq encrypt --password activemq --input mypassword
 ...
 Encrypted text: eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp</pre>
@@ -140,7 +140,7 @@ jdbc.password=ENC(eeWjNyX6FY8Fjp3E+F6qTy
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ bin/activemq start xbean:conf/activemq-security.xml</pre>
 </div></div></li><li><p>Unset the environment variable:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ unset ACTIVEMQ_ENCRYPTION_PASSWORD</pre>
-</div></div></li></ul><p>In this way your encryptor secret is never saved on your system and your encrypted passwords are safely stored in the configuration files.</p>
+</div></div></li></ul><p>In this way your encryptor secret is never saved on your system and your encrypted passwords are safely stored in the configuration files.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message