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 [13/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/jca-container.html
==============================================================================
--- websites/production/activemq/content/jca-container.html (original)
+++ websites/production/activemq/content/jca-container.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="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"><b>The JCA Container is moving</b><br clear="none">We will continune to support the ActiveMQ JCA Container up until ActiveMQ 3.1.
+<div class="wiki-content maincontent"><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"><b>The JCA Container is moving</b><br clear="none">We will continune to support the ActiveMQ JCA Container up until ActiveMQ 3.1.
 
 <p>After that point we will be moving to <a shape="rect" class="external-link" href="http://jencks.codehaus.org/" rel="nofollow">Jencks</a> which is a migration of the ActiveMQ codebase together with code <a shape="rect" class="external-link" href="http://geronimo.apache.org">Geronimo</a> and from some other contributors.</p>
 
@@ -112,8 +111,7 @@
 
 <p>By default the ActiveMQ <a shape="rect" href="resource-adapter.html" title="Resource Adapter">Resource Adapter</a>  will try to connect to a remote broker (ie. tcp://localhost:61616).  Also if you want to set how the broker is configured via XML then try the <em>brokerXmlConfig</em> property.</p>
 
-<p><em>Note:</em> In AMQ 3.x the default behavior is the ActiveMQ resource adapter will create an embedded broker</p>
-          </div>
+<p><em>Note:</em> In AMQ 3.x the default behavior is the ActiveMQ resource adapter will create an embedded broker</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jdbc-master-slave.html
==============================================================================
--- websites/production/activemq/content/jdbc-master-slave.html (original)
+++ websites/production/activemq/content/jdbc-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="JDBCMasterSlave-JDBCMasterSlave"></a>JDBC Master Slave</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="JDBCMasterSlave-JDBCMasterSlave"></a>JDBC Master Slave</h2>
 
 <p>First supported in ActiveMQ version 4.1</p>
 
@@ -215,8 +214,7 @@ failover:(tcp://broker1:61616,tcp://brok
 ]]></script>
 </div></div>
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jdbc-support.html
==============================================================================
--- websites/production/activemq/content/jdbc-support.html (original)
+++ websites/production/activemq/content/jdbc-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 support a range of SQL databases for message persistence such as</p>
+<div class="wiki-content maincontent"><p>We support a range of SQL databases for message persistence such as</p>
 <ul><li>Apache Derby</li><li>Axion</li><li>DB2</li><li>HSQL</li><li>Informix</li><li>MaxDB</li><li>MySQL</li><li>Oracle</li><li>Postgresql</li><li><a shape="rect" href="sqlserver.html" title="SQLServer">SQLServer</a></li><li><a shape="rect" href="sybase.html" title="Sybase">Sybase</a></li></ul>
 
 
@@ -158,8 +157,7 @@
     ...
 &lt;/jdbcPersistence&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmeter-performance-tests.html
==============================================================================
--- websites/production/activemq/content/jmeter-performance-tests.html (original)
+++ websites/production/activemq/content/jmeter-performance-tests.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="JMeterPerformanceTests-JMeterperformancetest"></a>JMeter performance test</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMeterPerformanceTests-JMeterperformancetest"></a>JMeter performance test</h3>
 
 <p>You can use JMeter to test the performance of your ActiveMQ Server. Please refer to the <a shape="rect" class="external-link" href="http://jakarta.apache.org/jmeter/">JMeter site</a> for detailed instructions on using this software.</p>
 
@@ -133,8 +132,7 @@
 
 <p>4. JMeter Consumer Listener</p>
 <ul class="alternate" type="square"><li>The Consumer Listener would provide statistics with the number of messages received and average messages per second.</li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmeter-system-tests.html
==============================================================================
--- websites/production/activemq/content/jmeter-system-tests.html (original)
+++ websites/production/activemq/content/jmeter-system-tests.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="JMeterSystemTests-JMeterSystemTests"></a>JMeter System Tests</h3>
 <p>You can use JMeter to test your ActiveMQ Server. Please refer to the JMeter site for detailed instructions on using this software.<br clear="none">
 The Test would check for duplicate messages and the order of messages received.</p>
@@ -122,8 +121,7 @@ The Test would check for duplicate messa
 
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-and-jdbc-operations-in-one-transaction.html
==============================================================================
--- websites/production/activemq/content/jms-and-jdbc-operations-in-one-transaction.html (original)
+++ websites/production/activemq/content/jms-and-jdbc-operations-in-one-transaction.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="JMSandJDBCoperationsinonetransaction-JMSandJDBCoperationsinonetransactionwithSpring%2FJencks%2FActiveMQ"></a>JMS and JDBC operations in one transaction with Spring/Jencks/ActiveMQ</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMSandJDBCoperationsinonetransaction-JMSandJDBCoperationsinonetransactionwithSpring%2FJencks%2FActiveMQ"></a>JMS and JDBC operations in one transaction with Spring/Jencks/ActiveMQ</h3>
 
 <p>Spring beans:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -236,8 +235,7 @@ public class EchoBean implements Message
     }
 }
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-local-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-local-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-local-broker.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="JMSBridgeWithLocalBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontothelocalActiveMQbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMSBridgeWithLocalBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontothelocalActiveMQbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -117,8 +116,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-oracle-aq.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-oracle-aq.html (original)
+++ websites/production/activemq/content/jms-bridge-with-oracle-aq.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="JMSBridgeWithOracleAQ-ExampleofaconfigurationthatshowshowtoconnecttoOracleAQqueuesandtopics."></a>Example of a configuration that shows how to connect to Oracle AQ queues and topics.</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMSBridgeWithOracleAQ-ExampleofaconfigurationthatshowshowtoconnecttoOracleAQqueuesandtopics."></a>Example of a configuration that shows how to connect to Oracle AQ queues and topics.</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -198,8 +197,7 @@ END;  
 ]]></script>
 </div></div>
 
