You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by bu...@apache.org on 2013/11/13 18:23:21 UTC

svn commit: r886526 [18/21] - 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...

Modified: websites/production/activemq/content/retroactive-consumer.html
==============================================================================
--- websites/production/activemq/content/retroactive-consumer.html (original)
+++ websites/production/activemq/content/retroactive-consumer.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="RetroactiveConsumer-Background"></a>Background</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="RetroactiveConsumer-Background"></a>Background</h2>
 
 <p>A retroactive consumer is just a regular JMS <b>Topic</b> consumer who indicates that at the start of a subscription every attempt should be used to go back in time and send any old messages (or the last message sent on that topic) that the consumer may have missed.</p>
 
@@ -105,8 +104,7 @@ consumer = session.createConsumer(topic)
 
 <p>In the case of topics, when we connect broker A to broker B, broker B will send broker A all the subscriptions that it has received. Since Broker A replicates messages to each subscription, and we want to avoid receiving duplicates at broker B, we can't send broker A more than 1 subscription for the same topic. So our network bridges keep track of the subscriptions sent across and only send the first subscription to a topic. Subsequent subscriptions increment the reference count of the subscription, but the subscription is not actually sent.</p>
 
-<p>This in essence is the problem. If the first subscription to a topic is not retroactive, it is sent B to A, and the B broker will not get the retroactive messages. Then subsequent subscriptions could be (retroactive), but it will not cause retroactive message to sent from broker A to broker B since the subsequent subscription will not be sent to broker A.</p>
-          </div>
+<p>This in essence is the problem. If the first subscription to a topic is not retroactive, it is sent B to A, and the B broker will not get the retroactive messages. Then subsequent subscriptions could be (retroactive), but it will not cause retroactive message to sent from broker A to broker B since the subsequent subscription will not be sent to broker A.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rightheader.html
==============================================================================
--- websites/production/activemq/content/rightheader.html (original)
+++ websites/production/activemq/content/rightheader.html Wed Nov 13 17:23:00 2013
@@ -72,10 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
-<p><a shape="rect" class="external-link" href="http://www.codehaus.org" rel="nofollow"><span class="image-wrap" style=""><img src="http://drools.codehaus.org/__unity__/images/logo.png" style="border: 0px solid black"></span></a></p>
-          </div>
+<div class="wiki-content maincontent">
+<p><a shape="rect" class="external-link" href="http://www.codehaus.org" rel="nofollow"><span class="image-wrap" style=""><img src="http://drools.codehaus.org/__unity__/images/logo.png" style="border: 0px solid black"></span></a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rss-and-atom.html
==============================================================================
--- websites/production/activemq/content/rss-and-atom.html (original)
+++ websites/production/activemq/content/rss-and-atom.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <p>We have added support for the <a shape="rect" href="rest.html" title="REST">REST</a>ful browsing of message queues in the <b>activemq-web</b> module. To try out this feature try the <a shape="rect" href="web-samples.html" title="Web Samples">Web Samples</a>.</p>
 
 <p>Browsing of queues is implemented by a servlet, <b>QueueBrowseServlet</b> which allows queues to be browsed using pluggable views. The current views supported are</p>
@@ -93,8 +92,7 @@
 <h3><a shape="rect" name="RSSandAtom-Examples"></a>Examples</h3>
 
 <ul><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=xml" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=xml</a> will browse the queue as XML</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0</a> will browse the FOO.BAR queue using RSS 2.0</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3</a> will browse the FOO.BAR queue using Atom</li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ruby.html
==============================================================================
--- websites/production/activemq/content/ruby.html (original)
+++ websites/production/activemq/content/ruby.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="Ruby-RubySupport"></a>Ruby Support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Ruby-RubySupport"></a>Ruby Support</h2>
 
 <p>For Ruby support we recommend the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/Ruby" rel="nofollow">Ruby Stomp Client</a></p>
 
@@ -102,8 +101,7 @@ gem install stomp
 
 <h2><a shape="rect" name="Ruby-ActiveMessaging"></a>ActiveMessaging</h2>
 
-<p>If you are working with Rails you might want to check out <a shape="rect" class="external-link" href="http://dev.tirsen.com/trac/activemessaging" rel="nofollow">ActiveMessaging</a>.</p>
-          </div>
+<p>If you are working with Rails you might want to check out <a shape="rect" class="external-link" href="http://dev.tirsen.com/trac/activemessaging" rel="nofollow">ActiveMessaging</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/run-broker.html
==============================================================================
--- websites/production/activemq/content/run-broker.html (original)
+++ websites/production/activemq/content/run-broker.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h1><a shape="rect" name="RunBroker-RunninganActiveMQBroker"></a>Running an ActiveMQ Broker</h1>
+<div class="wiki-content maincontent"><h1><a shape="rect" name="RunBroker-RunninganActiveMQBroker"></a>Running an ActiveMQ Broker</h1>
 
 <p>Note if you want to use an <b>embedded broker</b> then see <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">How do I embed a Broker inside a Connection</a></p>
 
@@ -142,11 +141,17 @@ nohup activemq &gt; /dev/null &amp;
 
 <p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
 
+<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
+
+<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
+
 <div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
 The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</td></tr></table></div>
 
 <p>Or you can use the <a shape="rect" href="jmx.html" title="JMX">JMX</a> support to view the running state of ActiveMQ.</p>
 
+<p>For more information see the file <tt>docs/WebConsole-README.txt</tt> in the distribution.</p>
+
 <h3><a shape="rect" name="RunBroker-RunningthebrokerinsideaServletEngine"></a>Running the broker inside a Servlet Engine</h3>
 
 <p>See the source code (or WAR) of the <a shape="rect" href="web-console.html" title="Web Console">Web Console</a> for an example of how to run the broker inside a web application using Spring.</p>
@@ -188,8 +193,7 @@ mvn activemq:run
 failover:tcp://host:port
 ]]></script>
 </div></div>
-<p>And the JMS client will auto-reconnect to the broker if it is shutdown and restarted later on.</p>
-          </div>
+<p>And the JMS client will auto-reconnect to the broker if it is shutdown and restarted later on.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/running-a-3x-broker.html
==============================================================================
--- websites/production/activemq/content/running-a-3x-broker.html (original)
+++ websites/production/activemq/content/running-a-3x-broker.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <p>The 3.x <a shape="rect" href="download.html" title="Download">binary distribution</a> of ActiveMQ comes with a script called 'activemq' which allows you to run a broker. Typing the following will run an ActiveMQ Broker using the out of the box configuration</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -176,8 +175,7 @@ java org.activemq.spring.Main src/sample
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 reliable:tcp://host:port
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/running-a-broker.html
==============================================================================
--- websites/production/activemq/content/running-a-broker.html (original)
+++ websites/production/activemq/content/running-a-broker.html Wed Nov 13 17:23:00 2013
@@ -72,9 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
-          </div>
+<div class="wiki-content maincontent"></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/runtime-configuration.html
==============================================================================
--- websites/production/activemq/content/runtime-configuration.html (original)
+++ websites/production/activemq/content/runtime-configuration.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>From version 5.9.0 a new broker plugin will allow selective changes to a broker xml configuration to take effect without broker restart.<br clear="none">
+<div class="wiki-content maincontent"><p>From version 5.9.0 a new broker plugin will allow selective changes to a broker xml configuration to take effect without broker restart.<br clear="none">
 Consider a retail environment where there are central processors (hubs) and stores(spokes). It is advantageous to be able to add a new store<br clear="none">
 without any down time.<br clear="none">
 The addition of a new store could entail a new network connector and some new authorization policies, both of which can now be modified on the fly.</p>
