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 [11/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/building.html
==============================================================================
--- websites/production/activemq/content/building.html (original)
+++ websites/production/activemq/content/building.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="Building-BuildingActiveMQfromSource">Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <a shape="rect" href="download.html">Download</a> a distribution or JAR.</p><h3 id="Building-Prequisites">Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <a shape="rect" href="source.html">Source</a></li><li>JDK (1.6 for version &lt;= 5.10, 1.7 for version &gt; 5.10)</li></ul><h2 id="Building-UsingMaven2(ActiveMQ4.1.xandUp)">Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">Maven 2.0.4</a>.</p><div class="conflue
 nce-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>You should set the MAVEN_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></div></div><h3 id="Building-DoingaQuickBuild">Doing a Quick Build</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="Building-BuildingActiveMQfromSource">Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <a shape="rect" href="download.html">Download</a> a distribution or JAR.</p><h3 id="Building-Prequisites">Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <a shape="rect" href="source.html">Source</a></li><li>JDK (1.6 for version &lt;= 5.10, 1.7 for version &gt; 5.10)</li></ul><h2 id="Building-UsingMaven2(ActiveMQ4.1.xandUp)">Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">M
 aven 2.0.4</a>.</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>You should set the MAVEN_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></div></div><h3 id="Building-DoingaQuickBuild">Doing a Quick Build</h3><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;">mvn -Dtest=false -DfailIfNoTests=false clean install 
 </pre>
 </div></div><h3 id="Building-UsinganIDE">Using an IDE</h3><p>If you prefer to use an IDE then you can auto-generate the IDE's project files using maven plugins. e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -99,7 +99,7 @@
 </div></div><p>or</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;">maven idea
 </pre>
-</div></div><p>etc.</p><h3 id="Building-OtherMaven1Goals">Other Maven 1 Goals</h3><p>For more details try the <a shape="rect" href="examples.html">Examples</a> or <a shape="rect" href="benchmark-tests.html">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p>
+</div></div><p>etc.</p><h3 id="Building-OtherMaven1Goals">Other Maven 1 Goals</h3><p>For more details try the <a shape="rect" href="examples.html">Examples</a> or <a shape="rect" href="benchmark-tests.html">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/c-integration-scenarios.html
==============================================================================
--- websites/production/activemq/content/c-integration-scenarios.html (original)
+++ websites/production/activemq/content/c-integration-scenarios.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">
 <h2 id="Cintegrationscenarios-OnewayandRPCwithCservices">One way and RPC with C services</h2>
 <p>Its common for the C services to be the back end services. The 2 common use cases are</p>
 
@@ -107,7 +108,7 @@
 
 <h3 id="Cintegrationscenarios-connectivitytoC">connectivity to C</h3>
 
-<p>We can link C into a Java process and invoke it directly via JNI. Another option is to wrap the C code as an Apache module and perform a HTTP POST to invoke a C service and extract the results of the service.</p>
+<p>We can link C into a Java process and invoke it directly via JNI. Another option is to wrap the C code as an Apache module and perform a HTTP POST to invoke a C service and extract the results of the service.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/c-integration.html
==============================================================================
--- websites/production/activemq/content/c-integration.html (original)
+++ websites/production/activemq/content/c-integration.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>It is very common for an organisation to have lots of legacy C code which needs integration into the message bus. The current available solutions are</p>
+<div class="wiki-content maincontent"><p>It is very common for an organisation to have lots of legacy C code which needs integration into the message bus. The current available solutions are</p>
 <ul><li><a shape="rect" href="cms.html">CMS</a> is an easy-to-use JMS 1.1-like API for C++. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</li><li>use the <a shape="rect" href="openwire-c-client.html">OpenWire C Client</a> which is only available in ActiveMQ 4.x or later.</li><li>we are working on the <a shape="rect" href="openwire-cpp-client.html">OpenWire CPP Client</a></li></ul>
 
 
@@ -80,7 +80,7 @@
 
 
 <p>Other alternative mechanisms to communicate using.</p>
-<ul><li>use the <a shape="rect" href="rest.html">REST</a> API</li><li>use <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <a shape="rect" href="how-do-i-access-activemq-from-csharp-or-dotnet.html">.Net or Mono</a> to use ActiveMQ insided .Net</li><li><a shape="rect" href="compile-activemq-with-gcj.html">Compile ActiveMQ with GCJ</a> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <a shape="rect" href="xmpp.html">XMPP</a> protocol</li></ul>
+<ul><li>use the <a shape="rect" href="rest.html">REST</a> API</li><li>use <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <a shape="rect" href="how-do-i-access-activemq-from-csharp-or-dotnet.html">.Net or Mono</a> to use ActiveMQ insided .Net</li><li><a shape="rect" href="compile-activemq-with-gcj.html">Compile ActiveMQ with GCJ</a> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <a shape="rect" href="xmpp.html">XMPP</a> protocol</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cache/cms.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/activemq/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/activemq/content/cache/nms.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/activemq/content/cached-ldap-authorization-module.html
==============================================================================
--- websites/production/activemq/content/cached-ldap-authorization-module.html (original)
+++ websites/production/activemq/content/cached-ldap-authorization-module.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-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2 id="CachedLDAPAuthorizationModule-Initializing">Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we use in embedded mode for testing. For
  an example on how to initialize the embedded ApacheDS with this ldif file take a look at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" class="external-link" href="http://www.openldap.org/" rel="nofollow">OpenLDAP</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for entries, so the configuration similar to 
 the one shown in the following snippet</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2 id="CachedLDAPAuthorizationModule-Initializing">Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we
  use in embedded mode for testing. For an example on how to initialize the embedded ApacheDS with this ldif file take a look at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" class="external-link" href="http://www.openldap.org/" rel="nofollow">OpenLDAP</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for ent
 ries, so the configuration similar to the one shown in the following snippet</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;">suffix          "dc=activemq,dc=apache,dc=org"
 rootdn          "cn=admin,dc=activemq,dc=apache,dc=org"
 # Cleartext passwords, especially for the rootdn, should
@@ -112,7 +112,7 @@ rootpw          {SSHA}lfAYn54xCFghgQv5B2
         /&gt;
     &lt;/map&gt;
 &lt;/authorizationPlugin&gt;</pre>
-</div></div><p>Full examples of configurations for <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property</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><td colspan="1" rowspan="1" class="confluenceTd"><p>version</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionURL</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>secret</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionProtocol</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>s</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>authentication</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>simple</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>queueSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>topicSearchBase</p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tempSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>refreshInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Interval (in milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>baseDn</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of ActiveMQ related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.6</p></td></tr></tbody></table></div><h2 id="CachedLDAPAuthorizationModule-Updates">Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature
  and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately applied)</p>
+</div></div><p>Full examples of configurations for <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property</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><td colspan="1" rowspan="1" class="confluenceTd"><p>version</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionURL</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>secret</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionProtocol</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>s</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>authentication</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>simple</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>queueSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>topicSearchBase</p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tempSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>refreshInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Interval (in milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>baseDn</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of ActiveMQ related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.6</p></td></tr></tbody></table></div><h2 id="CachedLDAPAuthorizationModule-Updates">Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature
  and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately applied)</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-i-get-commercial-support.html
==============================================================================
--- websites/production/activemq/content/can-i-get-commercial-support.html (original)
+++ websites/production/activemq/content/can-i-get-commercial-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" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="CanIgetcommercialsupport-CanIgetcommercialsupport?">Can I get commercial support? </h2>
+<div class="wiki-content maincontent"><h2 id="CanIgetcommercialsupport-CanIgetcommercialsupport?">Can I get commercial support? </h2>
 
-<p>Absolutely, see our <a shape="rect" href="support.html">Support</a> page for more details</p>
+<p>Absolutely, see our <a shape="rect" href="support.html">Support</a> page for more details</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-i-modify-messages-on-a-queue.html
==============================================================================
--- websites/production/activemq/content/can-i-modify-messages-on-a-queue.html (original)
+++ websites/production/activemq/content/can-i-modify-messages-on-a-queue.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="CanImodifymessagesonaqueue-CanImodifymessagesonaqueue?">Can I modify messages on a queue?</h2>
+<div class="wiki-content maincontent"><h2 id="CanImodifymessagesonaqueue-CanImodifymessagesonaqueue?">Can I modify messages on a queue?</h2>
 
-<p>The short answer is no. In JMS messages are immutable once they have been sent. If you find you need to modify messages its recommended that you create a consumer with some selector which matches the messages you wish to update, consume them and send new modified messages, either to another queue or if you are careful, back to the original queue. (If you are using the same queue, be careful not to get into a loop where your selector matches messages you are sending yourself - you may wish to use some JMS header to avoid this loop).</p>
+<p>The short answer is no. In JMS messages are immutable once they have been sent. If you find you need to modify messages its recommended that you create a consumer with some selector which matches the messages you wish to update, consume them and send new modified messages, either to another queue or if you are careful, back to the original queue. (If you are using the same queue, be careful not to get into a loop where your selector matches messages you are sending yourself - you may wish to use some JMS header to avoid this loop).</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html
==============================================================================
--- websites/production/activemq/content/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html (original)
+++ websites/production/activemq/content/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Absolutely! </p>
+<div class="wiki-content maincontent"><p>Absolutely! </p>
 
 <p>Strictly speaking each producer being used concurrently should be using a separate session (though in ActiveMQ it'll probably work fine if you just use one session for all publishers). </p>
 
 <p>For concurrent consumption create a session per consumer - as all messages are dispatched to a session in a single thread - but you can have as many sessions as you like per connection.</p>
 
-<p>To further help with concurrent consuming of JMS you can use <a shape="rect" class="external-link" href="http://jencks.codehaus.org/Message+Driven+POJOs" rel="nofollow">Message Driven POJOs</a></p>
+<p>To further help with concurrent consuming of JMS you can use <a shape="rect" class="external-link" href="http://jencks.codehaus.org/Message+Driven+POJOs" rel="nofollow">Message Driven POJOs</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-i-send-really-large-files-over-activemq.html
==============================================================================
--- websites/production/activemq/content/can-i-send-really-large-files-over-activemq.html (original)
+++ websites/production/activemq/content/can-i-send-really-large-files-over-activemq.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="CanIsendreallylargefilesoverActiveMQ-CanIsendreallylargefilesoverActiveMQ">Can I send really large files over ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2 id="CanIsendreallylargefilesoverActiveMQ-CanIsendreallylargefilesoverActiveMQ">Can I send really large files over ActiveMQ</h2>
 
 <p>The answer is yes. </p>
 
@@ -80,7 +80,7 @@
 
 <p>For 4.1 or ealier large file transfer is achieved using <a shape="rect" href="jms-streams.html">JMS Streams</a>. </p>
 
-<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <a shape="rect" href="blob-messages.html">Blob Messages</a> or <a shape="rect" href="jms-streams.html">JMS Streams</a> allows you to send and receive arbitrarily large files with very low RAM overhead.</p>
+<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <a shape="rect" href="blob-messages.html">Blob Messages</a> or <a shape="rect" href="jms-streams.html">JMS Streams</a> allows you to send and receive arbitrarily large files with very low RAM overhead.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-i-use-activemq-5x-or-later-on-java-14.html
==============================================================================
--- websites/production/activemq/content/can-i-use-activemq-5x-or-later-on-java-14.html (original)
+++ websites/production/activemq/content/can-i-use-activemq-5x-or-later-on-java-14.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="CanIuseActiveMQ5.xorlateronJava1.4-CanIuseActiveMQ5.0orlateronJava1.4?">Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
+<div class="wiki-content maincontent"><h2 id="CanIuseActiveMQ5.xorlateronJava1.4-CanIuseActiveMQ5.0orlateronJava1.4?">Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
 
 <p>Apache ActiveMQ 5.x or later is developed to run on Java 5 or later  to take advantage of the new language features together with the major fact that on Java 5 the new concurrency code is faster &amp; less buggy and requires less dependencies.</p>
 
@@ -82,7 +82,7 @@
 
 <h2 id="CanIuseActiveMQ5.xorlateronJava1.4-SeeAlso">See Also</h2>
 
-<ul><li><a shape="rect" href="what-platforms-does-activemq-support.html">What platforms does ActiveMQ support</a></li></ul>
+<ul><li><a shape="rect" href="what-platforms-does-activemq-support.html">What platforms does ActiveMQ support</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-two-brokers-share-the-same-database.html
==============================================================================
--- websites/production/activemq/content/can-two-brokers-share-the-same-database.html (original)
+++ websites/production/activemq/content/can-two-brokers-share-the-same-database.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h2 id="Cantwobrokerssharethesamedatabase-Cantwobrokerssharethesamedatabase">Can two brokers share the same database</h2>
+<div class="wiki-content maincontent"><h2 id="Cantwobrokerssharethesamedatabase-Cantwobrokerssharethesamedatabase">Can two brokers share the same database</h2>
 
 <p>The short answer is no; 2 brokers cannot operate on the same sets of database tables concurrently. ActiveMQ is designed for high performance so we want to minimise the amount of pessimistic locking; each broker is designed to work with its own persistent database.</p>
 
 <p>If you want to share the same physical database server across two brokers to simplify your installation &amp; backup procedures then just create 2 different logins for each broker so that they get their own sets of database tables within the same physical database. (i.e. each broker gets its own logical database within the same physical database server).</p>
 
-<p>Also if you want to only have one database but many possible brokers (for HA) then just use <a shape="rect" href="jdbc-master-slave.html">JDBC Master Slave</a></p>
+<p>Also if you want to only have one database but many possible brokers (for HA) then just use <a shape="rect" href="jdbc-master-slave.html">JDBC Master Slave</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/can-you-browse-a-topic.html
==============================================================================
--- websites/production/activemq/content/can-you-browse-a-topic.html (original)
+++ websites/production/activemq/content/can-you-browse-a-topic.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,13 +72,13 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>You can browse queues, can you browse a topic?</p>
+<div class="wiki-content maincontent"><p>You can browse queues, can you browse a topic?</p>
 
 <p>No. But then consuming messages on a topic does not affect any other consumers, so you don't need to 'browse' per se, just subscribe.</p>
 
 <p>i.e. browsing is necessary on queues as you wanna see what messages there are without removing them. For topics, everyone who's interested gets a copy of the message so just do a regular subscribe.</p>
 
-<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p>
+<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/certificateunknown.html
==============================================================================
--- websites/production/activemq/content/certificateunknown.html (original)
+++ websites/production/activemq/content/certificateunknown.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 something like this...</p>
+<div class="wiki-content maincontent"><p>If you get an error something 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;">
@@ -107,7 +107,7 @@ Caused by: javax.net.ssl.SSLHandshakeExc
 
 <h3 id="certificate_unknown-Fix">Fix</h3>
 
-<p>Make sure that you exported the broker's certificate (step 2 in <a shape="rect" href="how-do-i-use-ssl.html">How do I use SSL</a>) and imported it on the client into a truststore (step 4).  If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p>
+<p>Make sure that you exported the broker's certificate (step 2 in <a shape="rect" href="how-do-i-use-ssl.html">How do I use SSL</a>) and imported it on the client into a truststore (step 4).  If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/changes-in-40.html
==============================================================================
--- websites/production/activemq/content/changes-in-40.html (original)
+++ websites/production/activemq/content/changes-in-40.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="Changesin4.0-NewFeaturesin4.0">New Features in 4.0</h3>
+<div class="wiki-content maincontent"><h3 id="Changesin4.0-NewFeaturesin4.0">New Features in 4.0</h3>
 
 <ul><li><a shape="rect" href="masterslave.html">MasterSlave</a> provides support for continuous availability and fault tolerance of brokers to be able to handle catastrophic hardware failure and not loose a message (or get duplicates).</li><li>A new <a shape="rect" href="exclusive-consumer.html">Exclusive Consumer</a> feature allows you to pin message processing to a single consumer in a cluser of consumers.</li><li>A new <a shape="rect" href="message-groups.html">Message Groups</a> feaure allows you load balance messages accross a set of consumers but also garantee the message order for messages within a message group.</li><li>A new <a shape="rect" href="total-ordering.html">Total Ordering</a> feature to allow all consumers on a topic to see messages in the same order.</li><li>New <a shape="rect" href="how-can-i-monitor-activemq.html">JMX Management</a> and monitoring capabilities. You can now see statistics for each broker, destination, connector and connection!</li><li>Improved <
 a shape="rect" href="security.html">Security</a> plugin which provides JAAS support for authentication along with a pluggable strategy for authorization together with a default XML based implementation.</li><li>A new <a shape="rect" href="openwire-c-client.html">OpenWire C Client</a> is now available. This client talks the same wire protocol that the standard java client uses so every messaging broker feature available to the java client is available to the c client.</li><li>An experimental <a shape="rect" href="https://cwiki.apache.org/confluence/display/NMS">OpenWire dotNet</a> is available, written in pure C# along with a JMS-like API for working on the .Net platform with ActiveMQ</li><li>Queues can now be loaded up with persistent messages without locking up the broker. Persistent messages are now swapped out of memory when no consumer needs it soon.</li><li>A new <a shape="rect" href="consumer-priority.html">Consumer Priority</a> feature allows you to build location affinity by
  assignin a priority to consumers. The broker can then dispatch messages to higher priority consumers before dispatching to lower priority consumers.</li><li>A configurable per <a shape="rect" href="consumer-dispatch-async.html">Consumer Dispatch Async</a> flag which allows you to configure how messages are sent by the broker to a consumer.  This controls if the broker uses <a shape="rect" href="seda.html">SEDA</a> or <a shape="rect" class="unresolved" href="#">STP</a> style dispaching.</li><li>A new plug-able topic <a shape="rect" href="subscription-recovery-policy.html">Subscription Recovery Policy</a> which allows you to configure how many transient messages are replayed when a <a shape="rect" href="retroactive-consumer.html">Retroactive Consumer</a> is created.</li><li>A new <a shape="rect" href="retroactive-consumer.html">Retroactive Consumer</a> feature allows topic consumers to "go back in time" so that it receives old messages when the subscription is activated. If the consu
 mer is a durable consumer, he recover all the messages that are still in the persistent store.</li><li><a shape="rect" href="per-destination-policies.html">Per Destination Policies</a> allow you configure the behavior of destinations.</li><li>The broker now supports per destination plugable <a shape="rect" href="dispatch-policies.html">Dispatch Policies</a> so that you can choose the distribution algorithm used to send messages to a consumer.</li><li>The broker now supports two new types of connectors:
 	<ul><li><a shape="rect" href="the-jms-connector.html">The JMS Connector</a> is used to establish connection to external JMS providers so that messages can be bridged between the system.</li><li><a shape="rect" href="the-proxy-connector.html">The Proxy Connector</a>. Is used to proxy connections to another broker.</li></ul>
@@ -103,7 +103,7 @@ failover:tcp://host1:port1,tcp://host2:p
 
 <ul><li>The JDBC persistence adapter now uses JDBC statement batching to increase it's performance with the database. This should reduce the amount of time a checkpoint takes.</li><li>QueueBrowsers now play nicely with a queue that is currently being consumed from. It gives you a true snapshot of what the queue looked like when you created the browser and it does not affect the dispatching of messages to active consumers.</li><li>we no longer have hand-crafted marshalling code any more; its all based on <a shape="rect" href="openwire.html">OpenWire</a> and autogenerated from the open wire commands in the org.activemq.command package</li><li>The network bridges used for broker to broker messaging now use a lower level ActiveMQ command and transport API instead of the JMS API, this allows them to use more optimizations and have a lower per bridge resource consumption while letting the JMS client API implementation reduce it's complexity.</li><li>Two types of network bridges are now su
 pported:
 	<ul><li>A simple forwardng bridge - sends all messages as soon as possible to the remote broker. Great you know the usage patterns up front and allways want to do store and forward to a central broker.</li><li>A demand based forwarding bridge (same type of bridge that was using in ActiveMQ 3.x) which detects consumer demand on the remote broker and only forwards messages as needed.</li></ul>
-	</li><li>The demand based forwarding bridge now take advantage of the <a shape="rect" href="consumer-priority.html">Consumer Priority</a> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <a shape="rect" href="jms-streams.html">JMS Streams</a>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul>
+	</li><li>The demand based forwarding bridge now take advantage of the <a shape="rect" href="consumer-priority.html">Consumer Priority</a> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <a shape="rect" href="jms-streams.html">JMS Streams</a>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/class-diagrams-for-activemq-40-m4-source-code.html
==============================================================================
--- websites/production/activemq/content/class-diagrams-for-activemq-40-m4-source-code.html (original)
+++ websites/production/activemq/content/class-diagrams-for-activemq-40-m4-source-code.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>Class Diagrams for activemq-4.0-M4 source code.</p>
 
 <p>These diagrams cover the bulk of the source code and are in EMF format.&#160;</p>
@@ -82,7 +83,7 @@
 
 <p>Note about printing: Adobe In Design works well for printing if you want a large print but don't have access to an oversized/wide format ink jet (<a shape="rect" class="external-link" href="http://www.adobe.com/products/tryadobe/main.jsp#product=31" rel="nofollow">http://www.adobe.com/products/tryadobe/main.jsp#product=31</a>).&#160; Set up the page dimensions first, for example,&#160; normal letter size page is measured in pts, 51p0 width, 66p0 height.&#160; So for a wider than long oversized diagram you might go to File-&gt;Document Setup... and set Page Size to "Custom" and width to 255p0 (5 8 1/2" letter pages in width), and height to 112p0 (2 11" letter pages in height).&#160; Next go to File-&gt;Place... to import the EMF. Using the Scale tool (smaller box with an arrow pointing into larger box) size the image to fit inside the page (hold down shift key while sizing to keep proportions), and position it using the Selection tool (arrow).</p>
 
-<p>Then go to File-&gt;Print..., select "Setup" and check the "Tile" option.&#160; The "Tile" dropdown setting should be "Auto" and Overlap 4p0.&#160; Then set the Scale option to a percentage that maximizes the image coverage (there is a visual thumbnail that will indicate the coverage).&#160; Then Print.&#160; This should yield a nice large image printed out in tiled format on letter size pages.&#160; Each page will be properly numbered so you know their positions, and there will be marks for trimming and taping the pages together.&#160; A page cutter is neccessary.&#160; Just trim the right and bottom overlap on each page, then align and tape.</p>
+<p>Then go to File-&gt;Print..., select "Setup" and check the "Tile" option.&#160; The "Tile" dropdown setting should be "Auto" and Overlap 4p0.&#160; Then set the Scale option to a percentage that maximizes the image coverage (there is a visual thumbnail that will indicate the coverage).&#160; Then Print.&#160; This should yield a nice large image printed out in tiled format on letter size pages.&#160; Each page will be properly numbered so you know their positions, and there will be marks for trimming and taping the pages together.&#160; A page cutter is neccessary.&#160; Just trim the right and bottom overlap on each page, then align and tape.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/clustering.html
==============================================================================
--- websites/production/activemq/content/clustering.html (original)
+++ websites/production/activemq/content/clustering.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>Clustering is a large topic and often means different things to different people. We'll try to list the various aspects of clustering and how they relate to ActiveMQ</p><h2 id="Clustering-Queueconsumerclusters">Queue consumer clusters</h2><p>ActiveMQ supports reliable high performance load balancing of messages on a queue across consumers. In enterprise integration, this scenario is known as the&#160;<a shape="rect" class="external-link" href="http://www.eaipatterns.com/CompetingConsumers.html" rel="nofollow">competing consumers</a> pattern. The following figure illustrates the concept:</p><p><span class="confluence-embedded-file-wrapper image-center-wrapper"><img class="confluence-embedded-image image-center" src="clustering.data/competing-consumers.png"></span></p><p><span style="line-height: 1.4285715;">This solution receives the messages sent by the producers, enqueues them and distributes them between all the registered consumers. This has a number of benefits:</span></p><ul
 ><li><span style="line-height: 1.4285715;">The load is distributed in a very dynamic fashion. Additional consumers could be provisioned and attached to the queue in high load periods, without modifying any configuration in the queue, as the new consumer would behave as just another competing consumer.</span></li><li><span style="line-height: 1.4285715;">Better availability than systems using a load balancer. Load balancers usually rely on a monitorization system to find out which real-servers are unavailable. With competing consumers, a failed consumer won't be competing for messages and therefore messages won't be delivered to it even without monitorization.</span></li><li>High reliability, if a consumer fails, any unacknowledged messages are redelivered to other consumers on the queue.</li></ul><p>On the downside, this pattern might not be ideal in systems where the order processing is required. To mitigate this problem while maintaining the benefits, the competing consumers patte
 rn should be used in conjunction with other ActiveMQ&#160;<a shape="rect" href="features.html">features</a>&#160;like the <a shape="rect" href="exclusive-consumer.html">exclusive consumers</a> and the <a shape="rect" href="message-groups.html">message groups</a>&#160;as stated in the <a shape="rect" href="how-do-i-preserve-order-of-messages.html">ActiveMQ's FAQ</a>.</p><h2 id="Clustering-Brokerclusters">Broker clusters</h2><p>The most common mental model of clustering in a JMS context is that there is a collection of JMS brokers and a JMS client will connect to one of them; then if the JMS broker goes down, it will auto-reconnect to another broker.</p><p>We implement this using the <strong>failover://</strong> protocol in the JMS client. See the <a shape="rect" href="failover-transport-reference.html">Failover Transport Reference</a> page for details of how to configure the failover protocol. <em>Note:</em> The reliable:// protocol in ActiveMQ 3.x has now been changed to the failove
 r:// protocol</p><p>If we just run multiple brokers on a network and tell the clients about them using either <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>, then clients can easily failover from one broker to another. However, stand alone brokers don't know about consumers on other brokers; so if there are no consumers on a certain broker, messages could just pile up without being consumed. We have an outstanding <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-816">feature request</a> to tackle this on the client side - but currently the solution to this problem is to create a Network of brokers to store and forward messages between brokers.</p><h2 id="Clustering-Discoveryofbrokers">Discovery of brokers</h2><p>We su
 pport <a shape="rect" href="discovery.html">auto-discovery</a> of brokers using <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>,&#160;so clients can automatically detect and connect to a broker out of a logical group of brokers as well for brokers to discover and connect to other brokers to form large networks.</p><h2 id="Clustering-Networksofbrokers">Networks of brokers</h2><p>If you are using <a shape="rect" href="topologies.html">client/server or hub/spoke style topology</a> and you have many clients and many brokers, there is a chance that one broker has producers but no consumers, so that messages pile up without being processed. To avoid this, ActiveMQ supports a <a shape="rect" href="networks-of-brokers.html">Networks of Brokers</a> which provides <em
 >store and forward</em> to move messages from brokers with producers to brokers with consumers which allows us to support <a shape="rect" href="how-do-distributed-queues-work.html">distributed queues and topics</a> across a network of brokers.</p><p>This allows a client to connect to any broker - and fail over to another broker if there is a failure - providing a cluster of brokers&#160;from the clients perspective.</p><p>Networks of brokers also allows us to scale up to a massive number of clients in a network as we can run as many brokers as we need.</p><p>You can think of this as a cluster of clients connecting with a cluster of brokers with auto-failover and discovery, making a simple and easy to use messaging fabric.</p><h2 id="Clustering-MasterSlave">Master Slave</h2><p>The problem with running lots of stand alone brokers or brokers in a network is that messages are owned by a single physical broker at any point in time. If that broker goes down, you have to wait for it to be 
 restarted before the message can be delivered. (If you are using non-persistent messaging and a broker goes down you generally lose your message).</p><p>The idea behind <a shape="rect" href="masterslave.html">MasterSlave</a> is that messages are replicated to a slave broker so that even if you have a catastrophic hardware failure of the master's machine, file system or data centre, you get immediate failover to the slave with no message loss.</p><h2 id="Clustering-ReplicatedMessageStores">Replicated Message Stores</h2><p>An alternative to <a shape="rect" href="masterslave.html">MasterSlave</a> is to have some way to replicate the message store; so for the disk files to be shared in some way. For example using a SAN or shared network drive you can share the files of a broker so that if it fails another broker can take over straight away.</p><p>So by supporting a <a shape="rect" href="replicated-message-store.html">Replicated Message Store</a> you can reduce the risk of message loss t
 o provide either a HA backup or a full <a shape="rect" href="dr.html">DR</a> solution capable of surviving a data centre failure.</p>
+<div class="wiki-content maincontent"><p>Clustering is a large topic and often means different things to different people. We'll try to list the various aspects of clustering and how they relate to ActiveMQ</p><h2 id="Clustering-Queueconsumerclusters">Queue consumer clusters</h2><p>ActiveMQ supports reliable high performance load balancing of messages on a queue across consumers. In enterprise integration, this scenario is known as the&#160;<a shape="rect" class="external-link" href="http://www.eaipatterns.com/CompetingConsumers.html" rel="nofollow">competing consumers</a> pattern. The following figure illustrates the concept:</p><p><span class="confluence-embedded-file-wrapper image-center-wrapper"><img class="confluence-embedded-image image-center" src="clustering.data/competing-consumers.png"></span></p><p><span style="line-height: 1.4285715;">This solution receives the messages sent by the producers, enqueues them and distributes them between all the registered consumers. This h
 as a number of benefits:</span></p><ul><li><span style="line-height: 1.4285715;">The load is distributed in a very dynamic fashion. Additional consumers could be provisioned and attached to the queue in high load periods, without modifying any configuration in the queue, as the new consumer would behave as just another competing consumer.</span></li><li><span style="line-height: 1.4285715;">Better availability than systems using a load balancer. Load balancers usually rely on a monitorization system to find out which real-servers are unavailable. With competing consumers, a failed consumer won't be competing for messages and therefore messages won't be delivered to it even without monitorization.</span></li><li>High reliability, if a consumer fails, any unacknowledged messages are redelivered to other consumers on the queue.</li></ul><p>On the downside, this pattern might not be ideal in systems where the order processing is required. To mitigate this problem while maintaining the b
 enefits, the competing consumers pattern should be used in conjunction with other ActiveMQ&#160;<a shape="rect" href="features.html">features</a>&#160;like the <a shape="rect" href="exclusive-consumer.html">exclusive consumers</a> and the <a shape="rect" href="message-groups.html">message groups</a>&#160;as stated in the <a shape="rect" href="how-do-i-preserve-order-of-messages.html">ActiveMQ's FAQ</a>.</p><h2 id="Clustering-Brokerclusters">Broker clusters</h2><p>The most common mental model of clustering in a JMS context is that there is a collection of JMS brokers and a JMS client will connect to one of them; then if the JMS broker goes down, it will auto-reconnect to another broker.</p><p>We implement this using the <strong>failover://</strong> protocol in the JMS client. See the <a shape="rect" href="failover-transport-reference.html">Failover Transport Reference</a> page for details of how to configure the failover protocol. <em>Note:</em> The reliable:// protocol in ActiveMQ 3
 .x has now been changed to the failover:// protocol</p><p>If we just run multiple brokers on a network and tell the clients about them using either <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>, then clients can easily failover from one broker to another. However, stand alone brokers don't know about consumers on other brokers; so if there are no consumers on a certain broker, messages could just pile up without being consumed. We have an outstanding <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-816">feature request</a> to tackle this on the client side - but currently the solution to this problem is to create a Network of brokers to store and forward messages between brokers.</p><h2 id="Clustering-Discoveryofbrok
 ers">Discovery of brokers</h2><p>We support <a shape="rect" href="discovery.html">auto-discovery</a> of brokers using <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>,&#160;so clients can automatically detect and connect to a broker out of a logical group of brokers as well for brokers to discover and connect to other brokers to form large networks.</p><h2 id="Clustering-Networksofbrokers">Networks of brokers</h2><p>If you are using <a shape="rect" href="topologies.html">client/server or hub/spoke style topology</a> and you have many clients and many brokers, there is a chance that one broker has producers but no consumers, so that messages pile up without being processed. To avoid this, ActiveMQ supports a <a shape="rect" href="networks-of-brokers.html">Netw
 orks of Brokers</a> which provides <em>store and forward</em> to move messages from brokers with producers to brokers with consumers which allows us to support <a shape="rect" href="how-do-distributed-queues-work.html">distributed queues and topics</a> across a network of brokers.</p><p>This allows a client to connect to any broker - and fail over to another broker if there is a failure - providing a cluster of brokers&#160;from the clients perspective.</p><p>Networks of brokers also allows us to scale up to a massive number of clients in a network as we can run as many brokers as we need.</p><p>You can think of this as a cluster of clients connecting with a cluster of brokers with auto-failover and discovery, making a simple and easy to use messaging fabric.</p><h2 id="Clustering-MasterSlave">Master Slave</h2><p>The problem with running lots of stand alone brokers or brokers in a network is that messages are owned by a single physical broker at any point in time. If that broker goe
 s down, you have to wait for it to be restarted before the message can be delivered. (If you are using non-persistent messaging and a broker goes down you generally lose your message).</p><p>The idea behind <a shape="rect" href="masterslave.html">MasterSlave</a> is that messages are replicated to a slave broker so that even if you have a catastrophic hardware failure of the master's machine, file system or data centre, you get immediate failover to the slave with no message loss.</p><h2 id="Clustering-ReplicatedMessageStores">Replicated Message Stores</h2><p>An alternative to <a shape="rect" href="masterslave.html">MasterSlave</a> is to have some way to replicate the message store; so for the disk files to be shared in some way. For example using a SAN or shared network drive you can share the files of a broker so that if it fails another broker can take over straight away.</p><p>So by supporting a <a shape="rect" href="replicated-message-store.html">Replicated Message Store</a> you
  can reduce the risk of message loss to provide either a HA backup or a full <a shape="rect" href="dr.html">DR</a> solution capable of surviving a data centre failure.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms.html
==============================================================================
--- websites/production/activemq/content/cms.html (original)
+++ websites/production/activemq/content/cms.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,8 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Moved Page</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This page has moved <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">here</a></p></div></div>
+<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Moved Page</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<p>This page has moved <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">here</a></p></div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/04/18/activemq-cpp-11-released.html
==============================================================================
--- websites/production/activemq/content/cms/2007/04/18/activemq-cpp-11-released.html (original)
+++ websites/production/activemq/content/cms/2007/04/18/activemq-cpp-11-released.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%">
-<p>The ActiveMQ-CPP 1.1 release is now official! You can download the source distribution <a shape="rect" href="../../../../cms/download.html">here</a>.</p>
+<div class="wiki-content maincontent"><p>The ActiveMQ-CPP 1.1 release is now official! You can download the source distribution <a shape="rect" href="../../../../cms/download.html">here</a>.</p>
 
-<p>There are several bug fixes and enhancements that you might want to pick up if you're currently using 1.0. This is our last patch release before 2.0, which will have full openwire support ... and we're almost there, so stay tuned!</p>
+<p>There are several bug fixes and enhancements that you might want to pick up if you're currently using 1.0. This is our last patch release before 2.0, which will have full openwire support ... and we're almost there, so stay tuned!</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/04/18/activemq-cpp-20-rc1-now-available.html
==============================================================================
--- websites/production/activemq/content/cms/2007/04/18/activemq-cpp-20-rc1-now-available.html (original)
+++ websites/production/activemq/content/cms/2007/04/18/activemq-cpp-20-rc1-now-available.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%">
-<p>We've finally got OpenWire 2.0 Support! Download the Release candidate <a shape="rect" href="../../../../cms/download.html">here</a></p>
+<div class="wiki-content maincontent"><p>We've finally got OpenWire 2.0 Support! Download the Release candidate <a shape="rect" href="../../../../cms/download.html">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/04/20/activemq-cpp-20-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/04/20/activemq-cpp-20-release.html (original)
+++ websites/production/activemq/content/cms/2007/04/20/activemq-cpp-20-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Version 2.0 is now official.  Download it from <a shape="rect" href="../../../../cms/activemq-cpp-20-release.html">here</a></p>
+<div class="wiki-content maincontent"><p>Version 2.0 is now official.  Download it from <a shape="rect" href="../../../../cms/activemq-cpp-20-release.html">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/04/30/activemq-cpp-201-rc1-now-available.html
==============================================================================
--- websites/production/activemq/content/cms/2007/04/30/activemq-cpp-201-rc1-now-available.html (original)
+++ websites/production/activemq/content/cms/2007/04/30/activemq-cpp-201-rc1-now-available.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%">
-<p>ActiveMQ-CPP 2.0.1 RC1 is now available.  This is a bug fix release that addresses some issues that were found in the 2.0 release.  Download it from&#160; the <a shape="rect" href="../../../../cms/activemq-cpp-201-release.html">ActiveMQ-CPP 2.0.1 Release</a> page.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.0.1 RC1 is now available.  This is a bug fix release that addresses some issues that were found in the 2.0 release.  Download it from&#160; the <a shape="rect" href="../../../../cms/activemq-cpp-201-release.html">ActiveMQ-CPP 2.0.1 Release</a> page.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/04/30/cms-api-10-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/04/30/cms-api-10-release.html (original)
+++ websites/production/activemq/content/cms/2007/04/30/cms-api-10-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>We've finally released version 1.0 of the CMS (C++ Messaging Service) API.  This is the JMS-like API for C++ applications implemented by ActiveMQ-CPP.  The hope is that more and more C++ application will start moving toward a common API for messaging.  You can download CMS 1.0 <a shape="rect" href="../../../../cms/cms-api-10-release.html">here</a></p>
+<div class="wiki-content maincontent"><p>We've finally released version 1.0 of the CMS (C++ Messaging Service) API.  This is the JMS-like API for C++ applications implemented by ActiveMQ-CPP.  The hope is that more and more C++ application will start moving toward a common API for messaging.  You can download CMS 1.0 <a shape="rect" href="../../../../cms/cms-api-10-release.html">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/05/09/activemq-cpp-201-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/05/09/activemq-cpp-201-release.html (original)
+++ websites/production/activemq/content/cms/2007/05/09/activemq-cpp-201-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>Version 2.0.1 is now official. Download it from <a shape="rect" href="../../../../cms/activemq-cpp-201-release.html">here </a></p>
+<div class="wiki-content maincontent"><p>Version 2.0.1 is now official. Download it from <a shape="rect" href="../../../../cms/activemq-cpp-201-release.html">here </a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/07/24/cms-api-11-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/07/24/cms-api-11-release.html (original)
+++ websites/production/activemq/content/cms/2007/07/24/cms-api-11-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1, we're releasin version 1.1 of the CMS (C++ Messaging Service) API.  This has a few tweaks to decouple the API from ActiveMQ-CPP and to support exporting symbols from a shared library.  You can download CMS 1.1 <a shape="rect" href="../../../../cms/cms-api-11-release.html">here</a></p>
+<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1, we're releasin version 1.1 of the CMS (C++ Messaging Service) API.  This has a few tweaks to decouple the API from ActiveMQ-CPP and to support exporting symbols from a shared library.  You can download CMS 1.1 <a shape="rect" href="../../../../cms/cms-api-11-release.html">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/07/25/activemq-cpp-21-rc1-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/07/25/activemq-cpp-21-rc1-release.html (original)
+++ websites/production/activemq/content/cms/2007/07/25/activemq-cpp-21-rc1-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>ActiveMQ-CPP 2.1 RC1 is now available. This release features the ability to build both static and shared libraries, as well as bug fixes and performance improvements.  Download it from the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1 Release</a> page.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features the ability to build both static and shared libraries, as well as bug fixes and performance improvements.  Download it from the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1 Release</a> page.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/07/26/activemq-cpp-21-rc1-now-available.html
==============================================================================
--- websites/production/activemq/content/cms/2007/07/26/activemq-cpp-21-rc1-now-available.html (original)
+++ websites/production/activemq/content/cms/2007/07/26/activemq-cpp-21-rc1-now-available.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%">
-<p>ActiveMQ-CPP 2.1 RC1 is now available. This release features many bug fixes along with several performance  improvements.  See the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1</a> page.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features many bug fixes along with several performance  improvements.  See the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1</a> page.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/08/07/activemq-cpp-21-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/08/07/activemq-cpp-21-release.html (original)
+++ websites/production/activemq/content/cms/2007/08/07/activemq-cpp-21-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>ActiveMQ-CPP V2.1 is now official.  You can find out what was fixed and get the latest src archives on the&#160;<a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1 Release</a> page.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1 is now official.  You can find out what was fixed and get the latest src archives on the&#160;<a shape="rect" href="../../../../cms/activemq-cpp-21-release.html">ActiveMQ-CPP 2.1 Release</a> page.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/10/28/cms-api-12-release.html
==============================================================================
--- websites/production/activemq/content/cms/2007/10/28/cms-api-12-release.html (original)
+++ websites/production/activemq/content/cms/2007/10/28/cms-api-12-release.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1.1, we're releasing version 1.2 of the CMS (C++ Messaging Service) API.  The main change in this release is that the readXXX() methods in BytesMessage were made const so that they may be used from within the MessageListener's onMessage method.  You can download CMS 1.2 <a shape="rect" href="../../../../cms/cms-api-12-release.html">here</a></p>
+<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1.1, we're releasing version 1.2 of the CMS (C++ Messaging Service) API.  The main change in this release is that the readXXX() methods in BytesMessage were made const so that they may be used from within the MessageListener's onMessage method.  You can download CMS 1.2 <a shape="rect" href="../../../../cms/cms-api-12-release.html">here</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/11/05/activemq-cpp-211-released.html
==============================================================================
--- websites/production/activemq/content/cms/2007/11/05/activemq-cpp-211-released.html (original)
+++ websites/production/activemq/content/cms/2007/11/05/activemq-cpp-211-released.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%">
-<p>ActiveMQ-CPP V2.1.1 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-211-release.html">ActiveMQ-CPP 2.1.1 Release</a> page.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.1 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-211-release.html">ActiveMQ-CPP 2.1.1 Release</a> page.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/cms/2007/11/26/solaris-platform.html
==============================================================================
--- websites/production/activemq/content/cms/2007/11/26/solaris-platform.html (original)
+++ websites/production/activemq/content/cms/2007/11/26/solaris-platform.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="error"><span class="error">Unable to render {children}.</span> Can only find children for a page, this is a blogpost.</div>
+<div class="wiki-content maincontent"><div class="error"><span class="error">Unable to render {children}.</span> Can only find children for a page, this is a blogpost.</div></div>
         </td>
         <td valign="top">
           <div class="navigation">