activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956584 [15/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/cms/support.html
==============================================================================
--- websites/production/activemq/content/cms/support.html (original)
+++ websites/production/activemq/content/cms/support.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/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="Support-GettingHelp">Getting Help</h2>
+<div class="wiki-content maincontent"><h2 id="Support-GettingHelp">Getting Help</h2>
 
 <p>If you are experiencing problems using ActiveMQ then please first try the <a shape="rect" href="faq.html">FAQ</a>. If you cannot find your issue then report your problem to our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQCPP">Issue Tracker</a></p>
 
@@ -85,7 +85,7 @@
 
 <h3 id="Support-Gettingmorehelp">Getting more help</h3>
 
-<p>For more details on how to get more help such as commercial support see the <a shape="rect" class="external-link" href="http://activemq.apache.org/support.html">main ActiveMQ Support page</a></p>
+<p>For more details on how to get more help such as commercial support see the <a shape="rect" class="external-link" href="http://activemq.apache.org/support.html">main ActiveMQ Support page</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/tutorials.html
==============================================================================
--- websites/production/activemq/content/cms/tutorials.html (original)
+++ websites/production/activemq/content/cms/tutorials.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/">ActiveMQ</a>
@@ -72,11 +72,11 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="Tutorials-Tutorials">Tutorials</h1>
+<div class="wiki-content maincontent"><h1 id="Tutorials-Tutorials">Tutorials</h1>
 
 
 <p>This section lists the various tutorials and articles that cover how to use the ActiveMQ-CPP client.</p>
-<ul><li>&#160;<a shape="rect" href="handling-advisory-messages.html">Handling Advisory Messages</a></li></ul>
+<ul><li>&#160;<a shape="rect" href="handling-advisory-messages.html">Handling Advisory Messages</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/using-activemq-cpp.html
==============================================================================
--- websites/production/activemq/content/cms/using-activemq-cpp.html (original)
+++ websites/production/activemq/content/cms/using-activemq-cpp.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/">ActiveMQ</a>
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="UsingActiveMQ-CPP-UsingActiveMQ-CPP">Using ActiveMQ-CPP</h2>
+<div class="wiki-content maincontent"><h2 id="UsingActiveMQ-CPP-UsingActiveMQ-CPP">Using ActiveMQ-CPP</h2>
 
-<ul class="alternate"><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="cms-api-overview.html">CMS API Overview</a></li><li><a shape="rect" href="example.html">Example</a></li><li><a shape="rect" href="configuring.html">Configuring</a></li></ul>
+<ul class="alternate"><li><a shape="rect" href="getting-started.html">Getting Started</a></li><li><a shape="rect" href="cms-api-overview.html">CMS API Overview</a></li><li><a shape="rect" href="example.html">Example</a></li><li><a shape="rect" href="configuring.html">Configuring</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/using-the-solaris-cc-compiler.html
==============================================================================
--- websites/production/activemq/content/cms/using-the-solaris-cc-compiler.html (original)
+++ websites/production/activemq/content/cms/using-the-solaris-cc-compiler.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/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Use the Correct Compiler</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">Use the Correct Compiler</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>This Entry only applies to the Sun Studio 11 and above compiler.  The Sun Workshop compiler does not seem to support building this library.</p></div></div>
 
 <p>In order to use the Solaris compiler you must set some environment variables and then run the autogen.sh and configure scripts.  </p>
@@ -85,7 +85,7 @@
 
 <p>So in you own makefiles you must pass -library=stlport4 to CC when you build and link.</p>
 
-<p>You can find out more from Sun on this at <a shape="rect" class="external-link" href="http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html" rel="nofollow">STL Library Comparison</a></p>
+<p>You can find out more from Sun on this at <a shape="rect" class="external-link" href="http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html" rel="nofollow">STL Library Comparison</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/what-is-activemq-cpp.html
==============================================================================
--- websites/production/activemq/content/cms/what-is-activemq-cpp.html (original)
+++ websites/production/activemq/content/cms/what-is-activemq-cpp.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/">ActiveMQ</a>
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="WhatisActiveMQCPP-WhatisApacheActiveMQCPP?">What is Apache ActiveMQ CPP?</h2>
+<div class="wiki-content maincontent"><h2 id="WhatisActiveMQCPP-WhatisApacheActiveMQCPP?">What is Apache ActiveMQ CPP?</h2>
 
-<p>Apache ActiveMQ CPP is the C++ client for accessing the <a shape="rect" class="external-link" href="http://activemq.apache.org/">ActiveMQ</a> message broker.</p>
+<p>Apache ActiveMQ CPP is the C++ client for accessing the <a shape="rect" class="external-link" href="http://activemq.apache.org/">ActiveMQ</a> message broker.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/code-overview.html
==============================================================================
--- websites/production/activemq/content/code-overview.html (original)
+++ websites/production/activemq/content/code-overview.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="CodeOverview-Architecture">Architecture</h1>
+<div class="wiki-content maincontent"><h1 id="CodeOverview-Architecture">Architecture</h1>
 
 <p>The following section walks through the main parts of Apache ActiveMQ and links to the code to help you understand the layout</p>
 
@@ -170,7 +170,7 @@
 <p>The power of the <code>BrokerFilter</code> class comes from the fact that multiple filters can be cascaded to create different functional combinations. As an example, the <code>JaasAuthenticationBroker</code> is a subclass of <code>BrokerFilter</code> that modifies the methods used for adding and removing connections to allow for JAAS authentication. <code>AuthorizationBroker</code> is another subclass of <code>BrokerFilter</code>. This class modifies the destination regulation methods to enforce access levels. With this architecture, one can create a <code>JaasAuthenticationBroker</code> and have it use an <code>AuthorizationBroker</code> as its underlying broker (which would use another broker itself, etc.).</p>
 
 <p><code>BrokerPlugin</code>s are simple classes that will wrap their corresponding <code>Brokers</code> around the one they are given. i.e. "installing" an <code>AuthorizationPlugin</code> on an existing <code>Broker</code> will create an <code>AuthorizationBroker</code> that uses the original <code>Broker</code> internally. The main reason for the existence of <code>BrokerPlugin</code>s is to allow for one to configure the <code>Broker</code> used by the <code>BrokerService</code> class (either through code or XML configuration and spring).</p>
-<p></p>
+<p></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/command-agent.html
==============================================================================
--- websites/production/activemq/content/command-agent.html (original)
+++ websites/production/activemq/content/command-agent.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%">
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Removed in 5.9</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><ul class="alternate"><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4406">https://issues.apache.org/jira/browse/AMQ-4406</a></li></ul>
+<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Removed in 5.9</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><ul class="alternate"><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4406">https://issues.apache.org/jira/browse/AMQ-4406</a></li></ul>
 </div></div>
 <h2 id="CommandAgent-CommandAgent">Command Agent</h2>
 
@@ -120,7 +120,7 @@
 
 <h3 id="CommandAgent-Usingtheinteractiveconsole">Using the interactive console</h3>
 
-<p>The activemq-core module has a simple Java class called SimpleConsole which you can run in your IDE to get an interactive console for communicating with a broker over JMS. Type in the various commands (or help to get more help) and the results are returned on the console.</p>
+<p>The activemq-core module has a simple Java class called SimpleConsole which you can run in your IDE to get an interactive console for communicating with a broker over JMS. Type in the various commands (or help to get more help) and the results are returned on the console.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/community.html
==============================================================================
--- websites/production/activemq/content/community.html (original)
+++ websites/production/activemq/content/community.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%">
-Articles<ul><li><a shape="rect" href="books.html">Books</a></li><li><a shape="rect" href="contributing.html">Contributing</a></li><li><a shape="rect" href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" href="faq.html">FAQ</a><ul class="childpages-macro"><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="developing-activemq.html">Developing ActiveMQ</a></li><li><a shape="rect" href="errors.html">Errors</a></li><li><a shape="rect" href="general.html">General</a></li><li><a shape="rect" href="jms.html">JMS</a></li><li><a shape="rect" href="persistence-questions.html">Persistence Questions</a></li><li><a shape="rect" href="terminology.html">Terminology</a></li><li><a shape="rect" href="using-apache-activemq.html">Using Apache ActiveMQ</a></li></ul></li><li><a shape="rect" href="mailing-lists.html">Mailing Lists</a><ul class="childpages-macro"><li><a shape="rect" href="all-forums.html">All Forums</a></li><li><a shape="rec
 t" href="developer-forum.html">Developer Forum</a></li><li><a shape="rect" href="user-forum.html">User Forum</a></li></ul></li><li><a shape="rect" href="privacy-policy.html">Privacy Policy</a></li><li><a shape="rect" href="projects-using-activemq.html">Projects Using ActiveMQ</a></li><li><a shape="rect" href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" href="sponsorship.html">Sponsorship</a></li><li><a shape="rect" href="support.html">Support</a></li><li><a shape="rect" href="team.html">Team</a></li><li><a shape="rect" href="tips-for-getting-help.html">Tips for getting help</a></li><li><a shape="rect" href="users.html">Users</a></li></ul> 
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="articles.html">Articles</a></li><li><a shape="rect" href="books.html">Books</a></li><li><a shape="rect" href="contributing.html">Contributing</a></li><li><a shape="rect" href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" href="faq.html">FAQ</a><ul class="childpages-macro"><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="developing-activemq.html">Developing ActiveMQ</a></li><li><a shape="rect" href="errors.html">Errors</a></li><li><a shape="rect" href="general.html">General</a></li><li><a shape="rect" href="jms.html">JMS</a></li><li><a shape="rect" href="persistence-questions.html">Persistence Questions</a></li><li><a shape="rect" href="terminology.html">Terminology</a></li><li><a shape="rect" href="using-apache-activemq.html">Using Apache ActiveMQ</a></li></ul></li><li><a shape="rect" href="mailing-lists.html">Mailing List
 s</a><ul class="childpages-macro"><li><a shape="rect" href="all-forums.html">All Forums</a></li><li><a shape="rect" href="developer-forum.html">Developer Forum</a></li><li><a shape="rect" href="user-forum.html">User Forum</a></li></ul></li><li><a shape="rect" href="privacy-policy.html">Privacy Policy</a></li><li><a shape="rect" href="projects-using-activemq.html">Projects Using ActiveMQ</a></li><li><a shape="rect" href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" href="sponsorship.html">Sponsorship</a></li><li><a shape="rect" href="support.html">Support</a></li><li><a shape="rect" href="team.html">Team</a></li><li><a shape="rect" href="tips-for-getting-help.html">Tips for getting help</a></li><li><a shape="rect" href="users.html">Users</a></li></ul> </div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/compile-activemq-with-gcj.html
==============================================================================
--- websites/production/activemq/content/compile-activemq-with-gcj.html (original)
+++ websites/production/activemq/content/compile-activemq-with-gcj.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>You can use <a shape="rect" class="external-link" href="http://gcc.gnu.org/java/" rel="nofollow">GCJ</a> to build ActiveMQ as a shared library you can reuse from C++.</p>
 
 <h3 id="CompileActiveMQwithGCJ-NativecompileActiveMQHOWTO">Native compile ActiveMQ HOWTO</h3>
@@ -340,7 +341,7 @@ public class MQAdapter
 
 <p><a shape="rect" class="external-link" href="http://gcc.gnu.org/wiki/How%20to%20BC%20compile%20with%20GCJ" rel="nofollow">How to BC compile with GCJ</a></p>
 
-<p><a shape="rect" class="external-link" href="http://www.redhat.com/magazine/012oct05/features/java/" rel="nofollow">The state of Java on Linux</a></p>
+<p><a shape="rect" class="external-link" href="http://www.redhat.com/magazine/012oct05/features/java/" rel="nofollow">The state of Java on Linux</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/complex-single-broker-configuration-stomp-only.html
==============================================================================
--- websites/production/activemq/content/complex-single-broker-configuration-stomp-only.html (original)
+++ websites/production/activemq/content/complex-single-broker-configuration-stomp-only.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>Example of an ActiveMQ configuration with predefined queues, simple destination security (could easily update it to JAAS), complex Web Console security with Jetty JAAS, and JMX security too.</p>
+<div class="wiki-content maincontent"><p>Example of an ActiveMQ configuration with predefined queues, simple destination security (could easily update it to JAAS), complex Web Console security with Jetty JAAS, and JMX security too.</p>
 
 <p>While this is a fairly detailed configuration, it locks down every ActiveMQ service.  It would be ideal if ActiveMQ shipped with a default closed configuration like this.</p>
 
@@ -200,7 +200,7 @@
     &lt;realm-name&gt;ActiveMQ&lt;/realm-name&gt;
 &lt;/login-config&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/composite-destinations.html
==============================================================================
--- websites/production/activemq/content/composite-destinations.html (original)
+++ websites/production/activemq/content/composite-destinations.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,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
 <p>As of version 1.1, ActiveMQ supports a technology we call <em>composite destinations</em>. This allows a single virtual JMS Destination to be used to represent a collection of JMS Destinations.</p>
 
 <p>For example you can use composite destinations to send a message to 12 physical queues in one operation. Or send a message to one topic and one queue in one operation.</p>
@@ -113,7 +115,7 @@ producer.send(queue, someMessage);
 </pre>
 </div></div>
 
-<p>Composite destinations can also be configured on the <a shape="rect" href="virtual-destinations.html">broker side</a>, such that messages sent to a single destination by the client will be transparently copied to multiple physical destinations.</p>
+<p>Composite destinations can also be configured on the <a shape="rect" href="virtual-destinations.html">broker side</a>, such that messages sent to a single destination by the client will be transparently copied to multiple physical destinations.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configurable-ioexception-handling.html
==============================================================================
--- websites/production/activemq/content/configurable-ioexception-handling.html (original)
+++ websites/production/activemq/content/configurable-ioexception-handling.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>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2 id="ConfigurableIOExceptionHandling-DefaultIOExceptionhandler">Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messages). All file-based persistent stores
  are capable of surviving these kind of errors.</p><h3 id="ConfigurableIOExceptionHandling-ConfiguringDefaultIOExceptionhandler">Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2 id="ConfigurableIOExceptionHandling-DefaultIOExceptionhandler">Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messa
 ges). All file-based persistent stores are capable of surviving these kind of errors.</p><h3 id="ConfigurableIOExceptionHandling-ConfiguringDefaultIOExceptionhandler">Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</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;bean id="ioExceptionHandler" class="org.apache.activemq.util.DefaultIOExceptionHandler"&gt;
         &lt;property name="ignoreAllErrors"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
