activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956584 [20/37] - in /websites/production/activemq/content: ./ 2004/04/13/ 2004/05/26/ 2004/06/23/ 2004/06/25/ 2004/08/17/ 2004/08/23/ 2004/10/07/ 2004/11/02/ 2004/12/20/ 2005/02/03/ 2005/02/25/ 2005/04/11/ 2005/06/06/ 2005/07/04/ 2005/07/1...
Date Wed, 01 Jul 2015 20:13:56 GMT
Modified: websites/production/activemq/content/how-do-multiple-transports-work.html
==============================================================================
--- websites/production/activemq/content/how-do-multiple-transports-work.html (original)
+++ websites/production/activemq/content/how-do-multiple-transports-work.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,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <h3 id="Howdomultipletransportswork-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
 
 
 <p>The transport a client uses to connect to the broker is just the transport your client uses. So messages the broker sends to your client will be sent over that transport. However the broker can support many transports.</p>
 
-<p>So client A could connect over HTTP and client B could connect over tcp. Messages client A sends via HTTP will be delivered to B using B's transport, tcp.</p>
+<p>So client A could connect over HTTP and client B could connect over tcp. Messages client A sends via HTTP will be delivered to B using B's transport, tcp.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-do-transactions-work.html
==============================================================================
--- websites/production/activemq/content/how-do-transactions-work.html (original)
+++ websites/production/activemq/content/how-do-transactions-work.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,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
 <p>There are 2 kinds of transaction support in ActiveMQ. </p>
 
 <ul><li>JMS transactions - the commit() / rollback() methods on a Session  (which is like doing commit() / rollback() on a JDBC connection)</li><li>XA Transactions - where the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQXASession.html">XASession</a> acts as an <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/transaction/xa/XAResource.html" rel="nofollow">XAResource</a> by communicating with the Message Broker, rather like a JDBC Connection takes place in an XA transaction by communicating with the database.</li></ul>
@@ -87,7 +89,7 @@
 
 <p>If you wanna see the code, take a look at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java">MemoryTransactionStore</a> which proxies transactions for Memory and JDBC persistence adapters.</p>
 
-<p>The only real difference with XA transactions is that at the PREPARE stage we MUST write every command we have received (the send message or acknowledge message commands) to a persistent store so that we can recover properly.</p>
+<p>The only real difference with XA transactions is that at the PREPARE stage we MUST write every command we have received (the send message or acknowledge message commands) to a persistent store so that we can recover properly.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-a-queue-compare-to-a-topic.html
==============================================================================
--- websites/production/activemq/content/how-does-a-queue-compare-to-a-topic.html (original)
+++ websites/production/activemq/content/how-does-a-queue-compare-to-a-topic.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="HowdoesaQueuecomparetoaTopic-Topics">Topics</h3>
+<div class="wiki-content maincontent"><h3 id="HowdoesaQueuecomparetoaTopic-Topics">Topics</h3>
 <p>In JMS a Topic implements <em>publish and subscribe</em> semantics. When you publish a message it goes to all the subscribers who are interested - so zero to many subscribers will receive a copy of the message. Only subscribers who had an active subscription at the time the broker receives the message will get a copy of the message.</p>
 
 <h3 id="HowdoesaQueuecomparetoaTopic-Queues">Queues</h3>
 <p>A JMS Queue implements <em>load balancer</em> semantics. A single message will be received by exactly one consumer. If there are no consumers available at the time the message is sent it will be kept until a consumer is available that can process the message. If a consumer receives a message and does not acknowledge it before closing then the message will be redelivered to another consumer. A queue can have many consumers with messages <em>load balanced</em> across the available consumers.</p>
 
-<p>So Queues implement a reliable load balancer in JMS.</p>
+<p>So Queues implement a reliable load balancer in JMS.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-amqp.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-amqp.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-amqp.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><a shape="rect" href="amqp.html">AMQP</a> stands for the <em>Advanced Message Queue Protocol</em> and is a specification for how messaging clients and brokers can interoperate. AMQP is a specification of a wire-level protocol for client to message broker communication.  It is not a messaging system like ActiveMQ, but just a messaging protocol.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="amqp.html">AMQP</a> stands for the <em>Advanced Message Queue Protocol</em> and is a specification for how messaging clients and brokers can interoperate. AMQP is a specification of a wire-level protocol for client to message broker communication.  It is not a messaging system like ActiveMQ, but just a messaging protocol.</p>
 
 <p>ActiveMQ now implements AMQP 1.0!</p>
 
@@ -81,7 +81,7 @@
 <ul><li><a shape="rect" href="openwire.html">OpenWire</a>, a fast binary format</li><li><a shape="rect" href="stomp.html">Stomp</a>, a simple and easily implemented text based-protocol</li><li><a shape="rect" href="mqtt.html">MQTT</a>, a compact binary format for limited devices on an unreliable network</li></ul>
 
 
-<p>Through these protocols, ActiveMQ can support clients in C, C++, C#, Ruby, Python, Perl, PHP, Pike etc. AMQP is most similar to OpenWire, because both OpenWire and AMQP are designed for high performance messaging, through a binary (rather than text-based) format. As a text-based format, STOMP is much easier to implement, but gives somewhat slower performance.</p>
+<p>Through these protocols, ActiveMQ can support clients in C, C++, C#, Ruby, Python, Perl, PHP, Pike etc. AMQP is most similar to OpenWire, because both OpenWire and AMQP are designed for high performance messaging, through a binary (rather than text-based) format. As a text-based format, STOMP is much easier to implement, but gives somewhat slower performance.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-fuse-message-broker.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-fuse-message-broker.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-fuse-message-broker.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><a shape="rect" class="external-link" href="http://fusesource.com/products/enterprise-activemq/" rel="nofollow">Fuse Message Broker</a> is a certified distribution of Apache ActiveMQ provided by FuseSource. <a shape="rect" class="external-link" href="http://fusesource.com" rel="nofollow">FuseSource</a> does all of its development and bug fixes as part of the Apache ActiveMQ community, so there are no functional differences between the two. FuseSource may do more frequent releases than Apache, so it is possible to get bug fixes from a Fuse Message Broker release sooner than from an official Apache ActiveMQ release.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" class="external-link" href="http://fusesource.com/products/enterprise-activemq/" rel="nofollow">Fuse Message Broker</a> is a certified distribution of Apache ActiveMQ provided by FuseSource. <a shape="rect" class="external-link" href="http://fusesource.com" rel="nofollow">FuseSource</a> does all of its development and bug fixes as part of the Apache ActiveMQ community, so there are no functional differences between the two. FuseSource may do more frequent releases than Apache, so it is possible to get bug fixes from a Fuse Message Broker release sooner than from an official Apache ActiveMQ release.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-jbossmq.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-jbossmq.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-jbossmq.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>There are some similarities between the two; they both support JMS 1.1 and run inside <a shape="rect" href="jboss-integration.html">JBoss 4.x</a>.</p>
+<div class="wiki-content maincontent"><p>There are some similarities between the two; they both support JMS 1.1 and run inside <a shape="rect" href="jboss-integration.html">JBoss 4.x</a>.</p>
 
 <p>However ActiveMQ does offer some specific differences and advantages (at least from our perspective)</p>
 
