activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r886526 [17/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...
Date Wed, 13 Nov 2013 17:23:21 GMT
Modified: websites/production/activemq/content/openwire-cpp-client.html
==============================================================================
--- websites/production/activemq/content/openwire-cpp-client.html (original)
+++ websites/production/activemq/content/openwire-cpp-client.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">
 <h1><a shape="rect" name="OpenWireCPPClient-OpenWireC%5CClient"></a>OpenWire C++ Client</h1>
 
 
@@ -163,8 +162,7 @@ There are shortcomings to this approach.
 
 <p>Error handling is slightly different. The native C++ way of doing error handling is through exceptions. Exceptions work very well for something like the core library, so when an error occurs it will throw an instance of ActiveMQ::Exception to the caller. In the BrokerSession library, however, such exceptions may be caught by the background thread. In this case, that thread will call an application callback to pass along the exception. This ensures that all errors reach the application and can be dealt with appropriately.</p>
 
-<p>The default callback for exception handling simply print the relevant message to standard error.</p>
-          </div>
+<p>The default callback for exception handling simply print the relevant message to standard error.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/openwire-version-2-specification.html
==============================================================================
--- websites/production/activemq/content/openwire-version-2-specification.html (original)
+++ websites/production/activemq/content/openwire-version-2-specification.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>OpenWire Version 2 is not the latest version.</b><br clear="none">This article references OpenWire V2 which is no longer the latest version, the default setting shown in this article may not reflect the current defaults, see <a shape="rect" href="configuring-wire-formats.html" title="Configuring Wire Formats">this page</a> for the latest default OpenWire settings.</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>OpenWire Version 2 is not the latest version.</b><br clear="none">This article references OpenWire V2 which is no longer the latest version, the default setting shown in this article may not reflect the current defaults, see <a shape="rect" href="configuring-wire-formats.html" title="Configuring Wire Formats">this page</a> for the latest default OpenWire settings.</td></tr></table></div> 
 
 <h2><a shape="rect" name="OpenWireVersion2Specification-Overview"></a>Overview</h2>
 
@@ -324,8 +323,7 @@ cached-object-encoding:
 <h2><a shape="rect" name="OpenWireVersion2Specification-TightEncoding"></a>Tight Encoding</h2>
 
 <p>Another encoding option is supported by OpenWire which is called TightEncoding.  When tight encoding is used, it uses bit streams to marshal all the boolean values that would have taken up a byte in loose encoding to a bit in the bit stream.  To build the bit stream 2 passes through the object graph are taken so this is more CPU intensive marshaling process but it produces a smaller on the wire size.</p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/openwire.html
==============================================================================
--- websites/production/activemq/content/openwire.html (original)
+++ websites/production/activemq/content/openwire.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>OpenWire is our cross language <a shape="rect" href="wire-protocol.html" title="Wire Protocol">Wire Protocol</a> to allow native access to ActiveMQ from a number of different languages and platforms. The Java OpenWire transport is the default transport in ActiveMQ 4.x or later. For other languages see the following...</p>
+<div class="wiki-content maincontent"><p>OpenWire is our cross language <a shape="rect" href="wire-protocol.html" title="Wire Protocol">Wire Protocol</a> to allow native access to ActiveMQ from a number of different languages and platforms. The Java OpenWire transport is the default transport in ActiveMQ 4.x or later. For other languages see the following...</p>
 
 <ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">NMS</a> for the C# API to Messaging and the OpenWire implementation in C#</li><li><a shape="rect" href="openwire-c-client.html" title="OpenWire C Client">OpenWire C Client</a></li><li><a shape="rect" href="openwire-cpp-client.html" title="OpenWire CPP Client">OpenWire CPP Client</a></li></ul>
 
@@ -93,8 +92,7 @@
 <p>For a detailed specification of what you will see on the wire:</p>
 
 <ul><li><a shape="rect" href="openwire-version-2-specification.html" title="OpenWire Version 2 Specification">OpenWire Version 2 Specification</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/optimized-acknowledgement.html
==============================================================================
--- websites/production/activemq/content/optimized-acknowledgement.html (original)
+++ websites/production/activemq/content/optimized-acknowledgement.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="OptimizedAcknowledgement-Overview"></a>Overview</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="OptimizedAcknowledgement-Overview"></a>Overview</h2>
 
 <p>ActiveMQ supports acknowledging a range of messages in a single batch operations.  This option is disabled by default but can be used to improve throughput in some circumstances as it decreases load on the broker. Consider enabling it for your performance test scenario to see if it is applicable.</p>
 
@@ -111,8 +110,7 @@ cf = new ActiveMQConnectionFactory("tcp:
 </div></div>
 
 <h3><a shape="rect" name="OptimizedAcknowledgement-setOptimizeAcknowledgeTimeOut%285.6%29"></a>setOptimizeAcknowledgeTimeOut (5.6)</h3>
-<p>Since 5.4.2 there is a default timeout on a batch optimized acknowledge which ensures that acks are timely even if consumers are slow. On slow networks, the timeout can expire before the batch limit is reached so the reduced bandwith utilisation is bypassed. In version 5.6, the timeout is configurable via the optimizeAcknowledgeTimeOut attribute. Set as above via the connectiion URI or at the factory and connection level. The default value is 300ms, a value of 0 disables.</p>
-          </div>
+<p>Since 5.4.2 there is a default timeout on a batch optimized acknowledge which ensures that acks are timely even if consumers are slow. On slow networks, the timeout can expire before the batch limit is reached so the reduced bandwith utilisation is bypassed. In version 5.6, the timeout is configurable via the optimizeAcknowledgeTimeOut attribute. Set as above via the connectiion URI or at the factory and connection level. The default value is 300ms, a value of 0 disables.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/osgi-integration.html
==============================================================================
--- websites/production/activemq/content/osgi-integration.html (original)
+++ websites/production/activemq/content/osgi-integration.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="OSGiIntegration-Introduction"></a>Introduction</h1>
+<div class="wiki-content maincontent"><h1><a shape="rect" name="OSGiIntegration-Introduction"></a>Introduction</h1>
 
 <p>This article will provide more details on how to use ActiveMQ in <a shape="rect" class="external-link" href="http://karaf.apache.org/">Apache Karaf</a>, small OSGi based runtime. Apache Karaf was previously know as <em>ServiceMix kernel</em>, so informations found here are applicable to <a shape="rect" class="external-link" href="http://servicemix.apache.org/home.html">Apache ServiceMix Enterprise Service Bus</a> as well.</p>
 
@@ -206,8 +205,7 @@ karaf@root&gt; activemq:query --jmxlocal
 </div></div>
 <p>It will display informations about the connectors, list of queues, etc...</p>
 
-<p>You can also browse or purge queues using the <tt>activemq:browse</tt> and <tt>activemq:purge</tt> commands.  </p>
-          </div>
+<p>You can also browse or purge queues using the <tt>activemq:browse</tt> and <tt>activemq:purge</tt> commands.  </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/outbound-communication.html
==============================================================================
--- websites/production/activemq/content/outbound-communication.html (original)
+++ websites/production/activemq/content/outbound-communication.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 
 
 <h2><a shape="rect" name="OutboundCommunication-ConfiguringaSessionBeantosendmessagestoActiveMQ"></a>Configuring a Session Bean to send messages to ActiveMQ</h2>
@@ -244,8 +243,7 @@
 
 <p>The above example highlights the key configuration settings needed to enable EJBs deployed in JBoss to send JMS messages to an ActiveMQ destination.  </p>
 
-<p>You can try the above example, plus a few more, by downloading the <a shape="rect" href="outbound-communication.data/activemq-jboss-test.zip?version=3&amp;modificationDate=1117021355000">activemq-jboss-test.zip</a> file which contains the complete sample project.</p>
-          </div>
+<p>You can try the above example, plus a few more, by downloading the <a shape="rect" href="outbound-communication.data/activemq-jboss-test.zip?version=3&amp;modificationDate=1117021355000">activemq-jboss-test.zip</a> file which contains the complete sample project.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/overview.html
==============================================================================
--- websites/production/activemq/content/overview.html (original)
+++ websites/production/activemq/content/overview.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="download.html" title="Download">Download</a><ul><li><a shape="rect" href="activemq-11-release.html" title="ActiveMQ 1.1 Release">ActiveMQ 1.1 Release</a></li><li><a shape="rect" href="activemq-12-release.html" title="ActiveMQ 1.2 Release">ActiveMQ 1.2 Release</a></li><li><a shape="rect" href="activemq-13-release.html" title="ActiveMQ 1.3 Release">ActiveMQ 1.3 Release</a></li><li><a shape="rect" href="activemq-14-release.html" title="ActiveMQ 1.4 Release">ActiveMQ 1.4 Release</a></li><li><a shape="rect" href="activemq-15-release.html" title="ActiveMQ 1.5 Release">ActiveMQ 1.5 Release</a></li><li><a shape="rect" href="activemq-20-release.html" title="ActiveMQ 2.0 Release">ActiveMQ 2.0 Release</a></li><li><a shape="rect" href="activemq-21-release.html" title="ActiveMQ 2.1 Release">ActiveMQ 2.1 Release</a></li><li><a shape="rect" href="activemq-30-release.html" title="ActiveMQ 3.0 Release">ActiveMQ 3.0 Release</a></li><li><a shape="rect" href="activemq-31-r
 elease.html" title="ActiveMQ 3.1 Release">ActiveMQ 3.1 Release</a></li><li><a shape="rect" href="activemq-321-release.html" title="ActiveMQ 3.2.1 Release">ActiveMQ 3.2.1 Release</a></li><li><a shape="rect" href="activemq-322-release.html" title="ActiveMQ 3.2.2 Release">ActiveMQ 3.2.2 Release</a></li><li><a shape="rect" href="activemq-32-release.html" title="ActiveMQ 3.2 Release">ActiveMQ 3.2 Release</a></li><li><a shape="rect" href="activemq-401-release.html" title="ActiveMQ 4.0.1 Release">ActiveMQ 4.0.1 Release</a></li><li><a shape="rect" href="activemq-402-release.html" title="ActiveMQ 4.0.2 Release">ActiveMQ 4.0.2 Release</a></li><li><a shape="rect" href="activemq-40-m4-release.html" title="ActiveMQ 4.0 M4 Release">ActiveMQ 4.0 M4 Release</a></li><li><a shape="rect" href="activemq-40-rc2-release.html" title="ActiveMQ 4.0 RC2 Release">ActiveMQ 4.0 RC2 Release</a></li><li><a shape="rect" href="activemq-40-release.html" title="ActiveMQ 4.0 Release">ActiveMQ 4.0 Release</a></li><li><
 a shape="rect" href="activemq-410-release.html" title="ActiveMQ 4.1.0 Release">ActiveMQ 4.1.0 Release</a></li><li><a shape="rect" href="activemq-411-release.html" title="ActiveMQ 4.1.1 Release">ActiveMQ 4.1.1 Release</a></li><li><a shape="rect" href="activemq-412-release.html" title="ActiveMQ 4.1.2 Release">ActiveMQ 4.1.2 Release</a></li><li><a shape="rect" href="activemq-500-release.html" title="ActiveMQ 5.0.0 Release">ActiveMQ 5.0.0 Release</a></li><li><a shape="rect" href="activemq-510-release.html" title="ActiveMQ 5.1.0 Release">ActiveMQ 5.1.0 Release</a></li><li><a shape="rect" href="activemq-520-release.html" title="ActiveMQ 5.2.0 Release">ActiveMQ 5.2.0 Release</a></li><li><a shape="rect" href="activemq-530-release.html" title="ActiveMQ 5.3.0 Release">ActiveMQ 5.3.0 Release</a></li><li><a shape="rect" href="activemq-531-release.html" title="ActiveMQ 5.3.1 Release">ActiveMQ 5.3.1 Release</a></li><li><a shape="rect" href="activemq-532-release.html" title="ActiveMQ 5.3.2 Release
 ">ActiveMQ 5.3.2 Release</a></li><li><a shape="rect" href="activemq-540-release.html" title="ActiveMQ 5.4.0 Release">ActiveMQ 5.4.0 Release</a></li><li><a shape="rect" href="activemq-541-release.html" title="ActiveMQ 5.4.1 Release">ActiveMQ 5.4.1 Release</a></li><li><a shape="rect" href="activemq-542-release.html" title="ActiveMQ 5.4.2 Release">ActiveMQ 5.4.2 Release</a></li><li><a shape="rect" href="activemq-543-release.html" title="ActiveMQ 5.4.3 Release">ActiveMQ 5.4.3 Release</a></li><li><a shape="rect" href="activemq-550-release.html" title="ActiveMQ 5.5.0 Release">ActiveMQ 5.5.0 Release</a></li><li><a shape="rect" href="activemq-551-release.html" title="ActiveMQ 5.5.1 Release">ActiveMQ 5.5.1 Release</a></li><li><a shape="rect" href="activemq-560-release.html" title="ActiveMQ 5.6.0 Release">ActiveMQ 5.6.0 Release</a></li><li><a shape="rect" href="activemq-570-release.html" title="ActiveMQ 5.7.0 Release">ActiveMQ 5.7.0 Release</a></li><li><a shape="rect" href="activemq-580-relea
 se.html" title="ActiveMQ 5.8.0 Release">ActiveMQ 5.8.0 Release</a><ul><li><a shape="rect" href="58-migration-guide.html" title="5.8 Migration Guide">5.8 Migration Guide</a></li></ul></li><li><a shape="rect" href="activemq-590-release.html" title="ActiveMQ 5.9.0 Release">ActiveMQ 5.9.0 Release</a><ul><li><a shape="rect" href="59-migration-guide.html" title="5.9 Migration Guide">5.9 Migration Guide</a></li></ul></li><li><a shape="rect" href="in-progress.html" title="In Progress">In Progress</a><ul><li><a shape="rect" href="activemq-5100-release.html" title="ActiveMQ 5.10.0 Release">ActiveMQ 5.10.0 Release</a></li></ul></li></ul></li><li><a shape="rect" href="download-archives.html" title="Download Archives">Download Archives</a></li><li><a shape="rect" href="javadocs.html" title="JavaDocs">JavaDocs</a></li><li><a shape="rect" href="news.html" title="News">News</a></li></ul> 
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" href="download.html" title="Download">Download</a><ul><li><a shape="rect" href="activemq-11-release.html" title="ActiveMQ 1.1 Release">ActiveMQ 1.1 Release</a></li><li><a shape="rect" href="activemq-12-release.html" title="ActiveMQ 1.2 Release">ActiveMQ 1.2 Release</a></li><li><a shape="rect" href="activemq-13-release.html" title="ActiveMQ 1.3 Release">ActiveMQ 1.3 Release</a></li><li><a shape="rect" href="activemq-14-release.html" title="ActiveMQ 1.4 Release">ActiveMQ 1.4 Release</a></li><li><a shape="rect" href="activemq-15-release.html" title="ActiveMQ 1.5 Release">ActiveMQ 1.5 Release</a></li><li><a shape="rect" href="activemq-20-release.html" title="ActiveMQ 2.0 Release">ActiveMQ 2.0 Release</a></li><li><a shape="rect" href="activemq-21-release.html" title="ActiveMQ 2.1 Release">ActiveMQ 2.1 Release</a></li><li><a shape="rect" href="activemq-30-release.html" title="ActiveMQ 3.0 Release">ActiveMQ 3.0 Release</a></li><
 li><a shape="rect" href="activemq-31-release.html" title="ActiveMQ 3.1 Release">ActiveMQ 3.1 Release</a></li><li><a shape="rect" href="activemq-321-release.html" title="ActiveMQ 3.2.1 Release">ActiveMQ 3.2.1 Release</a></li><li><a shape="rect" href="activemq-322-release.html" title="ActiveMQ 3.2.2 Release">ActiveMQ 3.2.2 Release</a></li><li><a shape="rect" href="activemq-32-release.html" title="ActiveMQ 3.2 Release">ActiveMQ 3.2 Release</a></li><li><a shape="rect" href="activemq-401-release.html" title="ActiveMQ 4.0.1 Release">ActiveMQ 4.0.1 Release</a></li><li><a shape="rect" href="activemq-402-release.html" title="ActiveMQ 4.0.2 Release">ActiveMQ 4.0.2 Release</a></li><li><a shape="rect" href="activemq-40-m4-release.html" title="ActiveMQ 4.0 M4 Release">ActiveMQ 4.0 M4 Release</a></li><li><a shape="rect" href="activemq-40-rc2-release.html" title="ActiveMQ 4.0 RC2 Release">ActiveMQ 4.0 RC2 Release</a></li><li><a shape="rect" href="activemq-40-release.html" title="ActiveMQ 4.0 Relea
 se">ActiveMQ 4.0 Release</a></li><li><a shape="rect" href="activemq-410-release.html" title="ActiveMQ 4.1.0 Release">ActiveMQ 4.1.0 Release</a></li><li><a shape="rect" href="activemq-411-release.html" title="ActiveMQ 4.1.1 Release">ActiveMQ 4.1.1 Release</a></li><li><a shape="rect" href="activemq-412-release.html" title="ActiveMQ 4.1.2 Release">ActiveMQ 4.1.2 Release</a></li><li><a shape="rect" href="activemq-500-release.html" title="ActiveMQ 5.0.0 Release">ActiveMQ 5.0.0 Release</a></li><li><a shape="rect" href="activemq-510-release.html" title="ActiveMQ 5.1.0 Release">ActiveMQ 5.1.0 Release</a></li><li><a shape="rect" href="activemq-520-release.html" title="ActiveMQ 5.2.0 Release">ActiveMQ 5.2.0 Release</a></li><li><a shape="rect" href="activemq-530-release.html" title="ActiveMQ 5.3.0 Release">ActiveMQ 5.3.0 Release</a></li><li><a shape="rect" href="activemq-531-release.html" title="ActiveMQ 5.3.1 Release">ActiveMQ 5.3.1 Release</a></li><li><a shape="rect" href="activemq-532-relea
 se.html" title="ActiveMQ 5.3.2 Release">ActiveMQ 5.3.2 Release</a></li><li><a shape="rect" href="activemq-540-release.html" title="ActiveMQ 5.4.0 Release">ActiveMQ 5.4.0 Release</a></li><li><a shape="rect" href="activemq-541-release.html" title="ActiveMQ 5.4.1 Release">ActiveMQ 5.4.1 Release</a></li><li><a shape="rect" href="activemq-542-release.html" title="ActiveMQ 5.4.2 Release">ActiveMQ 5.4.2 Release</a></li><li><a shape="rect" href="activemq-543-release.html" title="ActiveMQ 5.4.3 Release">ActiveMQ 5.4.3 Release</a></li><li><a shape="rect" href="activemq-550-release.html" title="ActiveMQ 5.5.0 Release">ActiveMQ 5.5.0 Release</a></li><li><a shape="rect" href="activemq-551-release.html" title="ActiveMQ 5.5.1 Release">ActiveMQ 5.5.1 Release</a></li><li><a shape="rect" href="activemq-560-release.html" title="ActiveMQ 5.6.0 Release">ActiveMQ 5.6.0 Release</a></li><li><a shape="rect" href="activemq-570-release.html" title="ActiveMQ 5.7.0 Release">ActiveMQ 5.7.0 Release</a></li><li><a
  shape="rect" href="activemq-580-release.html" title="ActiveMQ 5.8.0 Release">ActiveMQ 5.8.0 Release</a><ul><li><a shape="rect" href="58-migration-guide.html" title="5.8 Migration Guide">5.8 Migration Guide</a></li></ul></li><li><a shape="rect" href="activemq-590-release.html" title="ActiveMQ 5.9.0 Release">ActiveMQ 5.9.0 Release</a><ul><li><a shape="rect" href="59-migration-guide.html" title="5.9 Migration Guide">5.9 Migration Guide</a></li></ul></li><li><a shape="rect" href="in-progress.html" title="In Progress">In Progress</a><ul><li><a shape="rect" href="activemq-5100-release.html" title="ActiveMQ 5.10.0 Release">ActiveMQ 5.10.0 Release</a></li></ul></li></ul></li><li><a shape="rect" href="download-archives.html" title="Download Archives">Download Archives</a></li><li><a shape="rect" href="javadocs.html" title="JavaDocs">JavaDocs</a></li><li><a shape="rect" href="news.html" title="News">News</a></li></ul> </div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/peer-transport-reference.html
==============================================================================
--- websites/production/activemq/content/peer-transport-reference.html (original)
+++ websites/production/activemq/content/peer-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="PeerTransportReference-ThePeerTransport"></a>The Peer Transport</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="PeerTransportReference-ThePeerTransport"></a>The Peer Transport</h3>
 
 <p>The Peer transport provides a peer-to-peer network with ActiveMQ. What actually happens is the peer transport uses the VM transport to create and connect to a local embedded broker but which configures the embedded broker to establish network connections to other peer embedded brokers.</p>
 
@@ -89,8 +88,7 @@
 </div></div>
 <p>&#160;</p>
 
-<p>&#160;</p>
-          </div>
+<p>&#160;</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/per-destination-policies.html
==============================================================================
--- websites/production/activemq/content/per-destination-policies.html (original)
+++ websites/production/activemq/content/per-destination-policies.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>We support a number of different policies which can be attached to individual destinations (queues, topics) or to wildcards of queue/topic hierarchies. This makes it easy to configure how different regions of the JMS destination space are handled.</p>
+<div class="wiki-content maincontent"><p>We support a number of different policies which can be attached to individual destinations (queues, topics) or to wildcards of queue/topic hierarchies. This makes it easy to configure how different regions of the JMS destination space are handled.</p>
 
 <p>The properties you can set on a Destination are as follows:</p>
 
@@ -176,8 +175,7 @@
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/performance-report.html
==============================================================================
--- websites/production/activemq/content/performance-report.html (original)
+++ websites/production/activemq/content/performance-report.html Wed Nov 13 17:23:00 2013
@@ -72,14 +72,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="Performancereport-Performanceguides"></a>Performance guides</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Performancereport-Performanceguides"></a>Performance guides</h2>
 
+<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
 
-<p>There is a <a shape="rect" class="external-link" href="http://fusesource.com/docs/broker/5.4/tuning/index.html" rel="nofollow">FuseSource tuning guide</a></p>
-
-<p>If you're not convinced by performance reports then please do try running performance tests yourselfs. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
-          </div>
+<p>The Commercial Providers on the <a shape="rect" href="support.html" title="Support">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/performance-tuning.html
==============================================================================
--- websites/production/activemq/content/performance-tuning.html (original)
+++ websites/production/activemq/content/performance-tuning.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>For a more complete overview see <a shape="rect" href="performance.html" title="Performance">Performance</a>.</p>
+<div class="wiki-content maincontent"><p>For a more complete overview see <a shape="rect" href="performance.html" title="Performance">Performance</a>.</p>
 
 <p>There are trade-offs between performance and reliabilty. <br clear="none">
 By default, activemq strikes a balance between the two, so there are some things you can change to increase throughput.</p>
@@ -115,12 +114,10 @@ By default, activemq strikes a balance b
 
 <h2><a shape="rect" name="PerformanceTuning-Performanceguides"></a>Performance guides</h2>
 
+<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
 
-<p>There is a <a shape="rect" class="external-link" href="http://fusesource.com/docs/broker/5.4/tuning/index.html" rel="nofollow">FuseSource tuning guide</a></p>
-
-<p>If you're not convinced by performance reports then please do try running performance tests yourselfs. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
-
-          </div>
+<p>The Commercial Providers on the <a shape="rect" href="support.html" title="Support">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/performance.html
==============================================================================
--- websites/production/activemq/content/performance.html (original)
+++ websites/production/activemq/content/performance.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="Performance-Performance"></a>Performance</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Performance-Performance"></a>Performance</h2>
 
 <p>Performance differs greatly depending on many different factors</p>
 
@@ -95,11 +94,9 @@
 
 <h2><a shape="rect" name="Performance-Performanceguides"></a>Performance guides</h2>
 
+<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
 
-<p>There is a <a shape="rect" class="external-link" href="http://fusesource.com/docs/broker/5.4/tuning/index.html" rel="nofollow">FuseSource tuning guide</a></p>
-
-<p>If you're not convinced by performance reports then please do try running performance tests yourselfs. You might wanna check out our overview of <a shape="rect" href="performance.html" title="Performance">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">ActiveMQ Performance Module Users Manual</a></p>
-          </div>
+<p>The Commercial Providers on the <a shape="rect" href="support.html" title="Support">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/perl.html
==============================================================================
--- websites/production/activemq/content/perl.html (original)
+++ websites/production/activemq/content/perl.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="Perl-PerlSupport"></a>Perl Support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Perl-PerlSupport"></a>Perl Support</h2>
 
 <p>For Perl support we recommend the use of the <a shape="rect" class="external-link" href="http://activemq.apache.org/stomp.html">Stomp protocol</a>.<br clear="none">
 There are various Perl Stomp clients available, such as</p>
@@ -85,8 +84,7 @@ There are various Perl Stomp clients ava
 
 <p>A more exhausting list of Stomp client libraries for Perl is available on <a shape="rect" class="external-link" href="http://stomp.github.com//implementations.html" rel="nofollow">stomp.github.com</a>.</p>
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/persistence-questions.html
==============================================================================
--- websites/production/activemq/content/persistence-questions.html (original)
+++ websites/production/activemq/content/persistence-questions.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>Questions relating to long term persistence of messages.</p>
+<div class="wiki-content maincontent"><p>Questions relating to long term persistence of messages.</p>
 
-<ul><li><a shape="rect" href="are-messages-read-directly-from-the-journal.html" title="Are messages read directly from the journal">Are messages read directly from the journal</a></li><li><a shape="rect" href="does-activemq-support-my-sql-database.html" title="Does ActiveMQ support my SQL database">Does ActiveMQ support my SQL database</a></li><li><a shape="rect" href="how-does-journaling-work-with-multiple-brokers.html" title="How does journaling work with multiple brokers">How does journaling work with multiple brokers</a></li><li><a shape="rect" href="how-does-the-journal-work.html" title="How does the journal work">How does the journal work</a></li><li><a shape="rect" href="how-do-i-back-up-kahadb.html" title="How do I back-up KahaDB">How do I back-up KahaDB</a></li><li><a shape="rect" href="how-do-i-change-the-message-store-directory-for-an-embedded-broker.html" title="How do I change the message store directory for an embedded broker.">How do I change the message store directo
 ry for an embedded broker.</a></li><li><a shape="rect" href="is-there-a-specified-size-of-the-journal.html" title="Is there a specified size of the journal">Is there a specified size of the journal</a></li><li><a shape="rect" href="what-happens-when-the-journal-size-is-exceeded.html" title="What happens when the journal size is exceeded">What happens when the journal size is exceeded</a></li><li><a shape="rect" href="what-is-the-difference-between-persistent-and-non-persistent-delivery.html" title="What is the difference between persistent and non-persistent delivery">What is the difference between persistent and non-persistent delivery</a></li></ul>
-          </div>
+<ul><li><a shape="rect" href="are-messages-read-directly-from-the-journal.html" title="Are messages read directly from the journal">Are messages read directly from the journal</a></li><li><a shape="rect" href="does-activemq-support-my-sql-database.html" title="Does ActiveMQ support my SQL database">Does ActiveMQ support my SQL database</a></li><li><a shape="rect" href="how-does-journaling-work-with-multiple-brokers.html" title="How does journaling work with multiple brokers">How does journaling work with multiple brokers</a></li><li><a shape="rect" href="how-does-the-journal-work.html" title="How does the journal work">How does the journal work</a></li><li><a shape="rect" href="how-do-i-back-up-kahadb.html" title="How do I back-up KahaDB">How do I back-up KahaDB</a></li><li><a shape="rect" href="how-do-i-change-the-message-store-directory-for-an-embedded-broker.html" title="How do I change the message store directory for an embedded broker.">How do I change the message store directo
 ry for an embedded broker.</a></li><li><a shape="rect" href="is-there-a-specified-size-of-the-journal.html" title="Is there a specified size of the journal">Is there a specified size of the journal</a></li><li><a shape="rect" href="what-happens-when-the-journal-size-is-exceeded.html" title="What happens when the journal size is exceeded">What happens when the journal size is exceeded</a></li><li><a shape="rect" href="what-is-the-difference-between-persistent-and-non-persistent-delivery.html" title="What is the difference between persistent and non-persistent delivery">What is the difference between persistent and non-persistent delivery</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/persistence.html
==============================================================================
--- websites/production/activemq/content/persistence.html (original)
+++ websites/production/activemq/content/persistence.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="Persistence-ActiveMQV5.9"></a>ActiveMQ V5.9</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Persistence-ActiveMQV5.9"></a>ActiveMQ V5.9</h2>
 
 <p>In ActiveMQ 5.9, the <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> is introduced.  It handles using <a shape="rect" class="external-link" href="http://zookeeper.apache.org/">Apache ZooKeeper</a> to pick a master from a set of broker nodes configured to replicate single LevelDB Store.  Then synchronizes all slave LevelDB Stores with the master keeps them up to date by replicating all updates to the master.  This might become the preferred <a shape="rect" href="masterslave.html" title="MasterSlave">Master Slave</a> configuration going forward.</p>
 
@@ -249,8 +248,7 @@ For an example of using a configuration 
 
 <h2><a shape="rect" name="Persistence-OtherResources"></a>Other Resources</h2>
 
-<p><a shape="rect" class="external-link" href="https://access.redhat.com/knowledge/docs/en-US/Fuse_MQ_Enterprise/7.1/html/Configuring_Broker_Persistence/files/front.html" rel="nofollow">FUSE Source ActiveMQ Persistence Guide</a></p>
-          </div>
+<p><a shape="rect" class="external-link" href="https://access.redhat.com/knowledge/docs/en-US/Fuse_MQ_Enterprise/7.1/html/Configuring_Broker_Persistence/files/front.html" rel="nofollow">FUSE Source ActiveMQ Persistence Guide</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/php.html
==============================================================================
--- websites/production/activemq/content/php.html (original)
+++ websites/production/activemq/content/php.html Wed Nov 13 17:23:00 2013
@@ -72,12 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="PHP-PHPSupport"></a>PHP Support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="PHP-PHPSupport"></a>PHP Support</h2>
 
 <p>For PHP support we recommend the PHP Stomp Client. A list of available clients for PHP is available <a shape="rect" class="external-link" href="http://stomp.codehaus.org/implementations.html" rel="nofollow">here</a>.<br clear="none">
-Among others you can grab a stomp-php client from <a shape="rect" class="external-link" href="http://stomp.fusesource.org/release/php/1.0/stomp-php-1.0.0.tar.gz" rel="nofollow">here</a></p>
-          </div>
+Among others you can grab a stomp-php client from <a shape="rect" class="external-link" href="http://stomp.fusesource.org/release/php/1.0/stomp-php-1.0.0.tar.gz" rel="nofollow">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/pike.html
==============================================================================
--- websites/production/activemq/content/pike.html (original)
+++ websites/production/activemq/content/pike.html Wed Nov 13 17:23:00 2013
@@ -72,12 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="Pike-PikeSupport"></a>Pike Support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Pike-PikeSupport"></a>Pike Support</h2>
 
 <p>For Pike support we recommend the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/Pike" rel="nofollow">Pike Stomp Client</a></p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/pluggable-storage-lockers.html
==============================================================================
--- websites/production/activemq/content/pluggable-storage-lockers.html (original)
+++ websites/production/activemq/content/pluggable-storage-lockers.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>With 5.7.0 release, we introduced the change on locking strategies for shared storage master/slave topologies. Previously storage locking (and thus master election) was hard-coded directly in the particular store. So KahaDB had only the option to use shared file lock, while JDBC was using database lock.</p>
+<div class="wiki-content maincontent"><p>With 5.7.0 release, we introduced the change on locking strategies for shared storage master/slave topologies. Previously storage locking (and thus master election) was hard-coded directly in the particular store. So KahaDB had only the option to use shared file lock, while JDBC was using database lock.</p>
 
 <p>Now, the storage locking is separated from the store, so you can implement your own locking strategies if necessary (or tune existing ones). Of course, every store has it's own default locker.</p>
 <h2><a shape="rect" name="Pluggablestoragelockers-Lockers"></a>Lockers</h2>
@@ -157,8 +156,7 @@ In addition, where the database supports
 </div></div>
 
 <p>The lease based lock is acquired by blocking at start and retained by the keepAlivePeriod. To retain, the lease is extended by the lockAcquireSleepInterval, so in theory the master is always (lockAcquireSleepInterval-lockKeepAlivePeriod) ahead of the slave w.r.t the lease. It is imperative that lockAcquireSleepInterval &gt; lockKeepAlivePeriod, to ensure the lease is always current.<br clear="none">
-In the simplest case, the clocks between master and slave must be in sync for this solution to work properly. If the clocks cannot be in sync, the locker can use the system time from the database CURRENT TIME and adjust the timeouts in accordance with their local variance from the db system time. If maxAllowableDiffFromDBTime is &gt; 0 the local periods will be adjusted by any delta that exceeds maxAllowableDiffFromDBTime.</p>
-          </div>
+In the simplest case, the clocks between master and slave must be in sync for this solution to work properly. If the clocks cannot be in sync, the locker can use the system time from the database CURRENT TIME and adjust the timeouts in accordance with their local variance from the db system time. If maxAllowableDiffFromDBTime is &gt; 0 the local periods will be adjusted by any delta that exceeds maxAllowableDiffFromDBTime.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/point-to-point-with-multiple-consumers.html
==============================================================================
--- websites/production/activemq/content/point-to-point-with-multiple-consumers.html (original)
+++ websites/production/activemq/content/point-to-point-with-multiple-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">
 <p>Note:  I am in to JMS and active MQ.<br clear="none">
 I am writing an application and would like to use Active MQ as Queue for queuing up processing request and have them consumed by the next available node in a distributed system. (One producer many consumers)</p>
 
@@ -86,8 +85,7 @@ The behavior I want is that each consume
 
 <p>Thanks,<br clear="none">
 Brian Mason<br clear="none">
-bmason@chrome.com</p>
-          </div>
+bmason@chrome.com</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/polo-page.html
==============================================================================
--- websites/production/activemq/content/polo-page.html (original)
+++ websites/production/activemq/content/polo-page.html Wed Nov 13 17:23:00 2013
@@ -72,24 +72,22 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
+<div class="wiki-content maincontent">
 
-
-<map id="gliffy-map-4120-9127" name="gliffy-map-4120-9127"></map>
+<map id="gliffy-map-4120-9579" name="gliffy-map-4120-9579"></map>
 <table class="gliffy-macro-table" width="100%"><tr><td align="left" colspan="1" rowspan="1">
             <table class="gliffy-macro-inner-table"><caption align="bottom">
                     
                         
                         <a shape="rect" href="https://cwiki.apache.org/confluence/plugins/gliffy/viewlargediagram.action?name=test&amp;ceoid=50841&amp;key=ACTIVEMQ&amp;pageId=50841" target="_self">Full Size</a>
                                     </caption><tr><td colspan="1" rowspan="1">
-                        <img class="gliffy-macro-image" style="border: none; width: 384px;" usemap="#gliffy-map-4120-9127" src="https://cwiki.apache.org/confluence/download/attachments/50841/test.png?version=2&amp;modificationDate=1372086219000" alt="">
+                        <img class="gliffy-macro-image" style="border: none; width: 384px;" usemap="#gliffy-map-4120-9579" src="https://cwiki.apache.org/confluence/download/attachments/50841/test.png?version=2&amp;modificationDate=1372086219000" alt="">
                     </td></tr></table>
         </td></tr></table>
 
 
 
-<p><font color="#3366ff"><b>hello</b></font></p>
-          </div>
+<p><font color="#3366ff"><b>hello</b></font></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/previous-versions.html
==============================================================================
--- websites/production/activemq/content/previous-versions.html (original)
+++ websites/production/activemq/content/previous-versions.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="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>
-          </div>
+<div class="wiki-content maincontent"><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></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/privacy-policy.html
==============================================================================
--- websites/production/activemq/content/privacy-policy.html (original)
+++ websites/production/activemq/content/privacy-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>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
+<div class="wiki-content maincontent"><p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
 
 <ol><li>The IP address from which you access the website;</li><li>The type of browser and operating system you use to access our site;</li><li>The date and time you access our site;</li><li>The pages you visit; and</li><li>The addresses of pages from where you followed a link to our site.</li></ol>
 
@@ -82,8 +81,7 @@
 
 <p>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p>
 
-<p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p>
-          </div>
+<p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/producer-flow-control.html
==============================================================================
--- websites/production/activemq/content/producer-flow-control.html (original)
+++ websites/production/activemq/content/producer-flow-control.html Wed Nov 13 17:23:00 2013
@@ -82,8 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="ProducerFlowControl-ProducerFlowControl"></a>Producer Flow Control</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ProducerFlowControl-ProducerFlowControl"></a>Producer Flow Control</h2>
 
 <p>In ActiveMQ 4.x flow control was implemented using TCP flow control. The underlying network connection of throttled consumers was suspended to enforce flow control limits. This strategy is very efficient but can lead to deadlocks if there are multiple producers and consumers sharing the same connection.</p>
 
@@ -203,8 +202,7 @@ connctionFactory.setProducerWindowSize(1
 &lt;/systemUsage&gt;]]></script>
 </div></div>
 
-<p>You can set limits of memory for <tt>NON_PERSISTENT</tt> messages, disk storage for <tt>PERSITENT</tt> messages and total usage for temporary messages, the broker will use before it slowdown producers. <em>Using the default settings shown above, the broker will block the <tt>send()</tt> call until some messages are consumed and space becomes available on the broker.</em>  The default values are shown above, you will probably need to increase these values for your environment. </p>
-          </div>
+<p>You can set limits of memory for <tt>NON_PERSISTENT</tt> messages, disk storage for <tt>PERSITENT</tt> messages and total usage for temporary messages, the broker will use before it slowdown producers. <em>Using the default settings shown above, the broker will block the <tt>send()</tt> call until some messages are consumed and space becomes available on the broker.</em>  The default values are shown above, you will probably need to increase these values for your environment. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/projects-using-activemq.html
==============================================================================
--- websites/production/activemq/content/projects-using-activemq.html (original)
+++ websites/production/activemq/content/projects-using-activemq.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/camel/">Apache Camel</a> is a POJO based routing and mediation framework</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/cxf/">Apache CXF</a> is a JAX-WS client and web services framework</li><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a> is the J2EE server project of the Apache Software Foundation.</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/servicemix/">Apache ServiceMix</a> an open source Enterprise Service Bus (ESB) based around the Java Business Integration specification (JSR 208). ServiceMix consists of a JBI container and component suite, massive <a shape="rect" class="external-link" href="http://incubator.apache.org/servicemix/Components">connectivity</a> with complete integration with Spring and Geronimo as well as supporting straight through, SEDA and clustered message flows, sma
 rt routing and transformations and orchestration via BPEL.</li><li><a shape="rect" class="external-link" href="http://portals.apache.org/jetspeed-2/">Apache Jetspeed</a> is the Apache enterprise portal.</li><li><a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory</a> is the Apache LDAP and Directory services project.</li><li><a shape="rect" class="external-link" href="http://openejb.apache.org">Apache TomEE</a> ActiveMQ is the default JMS provider.</li><li><a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a> a remoting framework for <a shape="rect" class="external-link" href="http://www.springframework.org/" rel="nofollow">Spring</a> which use JMS and ActiveMQ by default.</li><li><a shape="rect" class="external-link" href="http://www.eclipse.org/" rel="nofollow">Eclipse</a> is integrating ActiveMQ into the real time editing features for team development</li><li><a shape="rect" class="external-link" hre
 f="http://activecluster.codehaus.org/" rel="nofollow">ActiveCluster</a> is a clustering API with an implementation which uses JMS and ActiveMQ by default.</li><li><a shape="rect" class="external-link" href="http://activesoap.codehaus.org/" rel="nofollow">ActiveSOAP</a> is a lightweight and fast SOAP stack with pluggable transports</li><li><a shape="rect" class="external-link" href="http://www.open-im.net/en/" rel="nofollow">OpenIM Java Jabber &#194;&#174; Server</a> is an open-source Java implementation (BSD License) of Jabber Instant Messager</li><li><a shape="rect" class="external-link" href="http://mule.codehaus.org/" rel="nofollow">Mule</a> is an Enterprise Service Bus (ESB) messaging framework. It is a scalable, highly distributable object broker that can seamlessly handle interactions with services and applications using disparate transport and messaging technologies.</li><li><a shape="rect" class="external-link" href="http://planb.cloudnine.net.nz/" rel="nofollow">plan/b</a> 
 a distributed backup system</li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes</a> is a Swing application that allows you to interact with JMS providers. Hermes will work with any JMS enabled transport making it easy to browse or seach queues and topics, copy (via drag and drop) messages and delete them.</li><li><a shape="rect" class="external-link" href="http://sourceforge.net/projects/springside/" rel="nofollow">SpringSide</a> Pragmatic Enterprise Application KickStart and Common Library Stack. Use Spring Framework as core,provided a enterprise application develop platform and demo the best practice in enterprise application.</li></ul>
-
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Apache Camel</a> is a POJO based routing and mediation framework</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/cxf/">Apache CXF</a> is a JAX-WS client and web services framework</li><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a> is the J2EE server project of the Apache Software Foundation.</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/servicemix/">Apache ServiceMix</a> an open source Enterprise Service Bus (ESB) based around the Java Business Integration specification (JSR 208). ServiceMix consists of a JBI container and component suite, massive <a shape="rect" class="external-link" href="http://incubator.apache.org/servicemix/Components">connectivity</a> with complete integration with Spring and Geronimo as well as supporting straight through,
  SEDA and clustered message flows, smart routing and transformations and orchestration via BPEL.</li><li><a shape="rect" class="external-link" href="http://portals.apache.org/jetspeed-2/">Apache Jetspeed</a> is the Apache enterprise portal.</li><li><a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory</a> is the Apache LDAP and Directory services project.</li><li><a shape="rect" class="external-link" href="http://openejb.apache.org">Apache TomEE</a> ActiveMQ is the default JMS provider.</li><li><a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a> a remoting framework for <a shape="rect" class="external-link" href="http://www.springframework.org/" rel="nofollow">Spring</a> which use JMS and ActiveMQ by default.</li><li><a shape="rect" class="external-link" href="http://www.eclipse.org/" rel="nofollow">Eclipse</a> is integrating ActiveMQ into the real time editing features for team development</li><li><a 
 shape="rect" class="external-link" href="http://activecluster.codehaus.org/" rel="nofollow">ActiveCluster</a> is a clustering API with an implementation which uses JMS and ActiveMQ by default.</li><li><a shape="rect" class="external-link" href="http://activesoap.codehaus.org/" rel="nofollow">ActiveSOAP</a> is a lightweight and fast SOAP stack with pluggable transports</li><li><a shape="rect" class="external-link" href="http://www.open-im.net/en/" rel="nofollow">OpenIM Java Jabber &#194;&#174; Server</a> is an open-source Java implementation (BSD License) of Jabber Instant Messager</li><li><a shape="rect" class="external-link" href="http://mule.codehaus.org/" rel="nofollow">Mule</a> is an Enterprise Service Bus (ESB) messaging framework. It is a scalable, highly distributable object broker that can seamlessly handle interactions with services and applications using disparate transport and messaging technologies.</li><li><a shape="rect" class="external-link" href="http://planb.cloudni
 ne.net.nz/" rel="nofollow">plan/b</a> a distributed backup system</li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes</a> is a Swing application that allows you to interact with JMS providers. Hermes will work with any JMS enabled transport making it easy to browse or seach queues and topics, copy (via drag and drop) messages and delete them.</li><li><a shape="rect" class="external-link" href="http://sourceforge.net/projects/springside/" rel="nofollow">SpringSide</a> Pragmatic Enterprise Application KickStart and Common Library Stack. Use Spring Framework as core,provided a enterprise application develop platform and demo the best practice in enterprise application.</li></ul>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/proposed-c-client-architecture.html
==============================================================================
--- websites/production/activemq/content/proposed-c-client-architecture.html (original)
+++ websites/production/activemq/content/proposed-c-client-architecture.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>4/16/06 - Attaching wire_formats.pdf - a first cut at defining all of the commands for both openwire an stomp.&#160; Working toward an architecture that will support both.&#160;</p>
 
 <p>///////////////////////////////////////////////&#160;</p>
@@ -84,8 +83,7 @@
 
 <p>&#160;Regards,</p>
 
-<p>Nathan Mittler&#160;</p>
-          </div>
+<p>Nathan Mittler&#160;</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/protocols.html
==============================================================================
--- websites/production/activemq/content/protocols.html (original)
+++ websites/production/activemq/content/protocols.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>Apache ActiveMQ is a message broker which supports multiple wire level protocols for maximum interoperability.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is a message broker which supports multiple wire level protocols for maximum interoperability.</p>
 
-<ul><li><a shape="rect" href="amqp.html" title="AMQP">AMQP</a></li><li><a shape="rect" href="mqtt.html" title="MQTT">MQTT</a></li><li><a shape="rect" href="openwire.html" title="OpenWire">OpenWire</a></li><li><a shape="rect" href="rest.html" title="REST">REST</a></li><li><a shape="rect" href="rss-and-atom.html" title="RSS and Atom">RSS and Atom</a></li><li><a shape="rect" href="stomp.html" title="Stomp">Stomp</a></li><li><a shape="rect" href="wsif.html" title="WSIF">WSIF</a></li><li><a shape="rect" href="ws-notification.html" title="WS Notification">WS Notification</a></li><li><a shape="rect" href="xmpp.html" title="XMPP">XMPP</a></li></ul>
-          </div>
+<ul><li><a shape="rect" href="amqp.html" title="AMQP">AMQP</a></li><li><a shape="rect" href="mqtt.html" title="MQTT">MQTT</a></li><li><a shape="rect" href="openwire.html" title="OpenWire">OpenWire</a></li><li><a shape="rect" href="rest.html" title="REST">REST</a></li><li><a shape="rect" href="rss-and-atom.html" title="RSS and Atom">RSS and Atom</a></li><li><a shape="rect" href="stomp.html" title="Stomp">Stomp</a></li><li><a shape="rect" href="wsif.html" title="WSIF">WSIF</a></li><li><a shape="rect" href="ws-notification.html" title="WS Notification">WS Notification</a></li><li><a shape="rect" href="xmpp.html" title="XMPP">XMPP</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/pure-master-slave.html
==============================================================================
--- websites/production/activemq/content/pure-master-slave.html (original)
+++ websites/production/activemq/content/pure-master-slave.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="PureMasterSlave-PureMasterSlave"></a>Pure Master Slave</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="PureMasterSlave-PureMasterSlave"></a>Pure Master Slave</h3>
 
 <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>This feature has been deprecated and will be removed in version 5.8</b><br clear="none">This feature will be removed in 5.8 as it has not evolved to be production ready. <br clear="none">
 You are advised to use <a shape="rect" href="masterslave.html" title="MasterSlave">shared storage master/slave</a> or the <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a>.<br clear="none">
@@ -169,8 +168,7 @@ To identify a broker as a slave - there 
     &lt;/transportConnectors&gt;
   &lt;/broker&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/python.html
==============================================================================
--- websites/production/activemq/content/python.html (original)
+++ websites/production/activemq/content/python.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="Python-PythonSupport"></a>Python Support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="Python-PythonSupport"></a>Python Support</h2>
 
 <p>For Python support we recommend the <a shape="rect" class="external-link" href="http://stomp.github.com/implementations.html" rel="nofollow">Python Stomp Client</a></p>
 
-<p>Alternatively, you can try <a shape="rect" class="external-link" href="http://code.google.com/p/pyactivemq/" rel="nofollow">pyactivemq</a>, which is a Python wrapper for the ActiveMQ C++ Library. Because the ActiveMQ C++ library supports both Stomp and Openwire, pyactivemq does too.</p>
-          </div>
+<p>Alternatively, you can try <a shape="rect" class="external-link" href="http://code.google.com/p/pyactivemq/" rel="nofollow">pyactivemq</a>, which is a Python wrapper for the ActiveMQ C++ Library. Because the ActiveMQ C++ library supports both Stomp and Openwire, pyactivemq does too.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/qos.html
==============================================================================
--- websites/production/activemq/content/qos.html (original)
+++ websites/production/activemq/content/qos.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>QoS is a MOM abbreviation of the term <em>Quality of Service</em>. There are many different kinds of messaging with different qualities of service such as</p>
@@ -81,8 +80,7 @@
 <ul><li>topics versus queues</li><li>durable messaging versus <em>reliable</em> (some buffering takes place but if a consumer is down long enough the messages are discarded)</li><li>message timeout</li></ul>
 
 
-<p>etc.</p>
-          </div>
+<p>etc.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/quicklinks.html
==============================================================================
--- websites/production/activemq/content/quicklinks.html (original)
+++ websites/production/activemq/content/quicklinks.html Wed Nov 13 17:23:00 2013
@@ -72,9 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p><a shape="rect" href="download.html" title="Download">Download</a> | <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.9.0/apidocs/index.html">JavaDocs</a> <a shape="rect" href="javadocs.html" title="JavaDocs">More...</a> | <a shape="rect" href="source.html" title="Source">Source</a> | <a shape="rect" href="discussion-forums.html" title="Discussion Forums">Forums</a> | <a shape="rect" href="support.html" title="Support">Support</a></p>
-          </div>
+<div class="wiki-content maincontent"><p><a shape="rect" href="download.html" title="Download">Download</a> | <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.9.0/apidocs/index.html">JavaDocs</a> <a shape="rect" href="javadocs.html" title="JavaDocs">More...</a> | <a shape="rect" href="source.html" title="Source">Source</a> | <a shape="rect" href="discussion-forums.html" title="Discussion Forums">Forums</a> | <a shape="rect" href="support.html" title="Support">Support</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/redelivery-policy.html
==============================================================================
--- websites/production/activemq/content/redelivery-policy.html (original)
+++ websites/production/activemq/content/redelivery-policy.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="RedeliveryPolicy-RedeliveryPolicy"></a>Redelivery Policy</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="RedeliveryPolicy-RedeliveryPolicy"></a>Redelivery Policy</h2>
 
 <p>Detail on when messages are redelivered to a client can be found in the <a shape="rect" href="message-redelivery-and-dlq-handling.html" title="Message Redelivery and DLQ Handling">Message Redelivery and DLQ Handling</a> section.</p>
 
@@ -124,8 +123,7 @@
     map.put(new ActiveMQQueue("&gt;"), queuePolicy);
 
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-guide.html
==============================================================================
--- websites/production/activemq/content/release-guide.html (original)
+++ websites/production/activemq/content/release-guide.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>How to create and announce an ActiveMQ release. This release is based on <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based project at Apache </a>, so be sure to check it out before continuing and meet all prerequisites.</p>
+<div class="wiki-content maincontent"><p>How to create and announce an ActiveMQ release. This release is based on <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based project at Apache </a>, so be sure to check it out before continuing and meet all prerequisites.</p>
 
 <h2><a shape="rect" name="ReleaseGuide-Maven2Setup"></a>Maven 2 Setup</h2>
 
@@ -242,8 +241,7 @@ and commit once it looks good.
 <ol><li>Perform a release in JIRA and create a new release version in JIRA.
 	<ol><li>Move unresolved issues to the next release first, in a bulk (do not send email) update</li><li>You might also want to search for resolved/closed issues with no fix version just in case</li></ol>
 	</li><li>Create a download page for the release in the WIKI similar like the <a shape="rect" href="activemq-530-release.html" title="ActiveMQ 5.3.0 Release">ActiveMQ 5.3.0 Release</a></li><li>Update the <a shape="rect" href="xml-reference.html" title="Xml Reference">Xml Reference</a> page with a link to the HTML and XSD</li><li>Update latest release link on home page</li><li>Update <a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a> and <a shape="rect" href="javadocs.html" title="JavaDocs">JavaDocs</a> pages</li><li>Mail the <a shape="rect" class="external-link" href="mailto:dev@activemq.codehaus.org" rel="nofollow">dev</a> &amp; <a shape="rect" class="external-link" href="mailto:user@activemq.codehaus.org" rel="nofollow">user</a> lists</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/pages/viewrecentblogposts.action?key=ACTIVEMQ">Post</a> a news entry on the WIKI</li><li>tweet</li><li>Have a beer! <img align="middle" class
 ="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" alt="" border="0"></li></ol>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-info.html
==============================================================================
--- websites/production/activemq/content/release-info.html (original)
+++ websites/production/activemq/content/release-info.html Wed Nov 13 17:23:00 2013
@@ -72,13 +72,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <h2><a shape="rect" name="ReleaseInfo-GeneralReleaseInformation"></a>General Release Information</h2>
 
 <ul><li><a shape="rect" class="external-link" href="http://jira.activemq.org/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" rel="nofollow">Current RoadMap</a></li><li><a shape="rect" href="release-guide.html" title="Release Guide">Release Guide</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/incubator/SigningReleases">Signing Releases</a></li><li><a shape="rect" class="external-link" href="http://apache.org/dev/mirrors.html">Apache Mirror Guidelines</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-plans.html
==============================================================================
--- websites/production/activemq/content/release-plans.html (original)
+++ websites/production/activemq/content/release-plans.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">
 <h3><a shape="rect" name="ReleasePlans-Information"></a>Information</h3>
 
 <ul><li><a shape="rect" href="release-info.html" title="Release Info">Release Info</a></li><li><a shape="rect" href="how-you-can-help-release.html" title="How you can help release">How you can help release</a></li></ul>
@@ -82,8 +81,7 @@
 <h3><a shape="rect" name="ReleasePlans-ReleasePlans"></a>Release Plans</h3>
 
 <ul><li><a shape="rect" href="40-rc-1-guide.html" title="4.0 RC 1 Guide">4.0 RC 1 Guide</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/replicated-leveldb-store.html
==============================================================================
--- websites/production/activemq/content/replicated-leveldb-store.html (original)
+++ websites/production/activemq/content/replicated-leveldb-store.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="ReplicatedLevelDBStore-Synopsis"></a>Synopsis</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ReplicatedLevelDBStore-Synopsis"></a>Synopsis</h2>
 
 <p>The Replicated LevelDB Store uses Apache ZooKeeper to pick a master from a set of broker nodes configured to replicate a LevelDB Store. Then synchronizes all slave LevelDB Stores with the master keeps them up to date by replicating all updates from the master.</p>
 
@@ -168,8 +167,7 @@ failover:(tcp://broker1:61616,tcp://brok
 
 
 
-<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>Caveats</b><br clear="none">The LevelDB store does not yet support storing data associated with <a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a>.  Those are are stored in a separate non-replicated KahaDB data files.  Unexpected results will occur if you use <a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a> with the replicated leveldb store since that data will be not be there when the master fails over to a slave.</td></tr></table></div>
-          </div>
+<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>Caveats</b><br clear="none">The LevelDB store does not yet support storing data associated with <a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a>.  Those are are stored in a separate non-replicated KahaDB data files.  Unexpected results will occur if you use <a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a> with the replicated leveldb store since that data will be not be there when the master fails over to a slave.</td></tr></table></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/replicated-message-store.html
==============================================================================
--- websites/production/activemq/content/replicated-message-store.html (original)
+++ websites/production/activemq/content/replicated-message-store.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>If messages are stored on the hard drive of a broker or inside a single database; then you have a single point of failure with respect to the message persistence. If you lose the entire machine, disk or database, you have lost messages.</p>
+<div class="wiki-content maincontent"><p>If messages are stored on the hard drive of a broker or inside a single database; then you have a single point of failure with respect to the message persistence. If you lose the entire machine, disk or database, you have lost messages.</p>
 
 <p>For some high end users, messages should never be lost as they could have a large impact on the business. These kinds of users often require some kind of <a shape="rect" href="dr.html" title="DR">DR</a> stategy to support message replication so that they can loose an entire data centre and still not loose a message.</p>
 
@@ -100,8 +99,7 @@
 <h4><a shape="rect" name="ReplicatedMessageStore-UseCJDBC"></a>Use C-JDBC</h4>
 
 <p>If you don't have or can't afford a clustered database then you could use <a shape="rect" class="external-link" href="http://c-jdbc.objectweb.org/" rel="nofollow">C-JDBC</a> to replicate state across a number of physical datbases to avoid single point of failure and provide a <a shape="rect" href="dr.html" title="DR">DR</a> solution. As noted above using a replicated JDBC approach is very slow as it requires us to disable the high performance journal.</p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.html
==============================================================================
--- websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.html (original)
+++ websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.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>It may seem like the resource adapter when used in an app server like geronimo or jboss is not pooling connections.  Looking the the ActiveMQ broker logs, it will show multiple message for each use of a pooled conntion simlilar to:</p>
+<div class="wiki-content maincontent"><p>It may seem like the resource adapter when used in an app server like geronimo or jboss is not pooling connections.  Looking the the ActiveMQ broker logs, it will show multiple message for each use of a pooled conntion simlilar to:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -93,8 +92,7 @@
 
 <p>At first glance it may seem like a new connection is being established..  but if you look at the logs is more detail, you will noticed that the client connection id's are being reused since the connections are being pooled.  This behavior is a side-effect of the connection being reset to a 'cleaned up' state.  It allows the next client to use the connection as if it has just been created.</p>
 
-<p>So these messages are normal, and YES, your jms connections are being pooled!</p>
-          </div>
+<p>So these messages are normal, and YES, your jms connections are being pooled!</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/resource-adapter-properties.html
==============================================================================
--- websites/production/activemq/content/resource-adapter-properties.html (original)
+++ websites/production/activemq/content/resource-adapter-properties.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 ActiveMQ Resource Adapter allows you to configure several properties that:</p>
+<div class="wiki-content maincontent"><p>The ActiveMQ Resource Adapter allows you to configure several properties that:</p>
 <ul><li>sets the options used for connection used for inbound message delivery</li><li>sets the default options used for the outbound connection factory objects.</li></ul>
 
 
@@ -121,8 +120,7 @@
 
 <p>Sets the XML configuration file used to configure the embedded ActiveMQ broker via Spring if using embedded mode. If this property is omitted then no embedded broker is used and you must <a shape="rect" href="run-broker.html" title="Run Broker">run the broker</a> in a separate process or deployment unit.</p>
 
-<p>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas <a shape="rect" class="external-link" href="file:dir/file.xml" rel="nofollow">file:dir/file.xml</a> would use the file system. Any valid URL string is supported. </p>
-          </div>
+<p>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas <a shape="rect" class="external-link" href="file:dir/file.xml" rel="nofollow">file:dir/file.xml</a> would use the file system. Any valid URL string is supported. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/resource-adapter.html
==============================================================================
--- websites/production/activemq/content/resource-adapter.html (original)
+++ websites/production/activemq/content/resource-adapter.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="ResourceAdapter-Introduction"></a>Introduction</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="ResourceAdapter-Introduction"></a>Introduction</h2>
 
 <p>ActiveMQ includes a Java Connector Architecture (JCA) 1.5 Resource Adapter.  JCA 1.5 defines the contract between an J2EE application server and external resources such as databases and messaging middleware.  It allows the application server to efficiently pool connections, control transactions and manage security.  The Resource Adapter allows ActiveMQ to be used from any J2EE 1.4 application server. We have tested that the Resource Adapter works in the following J2EE 1.4 containers</p>
 
@@ -105,8 +104,7 @@
 <h2><a shape="rect" name="ResourceAdapter-ConfigurationReference"></a>Configuration Reference</h2>
 
 <ul><li><a shape="rect" href="resource-adapter-properties.html" title="Resource Adapter Properties">Resource Adapter Properties</a></li><li><a shape="rect" href="connection-factory-properties.html" title="Connection Factory Properties">Connection Factory Properties</a></li><li><a shape="rect" href="activation-spec-properties.html" title="Activation Spec Properties">Activation Spec Properties</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rest-protocols.html
==============================================================================
--- websites/production/activemq/content/rest-protocols.html (original)
+++ websites/production/activemq/content/rest-protocols.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>There are many ways to map JMS to REST...</p>
+<div class="wiki-content maincontent"><p>There are many ways to map JMS to REST...</p>
 
 <h2><a shape="rect" name="RESTprotocols-CrappynonREST"></a>Crappy non-REST</h2>
 
@@ -150,8 +149,7 @@ POST lockNextMessage/consumerId?max=10 
 
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rest.html
==============================================================================
--- websites/production/activemq/content/rest.html (original)
+++ websites/production/activemq/content/rest.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>ActiveMQ implements a RESTful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ implements a RESTful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p>
 
 <p>If you are interested in messaging directly from web browsers you might wanna check out our <a shape="rect" href="ajax.html" title="Ajax">Ajax</a> or <a shape="rect" href="websockets.html" title="WebSockets">WebSockets</a> support or try <a shape="rect" href="web-samples.html" title="Web Samples">running the REST examples</a></p>
 
@@ -270,8 +269,7 @@ wget  --user admin --password admin --sa
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[wget --user admin --password admin --auth-no-challenge http://localhost:8161/api/jolokia/read/org.apache.activemq:type=Broker,brokerName=localhost/TotalConsumerCount]]></script>
 </div></div>
 
-<p>For more information on Jolokia protocol, see its reference manual. An API like this makes it easy to script monitoring and management operations agains the broker.</p>
-          </div>
+<p>For more information on Jolokia protocol, see its reference manual. An API like this makes it easy to script monitoring and management operations agains the broker.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/restful-queue.html
==============================================================================
--- websites/production/activemq/content/restful-queue.html (original)
+++ websites/production/activemq/content/restful-queue.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="RESTfulQueue-RESTfulQueue"></a>RESTful Queue</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="RESTfulQueue-RESTfulQueue"></a>RESTful Queue</h2>
 
 <p>This document is intended to document the ideal RESTful interface to message queues in light of</p>
 
@@ -277,8 +276,7 @@ DELETE messageUri
 
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message