@@ -99,7 +99,7 @@
       ...
     &lt;/broker&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuration.html
==============================================================================
--- websites/production/activemq/content/configuration.html (original)
+++ websites/production/activemq/content/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,9 +72,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <p>Questions on configuring ActiveMQ's JMS client or the Message Broker</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-enable-detailed-logging.html">How can I enable detailed logging</a></li><li><a shape="rect" href="how-does-xbean-compare-to-spring-2.html">How does XBean compare to Spring 2</a></li><li><a shape="rect" href="how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker-.html">How do I configure 10s of 1000s of Queues in a single broker ?</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages-.html">How do I configure ActiveMQ to hold 100s of millions of Queue Messages ?</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-use-aio-server-transport.html">How do I configure ActiveMQ to use AIO server transport</a></li><li><a shape="rect" href="how-do-i-configure-automatic-reconnection.html">How do I configure automatic reconnection</a></li><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.html">How do I configure distributed queues or top
 ics</a></li><li><a shape="rect" href="how-do-i-configure-the-queues-i-want.html">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.html">How do I define a local address and local port for TCP or SSL</a></li><li><a shape="rect" href="how-do-i-disable-persistence.html">How do I disable persistence</a></li><li><a shape="rect" href="how-do-i-run-activemq-under-the-kaffe-jvm.html">How do I run ActiveMQ under the Kaffe JVM</a></li><li><a shape="rect" href="how-to-configure-a-new-database.html">How to configure a new database</a></li><li><a shape="rect" href="how-to-deploy-activemq-ra-versionrar-to-weblogic.html">How to deploy activemq-ra-version.rar to weblogic</a></li><li><a shape="rect" href="how-to-disable-multicast-discovery.html">How to disable multicast discovery?</a></li></ul>