-<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" class="external-link" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm" rel="nofollow">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p>
-          </div>
+<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" class="external-link" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm" rel="nofollow">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-remote-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-remote-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-remote-broker.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="JMSBridgeWithRemoteBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteActiveMQbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMSBridgeWithRemoteBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteActiveMQbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -117,8 +116,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.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="JMSBridgeWithRemoteTIBCOBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteTIBCOEMSbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMSBridgeWithRemoteTIBCOBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteTIBCOEMSbroker."></a>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -121,8 +120,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-streams.html
==============================================================================
--- websites/production/activemq/content/jms-streams.html (original)
+++ websites/production/activemq/content/jms-streams.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><b>deprecated</b></p>
+<div class="wiki-content maincontent"><p><b>deprecated</b></p>
 
 <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">This feature is deprecated, and end users is encouraged to <b>not</b> use it. This feature will be removed in a later ActiveMQ release.</td></tr></table></div>
 
@@ -139,8 +138,7 @@ in.close();
 <p><em>Note:</em><br clear="none">
 The  counterpart classes in AMQ 3.x  are :</p>
 <ul><li>JMSInputStream</li><li>JMSOutputStream</li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-to-jms-bridge.html
==============================================================================
--- websites/production/activemq/content/jms-to-jms-bridge.html (original)
+++ websites/production/activemq/content/jms-to-jms-bridge.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="JMStoJMSBridge-Introduction"></a>Introduction</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="JMStoJMSBridge-Introduction"></a>Introduction</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>Warning, try Camel first!</b><br clear="none">Note that we recommend you look at using <a shape="rect" class="external-link" href="http://camel.apache.org/">Apache Camel</a> for bridging ActiveMQ to or from any message broker (or indeed <a shape="rect" class="external-link" href="http://camel.apache.org/components.html">any other technology, protocol or middleware</a>) as its much easier to:
 <ul><li>keep things flexible; its very easy to map different queue/topic to one or more queues or topics on the other provider</li><li>perform content based routing, filtering and other <a shape="rect" class="external-link" href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li>allows you to work with <a shape="rect" class="external-link" href="http://camel.apache.org/components.html">any technology, protocol or middleware</a>, not just JMS providers</li></ul>
@@ -382,8 +381,7 @@ public class BridgeTest {
 
 }
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms.html
==============================================================================
--- websites/production/activemq/content/jms.html (original)
+++ websites/production/activemq/content/jms.html Wed Nov 13 17:23:00 2013
@@ -72,12 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-
+<div class="wiki-content maincontent">
 <p>Questions on using the JMS API and <a shape="rect" href="mom.html" title="Message Orientated Middleware">MOM</a> in general</p>
 
-<ul><li><a shape="rect" href="can-i-modify-messages-on-a-queue.html" title="Can I modify messages on a queue">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html" title="Can I send and receive messages concurrently on one JMS Connection">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.html" title="Can you browse a topic">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.html" title="How do durable queues and topics work">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.html" title="How does a Queue compare to a Topic">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.html" title="How does ConnectionFactory relate to the Broker">How does ConnectionFactory
  relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.html" title="How does JMS compare with email">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.html" title="How do I consume a specific message">How do I consume a specific message</a></li><li><a shape="rect" href="how-do-i-get-started-with-jms.html" title="How do I get started with JMS">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.html" title="How do I make messages durable">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.html" title="How do I send messages to different Destinations from a single MessageProducer">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.html" title="How do I use JMS efficiently">How d
 o I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.html" title="How should I implement request response with JMS">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.html" title="How to unit test JMS code">How to unit test JMS code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.html" title="Multiple consumers on a queue">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.html" title="Should I use transactions">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.html" title="Should I use XA">Should I use XA</a></li><li><a shape="rect" href="what-are-administered-objects.html" title="What are administered objects">What are administered objects</a></li></ul>
-          </div>
+<ul><li><a shape="rect" href="can-i-modify-messages-on-a-queue.html" title="Can I modify messages on a queue">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html" title="Can I send and receive messages concurrently on one JMS Connection">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.html" title="Can you browse a topic">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.html" title="How do durable queues and topics work">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.html" title="How does a Queue compare to a Topic">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.html" title="How does ConnectionFactory relate to the Broker">How does ConnectionFactory
  relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.html" title="How does JMS compare with email">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.html" title="How do I consume a specific message">How do I consume a specific message</a></li><li><a shape="rect" href="how-do-i-get-started-with-jms.html" title="How do I get started with JMS">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.html" title="How do I make messages durable">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.html" title="How do I send messages to different Destinations from a single MessageProducer">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.html" title="How do I use JMS efficiently">How d
 o I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.html" title="How should I implement request response with JMS">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.html" title="How to unit test JMS code">How to unit test JMS code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.html" title="Multiple consumers on a queue">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.html" title="Should I use transactions">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.html" title="Should I use XA">Should I use XA</a></li><li><a shape="rect" href="what-are-administered-objects.html" title="What are administered objects">What are administered objects</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmstemplate-gotchas.html
==============================================================================
--- websites/production/activemq/content/jmstemplate-gotchas.html (original)
+++ websites/production/activemq/content/jmstemplate-gotchas.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 thing to remember is JmsTemplate is designed for use in EJBs using the EJB containers JMS pooling abstraction. So every method will typically create a connection, session, producer or consumer, do something, then close them all down again. The idea being that this will use the J2EE containers pooling mechanism to pool the JMS resources under the covers. Without using a pooled JMS provider from the EJB container this is the worst possible way of working with JMS; since typically each create/close of a connection, producer/consumer results in a request-response with the JMS broker.</p>
+<div class="wiki-content maincontent"><p>The thing to remember is JmsTemplate is designed for use in EJBs using the EJB containers JMS pooling abstraction. So every method will typically create a connection, session, producer or consumer, do something, then close them all down again. The idea being that this will use the J2EE containers pooling mechanism to pool the JMS resources under the covers. Without using a pooled JMS provider from the EJB container this is the worst possible way of working with JMS; since typically each create/close of a connection, producer/consumer results in a request-response with the JMS broker.</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"><b>User Story</b><br clear="none">We had a bug once in ActiveMQ where if you created 65535 MessageProducer instances within the space of a few seconds, we'd get an exception thrown in the broker. Its a kinda silly thing to do, to create that many producers in a small space of time (one for each message to be sent) - JMS is designed for resources like producers and consumers to be created up front and reused across many message exchanges. The bug was highlighted by a user using JmsTemplate without a JMS pool underneath. Well at least it helped find our bug which I'm glad to say is now fixed, but it didn't help their performance too much <img align="mid
 dle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" alt="" border="0"></td></tr></table></div>
 
