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 [21/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/index.html
==============================================================================
--- websites/production/activemq/content/index.html (original)
+++ websites/production/activemq/content/index.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="Index-DownloadActiveMQ5.11.1Today!" style="text-align: center;"><a shape="rect" href="download.html">Download ActiveMQ 5.11.1 Today!</a></h3><p style="text-align: center;"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="index.data/activemq-5.x-box-reflection.png"></span></p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/">Apache ActiveMQ</a> &#8482; is the most popular and powerful open source messaging and <a shape="rect" href="enterprise-integration-patterns.html">Integration Patterns</a> server.</p><p>Apache ActiveMQ is fast, supports many <a shape="rect" href="cross-language-clients.html">Cross Language Clients and Protocols</a>, comes with easy to use <a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> and many <a shape="rect" href="features.html">advanced features</a> while fully supporting <a shape="rect" class="external-link" href="http://java.sun.com/pro
 ducts/jms/" rel="nofollow">JMS 1.1</a> and J2EE 1.4. Apache ActiveMQ is released under the <a shape="rect" class="external-link" href="http://www.apache.org/">Apache</a> <a shape="rect" class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p>Grab yourself a <a shape="rect" href="download.html">Download</a>, try our <a shape="rect" href="getting-started.html">Getting Started Guide</a>, surf our <a shape="rect" href="faq.html">FAQ</a> or start <a shape="rect" href="contributing.html">Contributing</a> and join us on our <a shape="rect" href="discussion-forums.html">Discussion Forums</a>.</p><h3 id="Index-Features">Features</h3><p></p><ul><li>Supports a variety of <a shape="rect" href="cross-language-clients.html">Cross Language Clients and Protocols</a> from Java, C, C++, C#, Ruby, Perl, Python, PHP<ul><li><a shape="rect" href="openwire.html">OpenWire</a> for high performance clients in Java, C, C++, C#</li><li><a shape="rect" href="stomp.html
 ">Stomp</a> support so that clients can be written easily in C, Ruby, Perl, Python, PHP, ActionScript/Flash, Smalltalk to talk to ActiveMQ as well as any other popular Message Broker</li><li><a shape="rect" href="amqp.html">AMQP</a> v1.0 support</li><li><a shape="rect" href="mqtt.html">MQTT</a> v3.1 support allowing for connections in an IoT environment.</li></ul></li><li>full support for the <a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> both in the JMS client and the Message Broker</li><li>Supports many <a shape="rect" href="features.html">advanced features</a> such as <a shape="rect" href="message-groups.html">Message Groups</a>, <a shape="rect" href="virtual-destinations.html">Virtual Destinations</a>, <a shape="rect" href="wildcards.html">Wildcards</a> and <a shape="rect" href="composite-destinations.html">Composite Destinations</a></li><li>Fully supports JMS 1.1 and J2EE 1.4 with support for transient, persistent, transactional 
 and XA messaging</li><li><a shape="rect" href="spring-support.html">Spring Support</a> so that ActiveMQ can be easily embedded into Spring applications and configured using Spring's XML configuration mechanism</li><li>Tested inside popular J2EE servers such as <a shape="rect" class="external-link" href="http://tomee.apache.org/">TomEE</a>, <a shape="rect" class="external-link" href="http://geronimo.apache.org/">Geronimo</a>, JBoss, GlassFish and WebLogic<ul><li>Includes <a shape="rect" href="resource-adapter.html">JCA 1.5 resource adaptors</a> for inbound &amp; outbound messaging so that ActiveMQ should auto-deploy in any J2EE 1.4 compliant server</li></ul></li><li>Supports pluggable <a shape="rect" href="uri-protocols.html">transport protocols</a> such as <a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.html">in-VM</a>, TCP, SSL, NIO, UDP, multicast, JGroups and JXTA transports</li><li>Supports very fast <a shape="rect" href="persistence.html">persistence</a> usin
 g JDBC along with a high performance journal</li><li>Designed for high performance clustering, client-server, peer based communication</li><li><a shape="rect" href="rest.html">REST</a> API to provide technology agnostic and language neutral web based API to messaging</li><li><a shape="rect" href="ajax.html">Ajax</a> to support web streaming support to web browsers using pure DHTML, allowing web browsers to be part of the messaging fabric</li><li><a shape="rect" href="axis-and-cxf-support.html">CXF and Axis Support</a> so that ActiveMQ can be easily dropped into either of these web service stacks to provide reliable messaging</li><li>Can be used as an in memory JMS provider, ideal for <a shape="rect" href="how-to-unit-test-jms-code.html">unit testing JMS</a></li></ul><h3 id="Index-News">News</h3><p>    
+<div class="wiki-content maincontent"><h3 id="Index-DownloadActiveMQ5.11.1Today!" style="text-align: center;"><a shape="rect" href="download.html">Download ActiveMQ 5.11.1 Today!</a></h3><p style="text-align: center;"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="index.data/activemq-5.x-box-reflection.png"></span></p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/">Apache ActiveMQ</a> &#8482; is the most popular and powerful open source messaging and <a shape="rect" href="enterprise-integration-patterns.html">Integration Patterns</a> server.</p><p>Apache ActiveMQ is fast, supports many <a shape="rect" href="cross-language-clients.html">Cross Language Clients and Protocols</a>, comes with easy to use <a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> and many <a shape="rect" href="features.html">advanced features</a> while fully supporting <a shape="rect" class="extern
 al-link" href="http://java.sun.com/products/jms/" rel="nofollow">JMS 1.1</a> and J2EE 1.4. Apache ActiveMQ is released under the <a shape="rect" class="external-link" href="http://www.apache.org/">Apache</a> <a shape="rect" class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p>Grab yourself a <a shape="rect" href="download.html">Download</a>, try our <a shape="rect" href="getting-started.html">Getting Started Guide</a>, surf our <a shape="rect" href="faq.html">FAQ</a> or start <a shape="rect" href="contributing.html">Contributing</a> and join us on our <a shape="rect" href="discussion-forums.html">Discussion Forums</a>.</p><h3 id="Index-Features">Features</h3><p></p><ul><li>Supports a variety of <a shape="rect" href="cross-language-clients.html">Cross Language Clients and Protocols</a> from Java, C, C++, C#, Ruby, Perl, Python, PHP<ul><li><a shape="rect" href="openwire.html">OpenWire</a> for high performance clients in Java, C, C++, C#</l
 i><li><a shape="rect" href="stomp.html">Stomp</a> support so that clients can be written easily in C, Ruby, Perl, Python, PHP, ActionScript/Flash, Smalltalk to talk to ActiveMQ as well as any other popular Message Broker</li><li><a shape="rect" href="amqp.html">AMQP</a> v1.0 support</li><li><a shape="rect" href="mqtt.html">MQTT</a> v3.1 support allowing for connections in an IoT environment.</li></ul></li><li>full support for the <a shape="rect" href="enterprise-integration-patterns.html">Enterprise Integration Patterns</a> both in the JMS client and the Message Broker</li><li>Supports many <a shape="rect" href="features.html">advanced features</a> such as <a shape="rect" href="message-groups.html">Message Groups</a>, <a shape="rect" href="virtual-destinations.html">Virtual Destinations</a>, <a shape="rect" href="wildcards.html">Wildcards</a> and <a shape="rect" href="composite-destinations.html">Composite Destinations</a></li><li>Fully supports JMS 1.1 and J2EE 1.4 with support for
  transient, persistent, transactional and XA messaging</li><li><a shape="rect" href="spring-support.html">Spring Support</a> so that ActiveMQ can be easily embedded into Spring applications and configured using Spring's XML configuration mechanism</li><li>Tested inside popular J2EE servers such as <a shape="rect" class="external-link" href="http://tomee.apache.org/">TomEE</a>, <a shape="rect" class="external-link" href="http://geronimo.apache.org/">Geronimo</a>, JBoss, GlassFish and WebLogic<ul><li>Includes <a shape="rect" href="resource-adapter.html">JCA 1.5 resource adaptors</a> for inbound &amp; outbound messaging so that ActiveMQ should auto-deploy in any J2EE 1.4 compliant server</li></ul></li><li>Supports pluggable <a shape="rect" href="uri-protocols.html">transport protocols</a> such as <a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.html">in-VM</a>, TCP, SSL, NIO, UDP, multicast, JGroups and JXTA transports</li><li>Supports very fast <a shape="rect" href="
 persistence.html">persistence</a> using JDBC along with a high performance journal</li><li>Designed for high performance clustering, client-server, peer based communication</li><li><a shape="rect" href="rest.html">REST</a> API to provide technology agnostic and language neutral web based API to messaging</li><li><a shape="rect" href="ajax.html">Ajax</a> to support web streaming support to web browsers using pure DHTML, allowing web browsers to be part of the messaging fabric</li><li><a shape="rect" href="axis-and-cxf-support.html">CXF and Axis Support</a> so that ActiveMQ can be easily dropped into either of these web service stacks to provide reliable messaging</li><li>Can be used as an in memory JMS provider, ideal for <a shape="rect" href="how-to-unit-test-jms-code.html">unit testing JMS</a></li></ul><h3 id="Index-News">News</h3><p>    
 
     
         
@@ -174,7 +174,7 @@
     
         
     </div>
-    <h3 id="Index-MoreNews">More News</h3><ul><li><a shape="rect" href="news.html">Get all the latest Apache ActiveMQ News Here!</a></li></ul>
+    <h3 id="Index-MoreNews">More News</h3><ul><li><a shape="rect" href="news.html">Get all the latest Apache ActiveMQ News Here!</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/initial-configuration.html
==============================================================================
--- websites/production/activemq/content/initial-configuration.html (original)
+++ websites/production/activemq/content/initial-configuration.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="InitialConfiguration-InitialConfiguration">Initial Configuration</h1>
+<div class="wiki-content maincontent"><h1 id="InitialConfiguration-InitialConfiguration">Initial Configuration</h1>
 
 
 <h2 id="InitialConfiguration-DocumentOrganization">Document Organization</h2>
@@ -134,7 +134,7 @@
 
 <h3 id="InitialConfiguration-Relatedopensourceprojects">Related open source projects</h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://camel.apache.org">Apache Camel</a></li><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a></li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes JMS</a></li><li><a shape="rect" class="external-link" href="http://stomp.github.com/" rel="nofollow">Stomp</a> is an open wire protocol (similar to HTTP) for communicating with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, Ruby etc.</li><li><a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul>
+<ul><li><a shape="rect" class="external-link" href="http://camel.apache.org">Apache Camel</a></li><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a></li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes JMS</a></li><li><a shape="rect" class="external-link" href="http://stomp.github.com/" rel="nofollow">Stomp</a> is an open wire protocol (similar to HTTP) for communicating with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, Ruby etc.</li><li><a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/installation.html
==============================================================================
--- websites/production/activemq/content/installation.html (original)
+++ websites/production/activemq/content/installation.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,8 +81,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Download a binary distribution of ActiveMQ and unpack it into some directory.
-
+<div class="wiki-content maincontent">
+<ul><li><a shape="rect" href="download.html">Download</a> a binary distribution of ActiveMQ and unpack it into some directory.</li></ul>
 
 
 <ul><li>To run an ActiveMQ broker, type the following commands from the directory in which you have just unpacked the ActiveMQ distribution.</li></ul>
@@ -101,7 +101,7 @@ activemq
 
 <p>See the <a shape="rect" href="initial-configuration.html">getting started guide</a> for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code</p>
 
-<p>If you want to use JNDI to connect to your JMS provider then please view the <a shape="rect" href="jndi-support.html">JNDI Support</a>. If you are a Spring user you should read about <a shape="rect" href="spring-support.html">Spring Support</a></p>
+<p>If you want to use JNDI to connect to your JMS provider then please view the <a shape="rect" href="jndi-support.html">JNDI Support</a>. If you are a Spring user you should read about <a shape="rect" href="spring-support.html">Spring Support</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/integrating-apache-activemq-with-glassfish.html
==============================================================================
--- websites/production/activemq/content/integrating-apache-activemq-with-glassfish.html (original)
+++ websites/production/activemq/content/integrating-apache-activemq-with-glassfish.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%">
-<h1 id="IntegratingApacheActiveMQwithGlassfish-General">General</h1><p>See this article for a description of how to connect Glassfish 3 to an ActiveMQ 5 broker, and consume messages using a Message Driven Bean: <a shape="rect" class="external-link" href="http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/" rel="nofollow">http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/</a></p><h1 id="IntegratingApacheActiveMQwithGlassfish-Glassfish4.1">Glassfish 4.1</h1><p>&#160;</p><ol><li>Add resource adapter<br clear="none"><ol><li>Download the resource-adapter file suitable to your broker version:<br clear="none"><a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/" rel="nofollow">http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/</a></li><li><p>Deploy the&#160; resource adapter with the name "activemq-rar"</p><div class="code panel pdl" style="border-wid
 th: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h1 id="IntegratingApacheActiveMQwithGlassfish-General">General</h1><p>See this article for a description of how to connect Glassfish 3 to an ActiveMQ 5 broker, and consume messages using a Message Driven Bean: <a shape="rect" class="external-link" href="http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/" rel="nofollow">http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/</a></p><h1 id="IntegratingApacheActiveMQwithGlassfish-Glassfish4.1">Glassfish 4.1</h1><p>&#160;</p><ol><li>Add resource adapter<br clear="none"><ol><li>Download the resource-adapter file suitable to your broker version:<br clear="none"><a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/" rel="nofollow">http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/</a></li><li><p>Deploy the&#160; resource adapter with the name "activemq-rar"</p><div cl
 ass="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">bin/asadmin deploy --type rar --name activemq-rar /tmp/activemq-rar-5.11.1.rar</pre>
 </div></div></li><li><p>Configure resource adapter <br clear="none">(Failover Setup)</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">bin/asadmin create-resource-adapter-config   \
@@ -103,7 +103,7 @@
   --property PhysicalName=MY.MAGIC.OUT \
   jms/queue/MY.MAGIC.OUT
 </pre>
-</div></div></li><li>Deploy your message driven beans and use the configured jndi names</li></ol>
+</div></div></li><li>Deploy your message driven beans and use the configured jndi names</li></ol></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/integrating-apache-activemq-with-jboss.html
==============================================================================
--- websites/production/activemq/content/integrating-apache-activemq-with-jboss.html (original)
+++ websites/production/activemq/content/integrating-apache-activemq-with-jboss.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%">
-<h1 id="IntegratingApacheActiveMQwithJBoss-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
+<div class="wiki-content maincontent"><h1 id="IntegratingApacheActiveMQwithJBoss-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
 
 <p>Integration with application servers is a common scenario in the enterprise Java world, especially when it comes to messaging. <a shape="rect" class="external-link" href="http://activemq.org/" rel="nofollow">ActiveMQ</a> is a JMS 1.1 compliant, open source, Apache Licensed, message oriented middleware (MOM) with <a shape="rect" class="external-link" href="http://activemq.org/site/changes-in-40.html" rel="nofollow">many</a>, <a shape="rect" class="external-link" href="http://activemq.org/site/new-features-in-41.html" rel="nofollow">many</a> features far beyond the JMS specification. ActiveMQ offers many different <a shape="rect" class="external-link" href="http://activemq.org/site/connectivity.html" rel="nofollow">points of connectivity</a>, many <a shape="rect" class="external-link" href="http://activemq.org/site/cross-language-clients.html" rel="nofollow">cross language clients</a> and many <a shape="rect" class="external-link" href="http://activemq.org/site/protocols.html" rel=
 "nofollow">pluggable transport protocols</a> including integration with any J2EE 1.4 application server.</p>
 
@@ -892,7 +892,7 @@ description: Time spent by a message bef
                     <a shape="rect" class="download-all-link" href="/confluence/pages/downloadallattachments.action?pageId=67786" title="Download all the latest versions of attachments on this page as single zip file.">Download All</a>
             </div>
 </div>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/integration-tests.html
==============================================================================
--- websites/production/activemq/content/integration-tests.html (original)
+++ websites/production/activemq/content/integration-tests.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>The Integration Tests validate that ActiveMQ Resource Adapter operate correctly when deployed with a J2EE application running in an Application Server such as Apache Geronimo.</p>
 
 <h2 id="IntegrationTests-GettingReady">Getting Ready</h2>
@@ -152,7 +153,7 @@ maven
 </div></div>
 <p>&#160;</p>
 
-<p>&#160;</p>
+<p>&#160;</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/interceptors.html
==============================================================================
--- websites/production/activemq/content/interceptors.html (original)
+++ websites/production/activemq/content/interceptors.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 has a sophisticated <em>interceptor stack</em> so that you can attach whatever functionality you require into the broker in an easy way without complicating all of the other broker code. This has really helped us keep the code clean and modular while offering powerful extension points.</p><p>For an example of the kinds of things you can do with interceptors see the following pages</p><ul><li><a shape="rect" href="logging-interceptor.html">Logging Interceptor</a></li><li><a shape="rect" href="security.html">Security</a></li><li><a shape="rect" href="visualisation.html">Visualisation</a></li><li><a shape="rect" href="timestampplugin.html">TimeStamp on the Broker</a></li><li><a shape="rect" href="statisticsplugin.html">Get Statistics via Messages</a></li><li><a shape="rect" href="destinations-plugin.html">Destinations Plugin</a></li></ul><h3 id="Interceptors-Howpluginswork">How plugins work</h3><p>A plugin is an instance of the interface <a shape="rect" class="external-link
 " href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerPlugin.html">BrokerPlugin</a> which allows a plugin to add itself into the broker interceptor chain, typically using the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a> as a base class to allow only certain operations to be customized.</p><p>The object that implements the BrokerPlugin interface is called out as a plugin in the message broker's XML configuration file (see example below). Your plugin can then optionally reference other beans that are defined in the XML file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>ActiveMQ has a sophisticated <em>interceptor stack</em> so that you can attach whatever functionality you require into the broker in an easy way without complicating all of the other broker code. This has really helped us keep the code clean and modular while offering powerful extension points.</p><p>For an example of the kinds of things you can do with interceptors see the following pages</p><ul><li><a shape="rect" href="logging-interceptor.html">Logging Interceptor</a></li><li><a shape="rect" href="security.html">Security</a></li><li><a shape="rect" href="visualisation.html">Visualisation</a></li><li><a shape="rect" href="timestampplugin.html">TimeStamp on the Broker</a></li><li><a shape="rect" href="statisticsplugin.html">Get Statistics via Messages</a></li><li><a shape="rect" href="destinations-plugin.html">Destinations Plugin</a></li></ul><h3 id="Interceptors-Howpluginswork">How plugins work</h3><p>A plugin is an instance of the interfac
 e <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerPlugin.html">BrokerPlugin</a> which allows a plugin to add itself into the broker interceptor chain, typically using the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a> as a base class to allow only certain operations to be customized.</p><p>The object that implements the BrokerPlugin interface is called out as a plugin in the message broker's XML configuration file (see example below). Your plugin can then optionally reference other beans that are defined in the XML file.</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;beans xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.org/config/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans 
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.org/config/1.0 
 http://activemq.apache.org/schema/activemq-core.xsd http://activemq.apache.org/camel/schema/spring  http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"&gt;
@@ -188,7 +188,7 @@ public class MyBroker extends BrokerFilt
 
 
 </pre>
-</div></div><p>For more details see <a shape="rect" href="developing-plugins.html">Developing Plugins</a></p>
+</div></div><p>For more details see <a shape="rect" href="developing-plugins.html">Developing Plugins</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ioexception-could-not-find-class-for-resource.html
==============================================================================
--- websites/production/activemq/content/ioexception-could-not-find-class-for-resource.html (original)
+++ websites/production/activemq/content/ioexception-could-not-find-class-for-resource.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 get an exception looking like this</p>
+<div class="wiki-content maincontent"><p>If you get an exception looking like this</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;">
 Reason:  java.io.exception : could not find class for resource: META-INF/services/org/apache/activemq/transport/tcp
@@ -103,7 +103,7 @@ Reason:  java.io.exception : could not f
 
 <p>Then it means that the files in META-INF/services could not be found on the classpath. These files are used to support loose coupling on ActiveMQ with the transport protocols (e.g. to avoid a classpath dependency on JXTA) and to allow dynamic protocol enhancement without a change to the core.</p>
 
-<p>So we're using the META-INF/services files as a way of coupling a protocol used in URL connections to a Java class name.</p>
+<p>So we're using the META-INF/services files as a way of coupling a protocol used in URL connections to a Java class name.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/irc.html
==============================================================================
--- websites/production/activemq/content/irc.html (original)
+++ websites/production/activemq/content/irc.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>Committers and contributors can often be found hanging out in IRC.&#160;<span style="line-height: 1.4285715;">Below is the information about the channel that we use:&#160;</span></p><p><strong>Server:</strong> irc.freenode.net</p><p><strong>Channel:</strong> #apache-activemq</p><p>There are many&#160;<a shape="rect" class="external-link" href="https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients" rel="nofollow">IRC clients</a>&#160;available out there depending on the operating system you are using.&#160;</p><p>&#160;</p><p>Note the IRC channel on codehaus is deprecated as of April 2015; please refrain from using that room. &#160;Likewise, be aware there is a channel named #activemq on the freenode server - please avoid it as well.</p>
+<div class="wiki-content maincontent"><p>Committers and contributors can often be found hanging out in IRC.&#160;<span style="line-height: 1.4285715;">Below is the information about the channel that we use:&#160;</span></p><p><strong>Server:</strong> irc.freenode.net</p><p><strong>Channel:</strong> #apache-activemq</p><p>There are many&#160;<a shape="rect" class="external-link" href="https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients" rel="nofollow">IRC clients</a>&#160;available out there depending on the operating system you are using.&#160;</p><p>&#160;</p><p>Note the IRC channel on codehaus is deprecated as of April 2015; please refrain from using that room. &#160;Likewise, be aware there is a channel named #activemq on the freenode server - please avoid it as well.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/is-there-a-specified-size-of-the-journal.html
==============================================================================
--- websites/production/activemq/content/is-there-a-specified-size-of-the-journal.html (original)
+++ websites/production/activemq/content/is-there-a-specified-size-of-the-journal.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>There is a "preferred" size for each log file of the journal.  By default there are 2 20 meg log files.</p>
+<div class="wiki-content maincontent">
+<p>There is a "preferred" size for each log file of the journal.  By default there are 2 20 meg log files.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/j2ee.html
==============================================================================
--- websites/production/activemq/content/j2ee.html (original)
+++ websites/production/activemq/content/j2ee.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>In J2EE 1.4 or later the standard way to integrate with a JMS provider is via JCA 1.5 and a <a shape="rect" href="resource-adapter.html">Resource Adapter</a>.</p>
 
-<h2 id="J2EE-Introduction">Introduction</h2><p>ActiveMQ includes a Java Connector Architecture (JCA) 1.5 Resource Adapter. JCA 1.5 defines the contract between an J2EE application server and external resources such as databases and messaging middleware. It allows the application server to efficiently pool connections, control transactions and manage security. The Resource Adapter allows ActiveMQ to be used from any J2EE 1.4 application server. We have tested that the Resource Adapter works in the following J2EE 1.4 containers</p><ul><li><a shape="rect" class="external-link" href="http://tomee.apache.org/tomcat-jms.html">TomEE</a> 1</li><li>Geronimo 1</li><li>GlassFish</li><li>JBoss 4</li><li>WebLogic 9</li><li>WebSphere 6</li></ul><h2 id="J2EE-Features">Features</h2><ul><li>Inbound connection delivers messages to MDBs via XA or local transactions.</li><li>Outbound connections support standard container pooling or can reuse the inbound connection/session to avoid XA.</li><li>JTA supp
 ort: Can be enlisted in XA and local transactions.</li><li>XA transaction recovery via XAResource.recover() supported.</li><li>When used outside a JTA transaction, session transaction settings retain normal JMS semantics so that it be used by your web-app tier.</li><li>Can configure and start up embedded broker.</li><li>Can connect to external ActiveMQ broker or embedded broker.</li><li>Inbound message delivery supports fine grain control of concurrency and prefetching.</li><li>Batching so that multiple messages can be delivered within the same transaction for optimal performances.</li></ul><h2 id="J2EE-DownloadingtheRAR">Downloading the RAR</h2><p>The RAR is available via <a shape="rect" class="external-link" href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22activemq-rar%22" rel="nofollow">maven central</a></p><p><span style="color: rgb(102,0,51);font-size: 20.0px;line-height: 1.5;">Deployment Guides</span></p><ul><li><a shape="rect" href="tomee.html">TomEE</a></li><li><a sha
 pe="rect" href="geronimo.html">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.html">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li></ul><h2 id="J2EE-TheuseofanEmbeddedBroker">The use of an Embedded Broker</h2><p>The ActiveMQ Resource Adapter can connect to a remote broker using any of the available transports, or it can start up an embedded broker. As described in the <a shape="rect" href="resource-adapter-properties.html">Resource Adapter Properties</a>, you can enable an embedded broker using the <strong>BrokerXmlConfig</strong> property.</p><h2 id="J2EE-ConfigurationReference">Configuration Reference</h2><ul><li><a shape="rect" href="resource-adapter-properties.html">Resource Adapter Properties</a></li><li><a shape="rect" href="connection-factory-properties.html">Connection Factory Properties</a></li><li><a shape="rect" href="activation-spec-properties.html">Acti
 vation Spec Properties</a></li></ul>
+<h2 id="J2EE-Introduction">Introduction</h2><p>ActiveMQ includes a Java Connector Architecture (JCA) 1.5 Resource Adapter. JCA 1.5 defines the contract between an J2EE application server and external resources such as databases and messaging middleware. It allows the application server to efficiently pool connections, control transactions and manage security. The Resource Adapter allows ActiveMQ to be used from any J2EE 1.4 application server. We have tested that the Resource Adapter works in the following J2EE 1.4 containers</p><ul><li><a shape="rect" class="external-link" href="http://tomee.apache.org/tomcat-jms.html">TomEE</a> 1</li><li>Geronimo 1</li><li>GlassFish</li><li>JBoss 4</li><li>WebLogic 9</li><li>WebSphere 6</li></ul><h2 id="J2EE-Features">Features</h2><ul><li>Inbound connection delivers messages to MDBs via XA or local transactions.</li><li>Outbound connections support standard container pooling or can reuse the inbound connection/session to avoid XA.</li><li>JTA supp
 ort: Can be enlisted in XA and local transactions.</li><li>XA transaction recovery via XAResource.recover() supported.</li><li>When used outside a JTA transaction, session transaction settings retain normal JMS semantics so that it be used by your web-app tier.</li><li>Can configure and start up embedded broker.</li><li>Can connect to external ActiveMQ broker or embedded broker.</li><li>Inbound message delivery supports fine grain control of concurrency and prefetching.</li><li>Batching so that multiple messages can be delivered within the same transaction for optimal performances.</li></ul><h2 id="J2EE-DownloadingtheRAR">Downloading the RAR</h2><p>The RAR is available via <a shape="rect" class="external-link" href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22activemq-rar%22" rel="nofollow">maven central</a></p><p><span style="color: rgb(102,0,51);font-size: 20.0px;line-height: 1.5;">Deployment Guides</span></p><ul><li><a shape="rect" href="tomee.html">TomEE</a></li><li><a sha
 pe="rect" href="geronimo.html">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.html">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li></ul><h2 id="J2EE-TheuseofanEmbeddedBroker">The use of an Embedded Broker</h2><p>The ActiveMQ Resource Adapter can connect to a remote broker using any of the available transports, or it can start up an embedded broker. As described in the <a shape="rect" href="resource-adapter-properties.html">Resource Adapter Properties</a>, you can enable an embedded broker using the <strong>BrokerXmlConfig</strong> property.</p><h2 id="J2EE-ConfigurationReference">Configuration Reference</h2><ul><li><a shape="rect" href="resource-adapter-properties.html">Resource Adapter Properties</a></li><li><a shape="rect" href="connection-factory-properties.html">Connection Factory Properties</a></li><li><a shape="rect" href="activation-spec-properties.html">Acti
 vation Spec Properties</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/java-service-wrapper.html
==============================================================================
--- websites/production/activemq/content/java-service-wrapper.html (original)
+++ websites/production/activemq/content/java-service-wrapper.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>This page provides some useful information on running the ActiveMQ broker as a windows-NT service or a daemon thread in Linux or Unix systems.</p>
+<div class="wiki-content maincontent"><p>This page provides some useful information on running the ActiveMQ broker as a windows-NT service or a daemon thread in Linux or Unix systems.</p>
 
 <div class="confluence-information-macro confluence-information-macro-warning"><p class="title">64bit 4gb memory limit</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>The ActiveMQ distribution uses an older and free community release of the service wrapper library. This wrapper has a memory limit of 4gb when running on 64bit platforms. You can manually <a shape="rect" class="external-link" href="http://wrapper.tanukisoftware.com/doc/english/download.jsp" rel="nofollow">download a newer release</a> of the wrapper library that does not have this limit, from the vendors website at. It us not possible for Apache ActiveMQ to update and distribute a newer release of the service wrapper, as the vendor changed licensing terms, which does not comply with ASF licensing terms. Therefore out of the box the service wrapper is stuck on that older release.</p>
@@ -116,7 +116,7 @@
 
 <p>If you are having problems running the service, turn on the wrapper debugging in the corresponding wrapper.conf file via (wrapper.debug=TRUE)</p>
 
-<p>Each time you run the wrapper, a log file will be created in ACTIVEMQ_HOME/data/wrapper.log&#160;</p>
+<p>Each time you run the wrapper, a log file will be created in ACTIVEMQ_HOME/data/wrapper.log&#160;</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javadocs.html
==============================================================================
--- websites/production/activemq/content/javadocs.html (original)
+++ websites/production/activemq/content/javadocs.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="JavaDocs-JavaDocsforApacheActiveMQ">JavaDocs for Apache ActiveMQ</h2><p>Versioned JavaDocs for Apache ActiveMQ could be found at</p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/">http://activemq.apache.org/maven/</a>x.y.z/apidocs/index.html kind of url, where <em>x.y.z</em> is broker version you're looking for.</p><p>For example <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.10.0/apidocs/index.html">http://activemq.apache.org/maven/5.10.0/apidocs/index.html</a> contains JavaDocs for <strong>5.10.0</strong>.</p><h2 id="JavaDocs-OtherJavaDocs">Other JavaDocs</h2><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/package-summary.html" rel="nofollow">JMS API</a></li></ul><h2 id="JavaDocs-CMSandC++Documentation">CMS and C++ Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS and ActiveMQ-CPP</a></li></ul><h2 id=
 "JavaDocs-NMSandC#Documentation">NMS and C# Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">NMS API</a></li></ul>
+<div class="wiki-content maincontent"><h2 id="JavaDocs-JavaDocsforApacheActiveMQ">JavaDocs for Apache ActiveMQ</h2><p>Versioned JavaDocs for Apache ActiveMQ could be found at</p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/">http://activemq.apache.org/maven/</a>x.y.z/apidocs/index.html kind of url, where <em>x.y.z</em> is broker version you're looking for.</p><p>For example <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.10.0/apidocs/index.html">http://activemq.apache.org/maven/5.10.0/apidocs/index.html</a> contains JavaDocs for <strong>5.10.0</strong>.</p><h2 id="JavaDocs-OtherJavaDocs">Other JavaDocs</h2><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/package-summary.html" rel="nofollow">JMS API</a></li></ul><h2 id="JavaDocs-CMSandC++Documentation">CMS and C++ Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS
  and ActiveMQ-CPP</a></li></ul><h2 id="JavaDocs-NMSandC#Documentation">NMS and C# Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">NMS API</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.html
==============================================================================
--- websites/production/activemq/content/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.html (original)
+++ websites/production/activemq/content/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.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 get an error like this</p>
+<div class="wiki-content maincontent"><p>If you get an error like this</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;">
@@ -170,7 +170,7 @@ broker.setDataDirectory(dir);
 
 <h3 id="java.io.IOExceptionFailedtocreatedatabase'derbydb',seethenextexceptionfordetails-See">See</h3>
 
-<ul><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></ul>
+<ul><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></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javalangnosuchmethoderror.html
==============================================================================
--- websites/production/activemq/content/javalangnosuchmethoderror.html (original)
+++ websites/production/activemq/content/javalangnosuchmethoderror.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 get an error like</p>
+<div class="wiki-content maincontent"><p>If you get an error like</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;">
@@ -110,7 +110,7 @@ javax.jms.ConnectionFactory.createConnec
 
 <p>Note that to a user of the JMS API, JMS 1.1 is completely backwards compatible. The only issue with upgrading to JMS 1.1 is that any JMS provider which implements only JMS 1.0.2b and does not implement JMS 1.1 will not work; however if you're using ActiveMQ you should be fine.</p>
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.html
==============================================================================
--- websites/production/activemq/content/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.html (original)
+++ websites/production/activemq/content/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.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 get an error like this</p>
+<div class="wiki-content maincontent"><p>If you get an error like this</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;">
@@ -117,7 +117,7 @@ org.jboss.system.ServiceController$Servi
 
 <h3 id="java.lang.NoSuchMethodExceptionorg.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker-Fix">Fix</h3>
 
-<p>You are using 3.0 of ActiveMQ. This bug is fixed in 3.1.x so use 3.1-M6 or later.</p>
+<p>You are using 3.0 of ActiveMQ. This bug is fixed in 3.1.x so use 3.1-M6 or later.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javalangoutofmemory.html
==============================================================================
--- websites/production/activemq/content/javalangoutofmemory.html (original)
+++ websites/production/activemq/content/javalangoutofmemory.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>Ok, this is manageable. It is possible to configure just about all of the memory utilisation of ActiveMQ. The first thing to determine is what part of the system is running out of memory. Is it the JVM, the broker, the consumers or the producers? </p>
+<div class="wiki-content maincontent"><p>Ok, this is manageable. It is possible to configure just about all of the memory utilisation of ActiveMQ. The first thing to determine is what part of the system is running out of memory. Is it the JVM, the broker, the consumers or the producers? </p>
 <div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>This entry refers to ActiveMQ versions 5.1.x and greater.</p></div></div>
 
@@ -135,7 +135,7 @@ try
 </pre>
 </div></div>
 
-<p>If you are using ActiveMQ via <a shape="rect" href="spring-support.html">Spring Support</a> or with JMSTemplates, be sure to check you are not falling for any of the <a shape="rect" href="jmstemplate-gotchas.html">JmsTemplate Gotchas</a>. It may also be worth recapping on <a shape="rect" href="how-do-i-use-jms-efficiently.html">How do I use JMS efficiently</a>.</p>
+<p>If you are using ActiveMQ via <a shape="rect" href="spring-support.html">Spring Support</a> or with JMSTemplates, be sure to check you are not falling for any of the <a shape="rect" href="jmstemplate-gotchas.html">JmsTemplate Gotchas</a>. It may also be worth recapping on <a shape="rect" href="how-do-i-use-jms-efficiently.html">How do I use JMS efficiently</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.html
==============================================================================
--- websites/production/activemq/content/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.html (original)
+++ websites/production/activemq/content/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.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 get exception like this:</p>
+<div class="wiki-content maincontent"><p>If you get exception like this:</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;">
@@ -113,7 +113,7 @@ tcp://localhost:61616?wireFormat.maxInac
 </pre>
 </div></div>
 
-<p>will use 30 sec timeout.</p>
+<p>will use 30 sec timeout.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.html
==============================================================================
--- websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.html (original)
+++ websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.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%">
-<p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
+<div class="wiki-content maincontent"><p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
 
-<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul>
+<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.html
==============================================================================
--- websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.html (original)
+++ websites/production/activemq/content/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.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%">
-<p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
+<div class="wiki-content maincontent"><p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
 
-<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul>
+<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jboss-integration.html
==============================================================================
--- websites/production/activemq/content/jboss-integration.html (original)
+++ websites/production/activemq/content/jboss-integration.html Wed Jul  1 20:13:48 2015
@@ -62,7 +62,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;
@@ -83,7 +83,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="JBossIntegration-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
+<div class="wiki-content maincontent"><h1 id="JBossIntegration-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
 
 <p>Integration with application servers is a common scenario in the enterprise Java world, especially when it comes to messaging. <a shape="rect" class="external-link" href="http://activemq.org/" rel="nofollow">ActiveMQ</a> is a JMS 1.1 compliant, open source, Apache Licensed, message oriented middleware (MOM) with <a shape="rect" class="external-link" href="http://activemq.org/site/changes-in-40.html" rel="nofollow">many</a>, <a shape="rect" class="external-link" href="http://activemq.org/site/new-features-in-41.html" rel="nofollow">many</a> features far beyond the JMS specification. ActiveMQ offers many different <a shape="rect" class="external-link" href="http://activemq.org/site/connectivity.html" rel="nofollow">points of connectivity</a>, many <a shape="rect" class="external-link" href="http://activemq.org/site/cross-language-clients.html" rel="nofollow">cross language clients</a> and many <a shape="rect" class="external-link" href="http://activemq.org/site/protocols.html" rel=
 "nofollow">pluggable transport protocols</a> including integration with any J2EE 1.4 application server.</p>
 
@@ -892,7 +892,7 @@ description: Time spent by a message bef
     <div>
                     <a shape="rect" class="download-all-link" href="/confluence/pages/downloadallattachments.action?pageId=67786" title="Download all the latest versions of attachments on this page as single zip file.">Download All</a>
             </div>
-</div>
+</div></div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/activemq/content/jdbc-master-slave.html
==============================================================================
--- websites/production/activemq/content/jdbc-master-slave.html (original)
+++ websites/production/activemq/content/jdbc-master-slave.html Wed 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="JDBCMasterSlave-JDBCMasterSlave">JDBC Master Slave</h2>
+<div class="wiki-content maincontent"><h2 id="JDBCMasterSlave-JDBCMasterSlave">JDBC Master Slave</h2>
 
 <p>First supported in ActiveMQ version 4.1</p>
 
@@ -213,7 +213,7 @@ failover:(tcp://broker1:61616,tcp://brok
 &lt;/beans&gt;
 </pre>
 </div></div>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

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

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

Modified: websites/production/activemq/content/jmeter-system-tests.html
==============================================================================
--- websites/production/activemq/content/jmeter-system-tests.html (original)
+++ websites/production/activemq/content/jmeter-system-tests.html Wed 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="JMeterSystemTests-JMeterSystemTests">JMeter System Tests</h3>
 <p>You can use JMeter to test your ActiveMQ Server. Please refer to the JMeter site for detailed instructions on using this software.<br clear="none">
 The Test would check for duplicate messages and the order of messages received.</p>
@@ -119,7 +120,7 @@ The Test would check for duplicate messa
 <ul class="alternate"><li>Consumer Identifier - Identifies the Consumer that received the message.</li><li>Producer Name - Producer name that send the message.</li><li>Message - The message body received.</li><li>Message Count - The number of messages received.</li></ul>
 
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/activemq/content/jms-bridge-with-local-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-local-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-local-broker.html Wed 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%">
-<h3 id="JMSBridgeWithLocalBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontothelocalActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3 id="JMSBridgeWithLocalBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontothelocalActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</h3>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
@@ -115,7 +115,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-oracle-aq.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-oracle-aq.html (original)
+++ websites/production/activemq/content/jms-bridge-with-oracle-aq.html Wed 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="JMSBridgeWithOracleAQ-ExampleofaconfigurationthatshowshowtoconnecttoOracleAQqueuesandtopics.">Example of a configuration that shows how to connect to Oracle AQ queues and topics.</h3>
+<div class="wiki-content maincontent"><h3 id="JMSBridgeWithOracleAQ-ExampleofaconfigurationthatshowshowtoconnecttoOracleAQqueuesandtopics.">Example of a configuration that shows how to connect to Oracle AQ queues and topics.</h3>
 
 <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;">
@@ -197,7 +197,7 @@ END;
 </pre>
 </div></div>
 
-<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" class="external-link" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm" rel="nofollow">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p>
+<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" class="external-link" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm" rel="nofollow">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-remote-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-remote-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-remote-broker.html Wed 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%">
-<h3 id="JMSBridgeWithRemoteBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3 id="JMSBridgeWithRemoteBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</h3>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
@@ -115,7 +115,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.html
==============================================================================
--- websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.html (original)
+++ websites/production/activemq/content/jms-bridge-with-remote-tibco-broker.html Wed 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%">
-<h3 id="JMSBridgeWithRemoteTIBCOBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteTIBCOEMSbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</h3>
+<div class="wiki-content maincontent"><h3 id="JMSBridgeWithRemoteTIBCOBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteTIBCOEMSbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</h3>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
@@ -119,7 +119,7 @@
     &lt;/bean&gt;
 &lt;/beans&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/activemq/content/jms-to-jms-bridge.html
==============================================================================
--- websites/production/activemq/content/jms-to-jms-bridge.html (original)
+++ websites/production/activemq/content/jms-to-jms-bridge.html Wed Jul  1 20:13:48 2015
@@ -62,7 +62,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;
@@ -83,7 +83,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h3 id="JMStoJMSBridge-Introduction">Introduction</h3>
+<div class="wiki-content maincontent"><h3 id="JMStoJMSBridge-Introduction">Introduction</h3>
 
 <div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning, try Camel first!</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>Note that we recommend you look at using <a shape="rect" class="external-link" href="http://camel.apache.org/">Apache Camel</a> for bridging ActiveMQ to or from any message broker (or indeed <a shape="rect" class="external-link" href="http://camel.apache.org/components.html">any other technology, protocol or middleware</a>) as its much easier to:</p>
@@ -373,7 +373,7 @@ public class BridgeTest {
 
 }
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/jms.html
==============================================================================
--- websites/production/activemq/content/jms.html (original)
+++ websites/production/activemq/content/jms.html Wed 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>Questions on using the JMS API and <a shape="rect" href="mom.html">MOM</a> in general</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="can-i-modify-messages-on-a-queue.html">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.html">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.html">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.html">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.html">How does ConnectionFactory relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.html">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.html">How do I consume a specific message</a></li><li><a shape="rect" hr
 ef="how-do-i-get-started-with-jms.html">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.html">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.html">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.html">How do I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.html">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.html">How to unit test JMS code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.html">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.html">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.html">Should I use XA</a></li><li><a shape="rect" href="w
 hat-are-administered-objects.html">What are administered objects</a></li></ul>
+<ul class="childpages-macro"><li><a shape="rect" href="can-i-modify-messages-on-a-queue.html">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.html">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.html">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.html">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.html">How does ConnectionFactory relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.html">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.html">How do I consume a specific message</a></li><li><a shape="rect" hr
 ef="how-do-i-get-started-with-jms.html">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.html">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.html">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.html">How do I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.html">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.html">How to unit test JMS code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.html">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.html">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.html">Should I use XA</a></li><li><a shape="rect" href="w
 hat-are-administered-objects.html">What are administered objects</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">