+<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-enable-detailed-logging.html">How can I enable detailed logging</a></li><li><a shape="rect" href="how-does-xbean-compare-to-spring-2.html">How does XBean compare to Spring 2</a></li><li><a shape="rect" href="how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker-.html">How do I configure 10s of 1000s of Queues in a single broker ?</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages-.html">How do I configure ActiveMQ to hold 100s of millions of Queue Messages ?</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-use-aio-server-transport.html">How do I configure ActiveMQ to use AIO server transport</a></li><li><a shape="rect" href="how-do-i-configure-automatic-reconnection.html">How do I configure automatic reconnection</a></li><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.html">How do I configure distributed queues or top
 ics</a></li><li><a shape="rect" href="how-do-i-configure-the-queues-i-want.html">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.html">How do I define a local address and local port for TCP or SSL</a></li><li><a shape="rect" href="how-do-i-disable-persistence.html">How do I disable persistence</a></li><li><a shape="rect" href="how-do-i-run-activemq-under-the-kaffe-jvm.html">How do I run ActiveMQ under the Kaffe JVM</a></li><li><a shape="rect" href="how-to-configure-a-new-database.html">How to configure a new database</a></li><li><a shape="rect" href="how-to-deploy-activemq-ra-versionrar-to-weblogic.html">How to deploy activemq-ra-version.rar to weblogic</a></li><li><a shape="rect" href="how-to-disable-multicast-discovery.html">How to disable multicast discovery?</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configure-startup-destinations.html