@@ -107,8 +106,7 @@ If checkPeriod is 0 (default) there is n
 
 
 
-<p>Some more implementation detail and links to the tests can be found in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4682">AMQ-4682</a></p>
-          </div>
+<p>Some more implementation detail and links to the tests can be found in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4682">AMQ-4682</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sample-camel-routes.html
==============================================================================
--- websites/production/activemq/content/sample-camel-routes.html (original)
+++ websites/production/activemq/content/sample-camel-routes.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h3><a shape="rect" name="SampleCamelRoutes-ExampleofaconfigurationthatshowhowtouseCamelrouteswithJuelandXpath."></a>Example of a configuration that show how to use Camel routes with Juel and Xpath.</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="SampleCamelRoutes-ExampleofaconfigurationthatshowhowtouseCamelrouteswithJuelandXpath."></a>Example of a configuration that show how to use Camel routes with Juel and Xpath.</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -224,8 +223,7 @@
     &lt;/camelContext&gt;
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sample-report.html
==============================================================================
--- websites/production/activemq/content/sample-report.html (original)
+++ websites/production/activemq/content/sample-report.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="samplereport-PerformanceTestReportTemplate"></a>Performance Test Report Template</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="samplereport-PerformanceTestReportTemplate"></a>Performance Test Report Template</h2>
 
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>&lt;testResult&gt;
@@ -144,8 +143,7 @@
   &lt;/property&gt;
 &lt;/testResult&gt;
 </pre>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sandbox.html
==============================================================================
--- websites/production/activemq/content/sandbox.html (original)
+++ websites/production/activemq/content/sandbox.html Wed Nov 13 17:23:00 2013
@@ -72,9 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
-          </div>
+<div class="wiki-content maincontent"></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/scaling-queues.html
==============================================================================
--- websites/production/activemq/content/scaling-queues.html (original)
+++ websites/production/activemq/content/scaling-queues.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Scaling to tens of thousands of Queues in a single broker is relatively straightforward - but requires some configuration changes from the default.</p>
+<div class="wiki-content maincontent"><p>Scaling to tens of thousands of Queues in a single broker is relatively straightforward - but requires some configuration changes from the default.</p>
 
 <h2><a shape="rect" name="ScalingQueues-ReducingThreads"></a>Reducing Threads</h2>
 
@@ -119,8 +118,7 @@ ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.act
 <p>Try <a shape="rect" class="external-link" href="http://tinyurl.com/o9qs2f" rel="nofollow">googling for the OS you are using</a></p>
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/scaling-the-depth-of-a-queue.html
==============================================================================
--- websites/production/activemq/content/scaling-the-depth-of-a-queue.html (original)
+++ websites/production/activemq/content/scaling-the-depth-of-a-queue.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Nearly all messaging systems (certainly open source ones) hold either a copy of a persistent message or a reference to a persisted message in memory. This is primarily to try and improve performance, but it also can significantly decrease the complexity of implementation. In fact ActiveMQ version 4 and below worked this - way - by holding references to persisted messages in memory.</p>
+<div class="wiki-content maincontent"><p>Nearly all messaging systems (certainly open source ones) hold either a copy of a persistent message or a reference to a persisted message in memory. This is primarily to try and improve performance, but it also can significantly decrease the complexity of implementation. In fact ActiveMQ version 4 and below worked this - way - by holding references to persisted messages in memory.</p>
 
 <p>However there is a limitation to this approach, no matter how much memory you have at your disposal, you will hit a limit to the number persistent messages a broker can handle at any particular time.</p>
 
@@ -182,8 +181,7 @@ Valid Durable Subscriber cursor types ar
 <h3><a shape="rect" name="ScalingtheDepthofaQueue-SeeAlso"></a>See Also</h3>
 
 <ul><li><a shape="rect" href="producer-flow-control.html" title="Producer Flow Control">Producer Flow Control</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/security.html
==============================================================================
--- websites/production/activemq/content/security.html (original)
+++ websites/production/activemq/content/security.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>ActiveMQ 4.x and greater provides pluggable security through various different providers.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ 4.x and greater provides pluggable security through various different providers.</p>
 
 <p>The most common providers are</p>
 <ul><li><a shape="rect" class="external-link" href="http://java.sun.com/products/jaas/" rel="nofollow">JAAS</a> for authentication</li><li>a default authorization mechanism using a simple XML configuration file.</li></ul>
@@ -611,8 +610,7 @@ activemq.password=manager
 <h3><a shape="rect" name="Security-ThirdPartyTools"></a>Third Party Tools </h3>
 
 <ul><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_LDAP_JDBC_Security_Plugins.php" rel="nofollow">ActiveMQ LDAP and JDBC Security Plugins from TTM Solutions</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/seda.html
==============================================================================
--- websites/production/activemq/content/seda.html (original)
+++ websites/production/activemq/content/seda.html Wed Nov 13 17:23:00 2013
@@ -72,12 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p><br clear="none">
+<div class="wiki-content maincontent"><p><br clear="none">
 <br clear="none">
 <br clear="none">
-Staged Event Driven Architecture which is a design pattern for building high performance and scalable distributed systems. See <a shape="rect" class="external-link" href="http://www.eecs.harvard.edu/~mdw/proj/seda/" rel="nofollow">this paper</a> for more details.</p>
-          </div>
+Staged Event Driven Architecture which is a design pattern for building high performance and scalable distributed systems. See <a shape="rect" class="external-link" href="http://www.eecs.harvard.edu/~mdw/proj/seda/" rel="nofollow">this paper</a> for more details.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/selectors.html
==============================================================================
--- websites/production/activemq/content/selectors.html (original)
+++ websites/production/activemq/content/selectors.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="Selectors-JMSSelectors"></a>JMS Selectors</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Selectors-JMSSelectors"></a>JMS Selectors</h2>
 
 <p>Selectors are a way of attaching a filter to a subscription to perform content based routing. Selectors are defined using SQL 92 syntax and typically apply to message headers; whether the standard properties available on a JMS message or custom headers you can add via the JMS code.</p>
 
@@ -118,8 +117,7 @@ XPATH '//title[@lang=''eng'']'
 <h3><a shape="rect" name="Selectors-StringPropertyConversions%2FSelectingAgainstSTOMPmessages"></a>String Property Conversions / Selecting Against STOMP messages</h3>
 
 <p>The JMS spec states that a String property should not get converted to a numeric when used in a selector.  So for example, if a message has the 'age' property set to String '21' then the following selector should not match it: 'age &gt; 18'.  Since ActiveMQ support STOMP client which can only send messages with string properties, that restriction is a bit limiting.  If you want your JMS selectors to auto-convert String properties the the appropriate number type, just prefix the the selector with 'convert_string_expressions:'.  If you changed selector in the previous example to be 'convert_string_expressions:age &gt; 18', then it would match the message.</p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/setting-up-activemq-with-tomcat-559.html