@@ -88,8 +87,7 @@
 <h3><a shape="rect" name="JmsTemplateGotchas-RecommendationsforusingJmsTemplate"></a>Recommendations for using JmsTemplate</h3>
 
 <ul><li>Never use a regular ConnectionFactory unless you are totally sure it does all the pooling you need</li><li>If using in an EJB ensure you use the EJB containers ConnectionFactory</li><li>If you are only publishing messages and you are not in an EJB container and you are using ActiveMQ, then you can use either the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/activemq/pool/PooledConnectionFactory.html" rel="nofollow">PooledConnectionFactory</a> or the <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/api/org/springframework/jms/connection/CachingConnectionFactory.html" rel="nofollow">Spring CachingConnectionFactory</a></li><li>If you are consuming messages its probably simpler &amp; more efficient &amp; less likely to lose messages to avoid using the receive() method and use Spring's <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.h
 tml#jms-mdp" rel="nofollow">MessageListenerContainer</a> instead</li><li>See also <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> and <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></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmsxuserid.html
==============================================================================
--- websites/production/activemq/content/jmsxuserid.html (original)
+++ websites/production/activemq/content/jmsxuserid.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="JMSXUserID-JMSXUserIDsupport"></a>JMSXUserID support</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="JMSXUserID-JMSXUserIDsupport"></a>JMSXUserID support</h2>
 
 <p>It is sometimes useful to know the authenticated username of the sender of a message. This is not added by default but you can enable it by setting the <b>populateJMSXUserID</b> property on the broker via Java code</p>
 
@@ -110,8 +109,7 @@ broker.start();
 
 <p>If you allow anonymous access, you MUST also add the </p><div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[useAuthenticatedPrincipalForJMSXUserID="true"]]></script>
-</div></div> property of the broker element. Otherwise, anonymous clients can spoof identities by setting the JMSXUserID property on from the client. This property is available in version 5.5 or 5.5-SNAPSHOT &gt; March 12th. Note, though, that for SSL certificate based authentication, e.g., when using TextFileCertificateLoginModule JAAS module, this will change the semantics of the broker-provided JMSXUserID. Instead of returning the DN of the certificate, it will provide the name the DN is mapped to by the JAAS module.
-          </div>
+</div></div> property of the broker element. Otherwise, anonymous clients can spoof identities by setting the JMSXUserID property on from the client. This property is available in version 5.5 or 5.5-SNAPSHOT &gt; March 12th. Note, though, that for SSL certificate based authentication, e.g., when using TextFileCertificateLoginModule JAAS module, this will change the semantics of the broker-provided JMSXUserID. Instead of returning the DN of the certificate, it will provide the name the DN is mapped to by the JAAS module.</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmx-support.html
==============================================================================
--- websites/production/activemq/content/jmx-support.html (original)
+++ websites/production/activemq/content/jmx-support.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>This page describes the JMX management requirements.</p>
 
 <h2><a shape="rect" name="JMXSupport-RequiredMBeans"></a>Required MBeans</h2>
@@ -115,8 +114,7 @@
 <ul><li>do we need/want an MBean per JMS Connection/Session/Producer/Consumer? Am not sure why other than a way to grab stats; if so maybe some kinda stats MBean instead?</li></ul>
 
 
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jmx.html
==============================================================================
--- websites/production/activemq/content/jmx.html (original)
+++ websites/production/activemq/content/jmx.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="JMX-JMX"></a>JMX</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="JMX-JMX"></a>JMX</h2>
 
 <p>Apache ActiveMQ has extensive support for JMX to allow you to monitor and control the behavior of the broker via the <a shape="rect" class="external-link" href="http://apache.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/package-summary.html">JMX MBeans</a>.</p>
 
@@ -300,8 +299,7 @@ SUNJMX=-Dcom.sun.management.jmxremote=tr
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Property Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> useMBeanServer </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> If true then it avoids creating a new MBean server if a MBeanServer has already been created in the JVM </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jmxDomainName </td><td colspan="1" rowspan="1" class="confluenceTd"> org.apache.activemq </td><td colspan="1" rowspan="1" class="confluenceTd"> The jmx domain that all objects names will use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> createMBeanServer </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> If we
  should create the MBeanServer is none is found. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> createConnector </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> If we should create a JMX connector (to allow remote management) for the MBeanServer </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> connectorPort </td><td colspan="1" rowspan="1" class="confluenceTd"> 1099 </td><td colspan="1" rowspan="1" class="confluenceTd"> The port that the JMX connector will use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> connectorHost </td><td colspan="1" rowspan="1" class="confluenceTd"> localhost </td><td colspan="1" rowspan="1" class="confluenceTd"> The host that the JMX connector and RMI server (if rmiServerPort&gt;0)  will use </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> rmiServerPort </td><td colspan="1" rowspan="1" class="confluenceTd"> 0    </td><td colspan=
 "1" rowspan="1" class="confluenceTd"> The RMI server port, handy if port usage needs to be restricted behind a firewall </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> connectorPath </td><td colspan="1" rowspan="1" class="confluenceTd"> /jmxrmi </td><td colspan="1" rowspan="1" class="confluenceTd"> The path that JMX connector will be registered under </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> findTigerMBeanServer </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd">  Enables/disables the searching for the Java 5 platform MBeanServer </td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jndi-support.html
==============================================================================
--- websites/production/activemq/content/jndi-support.html (original)
+++ websites/production/activemq/content/jndi-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>ActiveMQ will work with any JNDI provider capable of storing Java objects.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ will work with any JNDI provider capable of storing Java objects.</p>
 
 <p>However it is common to require a JNDI initial context to be able to run many JMS example programs, like <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/tutorial/1_3_1-fcs/doc/jms_tutorialTOC.html" rel="nofollow">Sun's JMS tutorial</a></p>
 