@@ -87,7 +87,7 @@
 
 <h2 id="HowdoesActiveMQcomparetoJBossMQ-MoreonJBossIntegration">More on JBoss Integration </h2>
 
-<p><a shape="rect" href="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></p>
+<p><a shape="rect" href="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-mantaray.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-mantaray.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-mantaray.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>We are obviously biased, and will tell you "just use ActiveMQ!" <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)">  But Mantaray is an OK JMS provider. The interesting thing about MantaRay is it can support a peer-based network, just as ActiveMQ does with its <a shape="rect" href="peer-transport-reference.html">peer transport</a>.</p>
+<div class="wiki-content maincontent"><p>We are obviously biased, and will tell you "just use ActiveMQ!" <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)">  But Mantaray is an OK JMS provider. The interesting thing about MantaRay is it can support a peer-based network, just as ActiveMQ does with its <a shape="rect" href="peer-transport-reference.html">peer transport</a>.</p>
 
 <p>We <a shape="rect" href="performance.html">benchmark</a> against Mantaray and other open source JMS providers and in our tests (in which we try to be as objective as possible) ActiveMQ exhibits higher performance in most scenarios.</p>
 
 <p>A peer transport can be useful when using non-persistent messaging. But if you want persistent messaging you often want to use a federated network with certain brokers on the network being the persistence brokers (so you can backup the file systems etc).</p>
 
-<p>The ideal topology often depends on your requirements and how you want to manage persistence and deal with hardware failures such as with <a shape="rect" href="masterslave.html">MasterSlave</a>.</p>
+<p>The ideal topology often depends on your requirements and how you want to manage persistence and deal with hardware failures such as with <a shape="rect" href="masterslave.html">MasterSlave</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-mule.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-mule.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-mule.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Apache ActiveMQ is a messaging provider, with extensive capabilities for message brokering.  Mule is described as an ESB, in that it defines and executes the brokering of message exchanges among integrated software components.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is a messaging provider, with extensive capabilities for message brokering.  Mule is described as an ESB, in that it defines and executes the brokering of message exchanges among integrated software components.</p>
 
 <h4 id="HowdoesActiveMQcomparetoMule?-Architecture">Architecture</h4>
 <p>Mule provides an accessible programming model for integration, designed to work well with - and leverage - other middleware technologies. For this reason, Mule does not provide a native messaging system, and it is therefore frequently used with Apache ActiveMQ.</p>
@@ -90,7 +90,7 @@
 <p>Additional ESB requirements, such as support for a distributed architecture and a native JBI container and components, are not supported by Mule. If you require these capabilities, we encourage you to investigate other open source ESBs that also integrate Apache ActiveMQ, such as <a shape="rect" class="external-link" href="http://servicemix.org/" rel="nofollow">Apache ServiceMix</a>, and even the <a shape="rect" class="external-link" href="http://incubator.apache.org/cxf/">Apache CXF</a> service framework.</p>
 
 <h4 id="HowdoesActiveMQcomparetoMule?-CommercialSupport,CopyrightandLicense">Commercial Support, Copyright and License</h4>
-<p>Both Mule and ActiveMQ have commercial support available from companies dedicated to the technologies. The commercial support corporation for Mule (MuleSource) holds the copyright to Mule, and licenses it under an open source license adapted from the Mozilla Public License (an "MPL+" license). Apache ActiveMQ is an open source project at the Apache Software Foundation, and as such is available under the Apache License 2.0. Commercial support for ActiveMQ is provided by <a shape="rect" class="external-link" href="http://open.iona.com/" rel="nofollow">Iona plc</a>. </p>
+<p>Both Mule and ActiveMQ have commercial support available from companies dedicated to the technologies. The commercial support corporation for Mule (MuleSource) holds the copyright to Mule, and licenses it under an open source license adapted from the Mozilla Public License (an "MPL+" license). Apache ActiveMQ is an open source project at the Apache Software Foundation, and as such is available under the Apache License 2.0. Commercial support for ActiveMQ is provided by <a shape="rect" class="external-link" href="http://open.iona.com/" rel="nofollow">Iona plc</a>. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-spread-toolkit.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-spread-toolkit.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-spread-toolkit.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>Spread Toolkit is a C++ library for messaging and only has <a shape="rect" class="external-link" href="http://www.spread.org/JMS4Spread/docs/" rel="nofollow">partial support for JMS</a>. It doesn't support durable messaging, transactions, XA or full JMS 1.1. It is also dependent on a native code Spread daemon running on the machine.</p>
 
 <p>Apache ActiveMQ on the other hand is the JMS provider used in <a shape="rect" class="external-link" href="http://geronimo.apache.org">Apache Geronimo</a> and is J2EE 1.4 certified in Geronimo and is 100% pure Java. ActiveMQ supports transient and durable messaging, transactions, XA, J2EE 1.4, JMS 1.1, JCA 1.5 as well as heaps of different features like <a shape="rect" href="message-groups.html">Message Groups</a> and <a shape="rect" href="clustering.html">Clustering</a></p>