==============================================================================
--- websites/production/activemq/content/setting-up-activemq-with-tomcat-559.html (original)
+++ websites/production/activemq/content/setting-up-activemq-with-tomcat-559.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Create the file &lt;webapp-root&gt;/META-INF/context.xml.  Here is an example:</p>
+<div class="wiki-content maincontent"><p>Create the file &lt;webapp-root&gt;/META-INF/context.xml.  Here is an example:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;Context antiJARLocking="true"&gt;
@@ -132,8 +131,7 @@ try {
     // TODO handle exception
 }
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/shared-file-system-master-slave.html
==============================================================================
--- websites/production/activemq/content/shared-file-system-master-slave.html (original)
+++ websites/production/activemq/content/shared-file-system-master-slave.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="SharedFileSystemMasterSlave-SharedFileSystemMasterSlave"></a>Shared File System Master Slave</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="SharedFileSystemMasterSlave-SharedFileSystemMasterSlave"></a>Shared File System Master Slave</h2>
 
 <p>If you have a SAN or shared file system it can be used to provide <em>high availability</em> such that if a broker is killed, another broker can take over immediately.</p>
 
@@ -157,8 +156,7 @@ failover:(tcp://broker1:61616,tcp://brok
 
 <p>At any time you can restart other brokers which join the cluster and start as slaves waiting to become a master if the master is shutdown or a failure occurs. So the following topology is created after a restart of an old master...</p>
 
-<p><span class="image-wrap" style=""><img src="shared-file-system-master-slave.data/MasterRestarted.png" style="border: 0px solid black"></span></p>
-          </div>
+<p><span class="image-wrap" style=""><img src="shared-file-system-master-slave.data/MasterRestarted.png" style="border: 0px solid black"></span></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/shiro.html
==============================================================================
--- websites/production/activemq/content/shiro.html (original)
+++ websites/production/activemq/content/shiro.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Version Compatibility</b><br clear="none">Not yet released.  Will be available in ActiveMQ 5.10.0</td></tr></table></div>
+<div class="wiki-content maincontent"><div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Version Compatibility</b><br clear="none">Not yet released.  Will be available in ActiveMQ 5.10.0</td></tr></table></div>
 
 <p>ActiveMQ 5.10 and later provides a fully customizable security experience using <a shape="rect" class="external-link" href="http://shiro.apache.org">Apache Shiro</a>.</p>
 
@@ -504,8 +503,7 @@ broker.setPlugins(new BrokerPlugin[]{shi
 
 <p>The ShiroPlugin installs the <tt>AuthenticationFilter</tt> immediately after the <tt>SubjectFilter</tt> in the broker filter chain.  The <tt>AuthenticationFilter</tt> ensures that the broker client <tt>Subject</tt> is authenticated if necessary before allowing the chain to continue.  If authentication is required and the <tt>Subject</tt> is not authenticated, the broker filter chain will not be executed, ensuring only verified identities may perform further behavior.</p>
 
-<p>WORK IN PROGRESS - STILL AUTHORING</p>
-          </div>
+<p>WORK IN PROGRESS - STILL AUTHORING</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/should-i-deploy-enterprise-integration-patterns-in-the-broker-or-another-application.html
==============================================================================
--- websites/production/activemq/content/should-i-deploy-enterprise-integration-patterns-in-the-broker-or-another-application.html (original)
+++ websites/production/activemq/content/should-i-deploy-enterprise-integration-patterns-in-the-broker-or-another-application.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="ShouldIdeployEnterpriseIntegrationPatternsinthebrokeroranotherapplication-ShouldIdeployEnterpriseIntegrationPatternsinthebrokeroranotherapplication"></a>Should I deploy Enterprise Integration Patterns in the broker or another application</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ShouldIdeployEnterpriseIntegrationPatternsinthebrokeroranotherapplication-ShouldIdeployEnterpriseIntegrationPatternsinthebrokeroranotherapplication"></a>Should I deploy Enterprise Integration Patterns in the broker or another application</h2>
 
 <p>Whether you deploy the <a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a> inside the ActiveMQ Broker or in a separate application depends on your requirements. </p>
 
@@ -92,8 +91,7 @@
 <ul><li><a shape="rect" href="should-i-deploy-the-broker-inside-my-jvm-or-appserver.html" title="Should I deploy the broker inside my JVM or AppServer">Should I deploy the broker inside my JVM or AppServer</a></li></ul>
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/should-i-deploy-the-broker-inside-my-jvm-or-appserver.html
==============================================================================
--- websites/production/activemq/content/should-i-deploy-the-broker-inside-my-jvm-or-appserver.html (original)
+++ websites/production/activemq/content/should-i-deploy-the-broker-inside-my-jvm-or-appserver.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>You can deploy the ActiveMQ Broker inside your JVM or Application Server. Whether you do or not has pros and cons depending on how many JVMs you have and what your backup &amp; recovery policy is.</p>
+<div class="wiki-content maincontent"><p>You can deploy the ActiveMQ Broker inside your JVM or Application Server. Whether you do or not has pros and cons depending on how many JVMs you have and what your backup &amp; recovery policy is.</p>
 
 <h3><a shape="rect" name="ShouldIdeploythebrokerinsidemyJVMorAppServer-Advantagesofembeddingthebroker"></a>Advantages of embedding the broker</h3>
 
@@ -93,8 +92,7 @@
 <h3><a shape="rect" name="ShouldIdeploythebrokerinsidemyJVMorAppServer-See"></a>See</h3>
 
 <ul><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">How do I embed a Broker inside a Connection</a></li><li><a shape="rect" href="run-broker.html" title="Run Broker">Run Broker</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/should-i-run-activemq-on-windows-in-a-directory-with-spaces.html
==============================================================================
--- websites/production/activemq/content/should-i-run-activemq-on-windows-in-a-directory-with-spaces.html (original)
+++ websites/production/activemq/content/should-i-run-activemq-on-windows-in-a-directory-with-spaces.html Wed Nov 13 17:23:00 2013
@@ -72,13 +72,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="ShouldIrunActiveMQonWindowsinadirectorywithspaces-ShouldIrunActiveMQonWindowsinadirectorywithspaces"></a>Should I run ActiveMQ on Windows in a directory with spaces</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ShouldIrunActiveMQonWindowsinadirectorywithspaces-ShouldIrunActiveMQonWindowsinadirectorywithspaces"></a>Should I run ActiveMQ on Windows in a directory with spaces</h2>
 
 <p>No.</p>
 
-<p>Its not a good idea to install and run application in paths on Windows which have spaces.</p>
-          </div>
+<p>Its not a good idea to install and run application in paths on Windows which have spaces.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/should-i-use-transactions.html
==============================================================================
--- websites/production/activemq/content/should-i-use-transactions.html (original)
+++ websites/production/activemq/content/should-i-use-transactions.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <p>You often have to choose between how you consume messages. The choices are</p>
 
 <ol><li>auto-acknowledgement</li><li>explicit acknowledgement via Message.acknowledge()</li><li>JMS transactions</li><li>XA</li></ol>
@@ -85,8 +84,7 @@
 
 <p>Incidentally, its a common misconception that transactions are slow; there's no real difference between a JMS transaction and a Message.acknowledge() from an architectural perspective in ActiveMQ; the only real issue is whether you are using persistent messaging and so must block until the commit is synchronized to disk (much the same way you must block with a Message.acknowledge() in a non-transactional JMS session). Note that transactions are available in non-persistent modes too - which are very lightweight and mostly client-side facades only.</p>
 
-<p>Its also worth noting that if you are using persistent messaging, the fastest way of using JMS is to actually use transactions and use batching; so you can send 1000 messages, all of which are asynchronous and super fast, then do one commit ever batch to minimise the latency involved with waiting for things to be synced to disk. (The same is tru e for consuming or mixed consume and produces etc).</p>
-          </div>
+<p>Its also worth noting that if you are using persistent messaging, the fastest way of using JMS is to actually use transactions and use batching; so you can send 1000 messages, all of which are asynchronous and super fast, then do one commit ever batch to minimise the latency involved with waiting for things to be synced to disk. (The same is tru e for consuming or mixed consume and produces etc).</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/should-i-use-xa.html
==============================================================================
--- websites/production/activemq/content/should-i-use-xa.html (original)
+++ websites/production/activemq/content/should-i-use-xa.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="ShouldIuseXA-ShouldIuseXAtransactions%28twophasecommit%3F%29"></a>Should I use XA transactions (two phase commit?)</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ShouldIuseXA-ShouldIuseXAtransactions%28twophasecommit%3F%29"></a>Should I use XA transactions (two phase commit?)</h2>
 
 <p>A common use of JMS is to consume messages from a queue or topic, process them using a database or EJB, then acknowledge / commit the message.</p>
 
@@ -124,8 +123,7 @@ catch (Exception e) {
 
 <p>Performing duplicate detection can add a performance overhead. e.g. doing a database query to see if you've processed the purchase order before etc. Most of the time things will work; its only in rare circumstances (ilke if a server crashes mid-way processing some messages) that messages get redelivered.</p>
 
-<p>So you can use the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html#getJMSRedelivered()" rel="nofollow">Message.getJMSRedelivered()</a> method to detect if a message has been redelivered and only if its been redelivered then perform the duplicate detection check.</p>
-          </div>
+<p>So you can use the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html#getJMSRedelivered()" rel="nofollow">Message.getJMSRedelivered()</a> method to detect if a message has been redelivered and only if its been redelivered then perform the duplicate detection check.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/site.html
==============================================================================
--- websites/production/activemq/content/site.html (original)
+++ websites/production/activemq/content/site.html Wed Nov 13 17:23:00 2013
@@ -72,9 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<ul><li><a shape="rect" href="banner.html" title="Banner">Banner</a></li><li><a shape="rect" href="navigation.html" title="Navigation">Navigation</a></li><li><a shape="rect" href="old-links.html" title="Old Links">Old Links</a></li><li><a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a></li><li><a shape="rect" href="siteindex.html" title="SiteIndex">SiteIndex</a></li><li><a shape="rect" href="sitemap.html" title="SiteMap">SiteMap</a></li></ul>
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" href="banner.html" title="Banner">Banner</a></li><li><a shape="rect" href="navigation.html" title="Navigation">Navigation</a></li><li><a shape="rect" href="old-links.html" title="Old Links">Old Links</a></li><li><a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a></li><li><a shape="rect" href="siteindex.html" title="SiteIndex">SiteIndex</a></li><li><a shape="rect" href="sitemap.html" title="SiteMap">SiteMap</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/siteindex.html
==============================================================================
--- websites/production/activemq/content/siteindex.html (original)
+++ websites/production/activemq/content/siteindex.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <h2>Space Index</h2>
 
 <p>
@@ -907,7 +906,7 @@
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="how-can-i-make-activemq-faster.html">How can I make ActiveMQ faster</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">See the ActiveMQ Tuning Guide http://fusesource.com/wiki/display/ProdInfo/FUSEMessageBrokerPerformanceTuningGuide</div>
+             <div class="smalltext" style="margin: 0 0 0 36px">See the Performance page for information about the performance of ActiveMQ and it's tuning parameters</div>
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="how-can-i-monitor-activemq.html">How can I monitor ActiveMQ</a>
         <br clear="none">
@@ -1564,7 +1563,7 @@
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="monitoring-activemq.html">Monitoring ActiveMQ</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">various ways to monitor ActiveMQ How can I monitor ActiveMQ. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the Web Console by pointing your browser at   http://localhost:8161/admin    From ActiveMQ 5.8 ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">various ways to monitor ActiveMQ How can I monitor ActiveMQ. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the Web Console by pointing your browser at   http://localhost:8161/admin  And from ActiveMQ 5.9 ... </div>
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="mqtt.html">MQTT</a>
         <br clear="none">
@@ -1727,7 +1726,7 @@
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="performance-report.html">Performance report</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Performance guides   There is a FuseSource tuning guide http://fusesource.com/docs/broker/5.4/tuning/index.html  If you're not convinced by performance reports then please do try running performance tests yourselfs. You might wanna check out our overview of Performance ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">Performance guides  If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of Performance or try using out the ActiveMQ Performance Module Users Manual  The Commercial ... </div>
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="performance-tuning.html">Performance Tuning</a>
         <br clear="none">
@@ -2306,7 +2305,7 @@
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="what-platforms-does-activemq-support.html">What platforms does ActiveMQ support</a>
         <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">What platforms does ActiveMQ Support?  ActiveMQ 5.x supports any Java platform of JDK 5.0 or later. To run on 1.4 see these instructions Can I use ActiveMQ 5.0 or later on Java 1.4. You can use ActiveMQ ... </div>
+             <div class="smalltext" style="margin: 0 0 0 36px">What platforms does ActiveMQ Support?  ActiveMQ 5.05.7 supports any Java platform of JDK 5.0 or later. To run on 1.4 see these instructions Can I use ActiveMQ 5.x or later on Java 1.4. You can use ActiveMQ ... </div>
                                  <span class="icon icon-page" title="Page">Page:</span>
                          <a shape="rect" href="while-posting-large-binary-file-to-activemq-is-there-a-way-to-measure-its-progress.html">While posting large binary file to activeMQ, is there a way to measure its progress</a>
         <br clear="none">
@@ -2377,8 +2376,7 @@
         </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-%21@%23%24"></a>!@#$</h4>
         </td></tr></table>
 </p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sitemap.html
==============================================================================
--- websites/production/activemq/content/sitemap.html (original)
+++ websites/production/activemq/content/sitemap.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="SiteMap-UsingActiveMQ"></a>Using ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="SiteMap-UsingActiveMQ"></a>Using ActiveMQ</h2>
 <ul><li><a shape="rect" href="configuring-brokers.html" title="Configuring Brokers">Configuring Brokers</a></li><li><a shape="rect" href="configuring-transports.html" title="Configuring Transports">Configuring Transports</a><ul><li><a shape="rect" href="activemq-4-connection-uris.html" title="ActiveMQ 4 Connection URIs">ActiveMQ 4 Connection URIs</a><ul><li><a shape="rect" href="broker-configuration-uri.html" title="Broker Configuration URI">Broker Configuration URI</a><ul><li><a shape="rect" href="broker-properties-uri.html" title="Broker Properties URI">Broker Properties URI</a></li><li><a shape="rect" href="broker-uri.html" title="Broker URI">Broker URI</a></li><li><a shape="rect" href="broker-xbean-uri.html" title="Broker XBean URI">Broker XBean URI</a></li></ul></li><li><a shape="rect" href="configuring-wire-formats.html" title="Configuring Wire Formats">Configuring Wire Formats</a></li><li><a shape="rect" href="connection-configuration-uri.html" title="Connection Configuration
  URI">Connection Configuration URI</a></li><li><a shape="rect" href="discovery-transport-reference.html" title="Discovery Transport Reference">Discovery Transport Reference</a></li><li><a shape="rect" href="failover-transport-reference.html" title="Failover Transport Reference">Failover Transport Reference</a></li><li><a shape="rect" href="fanout-transport-reference.html" title="Fanout Transport Reference">Fanout Transport Reference</a></li><li><a shape="rect" href="http-and-https-transports-reference.html" title="HTTP and HTTPs Transports Reference">HTTP and HTTPs Transports Reference</a></li><li><a shape="rect" href="multicast-transport-reference.html" title="Multicast Transport Reference">Multicast Transport Reference</a></li><li><a shape="rect" href="peer-transport-reference.html" title="Peer Transport Reference">Peer Transport Reference</a></li><li><a shape="rect" href="ssl-transport-reference.html" title="SSL Transport Reference">SSL Transport Reference</a></li><li><a shape="r
 ect" href="static-transport-reference.html" title="Static Transport Reference">Static Transport Reference</a></li><li><a shape="rect" href="tcp-transport-reference.html" title="TCP Transport Reference">TCP Transport Reference</a></li><li><a shape="rect" href="udp-transport-reference.html" title="UDP Transport Reference">UDP Transport Reference</a></li><li><a shape="rect" href="vm-transport-reference.html" title="VM Transport Reference">VM Transport Reference</a></li></ul></li><li><a shape="rect" href="activemq-inactivitymonitor.html" title="ActiveMQ InactivityMonitor">ActiveMQ InactivityMonitor</a></li><li><a shape="rect" href="zeroconf-transport-reference.html" title="ZeroConf Transport Reference">ZeroConf Transport Reference</a><ul><li><a shape="rect" href="zeroconf.html" title="ZeroConf">ZeroConf</a></li></ul></li></ul></li><li><a shape="rect" href="examples.html" title="Examples">Examples</a></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Sta
 rted</a><ul><li><a shape="rect" href="gettingstarted3x.html" title="Getting+Started+3.x">Getting+Started+3.x</a></li><li><a shape="rect" href="monitoring-activemq.html" title="Monitoring ActiveMQ">Monitoring ActiveMQ</a></li></ul></li><li><a shape="rect" href="hello-world.html" title="Hello World">Hello World</a></li><li><a shape="rect" href="initial-configuration.html" title="Initial Configuration">Initial Configuration</a></li><li><a shape="rect" href="installation.html" title="Installation">Installation</a></li><li><a shape="rect" href="known-bad-os-and-jvm-combinations.html" title="Known Bad OS and JVM Combinations">Known Bad OS and JVM Combinations</a></li><li><a shape="rect" href="performance-tuning.html" title="Performance Tuning">Performance Tuning</a></li><li><a shape="rect" href="run-broker.html" title="Run Broker">Run Broker</a></li><li><a shape="rect" href="topologies.html" title="Topologies">Topologies</a></li><li><a shape="rect" href="use-cases.html" title="Use Cases">
 Use Cases</a></li><li><a shape="rect" href="user-submitted-configurations.html" title="User Submitted Configurations">User Submitted Configurations</a><ul><li><a shape="rect" href="complex-single-broker-configuration-stomp-only.html" title="Complex Single Broker Configuration (STOMP only)">Complex Single Broker Configuration (STOMP only)</a></li><li><a shape="rect" href="jms-and-jdbc-operations-in-one-transaction.html" title="JMS and JDBC operations in one transaction">JMS and JDBC operations in one transaction</a></li><li><a shape="rect" href="jms-bridge-with-local-broker.html" title="JMS Bridge With Local Broker">JMS Bridge With Local Broker</a></li><li><a shape="rect" href="jms-bridge-with-oracle-aq.html" title="JMS Bridge With Oracle AQ">JMS Bridge With Oracle AQ</a></li><li><a shape="rect" href="jms-bridge-with-remote-broker.html" title="JMS Bridge With Remote Broker">JMS Bridge With Remote Broker</a></li><li><a shape="rect" href="jms-bridge-with-remote-tibco-broker.html" title
 ="JMS Bridge With Remote TIBCO Broker">JMS Bridge With Remote TIBCO Broker</a></li><li><a shape="rect" href="sample-camel-routes.html" title="Sample Camel Routes">Sample Camel Routes</a></li></ul></li><li><a shape="rect" href="web-samples.html" title="Web Samples">Web Samples</a></li><li><a shape="rect" href="xml-configuration.html" title="Xml Configuration">Xml Configuration</a></li><li><a shape="rect" href="xml-reference.html" title="Xml Reference">Xml Reference</a><ul><li><a shape="rect" href="xbean-xml-reference-41.html" title="XBean XML Reference 4.1">XBean XML Reference 4.1</a></li><li><a shape="rect" href="xbean-xml-reference-50.html" title="XBean XML Reference 5.0">XBean XML Reference 5.0</a></li></ul></li></ul>
 
 <h2><a shape="rect" name="SiteMap-Community"></a>Community</h2>
@@ -96,8 +95,7 @@
 
 <h2><a shape="rect" name="SiteMap-Site"></a>Site</h2>
 <ul><li><a shape="rect" href="banner.html" title="Banner">Banner</a></li><li><a shape="rect" href="navigation.html" title="Navigation">Navigation</a></li><li><a shape="rect" href="old-links.html" title="Old Links">Old Links</a><ul><li><a shape="rect" href="activemqdtd.html" title="activemq.dtd">activemq.dtd</a></li><li><a shape="rect" href="activesoap.html" title="ActiveSoap">ActiveSoap</a></li><li><a shape="rect" href="activespace.html" title="ActiveSpace">ActiveSpace</a></li><li><a shape="rect" href="cvs.html" title="CVS">CVS</a></li><li><a shape="rect" href="leftheader.html" title="LeftHeader">LeftHeader</a></li><li><a shape="rect" href="new-features-in-42.html" title="New Features in 4.2">New Features in 4.2</a></li><li><a shape="rect" href="point-to-point-with-multiple-consumers.html" title="Point to Point with multiple Consumers">Point to Point with multiple Consumers</a></li><li><a shape="rect" href="polo-page.html" title="polo page">polo page</a></li><li><a shape="rect" href
 ="previous-versions.html" title="Previous Versions">Previous Versions</a><ul><li><a shape="rect" href="activemq-3-networks-of-brokers.html" title="ActiveMQ 3 Networks of Brokers">ActiveMQ 3 Networks of Brokers</a></li><li><a shape="rect" href="activemq-3-transport-configurations.html" title="ActiveMQ 3 Transport Configurations">ActiveMQ 3 Transport Configurations</a></li><li><a shape="rect" href="advisory-support-in-activemq-3.html" title="Advisory Support in ActiveMQ 3">Advisory Support in ActiveMQ 3</a></li><li><a shape="rect" href="getting-started-3x.html" title="Getting Started 3.x">Getting Started 3.x</a></li><li><a shape="rect" href="running-a-3x-broker.html" title="Running a 3.x Broker">Running a 3.x Broker</a></li></ul></li><li><a shape="rect" href="rightheader.html" title="RightHeader">RightHeader</a></li><li><a shape="rect" href="stp.html" title="STP">STP</a></li></ul></li><li><a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a></li><li><a shape="rect" 
 href="siteindex.html" title="SiteIndex">SiteIndex</a></li><li><a shape="rect" href="sitemap.html" title="SiteMap">SiteMap</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sjsas-with-genericjmsra.html
==============================================================================
--- websites/production/activemq/content/sjsas-with-genericjmsra.html (original)
+++ websites/production/activemq/content/sjsas-with-genericjmsra.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h1><a shape="rect" name="SJSASwithGenericJMSRA-UsingActiveMQ%2CGenericJMSRAandSJSAS%28Glassfish%29"></a>Using ActiveMQ, Generic JMS RA and SJSAS (Glassfish)</h1>
+<div class="wiki-content maincontent"><h1><a shape="rect" name="SJSASwithGenericJMSRA-UsingActiveMQ%2CGenericJMSRAandSJSAS%28Glassfish%29"></a>Using ActiveMQ, Generic JMS RA and SJSAS (Glassfish)</h1>
 
 
 <p>This document is my notes on making ActiveMQ and SJSAS work together using GenericJMSRA. The objectives is to make ActiveMQ as the JMS provider and MDB can be deployed in SJSAS, listening messages from ActiveMQ. Please note that, the SJSAS version I use is 9.0 Update 1. I don't have time to test it with SJSAS 9.1 or Glassfish v2.</p>
@@ -264,8 +263,7 @@ asadmin create-connector-resource
 
 <h2><a shape="rect" name="SJSASwithGenericJMSRA-Reference"></a>Reference</h2>
 <ul><li><a shape="rect" class="external-link" href="http://weblogs.java.net/blog/rampsarathy/archive/2007/03/glassfish_v2_an_1.html" rel="nofollow">Another example on using genericjmsra and activemq by Ramesh</a></li><li><a shape="rect" class="external-link" href="https://genericjmsra.dev.java.net/docs/userguide/userguide.html" rel="nofollow">Official user guide on configuring genericjmsra</a></li><li><a shape="rect" class="external-link" href="http://forums.java.net/jive/thread.jspa?messageID=211849" rel="nofollow">The thread in Glassfish forum which I found my answer</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/slow-consumer-handling.html
==============================================================================
--- websites/production/activemq/content/slow-consumer-handling.html (original)
+++ websites/production/activemq/content/slow-consumer-handling.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p><a shape="rect" href="slow-consumers.html" title="Slow Consumers">Slow Consumers</a> can cause problems on non-durable topics since they can force the broker to keep old messages in RAM which once it fills up, forces the broker to slow down producers, causing the fast consumers to be slowed down. One option we could implement in the future is spooling to disk - but then spooling to disk could slow down the fast consumers too.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="slow-consumers.html" title="Slow Consumers">Slow Consumers</a> can cause problems on non-durable topics since they can force the broker to keep old messages in RAM which once it fills up, forces the broker to slow down producers, causing the fast consumers to be slowed down. One option we could implement in the future is spooling to disk - but then spooling to disk could slow down the fast consumers too.</p>
 
 <p>Currently we have a strategy that lets you configure the maximum number of matched messages the broker will keep around for a consumer in addition to its prefetch buffer. Once this maximum is reached, as new messages come in, older messages are discarded. This allows you to keep the RAM for current messages and keep sending messages to a slow consumer but to discard old messages.</p>
 
@@ -225,8 +224,7 @@
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Statistic</th><th colspan="1" rowspan="1" class="confluenceTh">Meaning</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">discarded</td><td colspan="1" rowspan="1" class="confluenceTd">The count of how many messages have been discarded during the lifetime of the subscription due to it being a slow consumer</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">matched</td><td colspan="1" rowspan="1" class="confluenceTd">The current number of messages matched and to be dispatched to the subscription as soon as some capacity is available in the prefetch buffer. So a non-zero value implies that the prefetch buffer is full for this subscription</td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/slow-consumers.html
==============================================================================
--- websites/production/activemq/content/slow-consumers.html (original)
+++ websites/production/activemq/content/slow-consumers.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <h2><a shape="rect" name="SlowConsumers-BlockedTransport"></a>Blocked Transport</h2>
 
 <p>when using TCP there can be occasions when a network outage can result in a blocked write. This can cause the entire broker to freeze - and the socket may never be unblocked. Currently we have a Thread that checks for blocked sockets - using a sweep protocol to detect if there are connections that are blocked writing for more than a configurable period. This can work but there is no way to unblock the calling thread that is associated with the send down the socket (which will be the publishing thread in non-durable topics).</p>
@@ -136,8 +135,7 @@ If consumers get too far behind we could
 
 <h3><a shape="rect" name="SlowConsumers-SlowConsumerDetector"></a>Slow Consumer Detector</h3>
 
-<p>We need a good way of detecting that a consumer is slow - together with knowing when the consumer speeds up again</p>
-          </div>
+<p>We need a good way of detecting that a consumer is slow - together with knowing when the consumer speeds up again</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/slow-networks-drop-large-messages.html
==============================================================================
--- websites/production/activemq/content/slow-networks-drop-large-messages.html (original)
+++ websites/production/activemq/content/slow-networks-drop-large-messages.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Note</b><br clear="none">This article only applies to older versions of ActiveMQ, i.e. 5.3 and 5.4.0. From 5.4.2 onwards this issue has been adressed in the bugs <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-2511">AMQ-2511</a> and <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-2088">AMQ-2088</a>.</td></tr></table></div>
+<div class="wiki-content maincontent"><div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Note</b><br clear="none">This article only applies to older versions of ActiveMQ, i.e. 5.3 and 5.4.0. From 5.4.2 onwards this issue has been adressed in the bugs <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-2511">AMQ-2511</a> and <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-2088">AMQ-2088</a>.</td></tr></table></div>
 <p>You may experience problems sending large messages using networks across slow links.</p>
 
 <p>The symptoms are usually that the network connection will be dropped and continuously re-established.</p>
@@ -121,8 +120,7 @@ Ideally the activity flag would get clea
 </div></div>
 
 <h3><a shape="rect" name="Slownetworksdroplargemessages-Seealso"></a>See also</h3>
-<p><a shape="rect" href="activemq-inactivitymonitor.html" title="ActiveMQ InactivityMonitor">ActiveMQ InactivityMonitor</a></p>
-          </div>
+<p><a shape="rect" href="activemq-inactivitymonitor.html" title="ActiveMQ InactivityMonitor">ActiveMQ InactivityMonitor</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/source-xref.html
==============================================================================
--- websites/production/activemq/content/source-xref.html (original)
+++ websites/production/activemq/content/source-xref.html Wed Nov 13 17:23:00 2013
@@ -72,10 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/xref/">ActiveMQ Core</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-ra/xref/">ActiveMQ Resource Adapter</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-web/xref/">ActiveMQ Web</a></li></ul>
-
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/xref/">ActiveMQ Core</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-ra/xref/">ActiveMQ Resource Adapter</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-web/xref/">ActiveMQ Web</a></li></ul>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/source.html
==============================================================================
--- websites/production/activemq/content/source.html (original)
+++ websites/production/activemq/content/source.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Warning</b><br clear="none">Apache ActiveMQ code repository was moved to git, The old svn repo will not be updated.</td></tr></table></div> 
+<div class="wiki-content maincontent"><div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Warning</b><br clear="none">Apache ActiveMQ code repository was moved to git, The old svn repo will not be updated.</td></tr></table></div> 
 
 <h2><a shape="rect" name="Source-WebBrowsingofgit"></a>Web Browsing of git</h2>
 
@@ -93,8 +92,7 @@
 
 <h2><a shape="rect" name="Source-Buildingthecode"></a>Building the code</h2>
 
-<p>To then build the code see <a shape="rect" href="building.html" title="Building">Building</a>.</p>
-          </div>
+<p>To then build the code see <a shape="rect" href="building.html" title="Building">Building</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sponsorship.html
==============================================================================
--- websites/production/activemq/content/sponsorship.html (original)
+++ websites/production/activemq/content/sponsorship.html Wed Nov 13 17:23:00 2013
@@ -72,11 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Thank you to <a shape="rect" class="external-link" href="http://www.apache.org/foundation/thanks.html">all the folks</a> who have <a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">sponsored</a> the Apache Software Foundation. </p>
+<div class="wiki-content maincontent"><p>Thank you to <a shape="rect" class="external-link" href="http://www.apache.org/foundation/thanks.html">all the folks</a> who have <a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">sponsored</a> the Apache Software Foundation. </p>
 
-<p>Want to help sponsor the foundation?  <a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Click here for more info</a>.</p>
-          </div>
+<p>Want to help sponsor the foundation?  <a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Click here for more info</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/spring-support.html
==============================================================================
--- websites/production/activemq/content/spring-support.html (original)
+++ websites/production/activemq/content/spring-support.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>We fully support Spring for configuration of the JMS client side as well as for configuring the JMS Message Broker.<br clear="none">
+<div class="wiki-content maincontent"><p>We fully support Spring for configuration of the JMS client side as well as for configuring the JMS Message Broker.<br clear="none">
 There is a great <a shape="rect" class="external-link" href="http://codedependents.com/2009/10/16/efficient-lightweight-jms-with-spring-and-activemq/" rel="nofollow">article</a> on using Spring with ActiveMQ - I'd recommend reading it first.</p>
 
 <h2><a shape="rect" name="SpringSupport-ConfiguringtheJMSclient"></a>Configuring the JMS client</h2>
@@ -189,8 +188,7 @@ There is a great <a shape="rect" class="
 
 <p>Also check out the following blogs for information about using Spring JMS with ActiveMQ: </p>
 <ul><li><a shape="rect" class="external-link" href="http://codedependents.com/2010/03/04/synchronous-request-response-with-activemq-and-spring/" rel="nofollow">Synchronous Request Response with ActiveMQ and Spring</a></li><li><a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html" rel="nofollow">Using Spring to Send JMS Messages</a></li><li><a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html" rel="nofollow">Using Spring to Receive JMS Messages</a></li><li><a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html" rel="nofollow">Tuning JMS Message Consumption In Spring</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sqlserver.html
==============================================================================
--- websites/production/activemq/content/sqlserver.html (original)
+++ websites/production/activemq/content/sqlserver.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="SQLServer-SQLServer"></a>SQL Server</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="SQLServer-SQLServer"></a>SQL Server</h2>
 
 
 <h3><a shape="rect" name="SQLServer-SQLServer2000Drivers%26nbsp%3B"></a>SQL Server 2000 Drivers&#160;</h3>
@@ -150,8 +149,7 @@ value="com.microsoft.jdbc.sqlserver.SQLS
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Key </th><th colspan="1" rowspan="1" class="confluenceTh"> Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> TcpTimedWaitDelay </td><td colspan="1" rowspan="1" class="confluenceTd"> DWORD </td><td colspan="1" rowspan="1" class="confluenceTd"> HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\ Services\TCPIP\Parameters </td><td colspan="1" rowspan="1" class="confluenceTd"> 30 (Decimal) </td><td colspan="1" rowspan="1" class="confluenceTd"> Reduces the time a connection spends in TIME_WAIT to 30 seconds </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> MaxUserPort </td><td colspan="1" rowspan="1" class="confluenceTd"> DWORD </td><td colspan="1" rowspan="1" class="confluenceTd"> HKEY_
 LOCAL_MACHINE\SYSTEM\CurrentControlSet\ Services\TCPIP\Parameters </td><td colspan="1" rowspan="1" class="confluenceTd"> 32768 (Decimal) </td><td colspan="1" rowspan="1" class="confluenceTd"> Increases the number of ports a client application can use to 32768 </td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ssl-transport-reference.html
==============================================================================
--- websites/production/activemq/content/ssl-transport-reference.html (original)
+++ websites/production/activemq/content/ssl-transport-reference.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h3><a shape="rect" name="SSLTransportReference-TheSSLTransport"></a>The SSL Transport</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="SSLTransportReference-TheSSLTransport"></a>The SSL Transport</h3>
 
 <p>The SSL transport allows clients to connect to a remote ActiveMQ broker using SSL over a TCP socket.</p>
 
@@ -156,8 +155,7 @@ ssl://localhost:61616?transport.needClie
 The reason is to prevent ActiveMQ atempting to connect to itself - if you do this with a self-signed<br clear="none">
 certificate, you will get a constant spam of certificate_unknown<br clear="none">
 stacktraces to the console, as the broker is not configured with the<br clear="none">
-truststore,</p></td></tr></table></div>
-          </div>
+truststore,</p></td></tr></table></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/static-transport-reference.html
==============================================================================
--- websites/production/activemq/content/static-transport-reference.html (original)
+++ websites/production/activemq/content/static-transport-reference.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h3><a shape="rect" name="StaticTransportReference-TheStaticTransport"></a>The Static Transport</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="StaticTransportReference-TheStaticTransport"></a>The Static Transport</h3>
 
 <p>The static transport provides a hard coded mechanism to discover other connections using a list of URIs. A connection using this discovery mechanism will attempt to connect to all URIs in the list until it is succesful.</p>
 
@@ -97,8 +96,7 @@
 
 <h5><a shape="rect" name="StaticTransportReference-Notes"></a>Notes</h5>
 
-<p>As the static transport protocol is for broker discovery, it should not be used by client programs. Clients wishing to failover to a static list of broker instances, should use the <a shape="rect" class="external-link" href="http://activemq.apache.org/failover-transport-reference.html">failover://</a> transport instead. </p>
-          </div>
+<p>As the static transport protocol is for broker discovery, it should not be used by client programs. Clients wishing to failover to a static list of broker instances, should use the <a shape="rect" class="external-link" href="http://activemq.apache.org/failover-transport-reference.html">failover://</a> transport instead. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/statisticsplugin.html
==============================================================================
--- websites/production/activemq/content/statisticsplugin.html (original)
+++ websites/production/activemq/content/statisticsplugin.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Beginning in ActiveMQ 5.3, a statistics plugin is included that can be used to retrieve statistics from the broker or its destinations. Note that the message must contain a <tt>replyTo</tt> header (the <tt>jmsReplyTo</tt> header if you're using JMS) else the message will be ignored. The <tt>replyTo</tt> header must contain the name of the destination from which you want to retrieve the stats message(s). The statistics message is a <tt>MapMessage</tt> populated with statistics for the target (i.e., a broker or a destination).</p>
+<div class="wiki-content maincontent"><p>Beginning in ActiveMQ 5.3, a statistics plugin is included that can be used to retrieve statistics from the broker or its destinations. Note that the message must contain a <tt>replyTo</tt> header (the <tt>jmsReplyTo</tt> header if you're using JMS) else the message will be ignored. The <tt>replyTo</tt> header must contain the name of the destination from which you want to retrieve the stats message(s). The statistics message is a <tt>MapMessage</tt> populated with statistics for the target (i.e., a broker or a destination).</p>
 
 <p>To retrieve stats for the broker, just send an empty message to the destination named <tt>ActiveMQ.Statistics.Broker</tt> along with a <tt>replyTo</tt> header. To retrieve stats for a destination, just send an empty message to the destination named  <tt>ActiveMQ.Statistics.Destination.&lt;destination-name&gt;</tt> or <tt>ActiveMQ.Statistics.Destination.&lt;wildcard-expression&gt;</tt> along with a <tt>replyTo</tt> header. If many destinations match a given wildcard expression, one stats message for each destination will be sent to the <tt>replyTo</tt> destination. </p>
 
@@ -254,8 +253,7 @@ dequeueCounter=0<br clear="none">
 enqueueCounter=1<br clear="none">
 retroactive=false<br clear="none">
 dispatchedCounter=1</p>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/stomp.html
==============================================================================
--- websites/production/activemq/content/stomp.html (original)
+++ websites/production/activemq/content/stomp.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>ActiveMQ supports the <a shape="rect" class="external-link" href="http://stomp.github.com/" rel="nofollow">Stomp</a> protocol and the Stomp - JMS mapping. This makes it easy to write a client in pure <a shape="rect" href="ruby.html" title="Ruby">Ruby</a>, <a shape="rect" href="perl.html" title="Perl">Perl</a>, <a shape="rect" href="python.html" title="Python">Python</a> or <a shape="rect" href="php.html" title="PHP">PHP</a> for working with ActiveMQ.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ supports the <a shape="rect" class="external-link" href="http://stomp.github.com/" rel="nofollow">Stomp</a> protocol and the Stomp - JMS mapping. This makes it easy to write a client in pure <a shape="rect" href="ruby.html" title="Ruby">Ruby</a>, <a shape="rect" href="perl.html" title="Perl">Perl</a>, <a shape="rect" href="python.html" title="Python">Python</a> or <a shape="rect" href="php.html" title="PHP">PHP</a> for working with ActiveMQ.</p>
 
 <p>Please see the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp site</a> for more details</p>
 
@@ -364,8 +363,7 @@ ant stomp
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Verb </th><th colspan="1" rowspan="1" class="confluenceTh"> Header </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> CONNECT </td><td colspan="1" rowspan="1" class="confluenceTd"> client-id </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies the JMS Client ID which is used in combination with the activemq.subcriptionName to denote a durable subscriber. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> selector </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies a JMS Selector using SQL 92 syntax as specified in the JMS 1.1 specif
 iciation. This allows a filter to be applied to each message as part of the subscription. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.dispatchAsync </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> Should messages be dispatched synchronously or asynchronously from the producer thread for non-durable topics in the broker? For fast consumers set this to <b>false</b>. For slow consumers set it to <b>true</b> so that dispatching will not block fast consumers. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.exclusive </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> I would like to be an <a shape="rect" href="exclusive-consumer.html" title="Exclusive Consumer">Exclusive Con
 sumer</a> on the queue. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.maximumPendingMessageLimit </td><td colspan="1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> For <a shape="rect" href="slow-consumer-handling.html" title="Slow Consumer Handling">Slow Consumer Handling</a> on non-durable topics by dropping old messages - we can set a maximum-pending limit, such that once a slow consumer backs up to this high water mark we begin to discard old messages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.noLocal </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies whether or not locally sent messages should be ignored for subscriptions. Set to <b>true</b> to filter out locally sent mess
 ages. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.prefetchSize </td><td colspan="1" rowspan="1" class="confluenceTd"> int </td><td colspan="1" rowspan="1" class="confluenceTd"> Specifies the maximum number of pending messages that will be dispatched to the client. Once this maximum is reached no more messages are dispatched until the client acknowledges a message. Set to <b>1</b> for very fair distribution of messages across consumers where processing messages can be slow. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.priority </td><td colspan="1" rowspan="1" class="confluenceTd"> byte </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets the priority of the consumer so that dispatching can be weighted in priority order. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE 
 </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.retroactive </td><td colspan="1" rowspan="1" class="confluenceTd"> boolean </td><td colspan="1" rowspan="1" class="confluenceTd"> For non-durable topics make this subscription <a shape="rect" href="retroactive-consumer.html" title="Retroactive Consumer">retroactive</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> SUBSCRIBE </td><td colspan="1" rowspan="1" class="confluenceTd"> activemq.subscriptionName </td><td colspan="1" rowspan="1" class="confluenceTd"> string </td><td colspan="1" rowspan="1" class="confluenceTd"> For durable topic subscriptions you must specify the same clientId on the connection and subcriptionName on the subscribe.<br clear="none" class="atl-forced-newline">
  <em><b>Note the spelling</b></em>: subcriptionName NOT subscriptionName. This is not intuitive, but it is how it is implemented in ActiveMQ 4.x. For the 5.0 release of ActiveMQ, both subcriptionName and <b><em>subscriptionName</em></b> will be supported <b>(subcriptionName removed as of v5.6.0)</b></td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/stp.html
==============================================================================
--- websites/production/activemq/content/stp.html (original)
+++ websites/production/activemq/content/stp.html Wed Nov 13 17:23:00 2013
@@ -72,9 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
-          </div>
+<div class="wiki-content maincontent"></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/structured-message-properties-and-mapmessages.html
==============================================================================
--- websites/production/activemq/content/structured-message-properties-and-mapmessages.html (original)
+++ websites/production/activemq/content/structured-message-properties-and-mapmessages.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="StructuredMessagePropertiesandMapMessages-StructuredMessagePropertiesandMapMessages"></a>Structured Message Properties and MapMessages</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="StructuredMessagePropertiesandMapMessages-StructuredMessagePropertiesandMapMessages"></a>Structured Message Properties and MapMessages</h2>
 
 <p>This JMS extension feature allows you to attach Map and List properties to any JMS Message or to use nested Maps and Lists inside a MapMessage. This allows you to efficiently send typesafe structured information in your messages without requiring the overhead of XML/XSD parsing which are parseable in other languages like C, C++, C# etc.</p>
 
@@ -85,8 +84,7 @@
 <p>The value can be an arbitrarily nested structure of Maps, Lists and primitive objects (numbers and strings). To give you an idea of the kinds of things you can do you could try looking at these unit test cases</p>
 
 <ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java">NestedMapMessageTest</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java">NestedMapAndListPropertyTest</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/subscription-recovery-policy.html
==============================================================================
--- websites/production/activemq/content/subscription-recovery-policy.html (original)
+++ websites/production/activemq/content/subscription-recovery-policy.html Wed Nov 13 17:23:00 2013
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>The subscription recovery policy allows you to go back in time when you subscribe to a topic.</p>
+<div class="wiki-content maincontent"><p>The subscription recovery policy allows you to go back in time when you subscribe to a topic.</p>
 
 <p>For example imagine you are processing a price feed; you're using a federated network and either a network glitch occurs or someone kills the broker you're talking to. If you reconnect to another broker in the cluster you may have lost messages.</p>
 
@@ -98,8 +97,7 @@
 <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html" rel="nofollow">http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html</a>
 <p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> TimedSubscriptionRecoveryPolicy </td><td colspan="1" rowspan="1" class="confluenceTd"> &lt;timedSubscriptionRecoveryPolicy recoverDuration="60000" /&gt; </td><td colspan="1" rowspan="1" class="confluenceTd"> Keep a timed buffer of messages around in memory and use that to recover new subscriptions. Recovery time is in milliseconds. </td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sun-jndi.html
==============================================================================
--- websites/production/activemq/content/sun-jndi.html (original)
+++ websites/production/activemq/content/sun-jndi.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 
 <p>here's an example jndi.properties file:</p>
 
@@ -188,8 +187,7 @@ QueueConnectionFactory/RefAddr/5/Type=us
 QueueConnectionFactory/RefAddr/5/Content=true
 QueueConnectionFactory/RefAddr/5/Encoding=String
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">