@@ -311,8 +310,7 @@ public final class SimpleProducer {
 }
 
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/journal-is-already-opened-by-this-application.html
==============================================================================
--- websites/production/activemq/content/journal-is-already-opened-by-this-application.html (original)
+++ websites/production/activemq/content/journal-is-already-opened-by-this-application.html Wed Nov 13 17:23:00 2013
@@ -81,8 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h3><a shape="rect" name="Journalisalreadyopenedbythisapplication-Error"></a>Error</h3>
+<div class="wiki-content maincontent"><h3><a shape="rect" name="Journalisalreadyopenedbythisapplication-Error"></a>Error</h3>
 
 <p>You get something like this</p>
 
@@ -114,8 +113,7 @@ org.apache.activemq.store.DefaultPersist
 
 <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>Be careful with broker names and URIs</b><br clear="none">Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html" rel="nofollow">do not allow things like underscores</a> in them etc.</td></tr></table></div>
 
-<p>This problem could also be caused by <a shape="rect" href="the-broker-will-not-start.html" title="The Broker will not start">a bad OS and JVM combination</a></p>
-          </div>
+<p>This problem could also be caused by <a shape="rect" href="the-broker-will-not-start.html" title="The Broker will not start">a bad OS and JVM combination</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/junit-reports.html
==============================================================================
--- websites/production/activemq/content/junit-reports.html (original)
+++ websites/production/activemq/content/junit-reports.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>The latest test reports are visible via the <a shape="rect" class="external-link" href="https://hudson.apache.org/hudson/job/ActiveMQ/">Hudson ActiveMQ continuous integration builds</a></p>
-          </div>
+<div class="wiki-content maincontent"><p>The latest test reports are visible via the <a shape="rect" class="external-link" href="https://hudson.apache.org/hudson/job/ActiveMQ/">Hudson ActiveMQ continuous integration builds</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/kaha-persistence.html
==============================================================================
--- websites/production/activemq/content/kaha-persistence.html (original)
+++ websites/production/activemq/content/kaha-persistence.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="KahaPersistence-KahaPersistence"></a>Kaha Persistence</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="KahaPersistence-KahaPersistence"></a>Kaha Persistence</h2>
 
 <p>Kaha Peristence is a storage solution written especially for message persistence and is part of the ActiveMQ project. It's tuned to provide optimal performance for typical message usage patterns, which involves writing/reading and discarding messages that are persisted very quickly.</p>
 
@@ -121,8 +120,7 @@
     &lt;/persistenceAdapter&gt;
   &lt;/broker&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/kahadb-replication-experimental.html
==============================================================================
--- websites/production/activemq/content/kahadb-replication-experimental.html (original)
+++ websites/production/activemq/content/kahadb-replication-experimental.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="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>Note</b><br clear="none">This is under review - and not currently supported. See <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> for the successor.</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>Note</b><br clear="none">This is under review - and not currently supported. See <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> for the successor.</td></tr></table></div> 
 
 
 <h2><a shape="rect" name="KahaDBReplication%28Experimental%29-Overview"></a>Overview</h2>
@@ -140,8 +139,7 @@ prompt&gt; $ACTIVEMQ_HOME/bin/activemq x
 <h3><a shape="rect" name="KahaDBReplication%28Experimental%29-ThedirectoryAttribute"></a>The directory Attribute</h3>
 
 <p>This is the data directory where the KahaDB will store it's persistence files.</p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/kahadb.html
==============================================================================
--- websites/production/activemq/content/kahadb.html (original)
+++ websites/production/activemq/content/kahadb.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>KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimised for fast persistence and is the the default storage mechanism from ActiveMQ 5.4 onwards. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the <a shape="rect" href="amq-message-store.html" title="AMQ Message Store">AMQ Message Store</a>.</p>
+<div class="wiki-content maincontent"><p>KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimised for fast persistence and is the the default storage mechanism from ActiveMQ 5.4 onwards. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the <a shape="rect" href="amq-message-store.html" title="AMQ Message Store">AMQ Message Store</a>.</p>
 
 <h2><a shape="rect" name="KahaDB-Configuration"></a>Configuration</h2>
 
@@ -182,8 +181,7 @@ In these cases you can use the mKahaDB p
 &lt;/broker&gt;
 ]]></script>
 </div></div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/known-bad-os-and-jvm-combinations.html
==============================================================================
--- websites/production/activemq/content/known-bad-os-and-jvm-combinations.html (original)
+++ websites/production/activemq/content/known-bad-os-and-jvm-combinations.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">
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Operating System</th><th colspan="1" rowspan="1" class="confluenceTh">Java Virtual Machine</th><th colspan="1" rowspan="1" class="confluenceTh">Problem description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Red Hat Linux Advanced Server release 2.1AS (Pensacola) kernel 2.4.9-e.62smp</td><td colspan="1" rowspan="1" class="confluenceTd">j2sdk1.4.0_01</td><td colspan="1" rowspan="1" class="confluenceTd">Broker could not start up due to error with journal</td></tr></tbody></table>
 </div>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/latency.html
==============================================================================
--- websites/production/activemq/content/latency.html (original)
+++ websites/production/activemq/content/latency.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>Latency</p>
+<div class="wiki-content maincontent"><p>Latency</p>
 