@@ -80,7 +81,7 @@
 
 <p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.html">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html">ActiveMQ Performance Module Users Manual</a></p>
 
-<p>The Commercial Providers on the <a shape="rect" href="support.html">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p>
+<p>The Commercial Providers on the <a shape="rect" href="support.html">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-connectionfactory-relate-to-the-broker.html
==============================================================================
--- websites/production/activemq/content/how-does-connectionfactory-relate-to-the-broker.html (original)
+++ websites/production/activemq/content/how-does-connectionfactory-relate-to-the-broker.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="HowdoesConnectionFactoryrelatetotheBroker-HowdoesConnectionFactoryrelatetotheBroker?">How does ConnectionFactory relate to the Broker?</h2>
+<div class="wiki-content maincontent"><h2 id="HowdoesConnectionFactoryrelatetotheBroker-HowdoesConnectionFactoryrelatetotheBroker?">How does ConnectionFactory relate to the Broker?</h2>
 
 <p>The ConnectionFactory is a JMS specification client side interface for creating connections to a JMS broker. The Broker is a service on the network or <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">embedded in the same JVM</a> which provides the message provider. So think of the ConnectionFactory as the client API for sending and receiving messages and the broker is a server side implementation.</p>
 
 <h3 id="HowdoesConnectionFactoryrelatetotheBroker-SeeAlso">See Also</h3>
 
 <ul><li><a shape="rect" href="how-do-i-create-new-destinations.html">How do I create new destinations</a></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">How do I embed a Broker inside a Connection</a></li><li><a shape="rect" href="what-are-administered-objects.html">What are administered objects</a></li></ul>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-jms-compare-with-email.html
==============================================================================
--- websites/production/activemq/content/how-does-jms-compare-with-email.html (original)
+++ websites/production/activemq/content/how-does-jms-compare-with-email.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,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>Certainly they both do similar things.  The main difference between them is their history and design criteria. </p>
 
 <p>JMS has a bunch of different qualities of service (durable v non-durable, queue v topic) designed for very high performance messaging with low latency together with reliability. Email is designed for connectivitiy on the web. So they have different design trade offs. e.g. its not a big deal to get multiple copies of an email (which I get fairly often if I loose a connection with an email server over POP for example). It would be a major disaster to get 2 copies of the "remove $1000 from my bank account" messages <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)"></p>
 
-<p>The main reasons for using JMS is performance (throughput &amp; latency), together with support for transactions &amp; XA together with avoiding duplicates and message loss.</p>
+<p>The main reasons for using JMS is performance (throughput &amp; latency), together with support for transactions &amp; XA together with avoiding duplicates and message loss.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-journaling-work-with-multiple-brokers.html
==============================================================================
--- websites/production/activemq/content/how-does-journaling-work-with-multiple-brokers.html (original)
+++ websites/production/activemq/content/how-does-journaling-work-with-multiple-brokers.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Brokers cannot share a journal.  Each must be configured with it's own journal.</p>
+<div class="wiki-content maincontent">
+<p>Brokers cannot share a journal.  Each must be configured with it's own journal.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-openwire-compare-to-stomp.html
==============================================================================
--- websites/production/activemq/content/how-does-openwire-compare-to-stomp.html (original)
+++ websites/production/activemq/content/how-does-openwire-compare-to-stomp.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,10 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p><a shape="rect" href="openwire.html">OpenWire</a> is the native protocol that Apache ActiveMQ uses. It is designed for performance and size on the wire - sacrificing some ease of implementation with higher performance and reduced network bandwidth as a priority. OpenWire was first released in Apache ActiveMQ 4.0.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="openwire.html">OpenWire</a> is the native protocol that Apache ActiveMQ uses. It is designed for performance and size on the wire - sacrificing some ease of implementation with higher performance and reduced network bandwidth as a priority. OpenWire was first released in Apache ActiveMQ 4.0.</p>
 
 <p><a shape="rect" href="stomp.html">Stomp</a> is a simpler text based protocol which is designed to be very simple to implement in a few hours in any language or platform (e.g. you can use a telnet client to communicate via Stomp). A Stomp client is not going to be as efficient as an client that uses<br clear="none">
-OpenWire, but it much simpler so you can generally be up and running with it much quicker.</p>
+OpenWire, but it much simpler so you can generally be up and running with it much quicker.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/activemq/content/how-does-the-website-work.html
==============================================================================
--- websites/production/activemq/content/how-does-the-website-work.html (original)
+++ websites/production/activemq/content/how-does-the-website-work.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%">
-<p>This website is actually rendered from the Wiki contents that you can <a shape="rect" href="how-do-i-edit-the-website.html">edit</a>.  <br clear="none">
+<div class="wiki-content maincontent"><p>This website is actually rendered from the Wiki contents that you can <a shape="rect" href="how-do-i-edit-the-website.html">edit</a>.  <br clear="none">
 When viewing a page on the static HTML website you can click on the <strong>edit</strong> link (bottom of the page) and you can edit the page. </p>
 
 <p>Other useful <a shape="rect" href="site.html">Site links</a> are</p>
 
 <ul class="childpages-macro"><li><a shape="rect" href="banner.html">Banner</a></li><li><a shape="rect" href="navigation.html">Navigation</a></li><li><a shape="rect" href="quicklinks.html">QuickLinks</a></li><li><a shape="rect" href="siteindex.html">SiteIndex</a></li><li><a shape="rect" href="sitemap.html">SiteMap</a></li></ul>
 
