You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2015/07/01 22:13:56 UTC

svn commit: r956584 [23/37] - in /websites/production/activemq/content: ./ 2004/04/13/ 2004/05/26/ 2004/06/23/ 2004/06/25/ 2004/08/17/ 2004/08/23/ 2004/10/07/ 2004/11/02/ 2004/12/20/ 2005/02/03/ 2005/02/25/ 2005/04/11/ 2005/06/06/ 2005/07/04/ 2005/07/1...

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 Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Async Sends<ul><li><a shape="rect" href="dispatch-policies.html">Dispatch Policies</a></li><li><a shape="rect" href="message-cursors.html">Message Cursors</a></li><li><a shape="rect" href="optimized-acknowledgement.html">Optimized Acknowledgement</a></li><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li><li><a shape="rect" href="total-ordering.html">Total Ordering</a></li></ul>
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="async-sends.html">Async Sends</a></li><li><a shape="rect" href="dispatch-policies.html">Dispatch Policies</a></li><li><a shape="rect" href="message-cursors.html">Message Cursors</a></li><li><a shape="rect" href="optimized-acknowledgement.html">Optimized Acknowledgement</a></li><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li><li><a shape="rect" href="total-ordering.html">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 Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-ActiveMQ Message Properties<ul><li><a shape="rect" href="advisory-message.html">Advisory Message</a></li><li><a shape="rect" href="blob-messages.html">Blob Messages</a></li><li><a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a></li><li><a shape="rect" href="jms-streams.html">JMS Streams</a></li><li><a shape="rect" href="message-transformation.html">Message Transformation</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html">Structured Message Properties and MapMessages</a></li></ul>
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="activemq-message-properties.html">ActiveMQ Message Properties</a></li><li><a shape="rect" href="advisory-message.html">Advisory Message</a></li><li><a shape="rect" href="blob-messages.html">Blob Messages</a></li><li><a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a></li><li><a shape="rect" href="jms-streams.html">JMS Streams</a></li><li><a shape="rect" href="message-transformation.html">Message Transformation</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html">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 Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="MessageGroups-MessageGroups">Message Groups</h2>
+<div class="wiki-content maincontent"><h2 id="MessageGroups-MessageGroups">Message Groups</h2>
 
 <p>Message Groups rock! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"> They are an enhancement to the <a shape="rect" href="exclusive-consumer.html">Exclusive Consumer</a> feature to provide</p>
 