-<p>We typically use this term when talking about the elapsed time it takes to process a single message. When using Request-Response message topologies its often means the round trip time for a message to flow to a service and for the reply to be recieved.</p>
-          </div>
+<p>We typically use this term when talking about the elapsed time it takes to process a single message. When using Request-Response message topologies its often means the round trip time for a message to flow to a service and for the reply to be recieved.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ldap-broker-discovery-mechanism.html
==============================================================================
--- websites/production/activemq/content/ldap-broker-discovery-mechanism.html (original)
+++ websites/production/activemq/content/ldap-broker-discovery-mechanism.html Wed Nov 13 17:23:00 2013
@@ -82,17 +82,26 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<p>Configuring network topologies can be quite tedious when the number of brokers in the system is large.  To help ease the configuration overhead for these types of situations, a broker can be configured to look up its broker connections using a LDAP v3 directory server.</p>
+<div class="wiki-content maincontent"><p>Configuring network topologies can be quite tedious when the number of brokers in the system is large.  To help ease the configuration overhead for these types of situations, a broker can be configured to look up its broker connections using a LDAP v3 directory server.</p>
 <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>Note</b><br clear="none">The basic feature was added to satisfy <del><a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-358">AMQ-358</a></del>.  There are known problems and limitations with this implementation. These deficiencies have been addressed in <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1587">AMQ-1587</a>. The features discussed on this page require the patch attached to JIRA issue <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1587">AMQ-1587</a>. This patch should apply cleanly to the ActiveMQ 5.0.0 release or 
 the current development trunk.</td></tr></table></div>
 
 <h2><a shape="rect" name="LDAPBrokerDiscoveryMechanism-LDAPv3DirectoryServerCompliance"></a>LDAP v3 Directory Server Compliance</h2>
 
 <p>The following table lists a known subset of directory servers and their compliance to work with the LDAP discovery feature.  Most LDAP v3 directory servers will support this feature if they properly implement the <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc2307.txt" rel="nofollow">RFC2307</a> schemas. In order to support the persistent search capabilities the server must implement the extension defined in <a shape="rect" class="external-link" href="http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-ldapext-psearch-03.txt" rel="nofollow">draft-ietf-ldapext-psearch-03.txt</a>.</p>
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Vendor </th><th colspan="1" rowspan="1" class="confluenceTh"> Product </th><th colspan="1" rowspan="1" class="confluenceTh"> Version </th><th colspan="1" rowspan="1" class="confluenceTh"> <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc2307.txt" rel="nofollow">RFC2307</a> </th><th colspan="1" rowspan="1" class="confluenceTh"> <a shape="rect" class="external-link" href="http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-ldapext-psearch-03.txt" rel="nofollow">draft-ietf-ldapext-psearch-03.txt</a> </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Apache </td><td colspan="1" rowspan="1" class="confluenceTd"> ApacheDS </td><td colspan="1" rowspan="1" class="confluenceTd"> 1.0.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons
 /check.gif" height="16" width="16" alt="" border="0"></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Microsoft </td><td colspan="1" rowspan="1" class="confluenceTd"> Active Directory </td><td colspan="1" rowspan="1" class="confluenceTd"> Windows 2000 <br clear="none" class="atl-forced-newline">
-Windows 2003 </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" alt="" border="0"></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Microsoft </td><td colspan="1" rowspan="1" class="confluenceTd"> Active Directory </td><td colspan="1" rowspan="1" class="confluenceTd"> Windows 2003 R2 </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div> </td><td colspan="1" rowspan="1" 
 class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Sun </td><td colspan="1" rowspan="1" class="confluenceTd"> OpenDS </td><td colspan="1" rowspan="1" class="confluenceTd"> 0.9.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> OpenLDAP </td><td colspan="1" rowspan="1" c
 lass="confluenceTd"> OpenLDAP </td><td colspan="1" rowspan="1" class="confluenceTd"> 2.3.x <br clear="none" class="atl-forced-newline">
-2.4.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div> </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Vendor </th><th colspan="1" rowspan="1" class="confluenceTh"> Product </th><th colspan="1" rowspan="1" class="confluenceTh"> Version </th><th colspan="1" rowspan="1" class="confluenceTh"> <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc2307.txt" rel="nofollow">RFC2307</a> </th><th colspan="1" rowspan="1" class="confluenceTh"> <a shape="rect" class="external-link" href="http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-ldapext-psearch-03.txt" rel="nofollow">draft-ietf-ldapext-psearch-03.txt</a> </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Apache </td><td colspan="1" rowspan="1" class="confluenceTd"> ApacheDS </td><td colspan="1" rowspan="1" class="confluenceTd"> 1.0.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons
 /check.gif" height="16" width="16" alt="" border="0"></div>
+ </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div>
+ </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Microsoft </td><td colspan="1" rowspan="1" class="confluenceTd"> Active Directory </td><td colspan="1" rowspan="1" class="confluenceTd"> Windows 2000 <br clear="none" class="atl-forced-newline">
+Windows 2003 </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" alt="" border="0"></div>
+ </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div>
+ </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Microsoft </td><td colspan="1" rowspan="1" class="confluenceTd"> Active Directory </td><td colspan="1" rowspan="1" class="confluenceTd"> Windows 2003 R2 </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div>
+ </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div>
+ </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Sun </td><td colspan="1" rowspan="1" class="confluenceTd"> OpenDS </td><td colspan="1" rowspan="1" class="confluenceTd"> 0.9.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div>
+ </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div>
+ </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> OpenLDAP </td><td colspan="1" rowspan="1" class="confluenceTd"> OpenLDAP </td><td colspan="1" rowspan="1" class="confluenceTd"> 2.3.x <br clear="none" class="atl-forced-newline">
+2.4.x </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"></div>
+ </td><td colspan="1" rowspan="1" class="confluenceTd"> <div align="center" class=""><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"></div>
+ </td></tr></tbody></table>
 </div>
 
 <p><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" height="16" width="16" alt="" border="0"> LDAP v3 directory server which do not support <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc2307.txt" rel="nofollow">RFC2307</a> by default. Support can be added by manually importing them. See vendor specific setup requirements on how to do this.<br clear="none">
@@ -116,6 +125,7 @@ Windows 2003 </td><td colspan="1" rowspa
 </div>
 
 <h3><a shape="rect" name="LDAPBrokerDiscoveryMechanism-ActiveMQConfiguration%28activemq.xml%29"></a>ActiveMQ Configuration (activemq.xml)</h3></div>
+
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>srv-a.mydomain.com</b></div><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;broker brokerName="srv-a.mydomain.com" ...&gt;
@@ -155,6 +165,7 @@ Windows 2003 </td><td colspan="1" rowspa
 </div>
 
 <h3><a shape="rect" name="LDAPBrokerDiscoveryMechanism-ActiveMQConfiguration%28activemq.xml%29"></a>ActiveMQ Configuration (activemq.xml)</h3></div>
+
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>srv-a.mydomain.com</b></div><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;broker brokerName="srv-a.mydomain.com" ...&gt;
@@ -223,8 +234,7 @@ Windows 2003 </td><td colspan="1" rowspa
    ...
 &lt;/broker&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/leftheader.html