-<p>Note that it takes a little while to update the Apache site at <a shape="rect" class="external-link" href="http://activemq.apache.org/">http://activemq.apache.org/</a> due to caching. Though this site usually updates quickly: <a shape="rect" class="external-link" href="http://cwiki.apache.org/ACTIVEMQ/">http://cwiki.apache.org/ACTIVEMQ/</a></p>
+<p>Note that it takes a little while to update the Apache site at <a shape="rect" class="external-link" href="http://activemq.apache.org/">http://activemq.apache.org/</a> due to caching. Though this site usually updates quickly: <a shape="rect" class="external-link" href="http://cwiki.apache.org/ACTIVEMQ/">http://cwiki.apache.org/ACTIVEMQ/</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-does-xbean-compare-to-spring-2.html
==============================================================================
--- websites/production/activemq/content/how-does-xbean-compare-to-spring-2.html (original)
+++ websites/production/activemq/content/how-does-xbean-compare-to-spring-2.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>Spring 2.0 has introduced the ability to handle custom XML languages inside the spring.xml. This is something we developed <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/">XBean</a> for way back in the Spring 1.x days.</p>
+<div class="wiki-content maincontent"><p>Spring 2.0 has introduced the ability to handle custom XML languages inside the spring.xml. This is something we developed <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/">XBean</a> for way back in the Spring 1.x days.</p>
 
 <p>The Spring hook requires component developers to write their own XML handling, processing DOMs and so forth. On various projects like ActiveMQ, Jencks, Jetty, ServiceMix, XFire - we didn't want to have to spend time hand-crafting parsing of XML code. So XBean is used to auto-create the parsing code along with an XSD and reference documentation for how to configure these services in custom XML languages.</p>
 
@@ -93,7 +93,7 @@
 
 <p>Here's an example Spring XML for Spring 2 which configures ActiveMQ, ActiveMQ Resource Adapter and Jencks all using Spring 2 with XSD validation (and so completion)</p>
 
-<p><a shape="rect" class="external-link" href="http://svn.codehaus.org/jencks/trunk/jencks/src/test/resources/org/jencks/xbean/xbean-validating.xml" rel="nofollow">http://svn.codehaus.org/jencks/trunk/jencks/src/test/resources/org/jencks/xbean/xbean-validating.xml</a></p>
+<p><a shape="rect" class="external-link" href="http://svn.codehaus.org/jencks/trunk/jencks/src/test/resources/org/jencks/xbean/xbean-validating.xml" rel="nofollow">http://svn.codehaus.org/jencks/trunk/jencks/src/test/resources/org/jencks/xbean/xbean-validating.xml</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-fast-is-activemq.html
==============================================================================
--- websites/production/activemq/content/how-fast-is-activemq.html (original)
+++ websites/production/activemq/content/how-fast-is-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%">
-<h2 id="HowfastisActiveMQ-HowfastisActiveMQ?">How fast is ActiveMQ?</h2>
+<div class="wiki-content maincontent"><h2 id="HowfastisActiveMQ-HowfastisActiveMQ?">How fast is ActiveMQ?</h2>
 
 <p>It all depends on the configuration, the operating system, hardware, JVM, JVM configuration and what you're doing. For more details see <a shape="rect" href="performance.html">Performance</a></p>
 
@@ -80,7 +80,7 @@
 
 <p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.html">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.html">ActiveMQ Performance Module Users Manual</a></p>
 
-<p>The Commercial Providers on the <a shape="rect" href="support.html">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p>
+<p>The Commercial Providers on the <a shape="rect" href="support.html">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-lightweight-is-sending-a-message.html
==============================================================================
--- websites/production/activemq/content/how-lightweight-is-sending-a-message.html (original)
+++ websites/production/activemq/content/how-lightweight-is-sending-a-message.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">
 <h3 id="Howlightweightissendingamessage-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
 
 
@@ -83,7 +84,7 @@
 
 <p>If you really want low latency, such as in a GUI thread or very high performance server, you probably want to enable asynchronous sending. The only downside of asynchronous sending is if the send fails for whatever reason (security exception typically or some transport failure), then you don't get an exception thrown in the sender thread, since all the work is done asynchronously, though your ErrorListener will get notified.</p>
 
-<p>(If you use the reliable transport, then you can let the JMS client handle transport errors and drop &amp; reconnect to another broker to handle auto-reconnection for you).</p>
+<p>(If you use the reliable transport, then you can let the JMS client handle transport errors and drop &amp; reconnect to another broker to handle auto-reconnection for you).</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-should-i-implement-request-response-with-jms.html
==============================================================================
--- websites/production/activemq/content/how-should-i-implement-request-response-with-jms.html (original)
+++ websites/production/activemq/content/how-should-i-implement-request-response-with-jms.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="HowshouldIimplementrequestresponsewithJMS-HowshouldIimplementrequestresponsewithJMS?">How should I implement request response with JMS?</h2>
+<div class="wiki-content maincontent"><h2 id="HowshouldIimplementrequestresponsewithJMS-HowshouldIimplementrequestresponsewithJMS?">How should I implement request response with JMS?</h2>
 
 <p>The simplest solution is to use <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/spring-remoting.html">Camel as a Spring Remoting provider</a> which allows you to hide all the JMS API from your business logic and letting Camel provide the request/response handling code for you.</p>
 
@@ -341,7 +341,7 @@ public class MessageProtocol {
     }
 }
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-should-i-package-applications-using-camel-and-activemq.html
==============================================================================
--- websites/production/activemq/content/how-should-i-package-applications-using-camel-and-activemq.html (original)
+++ websites/production/activemq/content/how-should-i-package-applications-using-camel-and-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%">
-<h2 id="HowshouldIpackageapplicationsusingCamelandActiveMQ-HowshouldIpackageapplicationsusingCamelandActiveMQ">How should I package applications using Camel and ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2 id="HowshouldIpackageapplicationsusingCamelandActiveMQ-HowshouldIpackageapplicationsusingCamelandActiveMQ">How should I package applications using Camel and ActiveMQ</h2>
 
 <p>So you may wish to use Camel's <a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> inside the ActiveMQ Broker. In which case the stand alone broker is already packaged to work with Camel out of the box; just add your EIP routing rules to ActiveMQ's <a shape="rect" href="xml-configuration.html">Xml Configuration</a> like the example routing rule which ships with ActiveMQ 5.x or later. If you want to include some Java routing rules, then just add your jar to somewhere inside ActiveMQ's lib directory.</p>
 
@@ -82,7 +82,7 @@
 
 <ul><li><a shape="rect" href="initial-configuration.html">what jars are required for ActiveMQ</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/what-jars-do-i-need.html">what jars are required for Camel</a></li></ul>
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-should-i-use-the-vm-transport.html
==============================================================================
--- websites/production/activemq/content/how-should-i-use-the-vm-transport.html (original)
+++ websites/production/activemq/content/how-should-i-use-the-vm-transport.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,6 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <h3 id="HowshouldIusetheVMtransport-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
 
 <p><a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.html">Using the VM transport</a> to connect to an in-JVM broker is the fastest and most efficient transport you can use.</p>