@@ -223,7 +223,7 @@ if (message.getBooleanProperty("JMSXGrou
 
 <h3 id="MessageGroups-See">See</h3>
 
-<ul><li><a shape="rect" href="how-do-message-groups-compare-to-selectors.html">How do Message Groups compare to Selectors</a></li></ul>
+<ul><li><a shape="rect" href="how-do-message-groups-compare-to-selectors.html">How do Message Groups compare to Selectors</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/message-redelivery-and-dlq-handling.html
==============================================================================
--- websites/production/activemq/content/message-redelivery-and-dlq-handling.html (original)
+++ websites/production/activemq/content/message-redelivery-and-dlq-handling.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="MessageRedeliveryandDLQHandling-Overview">Overview</h3><p>Messages are redelivered to a client when <strong>any</strong> of the following occurs:</p><ol><li>A transacted session is used and rollback() is called.</li><li>A transacted session is closed before commit is called.</li><li>A session is using CLIENT_ACKNOWLEDGE and Session.recover() is called.</li><li>A client connection times out (perhaps the code being executed takes longer than the configured time-out period)</li></ol><p>The broker transmits the default delivery policy that he prefers to a client connection in his BrokerInfo command packet. But the client can override the policy settings by using the ActiveMQConnection.getRedeliveryPolicy() method:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h3 id="MessageRedeliveryandDLQHandling-Overview">Overview</h3><p>Messages are redelivered to a client when <strong>any</strong> of the following occurs:</p><ol><li>A transacted session is used and rollback() is called.</li><li>A transacted session is closed before commit is called.</li><li>A session is using CLIENT_ACKNOWLEDGE and Session.recover() is called.</li><li>A client connection times out (perhaps the code being executed takes longer than the configured time-out period)</li></ol><p>The broker transmits the default delivery policy that he prefers to a client connection in his BrokerInfo command packet. But the client can override the policy settings by using the ActiveMQConnection.getRedeliveryPolicy() method:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">RedeliveryPolicy policy = connection.getRedeliveryPolicy();
 policy.setInitialRedeliveryDelay(500);
 policy.setBackOffMultiplier(2);
@@ -219,7 +219,7 @@ redeliveryDelay="10000" /&gt;
             &lt;/redeliveryPlugin&gt;
         &lt;/plugins&gt;
 </pre>
-</div></div><p>The familiar <a shape="rect" href="redelivery-policy.html">Redelivery Policy</a> has been extended to take a matching destination.<br clear="none"> fallbackToDeadLetter controls the action when there is no matching redeliver policy for a destination. Defaults to true so regular DLQ processing ensues.<br clear="none"> sendToDlqIfMaxRetriesExceeded controls the action when the retry limit is exceeded. Defaults to true so regular DLQ processing ensues. When false, the message is dropped.</p><ul><li>Note: broker schedulerSupport must be enabled for this feature to work.</li></ul>
+</div></div><p>The familiar <a shape="rect" href="redelivery-policy.html">Redelivery Policy</a> has been extended to take a matching destination.<br clear="none"> fallbackToDeadLetter controls the action when there is no matching redeliver policy for a destination. Defaults to true so regular DLQ processing ensues.<br clear="none"> sendToDlqIfMaxRetriesExceeded controls the action when the retry limit is exceeded. Defaults to true so regular DLQ processing ensues. When false, the message is dropped.</p><ul><li>Note: broker schedulerSupport must be enabled for this feature to work.</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/message-transformation.html
==============================================================================
--- websites/production/activemq/content/message-transformation.html (original)
+++ websites/production/activemq/content/message-transformation.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="MessageTransformation-MessageTransformation">Message Transformation</h2>
+<div class="wiki-content maincontent"><h2 id="MessageTransformation-MessageTransformation">Message Transformation</h2>
 
 <p>It is sometimes useful to transform a message inside the JMS provider. For example you may have an application that has been live for some time that uses ObjectMessage messages, but that you wish to convert to use XML payloads (to protect yourself from serialization issues).</p>
 
@@ -92,7 +92,7 @@
 <ul><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnectionFactory</a></li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a></li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQSession.html">ActiveMQSession</a></li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQMessageConsumer.html">ActiveMQMessageConsumer</a></li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQMessageProducer.html">ActiveMQMessageProducer</a></li></ul>
 
 
-<p>The transformer is inherited on child objects; so you can install a particular transformer on a connection factory and it will be inherited on all  connections, sessions, producers, consumers</p>
+<p>The transformer is inherited on child objects; so you can install a particular transformer on a connection factory and it will be inherited on all  connections, sessions, producers, consumers</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/mirrored-queues.html
==============================================================================
--- websites/production/activemq/content/mirrored-queues.html (original)
+++ websites/production/activemq/content/mirrored-queues.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="MirroredQueues-MirroredQueues">Mirrored Queues</h2>
+<div class="wiki-content maincontent"><h2 id="MirroredQueues-MirroredQueues">Mirrored Queues</h2>
 
 <p>Queues provide an excellent reliable and high performance <a shape="rect" href="how-does-a-queue-compare-to-a-topic.html">load balancing mechanism</a>. Each message placed on a queue can only be successfully processed by a single consumer. This is a good thing! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)">. However sometimes you want to monitor what messages flow between the producers and consumers on a queue. </p>
 
@@ -119,7 +119,7 @@
 </pre>
 </div></div>
 
-<p>This would make a topic named "*.qmirror" for each queue on your Broker.</p>
+<p>This would make a topic named "*.qmirror" for each queue on your Broker.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/mom.html
==============================================================================
--- websites/production/activemq/content/mom.html (original)
+++ websites/production/activemq/content/mom.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>Message Orientated Middleware. The art of building distributed systems using mostly asynchronous message passing with loosely coupled services consuming and emitting messages. So this includes JMS providers and message brokers.</p>
 
-<p>Typically MOMs can handle any specific service instance being down for some time, so that they provide loose coupling across time, space, location, platform and language.</p>
+<p>Typically MOMs can handle any specific service instance being down for some time, so that they provide loose coupling across time, space, location, platform and language.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/monitoring-activemq.html
==============================================================================
--- websites/production/activemq/content/monitoring-activemq.html (original)
+++ websites/production/activemq/content/monitoring-activemq.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p></div></div><p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
+<div class="wiki-content maincontent"><p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p></div></div><p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/mqtt.html
==============================================================================
--- websites/production/activemq/content/mqtt.html (original)
+++ websites/production/activemq/content/mqtt.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>ActiveMQ supports the <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a> protocol and will automatically map between JMS/NMS and MQTT clients. MQTT is a machine-to-machine (M2M) publish/subscribe messaging transport.</p><p>Please see the <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT site</a> for more details</p><h3 id="MQTT-EnablingtheActiveMQBrokerforMQTT">Enabling the ActiveMQ Broker for MQTT</h3><p>Its very easy to enable ActiveMQ for MQTT. Just add a connector to the broker using the MQTT URL.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>ActiveMQ supports the <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a> protocol and will automatically map between JMS/NMS and MQTT clients. MQTT is a machine-to-machine (M2M) publish/subscribe messaging transport.</p><p>Please see the <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT site</a> for more details</p><h3 id="MQTT-EnablingtheActiveMQBrokerforMQTT">Enabling the ActiveMQ Broker for MQTT</h3><p>Its very easy to enable ActiveMQ for MQTT. Just add a connector to the broker using the MQTT URL.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;transportConnectors&gt;
    &lt;transportConnector name="mqtt" uri="mqtt://localhost:1883"/&gt;
 &lt;/transportConnectors&gt;
@@ -101,7 +101,7 @@
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;transportConnector name="mqtt" uri="mqtt://localhost:1883?transport.activeMQSubscriptionPrefetch=32766"/&gt;</pre>
 </div></div><h3 id="MQTT-SubscriptionStrategy">Subscription Strategy</h3><p>ActiveMQ is a JMS broker in its core, so there needs to be some mapping between MQTT subscriptions and JMS semantics. Subscriptions with QoS=0 (At Most Once) are directly mapped to plain JMS non-persistent topics. For reliable messaging, QoS=1 and QoS=2, by default subscriptions are transformed to JMS durable topic subscribers. This behaviour is desired in most scenarios. For some use cases, it is useful to map these subscriptions to <a shape="rect" href="virtual-destinations.html">virtual topics</a>. Virtual topics provide a better scalability and are generally better solution if you want to use you MQTT subscribers over network of brokers. To change subscription strategy to use virtual topic, use the following settings:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;transportConnector name="mqtt" uri="mqtt://localhost:1883?transport.subscriptionStrategy=mqtt-virtual-topic-subscriptions"/&gt;</pre>
-</div></div><h3 id="MQTT-RetainedMessages">Retained Messages</h3><p>If a message has been published with the <em>retain</em> flag set, then the message will be 'remembered' by the topic so that if a new subscription arrives, the last retained message is sent to the subscription. Underneath, the broker uses <a shape="rect" href="subscription-recovery-policy.html">retained message subscription recovery policy</a> to retain messages with&#160;<em>ActiveMQ.Retain</em> property set. During the message conversion, MQTT messages with retain flag become JMS message with the <em>ActiveMQ.Retain&#160;</em>property set and retained by the broker.</p>
+</div></div><h3 id="MQTT-RetainedMessages">Retained Messages</h3><p>If a message has been published with the <em>retain</em> flag set, then the message will be 'remembered' by the topic so that if a new subscription arrives, the last retained message is sent to the subscription. Underneath, the broker uses <a shape="rect" href="subscription-recovery-policy.html">retained message subscription recovery policy</a> to retain messages with&#160;<em>ActiveMQ.Retain</em> property set. During the message conversion, MQTT messages with retain flag become JMS message with the <em>ActiveMQ.Retain&#160;</em>property set and retained by the broker.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/multicast-transport-reference.html
==============================================================================
--- websites/production/activemq/content/multicast-transport-reference.html (original)
+++ websites/production/activemq/content/multicast-transport-reference.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="MulticastTransportReference-TheMulticastTransport">The Multicast Transport</h3>
+<div class="wiki-content maincontent"><h3 id="MulticastTransportReference-TheMulticastTransport">The Multicast Transport</h3>
 
 <p>The Multicast transport allows clients to connect to a remote ActiveMQ broker using multicast</p>
 
@@ -103,7 +103,7 @@
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>multicast://224.1.2.3:6255?group=mygroupname
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/multicast-transport.html
==============================================================================
--- websites/production/activemq/content/multicast-transport.html (original)
+++ websites/production/activemq/content/multicast-transport.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>We could support a reliable multicast protocol and use that to distribute messages across. This page braindumps how that could fit in with ActiveMQ 4.x's architecture.</p>
 
 <ul><li>each VM would have its own embedded broker; JMS connections would talk VM protocol to the embedded broker (or TCP to some remote broker)</li><li>the brokers communicate with each other via multicast
@@ -84,7 +85,7 @@
 <h3 id="MulticastTransport-Brokerkeep-alive">Broker keep-alive</h3>
 
 <p>Each broker will repeatedly send its own BrokerInfo to the cloud. The MulticastBridge will receive them and keep that broker alive; brokers which don't send the brokerInfo within the heartbeat window are logically considered to have closed.</p>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network.html
==============================================================================
--- websites/production/activemq/content/multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network.html (original)
+++ websites/production/activemq/content/multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>You may wonder why you are not receiving any message at all during multicast, maybe you have just tried everything, and even on some other OS or distributions and JDK and realize that it works in some place and not on other... you may have tried a small C program to do the same..and it worked well.. you're feeling the pressure on your neck...what could be wrong on YOUR application on THIS OS/distribution...</p>
 
 <p>As a default, on the Linux platform, if you have IPV6 support enabled in your kernel, the Java Runtime (since 1.4 version) will use IPV6 sockets to communicate. That's perfectly fine, except that your network may not be configured for IPV6. So everything will be dropped...and nothing will ever be received on the consumer side (which maybe even does not support IPV6).</p>
@@ -91,7 +92,7 @@
 
 <p>If you have very knowledgeable sysadmins that are used to these problems (like in a TV or Radio company for instance where they use multicast a lot), they will be able to tell you immediately if IPV6 is supported on the network (alternatively they will be able to tell you as well if multicast is supported and on which address/port you can multicast), this is a plus and will help you tremendously.</p>
 
-<p>In some more frequent cases, your sysadmin will be as lost as you are as they are not dealing with these issues very frequently. So good luck for finding out problems. You will need to have a very strict approach to eliminate uncertainties. For this you will need at least a tool like <a shape="rect" class="external-link" href="http://www.ethereal.com" rel="nofollow">ethereal</a> (works on unix, linux and windows)</p>
+<p>In some more frequent cases, your sysadmin will be as lost as you are as they are not dealing with these issues very frequently. So good luck for finding out problems. You will need to have a very strict approach to eliminate uncertainties. For this you will need at least a tool like <a shape="rect" class="external-link" href="http://www.ethereal.com" rel="nofollow">ethereal</a> (works on unix, linux and windows)</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/multiple-consumers-on-a-queue.html
==============================================================================
--- websites/production/activemq/content/multiple-consumers-on-a-queue.html (original)
+++ websites/production/activemq/content/multiple-consumers-on-a-queue.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,16 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <p>If you want to consume concurrently from a queue, then you must use a different session for each consumer. </p>
 
 <p>This is because you must have a session per thread. The JMS contract is that only 1 session is used by one thread at once - which if you're using consumers means that only 1 consumer can receive messages at once if using the same session. So if you want concurrent consumption of messages, you need to use different sessions for each consumer.</p>
 
 <p>However its your call on how many connections you have. In a normal network based mode, sharing the same connection across sessions will essentially multiplex traffic across a single socket (and so reduce resource usage at the cost of more synchronization). So sometimes there's a need to use more connections, as typically using different sockets concurrently tends to be a bit faster than using a single one). </p>
 
-<p>Incidentally in the JCA specifications in J2EE 1.4, Resource Adapters will typically create 1 connection for each session, so there's a 1-1 mapping between the two.</p>
+<p>Incidentally in the JCA specifications in J2EE 1.4, Resource Adapters will typically create 1 connection for each session, so there's a 1-1 mapping between the two.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/my-producer-blocks.html
==============================================================================
--- websites/production/activemq/content/my-producer-blocks.html (original)
+++ websites/production/activemq/content/my-producer-blocks.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="Myproducerblocks-WhatcanIdoifmyproducerblockssendingamessage?">What can I do if my producer blocks sending a message?</h2>
+<div class="wiki-content maincontent"><h2 id="Myproducerblocks-WhatcanIdoifmyproducerblockssendingamessage?">What can I do if my producer blocks sending a message?</h2>
 
 <p>This relates to <a shape="rect" href="producer-flow-control.html">Producer Flow Control</a>.</p>
 
@@ -92,7 +92,7 @@
 
 <h3 id="Myproducerblocks-SeeAlso">See Also</h3>
 
-<ul><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li><li><a shape="rect" href="message-cursors.html">Message Cursors</a></li></ul>
+<ul><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li><li><a shape="rect" href="message-cursors.html">Message Cursors</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/navigation.html
==============================================================================
--- websites/production/activemq/content/navigation.html (original)
+++ websites/production/activemq/content/navigation.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985"><a shape="rect" href="overview.html">Overview</a></h3><ul class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a shape="rect" href="news.html">News</a></li><li><a shape="rect" href="new-features.html">New Features</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="faq.html">FAQ</a></li><li><a shape="rect" href="articles.html">Articles</a></li><li><a shape="rect" href="books.html">Books</a></li><li><a shape="rect" href="download.html">Download</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/licenses/">License</a></li></ul><h3 id="Navigation-Search">Search</h3><div>
+<div class="wiki-content maincontent"><h3 id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985"><a shape="rect" href="overview.html">Overview</a></h3><ul class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a shape="rect" href="news.html">News</a></li><li><a shape="rect" href="new-features.html">New Features</a></li><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="faq.html">FAQ</a></li><li><a shape="rect" href="articles.html">Articles</a></li><li><a shape="rect" href="books.html">Books</a></li><li><a shape="rect" href="download.html">Download</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/licenses/">License</a></li></ul><h3 id="Navigation-Search">Search</h3><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">
@@ -82,7 +82,7 @@
   <input type="hidden" name="sitesearch" value="activemq.apache.org">
 </form>
 </div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a shape="rect" class="external-link" href="http://activemq.apache.org/artemis/">Artemis</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/apollo" title="ActiveMQ Apollo">Apollo</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/" title="NMS is the .Net Messaging API">NMS</a></li></ul><h3 id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130"><a shape="rect" href="community.html">Community</a></h3><ul class="alternate"><li><a shape="rect" href="support.html">Support</a></li><li><a shape="rect" href="contributing.html">Contributing</a></li><li><a shape="rect" href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" href="http://javabot.evanchooly.com/logs/%23apache-activemq/today" rel="nofollow">IRC Log</a></li><li><a shape="rect" href="site.html">Site</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a shape="rect" href="projects-using-activemq.html">Projects Using ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a shape="rect" href="team.html">Team</a></li><li><a shape="rect" href="thanks.html">Thanks</a></li></ul><h3 id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883"><a shape="rect" href="features.html">Features</a></h3><ul class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory Message</a></li><li><a shape="rect" href="clustering.html">Clustering</a></li><li><a shape="rect" href="cross-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" href
 ="enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" href="message-groups.html">Message Groups</a></li><li><a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" href="performance.html">Performance</a></li><li><a shape="rect" href="persistence.html">Persistence</a></li><li><a shape="rect" href="security.html">Security</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="visualisation.html">Visualisation</a></li><li><a shape="rect" href="features.html">More ...</a></li></ul><h3 id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36167"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul class="alte
 rnate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="c-integration.html">C Integration</a></li><li><a shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">C# and .Net Integration</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" class="external-link" href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ" rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/" title="NMS is the .Net Messaging API">NMS</a></li><li><
 a shape="rect" href="rest.html">REST</a></li><li><a shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="stomp.html">Stomp</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="unix-service.html">Unix Service</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" href="connectivity.html">More ...</a></li></ul><h3 id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176"><a shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul class="alternate"><li><a shape="rect" href="version-5-getting-started.html">Getting Started</a></li><li><a shape="rect" href="version-5-initial-configuration.html">Initial Configuration</a></li><li><a shape="rect" href="version-5-run-broker.html">Running a Broker</a
 ></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded Brokers</a></li><li><a shape="rect" href="activemq-command-line-tools-reference.html">Command Line Tools</a></li><li><a shape="rect" href="configuring-version-5-transports.html">Configuring Transports</a></li><li><a shape="rect" href="version-5-examples.html">Examples</a></li><li><a shape="rect" href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a shape="rect" href="version-5-xml-configuration.html">Xml Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More ...</a></li></ul><h3 id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912"><a shape="rect" href="tools.html">Tools</a></h3><ul class="alternate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a shap
 e="rect" href="activemq-performance-module-users-manual.html">Maven2 Performance Plugin</a></li></ul><h3 id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919"><a shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/AMQ">Issues</a></li><li><a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel">Roadmap</a></li><li><a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel">Change log</a></li></ul><h3 id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903"><a shape="rect" href="developers.html">Developers</a></h3><ul class="alternate"><li><a shape="rect" href="source.html">Source</a></li><li><a shape="rect" href="buil
 ding.html">Building</a></li><li><a shape="rect" href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" href="becoming-a-committer.html">Becoming a committer</a></li><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" href="activemq-performance-module-users-manual.html">Maven2 Performance Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter Performance Tests</a></li><li><a shape="rect" href="integration-tests.html">Integration Tests</a></li></ul><h3 id="Navigation-ProjectReports">Project Reports</h3><ul class="alternate"><li><a shape="rect" href="junit-reports.h
 tml">JUnit Reports</a></li><li><a shape="rect" href="source-xref.html">Source XRef</a></li><li><a shape="rect" href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" href="xml-reference.html">Xml Reference</a><br clear="none"><br clear="none"><br clear="none"></li></ul>
+<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a shape="rect" class="external-link" href="http://activemq.apache.org/artemis/">Artemis</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/apollo" title="ActiveMQ Apollo">Apollo</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/" title="NMS is the .Net Messaging API">NMS</a></li></ul><h3 id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130"><a shape="rect" href="community.html">Community</a></h3><ul class="alternate"><li><a shape="rect" href="support.html">Support</a></li><li><a shape="rect" href="contributing.html">Contributing</a></li><li><a shape="rect" href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" href="http://javabot.evanchooly.com/logs/%23apache-activemq/today" rel="nofollow">IRC Log</a></li><li><a shape="rect" href="site.html">Site</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a shape="rect" href="projects-using-activemq.html">Projects Using ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a shape="rect" href="team.html">Team</a></li><li><a shape="rect" href="thanks.html">Thanks</a></li></ul><h3 id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883"><a shape="rect" href="features.html">Features</a></h3><ul class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory Message</a></li><li><a shape="rect" href="clustering.html">Clustering</a></li><li><a shape="rect" href="cross-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" href
 ="enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" href="message-groups.html">Message Groups</a></li><li><a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" href="performance.html">Performance</a></li><li><a shape="rect" href="persistence.html">Persistence</a></li><li><a shape="rect" href="security.html">Security</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="visualisation.html">Visualisation</a></li><li><a shape="rect" href="features.html">More ...</a></li></ul><h3 id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36167"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul class="alte
 rnate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="c-integration.html">C Integration</a></li><li><a shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">C# and .Net Integration</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" class="external-link" href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ" rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/" title="NMS is the .Net Messaging API">NMS</a></li><li><
 a shape="rect" href="rest.html">REST</a></li><li><a shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="stomp.html">Stomp</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="unix-service.html">Unix Service</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" href="connectivity.html">More ...</a></li></ul><h3 id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176"><a shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul class="alternate"><li><a shape="rect" href="version-5-getting-started.html">Getting Started</a></li><li><a shape="rect" href="version-5-initial-configuration.html">Initial Configuration</a></li><li><a shape="rect" href="version-5-run-broker.html">Running a Broker</a
 ></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded Brokers</a></li><li><a shape="rect" href="activemq-command-line-tools-reference.html">Command Line Tools</a></li><li><a shape="rect" href="configuring-version-5-transports.html">Configuring Transports</a></li><li><a shape="rect" href="version-5-examples.html">Examples</a></li><li><a shape="rect" href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a shape="rect" href="version-5-xml-configuration.html">Xml Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More ...</a></li></ul><h3 id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912"><a shape="rect" href="tools.html">Tools</a></h3><ul class="alternate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a shap
 e="rect" href="activemq-performance-module-users-manual.html">Maven2 Performance Plugin</a></li></ul><h3 id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919"><a shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/AMQ">Issues</a></li><li><a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel">Roadmap</a></li><li><a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel">Change log</a></li></ul><h3 id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903"><a shape="rect" href="developers.html">Developers</a></h3><ul class="alternate"><li><a shape="rect" href="source.html">Source</a></li><li><a shape="rect" href="buil
 ding.html">Building</a></li><li><a shape="rect" href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" href="becoming-a-committer.html">Becoming a committer</a></li><li><a shape="rect" href="code-overview.html">Code Overview</a></li><li><a shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" href="activemq-performance-module-users-manual.html">Maven2 Performance Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter Performance Tests</a></li><li><a shape="rect" href="integration-tests.html">Integration Tests</a></li></ul><h3 id="Navigation-ProjectReports">Project Reports</h3><ul class="alternate"><li><a shape="rect" href="junit-reports.h
 tml">JUnit Reports</a></li><li><a shape="rect" href="source-xref.html">Source XRef</a></li><li><a shape="rect" href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" href="xml-reference.html">Xml Reference</a><br clear="none"><br clear="none"><br clear="none"></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/networks-of-brokers.html
==============================================================================
--- websites/production/activemq/content/networks-of-brokers.html (original)
+++ websites/production/activemq/content/networks-of-brokers.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>To provide massive scalability of a large messaging fabric you typically want to allow many brokers to be connected together into a network so that you can have as many clients as you wish all logically connected together - and running as many message brokers as you need based on your number of clients and network topology.</p><p>If you are using <a shape="rect" href="topologies.html">client/server or hub/spoke style topology</a> then the broker you connect to becomes a single point of failure which is another reason for wanting a network (or cluster) of brokers so that you can survive failure of any particular broker, machine or subnet.</p><p>From 1.1 onwards of ActiveMQ supports <em>networks of brokers</em> which allows us to support <a shape="rect" href="how-do-distributed-queues-work.html">distributed queues and topics</a> across a network of brokers.</p><p>This allows a client to connect to any broker in the network - and fail over to another broker if there is a failure - p
 roviding from the clients perspective a <a shape="rect" href="ha.html">HA</a> cluster of brokers.</p><p><strong>N.B.</strong> By default a network connection is one way only - the broker that establishes the connection <em>passes messages to</em> the broker(s) its connected to. From version 5.x of ActiveMQ, a network connection can be optionally enabled to be duplex, which can be useful for hub and spoke architectures, where the hub is behind a firewall etc.</p><h2 id="NetworksofBrokers-Configuringanetworkofbrokers">Configuring a network of brokers</h2><p>The easiest way to configure a network of brokers is via the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>. There are two main ways to create a network of brokers</p><ul><li>use a hard coded list of networkConnector elements.</li></ul><ul><li>use Discovery to detect brokers (multicast or rendezvous).</li></ul><h3 id="NetworksofBrokers-ExamplewithafixedlistofURIs">Example with a fixed list of URIs</h3><p>Here i
 s an example of using the fixed list of URIs</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>To provide massive scalability of a large messaging fabric you typically want to allow many brokers to be connected together into a network so that you can have as many clients as you wish all logically connected together - and running as many message brokers as you need based on your number of clients and network topology.</p><p>If you are using <a shape="rect" href="topologies.html">client/server or hub/spoke style topology</a> then the broker you connect to becomes a single point of failure which is another reason for wanting a network (or cluster) of brokers so that you can survive failure of any particular broker, machine or subnet.</p><p>From 1.1 onwards of ActiveMQ supports <em>networks of brokers</em> which allows us to support <a shape="rect" href="how-do-distributed-queues-work.html">distributed queues and topics</a> across a network of brokers.</p><p>This allows a client to connect to any broker in the network - and fail over to an
 other broker if there is a failure - providing from the clients perspective a <a shape="rect" href="ha.html">HA</a> cluster of brokers.</p><p><strong>N.B.</strong> By default a network connection is one way only - the broker that establishes the connection <em>passes messages to</em> the broker(s) its connected to. From version 5.x of ActiveMQ, a network connection can be optionally enabled to be duplex, which can be useful for hub and spoke architectures, where the hub is behind a firewall etc.</p><h2 id="NetworksofBrokers-Configuringanetworkofbrokers">Configuring a network of brokers</h2><p>The easiest way to configure a network of brokers is via the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>. There are two main ways to create a network of brokers</p><ul><li>use a hard coded list of networkConnector elements.</li></ul><ul><li>use Discovery to detect brokers (multicast or rendezvous).</li></ul><h3 id="NetworksofBrokers-ExamplewithafixedlistofURIs">Example w
 ith a fixed list of URIs</h3><p>Here is an example of using the fixed list of URIs</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
 &lt;beans xmlns="http://activemq.org/config/1.0"&gt;
@@ -221,7 +221,7 @@
         &lt;/policyEntries&gt;
       &lt;/policyMap&gt;
     &lt;/destinationPolicy&gt;</pre>
-</div></div><p><strong>N.B.:</strong> When using replayWhenNoConsumers=true for versions &lt; 5.9, it is necessary to also disable the cursors duplicate detection using <strong>enableAudit=false</strong> as the cursor could mark the replayed messages as duplicates (depending on the time window between playing and replaying these messages over the network bridge). The problem is fully explained in this <a shape="rect" class="external-link" href="http://tmielke.blogspot.de/2012/03/i-have-messages-on-queue-but-they-dont.html" rel="nofollow">blog post</a>.</p><h4 id="NetworksofBrokers-Throttlinganetworkconsumer">Throttling a network consumer</h4><p>The conditionalNetworkBridgeFilterFactory factory allows a rate limit to be specified for a destination, such that network consumer can be throttled. Prefetch for a network consumer is largely negated by the fact that a network consumer relays a message typically acks very quickly so even with a low prefetch and decreased priority a network c
 onsumer can starve a modestly quick local consumer. Throttling provides a remedy for this.</p>
+</div></div><p><strong>N.B.:</strong> When using replayWhenNoConsumers=true for versions &lt; 5.9, it is necessary to also disable the cursors duplicate detection using <strong>enableAudit=false</strong> as the cursor could mark the replayed messages as duplicates (depending on the time window between playing and replaying these messages over the network bridge). The problem is fully explained in this <a shape="rect" class="external-link" href="http://tmielke.blogspot.de/2012/03/i-have-messages-on-queue-but-they-dont.html" rel="nofollow">blog post</a>.</p><h4 id="NetworksofBrokers-Throttlinganetworkconsumer">Throttling a network consumer</h4><p>The conditionalNetworkBridgeFilterFactory factory allows a rate limit to be specified for a destination, such that network consumer can be throttled. Prefetch for a network consumer is largely negated by the fact that a network consumer relays a message typically acks very quickly so even with a low prefetch and decreased priority a network c
 onsumer can starve a modestly quick local consumer. Throttling provides a remedy for this.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-41.html
==============================================================================
--- websites/production/activemq/content/new-features-in-41.html (original)
+++ websites/production/activemq/content/new-features-in-41.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin4.1-NewFeaturesinApacheActiveMQ4.1">New Features in Apache ActiveMQ 4.1</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin4.1-NewFeaturesinApacheActiveMQ4.1">New Features in Apache ActiveMQ 4.1</h2>
 
-<ul><li><a shape="rect" href="shared-file-system-master-slave.html">Shared File System Master Slave</a></li><li><a shape="rect" href="jdbc-master-slave.html">JDBC Master Slave</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.html">Configure Startup Destinations</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html">Structured Message Properties and MapMessages</a></li></ul>
+<ul><li><a shape="rect" href="shared-file-system-master-slave.html">Shared File System Master Slave</a></li><li><a shape="rect" href="jdbc-master-slave.html">JDBC Master Slave</a></li><li><a shape="rect" href="virtual-destinations.html">Virtual Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.html">Configure Startup Destinations</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.html">Structured Message Properties and MapMessages</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-50.html
==============================================================================
--- websites/production/activemq/content/new-features-in-50.html (original)
+++ websites/production/activemq/content/new-features-in-50.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,11 +72,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.0-NewFeaturesin5.0">New Features in 5.0</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.0-NewFeaturesin5.0">New Features in 5.0</h2>
 
 <p>In the 5.0 release of Apache ActiveMQ there are the following new features:</p>
 
-<ul><li><a shape="rect" href="amq-message-store.html">AMQ Message Store</a> (Faster Persistence!)</li><li><a shape="rect" href="message-cursors.html">Message Cursors</a> (To handle very large number of stored messages)</li><li><a shape="rect" href="blob-messages.html">Blob Messages</a></li><li><a shape="rect" href="command-agent.html">Command Agent</a></li><li><a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel Integration</a></li><li><a shape="rect" href="logging-a-warning-if-you-forget-to-start-a-connection.html">Logging a warning if you forget to start a Connection</a></li><li><a shape="rect" href="message-transformation.html">Message Transformation</a></li><li><a shape="rect" href="mirrored-queues.html">Mirrored Queues</a></li><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li></ul>
+<ul><li><a shape="rect" href="amq-message-store.html">AMQ Message Store</a> (Faster Persistence!)</li><li><a shape="rect" href="message-cursors.html">Message Cursors</a> (To handle very large number of stored messages)</li><li><a shape="rect" href="blob-messages.html">Blob Messages</a></li><li><a shape="rect" href="command-agent.html">Command Agent</a></li><li><a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel Integration</a></li><li><a shape="rect" href="logging-a-warning-if-you-forget-to-start-a-connection.html">Logging a warning if you forget to start a Connection</a></li><li><a shape="rect" href="message-transformation.html">Message Transformation</a></li><li><a shape="rect" href="mirrored-queues.html">Mirrored Queues</a></li><li><a shape="rect" href="producer-flow-control.html">Producer Flow Control</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-51.html
==============================================================================
--- websites/production/activemq/content/new-features-in-51.html (original)
+++ websites/production/activemq/content/new-features-in-51.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,14 +72,14 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.1-NewFeaturesin5.1">New Features in 5.1</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.1-NewFeaturesin5.1">New Features in 5.1</h2>
 
 <p>In the 5.1.x release of Apache ActiveMQ there are the following new features:</p>
 
 <ul><li>You can use the new <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.
 <h2 id="NewFeaturesin5.1-NewFeaturesin5.1.1">New Features in 5.1</h2></li><li>Support for more graceful handling of <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-1517">timeouts within MessageProducer.send</a></li><li>Add the option for a <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-1572">backup channel that is already connected for the Failover transport</a></li><li>ActiveMQ configuration can now validate against an XSD which means that it can be embedded in a spring configuration file.</li><li>Stomp can now handle delivering Map and Object messages.</li></ul>
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-511.html
==============================================================================
--- websites/production/activemq/content/new-features-in-511.html (original)
+++ websites/production/activemq/content/new-features-in-511.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.11-NewFeaturesin5.11.0">New Features in 5.11.0</h2><ul class="alternate"><li><span style="line-height: 1.4285715;">Destination import/export for lock down mode <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5218">AMQ-5218</a></span></li><li><p>Dynamic camel root loading <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5351">AMQ-5351</a></p></li><li><p>MQTT - QOS2 mapped to virtual topics&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5290">AMQ-5290</a></p></li><li>start scripts simplification&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5378">AMQ-5378</a></li><li>Recover scheduler database option&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3758">AMQ-3758</a></li><li>Jetty 8</li><li>Karaf 2.4.1</li></ul>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.11-NewFeaturesin5.11.0">New Features in 5.11.0</h2><ul class="alternate"><li><span style="line-height: 1.4285715;">Destination import/export for lock down mode <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5218">AMQ-5218</a></span></li><li><p>Dynamic camel root loading <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5351">AMQ-5351</a></p></li><li><p>MQTT - QOS2 mapped to virtual topics&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5290">AMQ-5290</a></p></li><li>start scripts simplification&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5378">AMQ-5378</a></li><li>Recover scheduler database option&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3758">AMQ-3758</a></li><li>Jetty 8</li><li>Karaf 2.4.1</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-52.html
==============================================================================
--- websites/production/activemq/content/new-features-in-52.html (original)
+++ websites/production/activemq/content/new-features-in-52.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Apache ActiveMQ 5.2 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11841">resolves</a> <span class="static-jira-issues_count">
+<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.2 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11841">resolves</a> <span class="static-jira-issues_count">
     <a shape="rect" class="issue-link" href="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=11841&amp;sorter/field=priority&amp;sorter/order=DESC&amp;tempMax=1000&amp;src=confmacro">
                     0 issue
             </a>
@@ -82,7 +82,7 @@
 <h2 id="NewFeaturesin5.2-NewFeaturesin5.2">New Features in 5.2</h2>
 <p>The new features and enhancements in this release include:</p>
 
-<ul><li><a shape="rect" href="advisory-message.html">Additional advisory messages</a> for messages delivered/consumed fast producers/slow consumers, Usage limits, Slaves become masters etc.</li><li>Enhanced ssl context configuration through spring/xbean</li><li>New individual acknowledge mode for message consumption</li><li>Ability to configure the automatic discarding of the items being sent to the dead letter queue</li><li>Ability to limit the maximum number of connections to a Broker</li><li>Ability to configure <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1244">separate lock</a> Datasource for JDBC Master slave.</li><li>activemq-camel and activemq-connection-pool now have their own modules, no longer in activemq-core</li><li>The default <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> brokerUrl now uses t
 he <a shape="rect" href="failover-transport-reference.html">failover transport</a>.</li><li>Uses Apache Camel <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/camel-150-release.html">1.5</a>.</li></ul>
+<ul><li><a shape="rect" href="advisory-message.html">Additional advisory messages</a> for messages delivered/consumed fast producers/slow consumers, Usage limits, Slaves become masters etc.</li><li>Enhanced ssl context configuration through spring/xbean</li><li>New individual acknowledge mode for message consumption</li><li>Ability to configure the automatic discarding of the items being sent to the dead letter queue</li><li>Ability to limit the maximum number of connections to a Broker</li><li>Ability to configure <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1244">separate lock</a> Datasource for JDBC Master slave.</li><li>activemq-camel and activemq-connection-pool now have their own modules, no longer in activemq-core</li><li>The default <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> brokerUrl now uses t
 he <a shape="rect" href="failover-transport-reference.html">failover transport</a>.</li><li>Uses Apache Camel <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/camel-150-release.html">1.5</a>.</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-53.html
==============================================================================
--- websites/production/activemq/content/new-features-in-53.html (original)
+++ websites/production/activemq/content/new-features-in-53.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,12 +72,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Apache ActiveMQ 5.3 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11914&amp;styleName=Html&amp;projectId=10520">resolves</a> 334 issues.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.3 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11914&amp;styleName=Html&amp;projectId=10520">resolves</a> 334 issues.</p>
 
 <h2 id="NewFeaturesin5.3-NewFeaturesin5.3">New Features in 5.3</h2>
 <p>The new features and enhancements in this release include:</p>
 
-<ul><li>New <a shape="rect" href="kahadb.html">KahaDB</a> persistent storage</li><li><a shape="rect" class="external-link" href="http://camel.apache.org">Camel 2.0.0</a> along with its web console</li><li>stomp over SSL and NIO support</li><li>Improved configuration - default one production oriented and a lot of use case configuration examples (like scalability and throughput)</li><li>Ability to query broker for statistics from non-Java clients (by sending a message)</li><li>More broker plugins included to help tracing messages in networks, improving logging, etc.</li><li>FTP support for blob messages</li><li>Improved activemq-admin to lookup for local processes if possible</li><li>... and much more</li></ul>
+<ul><li>New <a shape="rect" href="kahadb.html">KahaDB</a> persistent storage</li><li><a shape="rect" class="external-link" href="http://camel.apache.org">Camel 2.0.0</a> along with its web console</li><li>stomp over SSL and NIO support</li><li>Improved configuration - default one production oriented and a lot of use case configuration examples (like scalability and throughput)</li><li>Ability to query broker for statistics from non-Java clients (by sending a message)</li><li>More broker plugins included to help tracing messages in networks, improving logging, etc.</li><li>FTP support for blob messages</li><li>Improved activemq-admin to lookup for local processes if possible</li><li>... and much more</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-54.html
==============================================================================
--- websites/production/activemq/content/new-features-in-54.html (original)
+++ websites/production/activemq/content/new-features-in-54.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,14 +72,14 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.4-NewFeaturesin5.4.1">New Features in 5.4.1</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.4-NewFeaturesin5.4.1">New Features in 5.4.1</h2>
 <ul><li><a shape="rect" href="encrypted-passwords.html">Encrypted passwords</a></li><li>Added selector support in <a shape="rect" href="ajax.html">Ajax</a></li></ul>
 
 
 <h2 id="NewFeaturesin5.4-NewFeaturesin5.4">New Features in 5.4</h2>
 
 <ul><li><a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a></li><li>Message Priority</li><li><a shape="rect" href="websockets.html">WebSockets</a></li><li><a shape="rect" href="osgi-integration.html">Better OSGi support</a></li><li>Broker side options for updating failover clients automatically of new brokers joining and leaving the cluster - see <a shape="rect" href="failover-transport-reference.html">Failover Transport Reference</a></li><li><a shape="rect" href="unix-shell-script.html">Enhanced Shell Script</a> - for starting, stopping and managing the broker in a Unix environment</li><li><a shape="rect" href="web-console.html">Easy way to configure Web Console</a></li><li><a shape="rect" href="rest.html">Selectors for Ajax and REST consumers</a></li><li>JaasDualAuthentcationPlugin</li><li><a shape="rect" href="security.html">Anonymous users</a></li><li>Ajax Adapters</li><li>... and much more</li></ul>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-55.html
==============================================================================
--- websites/production/activemq/content/new-features-in-55.html (original)
+++ websites/production/activemq/content/new-features-in-55.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,14 +72,14 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.5-NewFeaturesin5.5.0">New Features in 5.5.0</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.5-NewFeaturesin5.5.0">New Features in 5.5.0</h2>
 <ul><li>Dependency on Java 1.6 (java 1.5 is no longer supported)</li><li>MDC logging (<a shape="rect" class="external-link" href="http://slf4j.org/" rel="nofollow">SLF4J</a>)</li><li>Upgrade to camel 2.7.0</li><li>DLQ processing per durable subscription</li><li>New network connector MBeans</li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/configurable-ioexception-handling.html">IOExceptionHandler</a> for JDBC store</li><li>Added support for <a shape="rect" class="external-link" href="http://commons.apache.org/daemon/">Apache Commons Daemon</a></li></ul>
 
 
 <h2 id="NewFeaturesin5.5-Improvementsin5.5.0">Improvements in 5.5.0</h2>
 <ul><li>Improved support for recovery of durable subscribers with priority support</li><li>Improved performance for offline durable subscriptions with large message backlogs (JDBC store)</li><li>better support for Guest login via JAAS</li></ul>
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-56.html
==============================================================================
--- websites/production/activemq/content/new-features-in-56.html (original)
+++ websites/production/activemq/content/new-features-in-56.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="NewFeaturesin5.6-NewFeaturesin5.6.0">New Features in 5.6.0</h2>
+<div class="wiki-content maincontent"><h2 id="NewFeaturesin5.6-NewFeaturesin5.6.0">New Features in 5.6.0</h2>
 
-<ul class="alternate"><li>LevelDB Store</li><li>MQTT transport</li><li>New LDAP security module</li><li>Stomp 1.1 support</li><li>stomp+nio+ssl transport</li><li>Multi KahaDB persistence</li><li>Priority Failover URIs</li><li>Automatic client rebalance in broker cluster</li></ul>
+<ul class="alternate"><li>LevelDB Store</li><li>MQTT transport</li><li>New LDAP security module</li><li>Stomp 1.1 support</li><li>stomp+nio+ssl transport</li><li>Multi KahaDB persistence</li><li>Priority Failover URIs</li><li>Automatic client rebalance in broker cluster</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/new-features-in-57.html
==============================================================================
--- websites/production/activemq/content/new-features-in-57.html (original)
+++ websites/production/activemq/content/new-features-in-57.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,8 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Java 7 support (compiled with jdk6 and validated with jdk7)
-	<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/websockets.html#WebSockets-SecureWebSockets">Secure WebSockets (wss) transport </a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/message-redelivery-and-dlq-handling.html#MessageRedeliveryandDLQHandling-BrokerRedelivery%28v5.7%29">Broker Based Redelivery</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/pluggable-storage-lockers.html">Pluggable Store Lockers</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/pluggable-storage-lockers.html#Pluggablestoragelockers-LeaseDatabaseLocker">Lease based database locker</a></li><li>Set a <a shape="rect" class="external-link" href="http://activemq.apache.org/redelivery-policy.html#RedeliveryPolicy-RedeliveryPolicyperDestination">RedeliveryPolicy per destination</a></li><li>Includes <a shape="rect" class="external-link" href="http://camel.apache.org/camel-2100-release.h
 tml">Apache Camel 2.10</a></li></ul>
+<div class="wiki-content maincontent"><ul><li>Java 7 support (compiled with jdk6 and validated with jdk7)</li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/websockets.html#WebSockets-SecureWebSockets">Secure WebSockets (wss) transport </a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/message-redelivery-and-dlq-handling.html#MessageRedeliveryandDLQHandling-BrokerRedelivery%28v5.7%29">Broker Based Redelivery</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/pluggable-storage-lockers.html">Pluggable Store Lockers</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/pluggable-storage-lockers.html#Pluggablestoragelockers-LeaseDatabaseLocker">Lease based database locker</a></li><li>Set a <a shape="rect" class="external-link" href="http://activemq.apache.org/redelivery-policy.html#RedeliveryPolicy-RedeliveryPolicyperDestination">RedeliveryPolicy per destination</a><
 /li><li>Includes <a shape="rect" class="external-link" href="http://camel.apache.org/camel-2100-release.html">Apache Camel 2.10</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">