==============================================================================
--- websites/production/activemq/content/leftheader.html (original)
+++ websites/production/activemq/content/leftheader.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://activemq.org" rel="nofollow"><span class="image-wrap" style=""><img src="http://www.logicblaze.com/images/logos/products/ActiveMQ/ActiveMQ_logo_200.jpg" style="border: 0px solid black"></span></a></p>
-          </div>
+<div class="wiki-content maincontent">
+<p><a shape="rect" class="external-link" href="http://activemq.org" rel="nofollow"><span class="image-wrap" style=""><img src="http://www.logicblaze.com/images/logos/products/ActiveMQ/ActiveMQ_logo_200.jpg" style="border: 0px solid black"></span></a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/leveldb-store.html
==============================================================================
--- websites/production/activemq/content/leveldb-store.html (original)
+++ websites/production/activemq/content/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">
-<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"><b>Version Compatibility</b><br clear="none">Available in ActiveMQ 5.8.0 and newer</td></tr></table></div>
+<div class="wiki-content maincontent"><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"><b>Version Compatibility</b><br clear="none">Available in ActiveMQ 5.8.0 and newer</td></tr></table></div>
 
 <p>The LevelDB Store is a file based persistence database that is local to the message broker that is using it. It has been optimized to provide even faster persistence than KahaDB.  It's similar to KahahDB but instead of using a custom B-Tree implementation to index the write ahead logs, it uses <a shape="rect" class="external-link" href="https://code.google.com/p/leveldb/" rel="nofollow">LevelDB</a> based indexes which have several nice properties due to the 'append only' files access patterns : </p>
 
@@ -119,8 +118,7 @@
 <h2><a shape="rect" name="LevelDBStore-AlsoSee"></a>Also See</h2>
 
 <ul><li><a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> An extended version of this store which self replicates to other broker nodes to increase message availability.</li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/life-cycle.html
==============================================================================
--- websites/production/activemq/content/life-cycle.html (original)
+++ websites/production/activemq/content/life-cycle.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="LifeCycle-LifecycleofChannels"></a>Life cycle of Channels</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="LifeCycle-LifecycleofChannels"></a>Life cycle of Channels</h2>
 
 <p>Blaze Channels are in one of five states:</p>
 
@@ -139,8 +138,7 @@
  //re-start
  channel.start();
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/load-testing-with-camel.html
==============================================================================
--- websites/production/activemq/content/load-testing-with-camel.html (original)
+++ websites/production/activemq/content/load-testing-with-camel.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="LoadTestingwithCamel-LoadTestingwithCamel"></a>Load Testing with Camel</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="LoadTestingwithCamel-LoadTestingwithCamel"></a>Load Testing with Camel</h2>
 
 <p>It is preferable at the time of writing to check out the source of ActiveMQ and Camel and perform local builds first.</p>
 
@@ -96,8 +95,7 @@ activemq/activemq-camel-loadtest&gt; mvn
 ]]></script>
 </div></div>
 
-<p>If you want to tinker with the configuration of ActiveMQ and Camel then edit the LocalBrokerParallelProducerLoadTest-context.xml file.</p>
-          </div>
+<p>If you want to tinker with the configuration of ActiveMQ and Camel then edit the LocalBrokerParallelProducerLoadTest-context.xml file.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/log4j-warn-no-appenders-could-be-found-for-logger.html
==============================================================================
--- websites/production/activemq/content/log4j-warn-no-appenders-could-be-found-for-logger.html (original)
+++ websites/production/activemq/content/log4j-warn-no-appenders-could-be-found-for-logger.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="log4j-WARNNoappenderscouldbefoundforlogger-Error"></a>Error</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="log4j-WARNNoappenderscouldbefoundforlogger-Error"></a>Error</h2>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
@@ -94,8 +93,7 @@ log4j:WARN Please initialize the log4j s
 
 <h2><a shape="rect" name="log4j-WARNNoappenderscouldbefoundforlogger-Solution"></a>Solution</h2>
 
-<p>You have not initialised log4j properly. Try reading the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">online log4j manual</a> or by adding a log4j.properties file to your classpath (to a directory which is on the classpath to be precise).</p>
-          </div>
+<p>You have not initialised log4j properly. Try reading the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">online log4j manual</a> or by adding a log4j.properties file to your classpath (to a directory which is on the classpath to be precise).</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/logging-a-warning-if-you-forget-to-start-a-connection.html
==============================================================================
--- websites/production/activemq/content/logging-a-warning-if-you-forget-to-start-a-connection.html (original)
+++ websites/production/activemq/content/logging-a-warning-if-you-forget-to-start-a-connection.html Wed Nov 13 17:23:00 2013
@@ -72,16 +72,14 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-          <div class="wiki-content maincontent">
-<h2><a shape="rect" name="LoggingawarningifyouforgettostartaConnection-LoggingawarningifyouforgettostartaConnection"></a>Logging a warning if you forget to start a Connection</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="LoggingawarningifyouforgettostartaConnection-LoggingawarningifyouforgettostartaConnection"></a>Logging a warning if you forget to start a Connection</h2>
 
 <p>A <em>very</em> common gotcha when working with JMS is forgetting to start the JMS connection, creating a consumer and not having it receive any messages. I myself have tripped up over this one many many times! <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" alt="" border="0"></p>
 
 <p>To try and help diagnose this mistake and give you an early warning by default ActiveMQ 4.2 detects this and generates a handy warning message telling you to call the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()" rel="nofollow">Connection.start() method</a> on the JMS connection.</p>
 
 <p>For more details on <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1253">this feature</a> see the discussion of the <b>warnAboutUnstartedConnectionTimeout</b> property on the <a shape="rect" href="connection-configuration-uri.html" title="Connection Configuration URI">Connection Configuration URI</a></p>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/logging-interceptor.html
==============================================================================
--- websites/production/activemq/content/logging-interceptor.html (original)
+++ websites/production/activemq/content/logging-interceptor.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="LoggingInterceptor-LoggingInterceptor"></a>Logging Interceptor</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="LoggingInterceptor-LoggingInterceptor"></a>Logging Interceptor</h2>
 
 <p>The Logging Interceptor is a pretty trivial <a shape="rect" href="interceptors.html" title="Interceptors">Interceptor</a> which just logs to <a shape="rect" class="external-link" href="http://jakarta.apache.org/commons/logging/">Jakarta Commons Logging</a> or <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/">log4j</a> as messages are sent or acknowledged on a broker.</p>
 