@@ -113,7 +114,7 @@ factory.setObjectMessageSerializationDef
 
 <p>&#160;</p>
 
-<p>&#160;</p>
+<p>&#160;</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-become-a-committer-on-the-activemq-project.html
==============================================================================
--- websites/production/activemq/content/how-to-become-a-committer-on-the-activemq-project.html (original)
+++ websites/production/activemq/content/how-to-become-a-committer-on-the-activemq-project.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="HowtoBecomeaCommitterontheActiveMQProject-HowtoBecomeaCommitterontheActiveMQProject">How to Become a Committer on the ActiveMQ Project</h1><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><span>This page is under active development so the ideas here are very fluid right now.</span></p></div></div><p><span style="line-height: 1.4285715;">As outlined on <a shape="rect" class="external-link" href="http://www.apache.org/foundation/how-it-works.html">How It Works document</a> and&#160;the </span><a shape="rect" class="external-link" href="https://www.apache.org/foundation/how-it-works.html#roles" style="line-height: 1.4285715;">ASF roles</a> defined there, we want to actively<span style="line-height: 1.4285715;">&#160;</span><span style="line-height: 1.4285715;"> encourage folks to move from being contrib
 utors to the ActiveMQ TLP toward becoming full-fledged committers on the project.&#160;</span><span style="line-height: 1.4285715;">In an effort to provide more transparency on what it takes to become a committer on the ActiveMQ project, we are assembling our thoughts here.&#160;</span><span style="line-height: 1.4285715;">As we work through the identification of the skills and values we feel are necessary to become a committer on the ActiveMQ project, we should continue to discuss our thoughts on the dev@activemq mailing list so that everyone is able to participate.&#160;</span></p><p>Below is the list of some of the guidelines we believe make up a good candidate for being offered committership:</p><p>&#160;</p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects&#160;</li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists&#160;</li><li>Willingness to contribute to the documentation</li><li>Willingness to mentor and be mento
 red</li><li>Helping to promote the community and this project, including outside of Apache</li><li>Sustained interest and contribution</li></ul>
+<div class="wiki-content maincontent"><h1 id="HowtoBecomeaCommitterontheActiveMQProject-HowtoBecomeaCommitterontheActiveMQProject">How to Become a Committer on the ActiveMQ Project</h1><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><span>This page is under active development so the ideas here are very fluid right now.</span></p></div></div><p><span style="line-height: 1.4285715;">As outlined on <a shape="rect" class="external-link" href="http://www.apache.org/foundation/how-it-works.html">How It Works document</a> and&#160;the </span><a shape="rect" class="external-link" href="https://www.apache.org/foundation/how-it-works.html#roles" style="line-height: 1.4285715;">ASF roles</a> defined there, we want to actively<span style="line-height: 1.4285715;">&#160;</span><span style="line-height: 1.4285715;"> enco
 urage folks to move from being contributors to the ActiveMQ TLP toward becoming full-fledged committers on the project.&#160;</span><span style="line-height: 1.4285715;">In an effort to provide more transparency on what it takes to become a committer on the ActiveMQ project, we are assembling our thoughts here.&#160;</span><span style="line-height: 1.4285715;">As we work through the identification of the skills and values we feel are necessary to become a committer on the ActiveMQ project, we should continue to discuss our thoughts on the dev@activemq mailing list so that everyone is able to participate.&#160;</span></p><p>Below is the list of some of the guidelines we believe make up a good candidate for being offered committership:</p><p>&#160;</p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects&#160;</li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists&#160;</li><li>Willingness to contribute to the documentation</li>
 <li>Willingness to mentor and be mentored</li><li>Helping to promote the community and this project, including outside of Apache</li><li>Sustained interest and contribution</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-configure-a-new-database.html
==============================================================================
--- websites/production/activemq/content/how-to-configure-a-new-database.html (original)
+++ websites/production/activemq/content/how-to-configure-a-new-database.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,6 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>ActiveMQ explicity supports Derby, Axion, HSQL, Oracle, and SQLServer. Below are the steps on how to configure a new database.</p>
 
 <p>1. Modify activemq.xml found in the directory "activemq_home/conf" by editing or adding a JDBC DataSource Configuration.</p>
@@ -124,7 +125,7 @@
 </div></div>
 <p>2. Set the datasource reference to use the new jdbc configuration e.g &lt;jdbcPersistence dataSourceRef="mssql-ds"/&gt;</p>
 
-<p>3. Place the jdbc driver in the directory "activemq_home/lib/optional".</p>
+<p>3. Place the jdbc driver in the directory "activemq_home/lib/optional".</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-deal-with-large-number-of-threads-in-clients.html
==============================================================================
--- websites/production/activemq/content/how-to-deal-with-large-number-of-threads-in-clients.html (original)
+++ websites/production/activemq/content/how-to-deal-with-large-number-of-threads-in-clients.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>If you study thread allocation in ActiveMQ clients, you'll notice that by default there is one thread allocated by every session. This basically means that session will use its <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html" rel="nofollow">ThreadPoolExecutor</a> to execute its tasks. Up until version 5.7 this executor was unbound which could lead to OOM problems in rare case where are a large number of busy sessions in the same JVM could cause uncontrollable spikes in thread creation. </p>
+<div class="wiki-content maincontent"><p>If you study thread allocation in ActiveMQ clients, you'll notice that by default there is one thread allocated by every session. This basically means that session will use its <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html" rel="nofollow">ThreadPoolExecutor</a> to execute its tasks. Up until version 5.7 this executor was unbound which could lead to OOM problems in rare case where are a large number of busy sessions in the same JVM could cause uncontrollable spikes in thread creation. </p>
 
 <p>In 5.7 we bounded this executor to a maximum of 1000 threads by default, which we believe should be enough for most use cases. In case of large number of busy sessions, each of them could end up using large number of threads and eventually OOM your application. There are couple of things you can do. The first obvious thing is to decrease the max thread limit a session can use, like this:</p>
 