==============================================================================
--- websites/production/activemq/content/configure-startup-destinations.html (original)
+++ websites/production/activemq/content/configure-startup-destinations.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%">
-<p>Typically in Apache ActiveMQ we <a shape="rect" href="how-do-i-create-new-destinations.html">create destinations on demand</a> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>.</p>
+<div class="wiki-content maincontent"><p>Typically in Apache ActiveMQ we <a shape="rect" href="how-do-i-create-new-destinations.html">create destinations on demand</a> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>.</p>
 
 <div class="confluence-information-macro confluence-information-macro-information"><p class="title">4.1 Feature</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>Note this feature is available from 4.1 onwards. If you try this XML on older versions of ActiveMQ you will get an exception about the 'destinations' property not being writable.</p></div></div>
@@ -113,7 +113,7 @@
 
 &lt;/beans&gt;
 ]]></script>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configure-version-5-brokers.html
==============================================================================
--- websites/production/activemq/content/configure-version-5-brokers.html (original)
+++ websites/production/activemq/content/configure-version-5-brokers.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="Configureversion5Brokers-Overview">Overview</h3>
+<div class="wiki-content maincontent"><h3 id="Configureversion5Brokers-Overview">Overview</h3>
 
 <p>There is an updates XML syntax for configuring message brokers - <a shape="rect" class="external-link" href="http://activemq.apache.org/schema/core/activemq-core-5.0-SNAPSHOT.xsd">see here</a></p>
 
@@ -248,7 +248,7 @@
 &lt;/beans&gt;
 ]]></script>
 </div></div>
-<p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p>
+<p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuring-activemq-cpp.html
==============================================================================
--- websites/production/activemq/content/configuring-activemq-cpp.html (original)
+++ websites/production/activemq/content/configuring-activemq-cpp.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>The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP.  All configuration is achieved via URI-encoded parameters, either on the connection or destinations.  Through the URIs, you can configure virtually every facet of your ActiveMQ-CPP client.  The tables below show the comprehensive set of parameters.</p>
+<div class="wiki-content maincontent"><p>The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP.  All configuration is achieved via URI-encoded parameters, either on the connection or destinations.  Through the URIs, you can configure virtually every facet of your ActiveMQ-CPP client.  The tables below show the comprehensive set of parameters.</p>
 
 
 <h2 id="ConfiguringActiveMQCPP-ConnectionURIParameters"><strong>Connection URI Parameters</strong></h2>