@@ -128,8 +127,7 @@
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/mailing-lists.html
==============================================================================
--- websites/production/activemq/content/mailing-lists.html (original)
+++ websites/production/activemq/content/mailing-lists.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 following mailing lists are available. Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.html" title="Tips for getting help">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>The following mailing lists are available. Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.html" title="Tips for getting help">Tips for getting help</a>.</p>
 
 <h2><a shape="rect" name="MailingLists-ApacheMailingLists"></a>Apache Mailing Lists</h2>
 
@@ -84,8 +83,7 @@
 
 <h3><a shape="rect" name="MailingLists-DiscussionForums"></a>Discussion Forums</h3>
 
-<p>If you prefer you could use our <a shape="rect" href="discussion-forums.html" title="Discussion Forums">Discussion Forums</a> which are sync'd with the above mailing lists.</p>
-          </div>
+<p>If you prefer you could use our <a shape="rect" href="discussion-forums.html" title="Discussion Forums">Discussion Forums</a> which are sync'd with the above mailing lists.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/manage-durable-subscribers.html
==============================================================================
--- websites/production/activemq/content/manage-durable-subscribers.html (original)
+++ websites/production/activemq/content/manage-durable-subscribers.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><a shape="rect" href="how-do-durable-queues-and-topics-work.html" title="How do durable queues and topics work">Durable topic subscribers</a> that are offline for a long period of time are usually not desired in the system. The reason for that is that broker needs to keep all the messages sent to those topics for the said subscribers. And this message piling can over time exhaust broker store limits for example and lead to the overall slowdown of the system.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="how-do-durable-queues-and-topics-work.html" title="How do durable queues and topics work">Durable topic subscribers</a> that are offline for a long period of time are usually not desired in the system. The reason for that is that broker needs to keep all the messages sent to those topics for the said subscribers. And this message piling can over time exhaust broker store limits for example and lead to the overall slowdown of the system.</p>
 
 <p>You can always manually unsubscribe inactive durable subscriber using management tools like <a shape="rect" href="jmx.html" title="JMX">JConsole</a> or <a shape="rect" href="web-console.html" title="Web Console">Web Console</a>, but clearly there's more that can be done to help manage systems that use durable subscribers (perhaps coming from environments that they don't control) </p>
 
@@ -113,8 +112,7 @@
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;broker name="localhost" offlineDurableSubscriberTimeout="86400000" offlineDurableSubscriberTaskSchedule="3600000"&gt;]]></script>
 </div></div>
 
-<p>which means that we check every hour and remove subscriber that has been offline for a day.</p>
-          </div>
+<p>which means that we check every hour and remove subscriber that has been offline for a day.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/masterslave.html
==============================================================================
--- websites/production/activemq/content/masterslave.html (original)
+++ websites/production/activemq/content/masterslave.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="MasterSlave-IntroductiontoMaster%2FSlave"></a>Introduction to Master / Slave</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="MasterSlave-IntroductiontoMaster%2FSlave"></a>Introduction to Master / Slave</h2>
 
 <p>The following are the different kinds of Master/Slave configurations available:</p>
 
@@ -83,8 +82,7 @@
 
 
 
-<p>If you are using a shared network file system such as a SAN we recommend a <a shape="rect" href="shared-file-system-master-slave.html" title="Shared File System Master Slave">Shared File System Master Slave</a>. If you are happy to dispense with the high performance journal and are using pure JDBC as your persistence engine then you should use <a shape="rect" href="jdbc-master-slave.html" title="JDBC Master Slave">JDBC Master Slave</a> instead.  For those willing to try out new tech, the <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> gives speeds similar to a SAN solution without the hassle of having to setup a highly available shared file system.</p>
-          </div>
+<p>If you are using a shared network file system such as a SAN we recommend a <a shape="rect" href="shared-file-system-master-slave.html" title="Shared File System Master Slave">Shared File System Master Slave</a>. If you are happy to dispense with the high performance journal and are using pure JDBC as your persistence engine then you should use <a shape="rect" href="jdbc-master-slave.html" title="JDBC Master Slave">JDBC Master Slave</a> instead.  For those willing to try out new tech, the <a shape="rect" href="replicated-leveldb-store.html" title="Replicated LevelDB Store">Replicated LevelDB Store</a> gives speeds similar to a SAN solution without the hassle of having to setup a highly available shared file system.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/maven2-activemq-broker-plugin.html
==============================================================================
--- websites/production/activemq/content/maven2-activemq-broker-plugin.html (original)
+++ websites/production/activemq/content/maven2-activemq-broker-plugin.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 provides a Maven2 plugin to easily startup a JMS broker. It is useful to quickly boot up a message broker in your Maven2 project for debugging or for doing integration tests.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ provides a Maven2 plugin to easily startup a JMS broker. It is useful to quickly boot up a message broker in your Maven2 project for debugging or for doing integration tests.</p>
 
 <h3><a shape="rect" name="Maven2ActiveMQBrokerPlugin-%26nbsp%3BHowtoUse"></a>&#160;How to Use</h3>
 