@@ -114,7 +114,7 @@ conn.start();</pre>
 
 <p>However you need to have in mind that this approach can affect performance of the whole system.</p>
 
-<p>So there you go. In the unlikely scenario where your application has trouble with the number of threads created by JMS session, you can use one of the shown techniques to deal with it. As always there's no silver bullet for all scenarios, so measure and tune for your system.</p>
+<p>So there you go. In the unlikely scenario where your application has trouble with the number of threads created by JMS session, you can use one of the shown techniques to deal with it. As always there's no silver bullet for all scenarios, so measure and tune for your system.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-deploy-activemq-ra-versionrar-to-weblogic.html
==============================================================================
--- websites/production/activemq/content/how-to-deploy-activemq-ra-versionrar-to-weblogic.html (original)
+++ websites/production/activemq/content/how-to-deploy-activemq-ra-versionrar-to-weblogic.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,6 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <h3 id="Howtodeployactivemq-ra-version.rartoweblogic-ThisisaguideonhowtodeployActiveMQ'sresouceadaptertoweblogic9.1.">This is a guide on how to deploy ActiveMQ's resouce adapter to weblogic 9.1.</h3>
 
 <ol><li>Create a new domain in weblogic using the configuration wizard (Start menu BEA Products -&gt; Tools -&gt; configuration Wizard ).</li><li>Add the jar dependencies (these are the jars inside the rar file..for some reason weblogic is not loading these from the rar file)&#160; in the classpath . One way to do this is by dropping the jars in the lib directory of the domain (&lt;%BEA_HOME%&gt;\user_projects\domains\&lt;%DOMAIN_NAME%&gt;\lib).&#160;</li></ol>
@@ -109,7 +110,7 @@
 <br clear="none" class="atl-forced-newline">
 &#160;
 <br clear="none" class="atl-forced-newline">
-&#160;</li><li>Start the domain's weblogic server (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Admin Server Console) and enter the username and password.</li><li>On the main menu, click "Deployments" under "Your Deployed Resources"</li><li>On the deployment table, click "install" button. If the button is disabled, then click "Lock &amp; Edit" to enable it.</li><li>Browse for the activemq-ra-*.rar file then click next (for testing purpose, choose the default onwards).</li><li>Click the "activate changes" button to check if the resource adapter is properly deployed.</li></ol>
+&#160;</li><li>Start the domain's weblogic server (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Admin Server Console) and enter the username and password.</li><li>On the main menu, click "Deployments" under "Your Deployed Resources"</li><li>On the deployment table, click "install" button. If the button is disabled, then click "Lock &amp; Edit" to enable it.</li><li>Browse for the activemq-ra-*.rar file then click next (for testing purpose, choose the default onwards).</li><li>Click the "activate changes" button to check if the resource adapter is properly deployed.</li></ol></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-disable-auto-destination-creation.html
==============================================================================
--- websites/production/activemq/content/how-to-disable-auto-destination-creation.html (original)
+++ websites/production/activemq/content/how-to-disable-auto-destination-creation.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>see <a shape="rect" href="how-do-i-restrict-connections-from-creating-new-queues-or-topics.html">How do I restrict connections from creating new queues or topics</a></p>
+<div class="wiki-content maincontent"><p>see <a shape="rect" href="how-do-i-restrict-connections-from-creating-new-queues-or-topics.html">How do I restrict connections from creating new queues or topics</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-disable-multicast-discovery.html
==============================================================================
--- websites/production/activemq/content/how-to-disable-multicast-discovery.html (original)
+++ websites/production/activemq/content/how-to-disable-multicast-discovery.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>By default, the <a shape="rect" href="xml-configuration.html">ActiveMQ xml configuration</a> includes the <a shape="rect" href="discovery.html">multicast discovery</a> mechanism. The tcp transport connector advertises its self using multicast and a multicast network connector is configured to listen to the same address. In this way, all brokers that share the default multicast address will automatically network with each other. <br clear="none">
+<div class="wiki-content maincontent"><p>By default, the <a shape="rect" href="xml-configuration.html">ActiveMQ xml configuration</a> includes the <a shape="rect" href="discovery.html">multicast discovery</a> mechanism. The tcp transport connector advertises its self using multicast and a multicast network connector is configured to listen to the same address. In this way, all brokers that share the default multicast address will automatically network with each other. <br clear="none">
 If multicast is not required, the multicast attributes of the Transport Connector and Network Connector can be removed.</p>
 
 <p>To stop advertising your connection URI on the multicast network remove the discoveryUri attribute from the &lt;transportConnector/&gt;:</p>
@@ -106,7 +106,7 @@ If multicast is not required, the multic
 </div></div>
 <p>Alternatively, provide a static networkConnector for each broker you wish to network with by replacing the the discoveryUri with the static transport connection URI of your target broker.</p>
 
-<p>For more information see the <a shape="rect" href="discovery-transport-reference.html">Discovery Transport Reference</a></p>
+<p>For more information see the <a shape="rect" href="discovery-transport-reference.html">Discovery Transport Reference</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-to-unit-test-jms-code.html
==============================================================================
--- websites/production/activemq/content/how-to-unit-test-jms-code.html (original)
+++ websites/production/activemq/content/how-to-unit-test-jms-code.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>When unit testing code with JMS you'll typically want to avoid the overhead of running separate proceses; plus you'll want to increase startup time as fast as possible as you tend to run unit tests often and want immediate feedback. Also persistence can often cause problems - as previous test case results can adversely affect future test case runs - so you often need to purge queues on startup.</p>
+<div class="wiki-content maincontent"><p>When unit testing code with JMS you'll typically want to avoid the overhead of running separate proceses; plus you'll want to increase startup time as fast as possible as you tend to run unit tests often and want immediate feedback. Also persistence can often cause problems - as previous test case results can adversely affect future test case runs - so you often need to purge queues on startup.</p>
 
 <p>So when unit testing JMS code we recommend the following</p>
 
@@ -131,7 +131,7 @@ context.lookup("dynamicQueues/FOO.BAR");
 </pre>
 </div></div>
 