@@ -128,7 +128,7 @@ d = session-&gt;createTopic("com.foo?con
 
 <h3 id="ConfiguringActiveMQCPP-OpenWire-onlyOptions"><strong>OpenWire-only Options</strong></h3>
 <div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.browser</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.networkSubscription</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.optimizedAcknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Enables an optimised acknowledgement mode where mes
 sages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.noRangeAcks</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p>producer.dispatchAsyc</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuring-brokers.html
==============================================================================
--- websites/production/activemq/content/configuring-brokers.html (original)
+++ websites/production/activemq/content/configuring-brokers.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="ConfiguringBrokers-Overview">Overview</h3>
 
 <p>In ActiveMQ 4, we are using a new xml format to configure the broker.</p>
@@ -120,7 +121,7 @@
   
 &lt;/beans&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuring-transports.html
==============================================================================
--- websites/production/activemq/content/configuring-transports.html (original)
+++ websites/production/activemq/content/configuring-transports.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="ConfiguringTransports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong>failover:</strong> or <strong>static:</strong> URIs, do not put any whitespace around the <strong>,</strong> symbol.</p></div></div><h3 id="ConfiguringTransports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead
  of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.html">VM Transport Reference</a></p><h3 id="ConfiguringTransports-TheAMQPTransport">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.html">AMQP</a> Transport Reference.</p><h3 id="ConfiguringTransports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a>. Its a light weight publish/subscribe messaging tr
 ansport. See the <a shape="rect" href="mqtt.html">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringTransports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.html">TCP Transport Reference</a></p><h3 id="ConfiguringTransports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broker's XML configuration file.</p><div class="code 
 panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="ConfiguringTransports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong>failover:</strong> or <strong>static:</strong> URIs, do not put any whitespace around the <strong>,</strong> symbol.</p></div></div><h3 id="ConfiguringTransports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each ot
 her inside the VM without the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.html">VM Transport Reference</a></p><h3 id="ConfiguringTransports-TheAMQPTransport">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.html">AMQP</a> Transport Reference.</p><h3 id="ConfiguringTransports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a>. Its a light
  weight publish/subscribe messaging transport. See the <a shape="rect" href="mqtt.html">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringTransports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.html">TCP Transport Reference</a></p><h3 id="ConfiguringTransports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broker's XML co
 nfiguration file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;broker&gt;
   ...
   &lt;transportConnectors&gt;
@@ -108,7 +108,7 @@
   ...
 &lt;/broker&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuring-version-5-transports.html
==============================================================================
--- websites/production/activemq/content/configuring-version-5-transports.html (original)
+++ websites/production/activemq/content/configuring-version-5-transports.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%">
-<h2 id="ConfiguringVersion5Transports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong>failover:</strong> or <strong>static:</strong> URIs, do not put any whitespace around the <strong>,</strong> symbol.</p></div></div><h3 id="ConfiguringVersion5Transports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM with
 out the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.html">VM Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheAMQPTransport">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.html">AMQP</a> Transport Reference.</p><h3 id="ConfiguringVersion5Transports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a>. Its a light weigh
 t publish/subscribe messaging transport. See the <a shape="rect" href="mqtt.html">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringVersion5Transports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.html">TCP Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broke
 r's XML configuration file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="ConfiguringVersion5Transports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong>failover:</strong> or <strong>static:</strong> URIs, do not put any whitespace around the <strong>,</strong> symbol.</p></div></div><h3 id="ConfiguringVersion5Transports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to co
 nnect to each other inside the VM without the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.html">VM Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheAMQPTransport">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.html">AMQP</a> Transport Reference.</p><h3 id="ConfiguringVersion5Transports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel=
 "nofollow">MQTT</a>. Its a light weight publish/subscribe messaging transport. See the <a shape="rect" href="mqtt.html">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringVersion5Transports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.html">TCP Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here'
 s an example as defined within a broker's XML configuration file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;broker&gt;
   ...
   &lt;transportConnectors&gt;
@@ -109,7 +109,7 @@
   ...
 &lt;/broker&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/configuring-wire-formats.html
==============================================================================
--- websites/production/activemq/content/configuring-wire-formats.html (original)
+++ websites/production/activemq/content/configuring-wire-formats.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="ConfiguringWireFormats-TheOpenWireWireFormat">The OpenWire Wire Format</h3>
+<div class="wiki-content maincontent"><h3 id="ConfiguringWireFormats-TheOpenWireWireFormat">The OpenWire Wire Format</h3>
 
 <p>OpenWire is the default Wire Format that ActiveMQ uses.&#160; It provides a highly efficent binary format for high speed messaging.&#160; OpenWire options can be configured on a JMS client's connection URI string or on a Brokers transport bind URI.</p>
 <div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Parameter Name <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default Value <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> stackTraceEnabled <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the stack trace of exception that occur on the broker be sent to the client? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> tcpNoDelayEnabled <br clear="none" class="atl-forced-newline"> </p></t
 d><td colspan="1" rowspan="1" class="confluenceTd"><p> true <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cacheEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should commonly repeated values be cached so that less marshalling occurs? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> tightEncodingEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should wire
  size be optimized over CPU usage ? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> prefixPacketSize&#160; </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the size of the packet be prefixed before each packet is marshalled? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxInactivityDuration </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 30000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The maximum <a shape="rect" href="activemq-inactivitymonitor.html">inactivity</a> duration (before which the socket is considered dead) in milliseconds. On some platforms it can take a long time for a socket to appear to die, so we allow the broker to kill connections if they are inactive for a period o
 f time. Use by some transports to enable a keep alive heart beat feature. Set to a value &lt;= 0 to disable inactivity monitoring. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxInactivityDurationInitalDelay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 10000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The initial delay in starting the maximum <a shape="rect" href="activemq-inactivitymonitor.html">inactivity</a> checks (and, yes, the word 'Inital' is supposed to be misspelled like that) </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cacheSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1024 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> If cacheEnabled is true, then this specifies the maximum number of values to cached.  This property was added in ActiveMQ 4.1 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxFrameSize </p></td><td colspan="1"
  rowspan="1" class="confluenceTd"><p> MAX_LONG </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Maximum frame size that can be sent. Can help help prevent OOM DOS attacks </p></td></tr></tbody></table></div>
@@ -107,7 +107,7 @@ ActiveMQConnectionFactory cf =
   &lt;property name="brokerURL" 
     value="failover:(tcp://localhost:61616?jms.optimizeAcknowledge=false&amp;wireFormat.maxInactivityDuration=30000)" /&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/connection-configuration-uri.html
==============================================================================
--- websites/production/activemq/content/connection-configuration-uri.html (original)
+++ websites/production/activemq/content/connection-configuration-uri.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,13 +81,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="ConnectionConfigurationURI-ConnectionConfigurationURI">Connection Configuration URI</h2><p>An Apache ActiveMQ connection can be configured by explicitly setting properties on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves via the bean properties or using the following URI syntax.</p><h3 id="ConnectionConfigurationURI-Example">Example</h3><p>You set the property called jms.$PROPERTY on a regular connection URI. For example you can set the brokerURL on your ActiveMQConnectionFactory to the following value to enable <a shape="rect" href="async-sends.html">Async Sends</a></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="ConnectionConfigurationURI-ConnectionConfigurationURI">Connection Configuration URI</h2><p>An Apache ActiveMQ connection can be configured by explicitly setting properties on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves via the bean properties or using the following URI syntax.</p><h3 id="ConnectionConfigurationURI-Example">Example</h3><p>You set the property called jms.$PROPERTY on a regular connection URI. For example you can set the brokerURL on your ActiveMQConnectionFactory to the following value to enable <a shape="rect" href="async-sends.html">Async Sends</a></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeCon
 tent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">tcp://localhost:61616?jms.useAsyncSend=true
 </pre>
 </div></div><h3 id="ConnectionConfigurationURI-ConnectionOptions">Connection Options</h3><p>The following options should be prefixed with <strong>jms.</strong> when used on a URI when connecting to a broker.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>alwaysSessionAsync</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If this flag is set then a separate thread is used for dispatching messages for each Session in the Connection. However, a separate thread is always used if there is more than one session, or the session isn't in auto acknowledge or dups ok mode</p></td></tr><tr><td colspan="1" rowspan="1" class=
 "confluenceTd"><p>clientID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets the JMS clientID to use for the connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>closeTimeout</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>15000ms</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets the timeout before a close is considered complete. Normally a close() on a connection waits for confirmation from the broker; this allows that operation to timeout to save the client hanging if there is no broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>copyMessageOnSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should a JMS message be copied to a new JMS Message object as part of the send() method in JMS. This is enabled by default to be compliant with the JMS spec
 ification. You can disable it if you do not mutate JMS messages after they are sent for a performance boost.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>disableTimeStampsByDefault</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not timestamps on messages should be disabled or not. If you disable them it adds a small performance boost.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>dispatchAsync</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker <a shape="rect" href="consumer-dispatch-async.html">dispatch messages asynchronously</a> to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>nestedMapAndListEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="conflue
 nceTd"><p>Enables/disables whether or not <a shape="rect" href="structured-message-properties-and-mapmessages.html">Structured Message Properties and MapMessages</a> are supported so that Message properties and MapMessage entries can contain nested Map and List objects. Available since version 4.1 onwards</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>objectMessageSerializationDefered</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When an object is set on an ObjectMessage, the JMS spec requires the object to be serialized by that set method. Enabling this flag causes the object to not get serialized. The object may subsequently get serialized if the message needs to be sent over a socket or stored to disk.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>optimizeAcknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p>Enables an optimised acknowledgement mode where messages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>optimizeAcknowledgeTimeOut</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>300ms</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if &gt; 0, specifies the max time between batch acks when optimizeAcknowledge is enabled. (since 5.6)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>optimizedAckScheduledAckInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if &gt; 0, specifies a <span style="line-height: 1.4285715;">time int
 erval upon which all the outstanding acks are delivered when optimized acknowledge is used so that a long running consumer that doesn't receive any more messages will eventually ack the last few unacked messages (since 5.7)</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>optimizedMessageDispatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If this flag is set then an larger prefetch limit is used - only applicable for durable topic subscribers</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useAsyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Forces the use of <a shape="rect" href="async-sends.html">Async Sends</a> which adds a massive performance boost; but means that the send() method will return immediately whether the message has been sent or not which could lead to m
 essage loss.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useCompression</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables the use of compression of the message bodies</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useRetroactiveConsumer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>warnAboutUnstartedConnectionTimeout</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>500</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables the timeout in milliseconds from a connection creation to when a w
 arning is generated if the connection is not properly started via <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()" rel="nofollow">Connection.start()</a> and a message is received by a consumer. It is a very common gotcha to forget to <a shape="rect" href="i-am-not-receiving-any-messages-what-is-wrong.html">start the connection and then wonder why no messages are delivered</a> so this option makes the default case to create a warning if the user forgets. To disable the warning just set the value to &lt; 0 (say -1).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>auditDepth</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>2048</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The size of the message window that will be audited (for duplicates and out of order messages</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>auditMaximumProducerNumber</p></td><td co
 lspan="1" rowspan="1" class="confluenceTd"><p>64</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum number of producers that will be audited</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>alwaysSyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When true a MessageProducer will always use Sync sends when sending a Message even if it is not required for the Delivery Mode</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumerExpiryCheckEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Controls whether message expiration checking is done in each MessageConsumer prior to dispatching a message. Disabling this check can lead to consumption of expired messages. (since 5.11)</p></td></tr></tbody></table></div><h3 id="ConnectionConfigurationURI-NestedOptions">Nested O
 ptions</h3><p>You can also configure nested objects on the connection object using the given prefixes. See the javadoc for a breakdown of each individual property.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Object configured</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>See Also</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jms.blobTransferPolicy.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/blob/BlobTransferPolicy.html">BlobTransferPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="unresolved" href="#">Blob Message</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jms.prefetchPolicy.*</p></td><td colspan="1" rowspa
 n="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://http//activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQPrefetchPolicy.html" rel="nofollow">ActiveMQPrefetchPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="what-is-the-prefetch-limit-for.html">What is the prefetch limit for</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jms.redeliveryPolicy.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/RedeliveryPolicy.html">RedeliveryPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="redelivery-policy.html">Redelivery Policy</a></p></td></tr></tbody></table></div><p>For example you could set</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;">tcp://localhost:61616?jms.prefetchPolicy.all=100&amp;jms.redeliveryPolicy.maximumRedeliveries=5
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/connection-factory-properties.html
==============================================================================
--- websites/production/activemq/content/connection-factory-properties.html (original)
+++ websites/production/activemq/content/connection-factory-properties.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>The 'outbound' Connection Factory objects used to send messages by default use the connection configuration properties of the Resource Adapter deployment, but those properties can be overridden per connection factory.</p>
 
 <p>The Connection Factory properties that can be configured are:</p>
@@ -98,7 +99,7 @@
 
 <h4 id="ConnectionFactoryProperties-UseInboundSession">UseInboundSession</h4>
 
-<p>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</p>
+<p>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/connectivity.html
==============================================================================
--- websites/production/activemq/content/connectivity.html (original)
+++ websites/production/activemq/content/connectivity.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>Apache ActiveMQ is designed to support a large number if <a shape="rect" href="cross-language-clients.html">Cross Language Clients</a>, speak a wide range of <a shape="rect" href="protocols.html">Protocols</a> and be usable in a wide variety of <a shape="rect" href="containers.html">Containers</a> in addition to being usable in a stand alone Java SE platform.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is designed to support a large number if <a shape="rect" href="cross-language-clients.html">Cross Language Clients</a>, speak a wide range of <a shape="rect" href="protocols.html">Protocols</a> and be usable in a wide variety of <a shape="rect" href="containers.html">Containers</a> in addition to being usable in a stand alone Java SE platform.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="containers.html">Containers</a><ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.html">BlazeDS</a></li><li><a shape="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="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" href="jca-container.html">JCA Container</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.html">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.html">OSGi Integration</a></li><li><a shape="rect" href="
 resource-adapter.html">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-genericjmsra.html">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="sun-jndi.html">Sun JNDI</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="zos.html">zOS</a></li></ul></li><li><a shape="rect" href="cross-language-clients.html">Cross Language Clients</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-c-clients.html">ActiveMQ C++ Clients</a></li><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a shape="rect" href="c-integration.html">C Integration</a></li><li><a shape="rect" href="cms.html">CMS</a></li><li><a shape="rect" href="delphi-and-freepascal.html">Delphi and FreePascal</a></li><li><a shape="rect" href="dot-net.html">dot Net</a></li><li><a shape="rect" href="perl.html">Perl</
 a></li><li><a shape="rect" href="php.html">PHP</a></li><li><a shape="rect" href="pike.html">Pike</a></li><li><a shape="rect" href="python.html">Python</a></li><li><a shape="rect" href="ruby.html">Ruby</a></li><li><a shape="rect" href="websockets.html">WebSockets</a></li></ul></li><li><a shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a shape="rect" href="protocols.html">Protocols</a><ul class="childpages-macro"><li><a shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" href="mqtt.html">MQTT</a></li><li><a shape="rect" href="openwire.html">OpenWire</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" href="stomp.html">Stomp</a></li><li><a shape="rect" href="wsif.html">WSIF</a></li><li><a shape="rect" href="ws-notification.html">WS Notification</a></li><li><a shape="rect" href="xmpp.html">XMPP</a></li></ul></li></ul> 
+<ul class="childpages-macro"><li><a shape="rect" href="containers.html">Containers</a><ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.html">BlazeDS</a></li><li><a shape="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="integrating-apache-activemq-with-jboss.html">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.html">J2EE</a></li><li><a shape="rect" href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" href="jca-container.html">JCA Container</a></li><li><a shape="rect" href="jndi-support.html">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.html">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.html">OSGi Integration</a></li><li><a shape="rect" href="
 resource-adapter.html">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-genericjmsra.html">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.html">Spring Support</a></li><li><a shape="rect" href="sun-jndi.html">Sun JNDI</a></li><li><a shape="rect" href="tomcat.html">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.html">WebLogic Integration</a></li><li><a shape="rect" href="zos.html">zOS</a></li></ul></li><li><a shape="rect" href="cross-language-clients.html">Cross Language Clients</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-c-clients.html">ActiveMQ C++ Clients</a></li><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a shape="rect" href="c-integration.html">C Integration</a></li><li><a shape="rect" href="cms.html">CMS</a></li><li><a shape="rect" href="delphi-and-freepascal.html">Delphi and FreePascal</a></li><li><a shape="rect" href="dot-net.html">dot Net</a></li><li><a shape="rect" href="perl.html">Perl</
 a></li><li><a shape="rect" href="php.html">PHP</a></li><li><a shape="rect" href="pike.html">Pike</a></li><li><a shape="rect" href="python.html">Python</a></li><li><a shape="rect" href="ruby.html">Ruby</a></li><li><a shape="rect" href="websockets.html">WebSockets</a></li></ul></li><li><a shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a shape="rect" href="protocols.html">Protocols</a><ul class="childpages-macro"><li><a shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" href="mqtt.html">MQTT</a></li><li><a shape="rect" href="openwire.html">OpenWire</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" href="stomp.html">Stomp</a></li><li><a shape="rect" href="wsif.html">WSIF</a></li><li><a shape="rect" href="ws-notification.html">WS Notification</a></li><li><a shape="rect" href="xmpp.html">XMPP</a></li></ul></li></ul> </div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/consumer-dispatch-async.html
==============================================================================
--- websites/production/activemq/content/consumer-dispatch-async.html (original)
+++ websites/production/activemq/content/consumer-dispatch-async.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="ConsumerDispatchAsync-Overview">Overview</h2>
+<div class="wiki-content maincontent"><h2 id="ConsumerDispatchAsync-Overview">Overview</h2>
 
 <p>In AMQ4, the choice of a broker performing synchronous or asynchronous dispatch to a consumer has become more configurable.  It is now configured as a default value on the <a shape="rect" href="connection-configuration-uri.html">connection URI, Connection and ConnectionFactory</a> together with being customizable on a per consumer basis via the <a shape="rect" href="destination-options.html">Destination Options</a> instead previously just being a transport server setting.  </p>
 
@@ -116,7 +116,7 @@
 queue = new ActiveMQQueue("TEST.QUEUE?consumer.dispatchAsync=false");
 consumer = session.createConsumer(queue);
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/consumer-features.html
==============================================================================
--- websites/production/activemq/content/consumer-features.html (original)
+++ websites/production/activemq/content/consumer-features.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-Consumer Dispatch Async<ul><li><a shape="rect" href="consumer-priority.html">Consumer Priority</a></li><li><a shape="rect" href="exclusive-consumer.html">Exclusive Consumer</a></li><li><a shape="rect" href="manage-durable-subscribers.html">Manage Durable Subscribers</a></li><li><a shape="rect" href="message-groups.html">Message Groups</a></li><li><a shape="rect" href="redelivery-policy.html">Redelivery Policy</a></li><li><a shape="rect" href="retroactive-consumer.html">Retroactive Consumer</a></li><li><a shape="rect" href="selectors.html">Selectors</a></li><li><a shape="rect" href="slow-consumer-handling.html">Slow Consumer Handling</a></li><li><a shape="rect" href="subscription-recovery-policy.html">Subscription Recovery Policy</a></li></ul>
+<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="consumer-dispatch-async.html">Consumer Dispatch Async</a></li><li><a shape="rect" href="consumer-priority.html">Consumer Priority</a></li><li><a shape="rect" href="exclusive-consumer.html">Exclusive Consumer</a></li><li><a shape="rect" href="manage-durable-subscribers.html">Manage Durable Subscribers</a></li><li><a shape="rect" href="message-groups.html">Message Groups</a></li><li><a shape="rect" href="redelivery-policy.html">Redelivery Policy</a></li><li><a shape="rect" href="retroactive-consumer.html">Retroactive Consumer</a></li><li><a shape="rect" href="selectors.html">Selectors</a></li><li><a shape="rect" href="slow-consumer-handling.html">Slow Consumer Handling</a></li><li><a shape="rect" href="subscription-recovery-policy.html">Subscription Recovery Policy</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message