@@ -167,8 +166,7 @@
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> configUri </td><td colspan="1" rowspan="1" class="confluenceTd"> broker:(tcp://localhost:61616)?useJmx=false&amp;persistent=false </td><td colspan="1" rowspan="1" class="confluenceTd"> The broker configuration URI that will be use to startup the broker. For more information, refer <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">here</a><br clear="none" class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> fork </td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> If true, start up the broker in a separate thread, enabling ma
 ven to continue processing (Useful for integration testing).<br clear="none" class="atl-forced-newline"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> systemProperties </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Additional system properties that will be set.<br clear="none" class="atl-forced-newline"> </td></tr></tbody></table>
 </div>
 
-<p>&#160;Note: By default, the broker plugin will set activemq.base, activemq.home, org.apache.activemq.default.directory.prefix, derby.system.home to ./target/. This means that all data folders will be created there, hence will easily be deleted by running mvn clean.</p>
-          </div>
+<p>&#160;Note: By default, the broker plugin will set activemq.base, activemq.home, org.apache.activemq.default.directory.prefix, derby.system.home to ./target/. This means that all data folders will be created there, hence will easily be deleted by running mvn clean.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/mdc-logging.html
==============================================================================
--- websites/production/activemq/content/mdc-logging.html (original)
+++ websites/production/activemq/content/mdc-logging.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>As of version 5.5.0, ActiveMQ uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">slf4j</a> as the logging framework. This allows us to support <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/MDC.html" rel="nofollow">MDC logging</a>.<br clear="none">
+<div class="wiki-content maincontent"><p>As of version 5.5.0, ActiveMQ uses <a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">slf4j</a> as the logging framework. This allows us to support <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/MDC.html" rel="nofollow">MDC logging</a>.<br clear="none">
 See more details about MDC logging in the <a shape="rect" class="external-link" href="http://logback.qos.ch/manual/mdc.html" rel="nofollow">logback manual</a>.</p>
 
 <p>Currently ActiveMQ add three pieces of information to the diagnostic context:</p>
@@ -112,8 +111,7 @@ See more details about MDC logging in th
 2011-03-23 13:51:04,941 [oker-2A] Task-2] - DEBUG DemandForwardingBridgeSupport  - broker-2A                                            - bridging (broker-2A -&gt; broker-1B, consu...
 
 ]]></script>
-</div></div>
-          </div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/message-cursors.html
==============================================================================
--- websites/production/activemq/content/message-cursors.html (original)
+++ websites/production/activemq/content/message-cursors.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="MessageCursors-MessageCursors"></a>Message Cursors</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="MessageCursors-MessageCursors"></a>Message Cursors</h2>
 
 <p>A common problem in previous versions of ActiveMQ was <a shape="rect" href="my-producer-blocks.html" title="My producer blocks">running out of RAM buffer</a> when using non-persistent messaging.</p>
 
@@ -173,8 +172,7 @@ Valid Durable Subscriber cursor types ar
 <h3><a shape="rect" name="MessageCursors-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/message-dispatching-features.html
==============================================================================
--- websites/production/activemq/content/message-dispatching-features.html (original)
+++ websites/production/activemq/content/message-dispatching-features.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="async-sends.html" title="Async Sends">Async Sends</a></li><li><a shape="rect" href="dispatch-policies.html" title="Dispatch Policies">Dispatch Policies</a></li><li><a shape="rect" href="message-cursors.html" title="Message Cursors">Message Cursors</a></li><li><a shape="rect" href="optimized-acknowledgement.html" title="Optimized Acknowledgement">Optimized Acknowledgement</a></li><li><a shape="rect" href="producer-flow-control.html" title="Producer Flow Control">Producer Flow Control</a></li><li><a shape="rect" href="total-ordering.html" title="Total Ordering">Total Ordering</a></li></ul>
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" href="async-sends.html" title="Async Sends">Async Sends</a></li><li><a shape="rect" href="dispatch-policies.html" title="Dispatch Policies">Dispatch Policies</a></li><li><a shape="rect" href="message-cursors.html" title="Message Cursors">Message Cursors</a></li><li><a shape="rect" href="optimized-acknowledgement.html" title="Optimized Acknowledgement">Optimized Acknowledgement</a></li><li><a shape="rect" href="producer-flow-control.html" title="Producer Flow Control">Producer Flow Control</a></li><li><a shape="rect" href="total-ordering.html" title="Total Ordering">Total Ordering</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/message-features.html
==============================================================================
--- websites/production/activemq/content/message-features.html (original)
+++ websites/production/activemq/content/message-features.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-message-properties.html" title="ActiveMQ Message Properties">ActiveMQ Message Properties</a></li><li><a shape="rect" href="advisory-message.html" title="Advisory Message">Advisory Message</a></li><li><a shape="rect" href="blob-messages.html" title="Blob Messages">Blob Messages</a></li><li><a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a></li><li><a shape="rect" href="jms-streams.html" title="JMS Streams">JMS Streams</a></li><li><a shape="rect" href="message-transformation.html" title="Message Transformation">Message Transformation</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html" title="Structured Message Properties and MapMessages">Structured Message Properties and MapMessages</a></li></ul>
-          </div>
+<div class="wiki-content maincontent"><ul><li><a shape="rect" href="activemq-message-properties.html" title="ActiveMQ Message Properties">ActiveMQ Message Properties</a></li><li><a shape="rect" href="advisory-message.html" title="Advisory Message">Advisory Message</a></li><li><a shape="rect" href="blob-messages.html" title="Blob Messages">Blob Messages</a></li><li><a shape="rect" href="delay-and-schedule-message-delivery.html" title="Delay and Schedule Message Delivery">Delay and Schedule Message Delivery</a></li><li><a shape="rect" href="jms-streams.html" title="JMS Streams">JMS Streams</a></li><li><a shape="rect" href="message-transformation.html" title="Message Transformation">Message Transformation</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html" title="Structured Message Properties and MapMessages">Structured Message Properties and MapMessages</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/message-groups.html
==============================================================================
--- websites/production/activemq/content/message-groups.html (original)
+++ websites/production/activemq/content/message-groups.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="MessageGroups-MessageGroups"></a>Message Groups</h2>
+<div class="wiki-content maincontent"><h2><a shape="rect" name="MessageGroups-MessageGroups"></a>Message Groups</h2>
 
 <p>Message Groups rock! <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" alt="" border="0"> They are an enhancement to the <a shape="rect" href="exclusive-consumer.html" title="Exclusive Consumer">Exclusive Consumer</a> feature to provide</p>
 
@@ -223,8 +222,7 @@ if (message.getBooleanProperty("JMSXGrou
 <h3><a shape="rect" name="MessageGroups-See"></a>See</h3>
 
 <ul><li><a shape="rect" href="how-do-message-groups-compare-to-selectors.html" title="How do Message Groups compare to Selectors">How do Message Groups compare to Selectors</a></li></ul>
-
-          </div>
+</div>
         </td>
         <td valign="top">
           <div class="navigation">