-<p>To avoid having to explicitly configure every single JMS destination in the jndi.properties file, please see the <a shape="rect" href="how-do-i-create-new-destinations.html">other options for creating destinations</a>.</p>
+<p>To avoid having to explicitly configure every single JMS destination in the jndi.properties file, please see the <a shape="rect" href="how-do-i-create-new-destinations.html">other options for creating destinations</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/how-you-can-help-release.html
==============================================================================
--- websites/production/activemq/content/how-you-can-help-release.html (original)
+++ websites/production/activemq/content/how-you-can-help-release.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="Howyoucanhelprelease-HowtoHelp">How to Help</h2>
+<div class="wiki-content maincontent"><h2 id="Howyoucanhelprelease-HowtoHelp">How to Help</h2>
 
 <p>Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the <a shape="rect" href="mailing-lists.html">activemq-dev@ mailing list</a> or create a <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ">JIRA</a> issue.</p>
 
-<p>ActiveMQ is available in both source and binary distributions.  See <a shape="rect" href="getting-started.html">Getting Started</a>.</p>
+<p>ActiveMQ is available in both source and binary distributions.  See <a shape="rect" href="getting-started.html">Getting Started</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/http-and-https-transports-reference.html
==============================================================================
--- websites/production/activemq/content/http-and-https-transports-reference.html (original)
+++ websites/production/activemq/content/http-and-https-transports-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="HTTPandHTTPsTransportsReference-HTTPandHTTPSTransports">HTTP and HTTPS Transports</h3>
+<div class="wiki-content maincontent"><h3 id="HTTPandHTTPsTransportsReference-HTTPandHTTPSTransports">HTTP and HTTPS Transports</h3>
 
 <p>The HTTP and HTTPS transports are used to tunnel over HTTP or HTTPS using XML payloads. This allows the ActiveMQ client and broker to tunnel over HTTP avoiding any firewall issues. </p>
 
@@ -103,7 +103,7 @@ https://localhost:8080
 <ul><li><a shape="rect" class="external-link" href="http://hc.apache.org/httpclient-3.x/">HttpClient</a></li><li>and <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream</a></li></ul>
 
 
-<p>Make sure you have them in your classpath if you use this transport. Also, if you're configuring networks of brokers with http(s) transport make sure you have them in broker's classpath (somewhere under <code>lib/</code> directory) as the broker will act as a client in that case.</p>
+<p>Make sure you have them in your classpath if you use this transport. Also, if you're configuring networks of brokers with http(s) transport make sure you have them in broker's classpath (somewhere under <code>lib/</code> directory) as the broker will act as a client in that case.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-am-having-problems-with-the-spring-jmstemplate.html
==============================================================================
--- websites/production/activemq/content/i-am-having-problems-with-the-spring-jmstemplate.html (original)
+++ websites/production/activemq/content/i-am-having-problems-with-the-spring-jmstemplate.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="IamhavingproblemswiththeSpringJmsTemplate-IamhavingproblemswiththeSpringJmsTemplate">I am having problems with the Spring JmsTemplate</h2>
+<div class="wiki-content maincontent"><h2 id="IamhavingproblemswiththeSpringJmsTemplate-IamhavingproblemswiththeSpringJmsTemplate">I am having problems with the Spring JmsTemplate</h2>
 
-<p>For more detail see the <a shape="rect" href="jmstemplate-gotchas.html">JmsTemplate Gotchas</a> page along with the <a shape="rect" href="spring-support.html">Spring Support</a></p>
+<p>For more detail see the <a shape="rect" href="jmstemplate-gotchas.html">JmsTemplate Gotchas</a> page along with the <a shape="rect" href="spring-support.html">Spring Support</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-am-not-receiving-any-messages-what-is-wrong.html
==============================================================================
--- websites/production/activemq/content/i-am-not-receiving-any-messages-what-is-wrong.html (original)
+++ websites/production/activemq/content/i-am-not-receiving-any-messages-what-is-wrong.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="Iamnotreceivinganymessages,whatiswrong-Iamnotreceivinganymessages-whatiswrong?">I am not receiving any messages - what is wrong?</h3>
+<div class="wiki-content maincontent"><h3 id="Iamnotreceivinganymessages,whatiswrong-Iamnotreceivinganymessages-whatiswrong?">I am not receiving any messages - what is wrong?</h3>
 
 <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 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)"></p>
 
@@ -85,7 +85,7 @@
 
 <h3 id="Iamnotreceivinganymessages,whatiswrong-Ifyouarecallingconnection.start()">If you are calling connection.start()</h3>
 
-<p>Another common gotcha is <a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.html">due to another consumer grabbing the messages</a>. If its not that then please look at <a shape="rect" href="jmx.html">JMX</a> or the <a shape="rect" href="web-console.html">Web Console</a> to determine what consumers are available and their status. Then get some <a shape="rect" href="support.html">Support</a> to help you resolve your issue.</p>
+<p>Another common gotcha is <a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.html">due to another consumer grabbing the messages</a>. If its not that then please look at <a shape="rect" href="jmx.html">JMX</a> or the <a shape="rect" href="web-console.html">Web Console</a> to determine what consumers are available and their status. Then get some <a shape="rect" href="support.html">Support</a> to help you resolve your issue.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-cannot-connect-to-activemq-from-jconsole.html
==============================================================================
--- websites/production/activemq/content/i-cannot-connect-to-activemq-from-jconsole.html (original)
+++ websites/production/activemq/content/i-cannot-connect-to-activemq-from-jconsole.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Make sure that the machine you are talking to has a valid <strong>java.rmi.server.hostname-property</strong> value</p>
+<div class="wiki-content maincontent"><p>Make sure that the machine you are talking to has a valid <strong>java.rmi.server.hostname-property</strong> value</p>
 
 <p>e.g. on unix (OS X, Linux, Solaris)</p>
 
@@ -99,7 +99,7 @@ activemq
 SET ACTIVEMQ_OPTS=%ACTIVEMQ_OPTS% -Djava.rmi.server.hostname=&lt;hostname&gt; 
 activemq
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-do-not-receive-messages-in-my-second-consumer.html
==============================================================================
--- websites/production/activemq/content/i-do-not-receive-messages-in-my-second-consumer.html (original)
+++ websites/production/activemq/content/i-do-not-receive-messages-in-my-second-consumer.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="Idonotreceivemessagesinmysecondconsumer-Scenario">Scenario</h3>
+<div class="wiki-content maincontent"><h3 id="Idonotreceivemessagesinmysecondconsumer-Scenario">Scenario</h3>
 
 <ul><li>You send 100 messages to a queue.</li><li>Start consumer A, it receives the message</li><li>You start another consumer B, it doesn't receive any messages.</li><li>You kill A.</li><li>Consumer B receives messages now, why?</li></ul>
 
@@ -96,7 +96,7 @@
 
 <h3 id="Idonotreceivemessagesinmysecondconsumer-Seealso">See also</h3>
 
-<ul><li><a shape="rect" href="how-do-i-change-dispatch-policy.html">How do I change dispatch policy</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li></ul>
+<ul><li><a shape="rect" href="how-do-i-change-dispatch-policy.html">How do I change dispatch policy</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-get-errors-building-the-code-whats-wrong.html
==============================================================================
--- websites/production/activemq/content/i-get-errors-building-the-code-whats-wrong.html (original)
+++ websites/production/activemq/content/i-get-errors-building-the-code-whats-wrong.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,6 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>We currently use a multi-project maven build system, which can be a little fragile. If you are ever having problems building we suggest you try the following in the root <em>activemq</em> directory</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -91,7 +92,7 @@ mvn
 </pre>
 </div></div>
 
-<p>You may also want to <a shape="rect" href="how-do-i-build-but-disable-the-unit-tests.html">disable the unit tests</a></p>
+<p>You may also want to <a shape="rect" href="how-do-i-build-but-disable-the-unit-tests.html">disable the unit tests</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/i-see-nc-client-ids-what-does-that-mean.html
==============================================================================
--- websites/production/activemq/content/i-see-nc-client-ids-what-does-that-mean.html (original)
+++ websites/production/activemq/content/i-see-nc-client-ids-what-does-that-mean.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%">
-<p>Durable subscription ClientIds and SubscriptionNames using the <strong>NC</strong> prefix are the result of durable subscriptions in a <a shape="rect" href="networks-of-brokers.html">networks of brokers</a>.<br clear="none">
+<div class="wiki-content maincontent"><p>Durable subscription ClientIds and SubscriptionNames using the <strong>NC</strong> prefix are the result of durable subscriptions in a <a shape="rect" href="networks-of-brokers.html">networks of brokers</a>.<br clear="none">
 When a durable subscription is being forwarded by a network connector (or demand forwarding bridge), the network durable subscription needs to outlive the subscription that created it. This is achieved by using a well known name for the clientId and subscriptionName that can be easily be mapped to the original subscription. The prefix NC_, and NC-DS_ are used, where NC denotes Network Connector and DS denotes Durable Subscription. The prefix is combined with the local broker name and the target destination.</p>
 
 <p>The expectation is that the connectionId associated with these subscriptions can change on a reconnect, but the durable subsctiption remains. In this way, the durable subscription can continue to receive messages even if there is a network partition between the originating broker and the forwarding broker.</p>
 
 <p>On a restart, the NC durable subscriptions are activated by default, to ensure that no messages are lost. If lost messages are acceptable, it is possible to ensure that the NC durable sub is activated dynamically, when the original subscription is again activated on the remote broker and propagated to the network connector. The network connector configuration 'dynamicOnly' attribute is used to control this behavior.</p>
 
-<p>A NC durable subscription is only deleted when the original durable consumer is unsubscribed.</p>
+<p>A NC durable subscription is only deleted when the original durable consumer is unsubscribed.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ideas.html
==============================================================================
--- websites/production/activemq/content/ideas.html (original)
+++ websites/production/activemq/content/ideas.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <p>This page hosts various ideas and thoughts...</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="restful-queue.html">RESTful Queue</a></li></ul>
+<ul class="childpages-macro"><li><a shape="rect" href="restful-queue.html">RESTful Queue</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/in-progress.html
==============================================================================
--- websites/production/activemq/content/in-progress.html (original)
+++ websites/production/activemq/content/in-progress.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,10 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="InProgress-ReleasesInProgress">Releases In Progress</h2>
+<div class="wiki-content maincontent"><h2 id="InProgress-ReleasesInProgress">Releases In Progress</h2>
 
 <p>The following releases are currently in progress</p>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/inbound-communication.html
==============================================================================
--- websites/production/activemq/content/inbound-communication.html (original)
+++ websites/production/activemq/content/inbound-communication.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,6 +81,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <h2 id="InboundCommunication-INLINEConfiguringanMDBtoreceivemessagesfromActiveMQ">Configuring an MDB to receive messages from ActiveMQ</h2>
 <p>There are three MDBs declared in the <a shape="rect" href="inbound-communication.data/ejb-jar.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3249" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="ejb-jar.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">ejb-jar.xml</a> deployment descriptor.  For this example, I will be explaining how to configure the <code>TopicDurableMDB</code> to be invoked by JBoss when a message is received on an ActiveMQ Topic.</p>
 
@@ -177,7 +180,7 @@
 
 <p>The above examples highlight the key configuration settings needed to enable MDBs deployed in JBoss to process messages from an ActiveMQ destination.  </p>
 
-<p>You can try the above example, plus a few more, by downloading the <a shape="rect" href="inbound-communication.data/activemq-jboss-test.zip?version=3&amp;modificationDate=1117021355000&amp;api=v2" data-linked-resource-id="3278" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-jboss-test.zip" data-nice-type="Zip Archive" data-linked-resource-content-type="application/zip" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">activemq-jboss-test.zip</a> file which contains the complete sample project.</p>
+<p>You can try the above example, plus a few more, by downloading the <a shape="rect" href="inbound-communication.data/activemq-jboss-test.zip?version=3&amp;modificationDate=1117021355000&amp;api=v2" data-linked-resource-id="3278" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-jboss-test.zip" data-nice-type="Zip Archive" data-linked-resource-content-type="application/zip" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">activemq-jboss-test.zip</a> file which contains the complete sample project.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message