activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956584 [30/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/quicklinks.html
==============================================================================
--- websites/production/activemq/content/quicklinks.html (original)
+++ websites/production/activemq/content/quicklinks.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.11.0/apidocs/index.html">JavaDocs</a> <a shape="rect" href="javadocs.html">More...</a> | <a shape="rect" href="source.html">Source</a> | <a shape="rect" href="discussion-forums.html">Forums</a> | <a shape="rect" href="support.html">Support</a></p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="download.html">Download</a> | <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.11.0/apidocs/index.html">JavaDocs</a> <a shape="rect" href="javadocs.html">More...</a> | <a shape="rect" href="source.html">Source</a> | <a shape="rect" href="discussion-forums.html">Forums</a> | <a shape="rect" href="support.html">Support</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/redelivery-policy.html
==============================================================================
--- websites/production/activemq/content/redelivery-policy.html (original)
+++ websites/production/activemq/content/redelivery-policy.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="RedeliveryPolicy-RedeliveryPolicy">Redelivery Policy</h2>
+<div class="wiki-content maincontent"><h2 id="RedeliveryPolicy-RedeliveryPolicy">Redelivery Policy</h2>
 
 <p>Detail on when messages are redelivered to a client can be found in the <a shape="rect" href="message-redelivery-and-dlq-handling.html">Message Redelivery and DLQ Handling</a> section.</p>
 
@@ -121,7 +121,7 @@
     map.put(new ActiveMQQueue("&gt;"), queuePolicy);
 
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-guide.html
==============================================================================
--- websites/production/activemq/content/release-guide.html (original)
+++ websites/production/activemq/content/release-guide.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>How to create and announce an ActiveMQ release. This release is based on <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based project at Apache </a>, so be sure to check it out before continuing and meet all prerequisites.</p><h2 id="ReleaseGuide-Maven2Setup">Maven 2 Setup</h2><p>Before you deploy anything to the maven repository using Maven 2, you should configure your ~/.m2/settings.xml file<br clear="none"> so that the file permissions of the deployed artifacts are group writeable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>How to create and announce an ActiveMQ release. This release is based on <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based project at Apache </a>, so be sure to check it out before continuing and meet all prerequisites.</p><h2 id="ReleaseGuide-Maven2Setup">Maven 2 Setup</h2><p>Before you deploy anything to the maven repository using Maven 2, you should configure your ~/.m2/settings.xml file<br clear="none"> so that the file permissions of the deployed artifacts are group writeable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions.</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;settings&gt;
   ...
   &lt;servers&gt;
@@ -179,7 +179,7 @@ ln -s activemq-core-5.9.0.xsd activemq-c
 svn add activemq-core.xsd
 # and commit once it looks good.
 </pre>
-</div></div></li><li>Continue with the Announcing section below</li><li>Created a in progress wiki page for the next release</li></ol><h2 id="ReleaseGuide-AnnouncingtheActiveMQRelease">Announcing the ActiveMQ Release</h2><ol><li>Perform a release in JIRA and create a new release version in JIRA.<ol><li>Move unresolved issues to the next release first, in a bulk (do not send email) update</li><li>You might also want to search for resolved/closed issues with no fix version just in case</li></ol></li><li>Create a download page for the release in the WIKI similar like the <a shape="rect" href="activemq-530-release.html">ActiveMQ 5.3.0 Release</a>; also update the main <a shape="rect" href="download.html">Download</a> page as appropriate</li><li>Update the <a shape="rect" href="xml-reference.html">Xml Reference</a> page with a link to the HTML and XSD</li><li>Update latest release link on home page</li><li>Change the links for the prior release to reference the archive (at&#160;<a shape=
 "rect" class="external-link" href="http://archive.apache.org/dist/activemq/">http://archive.apache.org/dist/activemq/</a>); otherwise, users will not be able to locate the older release for download</li><li>Update <a shape="rect" href="quicklinks.html">QuickLinks</a> and <a shape="rect" href="javadocs.html">JavaDocs</a> pages</li><li>Mail the <a shape="rect" class="external-link" href="mailto:dev@activemq.codehaus.org" rel="nofollow">dev</a> &amp; <a shape="rect" class="external-link" href="mailto:user@activemq.codehaus.org" rel="nofollow">user</a> lists</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/pages/viewrecentblogposts.action?key=ACTIVEMQ">Post</a> a news entry on the WIKI</li><li>tweet</li><li>Have a beer! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li></ol>
+</div></div></li><li>Continue with the Announcing section below</li><li>Created a in progress wiki page for the next release</li></ol><h2 id="ReleaseGuide-AnnouncingtheActiveMQRelease">Announcing the ActiveMQ Release</h2><ol><li>Perform a release in JIRA and create a new release version in JIRA.<ol><li>Move unresolved issues to the next release first, in a bulk (do not send email) update</li><li>You might also want to search for resolved/closed issues with no fix version just in case</li></ol></li><li>Create a download page for the release in the WIKI similar like the <a shape="rect" href="activemq-530-release.html">ActiveMQ 5.3.0 Release</a>; also update the main <a shape="rect" href="download.html">Download</a> page as appropriate</li><li>Update the <a shape="rect" href="xml-reference.html">Xml Reference</a> page with a link to the HTML and XSD</li><li>Update latest release link on home page</li><li>Change the links for the prior release to reference the archive (at&#160;<a shape=
 "rect" class="external-link" href="http://archive.apache.org/dist/activemq/">http://archive.apache.org/dist/activemq/</a>); otherwise, users will not be able to locate the older release for download</li><li>Update <a shape="rect" href="quicklinks.html">QuickLinks</a> and <a shape="rect" href="javadocs.html">JavaDocs</a> pages</li><li>Mail the <a shape="rect" class="external-link" href="mailto:dev@activemq.codehaus.org" rel="nofollow">dev</a> &amp; <a shape="rect" class="external-link" href="mailto:user@activemq.codehaus.org" rel="nofollow">user</a> lists</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/pages/viewrecentblogposts.action?key=ACTIVEMQ">Post</a> a news entry on the WIKI</li><li>tweet</li><li>Have a beer! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li></ol></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-info.html
==============================================================================
--- websites/production/activemq/content/release-info.html (original)
+++ websites/production/activemq/content/release-info.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,10 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <h2 id="ReleaseInfo-GeneralReleaseInformation">General Release Information</h2>
 
-<ul><li><a shape="rect" class="external-link" href="http://jira.activemq.org/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" rel="nofollow">Current RoadMap</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/incubator/SigningReleases">Signing Releases</a></li><li><a shape="rect" class="external-link" href="http://apache.org/dev/mirrors.html">Apache Mirror Guidelines</a></li></ul>
+<ul><li><a shape="rect" class="external-link" href="http://jira.activemq.org/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" rel="nofollow">Current RoadMap</a></li><li><a shape="rect" href="release-guide.html">Release Guide</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/incubator/SigningReleases">Signing Releases</a></li><li><a shape="rect" class="external-link" href="http://apache.org/dev/mirrors.html">Apache Mirror Guidelines</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/release-plans.html
==============================================================================
--- websites/production/activemq/content/release-plans.html (original)
+++ websites/production/activemq/content/release-plans.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <h3 id="ReleasePlans-Information">Information</h3>
 
 <ul><li><a shape="rect" href="release-info.html">Release Info</a></li><li><a shape="rect" href="how-you-can-help-release.html">How you can help release</a></li></ul>
@@ -79,7 +80,7 @@
 
 <h3 id="ReleasePlans-ReleasePlans">Release Plans</h3>
 
-<ul><li><a shape="rect" href="40-rc-1-guide.html">4.0 RC 1 Guide</a></li></ul>
+<ul><li><a shape="rect" href="40-rc-1-guide.html">4.0 RC 1 Guide</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/replicated-leveldb-store.html
==============================================================================
--- websites/production/activemq/content/replicated-leveldb-store.html (original)
+++ websites/production/activemq/content/replicated-leveldb-store.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="ReplicatedLevelDBStore-Synopsis">Synopsis</h2><p>The Replicated LevelDB Store uses Apache ZooKeeper to pick a master from a set of broker nodes configured to replicate a LevelDB Store. Then synchronizes all slave LevelDB Stores with the master keeps them up to date by replicating all updates from the master.</p><p>The Replicated LevelDB Store uses the same data files as a LevelDB Store, so you can switch a broker configuration between replicated and non replicated whenever you want.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Version Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available as of ActiveMQ 5.9.0.</p></div></div><h2 id="ReplicatedLevelDBStore-Howitworks.">How it works.</h2><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="replicated-leveldb-stor
 e.data/replicated-leveldb-store.png"></span></p><p>It uses <a shape="rect" class="external-link" href="http://zookeeper.apache.org/">Apache ZooKeeper</a> to coordinate which node in the cluster becomes the master. The elected master broker node starts and accepts client connections. The other nodes go into slave mode and connect the the master and synchronize their persistent state /w it. The slave nodes do not accept client connections. All persistent operations are replicated to the connected slaves. If the master dies, the slaves with the latest update gets promoted to become the master. The failed node can then be brought back online and it will go into slave mode.</p><p>All messaging operations which require a sync to disk will wait for the update to be replicated to a quorum of the nodes before completing. So if you configure the store with <code>replicas="3"</code> then the quorum size is <code>(3/2+1)=2</code>. The master will store the update locally and wait for 1 other sl
 ave to store the update before reporting success. Another way to think about it is that store will do synchronous replication to a quorum of the replication nodes and asynchronous replication replication to any additional nodes.</p><p>When a new master is elected, you also need at least a quorum of nodes online to be able to find a node with the lastest updates. The node with the lastest updates will become the new master. Therefore, it's recommend that you run with at least 3 replica nodes so that you can take one down without suffering a service outage.</p><h3 id="ReplicatedLevelDBStore-DeploymentTips">Deployment Tips</h3><p>Clients should be using the <a shape="rect" href="failover-transport-reference.html">Failover Transport</a> to connect to the broker nodes in the replication cluster. e.g. using a URL something like the following:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="ReplicatedLevelDBStore-Synopsis">Synopsis</h2><p>The Replicated LevelDB Store uses Apache ZooKeeper to pick a master from a set of broker nodes configured to replicate a LevelDB Store. Then synchronizes all slave LevelDB Stores with the master keeps them up to date by replicating all updates from the master.</p><p>The Replicated LevelDB Store uses the same data files as a LevelDB Store, so you can switch a broker configuration between replicated and non replicated whenever you want.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Version Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available as of ActiveMQ 5.9.0.</p></div></div><h2 id="ReplicatedLevelDBStore-Howitworks.">How it works.</h2><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedd
 ed-image" src="replicated-leveldb-store.data/replicated-leveldb-store.png"></span></p><p>It uses <a shape="rect" class="external-link" href="http://zookeeper.apache.org/">Apache ZooKeeper</a> to coordinate which node in the cluster becomes the master. The elected master broker node starts and accepts client connections. The other nodes go into slave mode and connect the the master and synchronize their persistent state /w it. The slave nodes do not accept client connections. All persistent operations are replicated to the connected slaves. If the master dies, the slaves with the latest update gets promoted to become the master. The failed node can then be brought back online and it will go into slave mode.</p><p>All messaging operations which require a sync to disk will wait for the update to be replicated to a quorum of the nodes before completing. So if you configure the store with <code>replicas="3"</code> then the quorum size is <code>(3/2+1)=2</code>. The master will store the 
 update locally and wait for 1 other slave to store the update before reporting success. Another way to think about it is that store will do synchronous replication to a quorum of the replication nodes and asynchronous replication replication to any additional nodes.</p><p>When a new master is elected, you also need at least a quorum of nodes online to be able to find a node with the lastest updates. The node with the lastest updates will become the new master. Therefore, it's recommend that you run with at least 3 replica nodes so that you can take one down without suffering a service outage.</p><h3 id="ReplicatedLevelDBStore-DeploymentTips">Deployment Tips</h3><p>Clients should be using the <a shape="rect" href="failover-transport-reference.html">Failover Transport</a> to connect to the broker nodes in the replication cluster. e.g. using a URL something like the following:</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;">failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)
 </pre>
 </div></div><p>You should run at least 3 ZooKeeper server nodes so that the ZooKeeper service is highly available. Don't overcommit your ZooKeeper servers. An overworked ZooKeeper might start thinking live replication nodes have gone offline due to delays in processing their 'keep-alive' messages.</p><p>For best results, make sure you explicitly configure the hostname attribute with a hostname or ip address for the node that other cluster members to access the machine with. The automatically determined hostname is not always accessible by the other cluster members and results in slaves not being able to establish a replication session with the master.</p><h2 id="ReplicatedLevelDBStore-Configuration">Configuration</h2><p>You can configure ActiveMQ to use LevelDB for its persistence adapter - like below :</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -101,7 +101,7 @@
     ...
   &lt;/broker&gt;
 </pre>
-</div></div><h3 id="ReplicatedLevelDBStore-ReplicatedLevelDBStoreProperties">Replicated LevelDB Store Properties</h3><p>All the broker nodes that are part of the same replication set should have matching <code>brokerName</code> XML attributes. The following configuration properties should be the same on all the broker nodes that are part of the same replication set:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>replicas</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>3</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of nodes that will exist in the cluster. At least (replicas/2)+1 nodes must be online to avoid service outage.</p
 ></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>securityToken</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A security token which must match on all replication nodes for them to accept each others replication requests.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkAddress</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>127.0.0.1:2181</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A comma separated list of ZooKeeper servers.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkPassword</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The password to use when connecting to the ZooKeeper server.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkPath</code></p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p><code>/default</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The path to the ZooKeeper directory where Master/Slave election information will be exchanged.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkSessionTimeout</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>2s</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How quickly a node failure will be detected by ZooKeeper. (prior to 5.11 - this had a typo <span>zkSessionTmeout)</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>quorum_mem</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Controls where updates are reside before being considered complete. This setting is a comma separated list of the following options: <code>local_mem</code>, <code>local_disk</code>, 
 <code>remote_mem</code>, <code>remote_disk</code>, <code>quorum_mem</code>, <code>quorum_disk</code>. If you combine two settings for a target, the stronger guarantee is used. For example, configuring <code>local_mem, local_disk</code> is the same as just using <code>local_disk</code>. quorum_mem is the same as <code>local_mem, remote_mem</code> and <code>quorum_disk</code> is the same as <code>local_disk, remote_disk</code></p></td></tr></tbody></table></div><p>Different replication sets can share the same <code>zkPath</code> as long they have different <code>brokerName</code>.</p><p>The following configuration properties can be unique per node:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p><code>bind</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tcp://0.0.0.0:61619</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When this node becomes a master, it will bind the configured address and port to service the replication protocol. Using dynamic ports is also supported. Just configure with <code>tcp://0.0.0.0:0</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>hostname</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The host name used to advertise the replication service when this node becomes the master. If not set it will be automatically determined.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>weight</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The replication node that has the latest update wi
 th the highest weight will become the master. Used to give preference to some nodes towards becoming master.</p></td></tr></tbody></table></div><p>The store also supports the same configuration properties of a standard <a shape="rect" href="leveldb-store.html">LevelDB Store</a> but it does not support the pluggable storage lockers :</p><h3 id="ReplicatedLevelDBStore-StandardLevelDBStoreProperties">Standard LevelDB Store Properties</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>directory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>LevelDB</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The directory which the store will use to hold it'
 s data files. The store will create the directory if it does not already exist.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>readThreads</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of concurrent IO read threads to allowed.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>104857600</code> (100 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The max size (in bytes) of each data log file before log file rotation occurs.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logWriteBufferSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>4194304</code> (4 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>That maximum amount of log data to build up before writing to th
 e file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>verifyChecksums</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Set to true to force checksum verification of all data that is read from the file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>paranoidChecks</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Make the store error out as soon as possible if it detects internal corruption.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexFactory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.fusesource.leveldbjni.JniDBFactory, org.iq80.leveldb.impl.Iq80DBFactory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The factory classes to use when cre
 ating the LevelDB indexes</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexMaxOpenFiles</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>1000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number of open files that can be used by the index.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexBlockRestartInterval</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>16</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number keys between restart points for delta encoding of keys.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexWriteBufferSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>6291456</code> (6 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Amount of index data to build up in memory before converting to a sorted on-disk file.</p></td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"><p><code>indexBlockSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>4096</code> (4 K)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The size of index data packed per block.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexCacheSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>268435456</code> (256 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum amount of off-heap memory to use to cache index blocks.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexCompression</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>snappy</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The type of compression to apply to the index blocks. Can be snappy or none.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logCompression</code></p></td><td colspan="
 1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The type of compression to apply to the log records. Can be snappy or none.</p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Caveats</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The LevelDB store does not yet support storing data associated with <a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a>. Those are are stored in a separate non-replicated KahaDB data files. Unexpected results will occur if you use <a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a> with the replicated leveldb store since that data will be not be there when the master fails over to a slave.</p></div></div>
+</div></div><h3 id="ReplicatedLevelDBStore-ReplicatedLevelDBStoreProperties">Replicated LevelDB Store Properties</h3><p>All the broker nodes that are part of the same replication set should have matching <code>brokerName</code> XML attributes. The following configuration properties should be the same on all the broker nodes that are part of the same replication set:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>replicas</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>3</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of nodes that will exist in the cluster. At least (replicas/2)+1 nodes must be online to avoid service outage.</p
 ></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>securityToken</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A security token which must match on all replication nodes for them to accept each others replication requests.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkAddress</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>127.0.0.1:2181</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A comma separated list of ZooKeeper servers.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkPassword</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The password to use when connecting to the ZooKeeper server.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkPath</code></p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p><code>/default</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The path to the ZooKeeper directory where Master/Slave election information will be exchanged.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>zkSessionTimeout</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>2s</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How quickly a node failure will be detected by ZooKeeper. (prior to 5.11 - this had a typo <span>zkSessionTmeout)</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>quorum_mem</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Controls where updates are reside before being considered complete. This setting is a comma separated list of the following options: <code>local_mem</code>, <code>local_disk</code>, 
 <code>remote_mem</code>, <code>remote_disk</code>, <code>quorum_mem</code>, <code>quorum_disk</code>. If you combine two settings for a target, the stronger guarantee is used. For example, configuring <code>local_mem, local_disk</code> is the same as just using <code>local_disk</code>. quorum_mem is the same as <code>local_mem, remote_mem</code> and <code>quorum_disk</code> is the same as <code>local_disk, remote_disk</code></p></td></tr></tbody></table></div><p>Different replication sets can share the same <code>zkPath</code> as long they have different <code>brokerName</code>.</p><p>The following configuration properties can be unique per node:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p><code>bind</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tcp://0.0.0.0:61619</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When this node becomes a master, it will bind the configured address and port to service the replication protocol. Using dynamic ports is also supported. Just configure with <code>tcp://0.0.0.0:0</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>hostname</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The host name used to advertise the replication service when this node becomes the master. If not set it will be automatically determined.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>weight</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The replication node that has the latest update wi
 th the highest weight will become the master. Used to give preference to some nodes towards becoming master.</p></td></tr></tbody></table></div><p>The store also supports the same configuration properties of a standard <a shape="rect" href="leveldb-store.html">LevelDB Store</a> but it does not support the pluggable storage lockers :</p><h3 id="ReplicatedLevelDBStore-StandardLevelDBStoreProperties">Standard LevelDB Store Properties</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>directory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>LevelDB</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The directory which the store will use to hold it'
 s data files. The store will create the directory if it does not already exist.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>readThreads</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of concurrent IO read threads to allowed.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>104857600</code> (100 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The max size (in bytes) of each data log file before log file rotation occurs.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logWriteBufferSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>4194304</code> (4 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>That maximum amount of log data to build up before writing to th
 e file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>verifyChecksums</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Set to true to force checksum verification of all data that is read from the file system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>paranoidChecks</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Make the store error out as soon as possible if it detects internal corruption.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexFactory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.fusesource.leveldbjni.JniDBFactory, org.iq80.leveldb.impl.Iq80DBFactory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The factory classes to use when cre
 ating the LevelDB indexes</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexMaxOpenFiles</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>1000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number of open files that can be used by the index.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexBlockRestartInterval</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>16</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number keys between restart points for delta encoding of keys.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexWriteBufferSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>6291456</code> (6 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Amount of index data to build up in memory before converting to a sorted on-disk file.</p></td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"><p><code>indexBlockSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>4096</code> (4 K)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The size of index data packed per block.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexCacheSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>268435456</code> (256 MB)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum amount of off-heap memory to use to cache index blocks.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexCompression</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>snappy</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The type of compression to apply to the index blocks. Can be snappy or none.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>logCompression</code></p></td><td colspan="
 1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The type of compression to apply to the log records. Can be snappy or none.</p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Caveats</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The LevelDB store does not yet support storing data associated with <a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a>. Those are are stored in a separate non-replicated KahaDB data files. Unexpected results will occur if you use <a shape="rect" href="delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a> with the replicated leveldb store since that data will be not be there when the master fails over to a slave.</p></div></div></
 div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/replicated-message-store.html
==============================================================================
--- websites/production/activemq/content/replicated-message-store.html (original)
+++ websites/production/activemq/content/replicated-message-store.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>If messages are stored on the hard drive of a broker or inside a single database; then you have a single point of failure with respect to the message persistence. If you lose the entire machine, disk or database, you have lost messages.</p>
+<div class="wiki-content maincontent"><p>If messages are stored on the hard drive of a broker or inside a single database; then you have a single point of failure with respect to the message persistence. If you lose the entire machine, disk or database, you have lost messages.</p>
 
 <p>For some high end users, messages should never be lost as they could have a large impact on the business. These kinds of users often require some kind of <a shape="rect" href="dr.html">DR</a> stategy to support message replication so that they can loose an entire data centre and still not loose a message.</p>
 
@@ -98,7 +98,7 @@
 
 <h4 id="ReplicatedMessageStore-UseC-JDBC">Use C-JDBC</h4>
 
-<p>If you don't have or can't afford a clustered database then you could use <a shape="rect" class="external-link" href="http://c-jdbc.objectweb.org/" rel="nofollow">C-JDBC</a> to replicate state across a number of physical datbases to avoid single point of failure and provide a <a shape="rect" href="dr.html">DR</a> solution. As noted above using a replicated JDBC approach is very slow as it requires us to disable the high performance journal.</p>
+<p>If you don't have or can't afford a clustered database then you could use <a shape="rect" class="external-link" href="http://c-jdbc.objectweb.org/" rel="nofollow">C-JDBC</a> to replicate state across a number of physical datbases to avoid single point of failure and provide a <a shape="rect" href="dr.html">DR</a> solution. As noted above using a replicated JDBC approach is very slow as it requires us to disable the high performance journal.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.html
==============================================================================
--- websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.html (original)
+++ websites/production/activemq/content/resource-adapter-does-not-seem-to-pool-connections.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>It may seem like the resource adapter when used in an app server like geronimo or jboss is not pooling connections.  Looking the the ActiveMQ broker logs, it will show multiple message for each use of a pooled conntion simlilar to:</p>
+<div class="wiki-content maincontent"><p>It may seem like the resource adapter when used in an app server like geronimo or jboss is not pooling connections.  Looking the the ActiveMQ broker logs, it will show multiple message for each use of a pooled conntion simlilar to:</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;">
@@ -92,7 +92,7 @@
 
 <p>At first glance it may seem like a new connection is being established..  but if you look at the logs is more detail, you will noticed that the client connection id's are being reused since the connections are being pooled.  This behavior is a side-effect of the connection being reset to a 'cleaned up' state.  It allows the next client to use the connection as if it has just been created.</p>
 
-<p>So these messages are normal, and YES, your jms connections are being pooled!</p>
+<p>So these messages are normal, and YES, your jms connections are being pooled!</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/resource-adapter-properties.html
==============================================================================
--- websites/production/activemq/content/resource-adapter-properties.html (original)
+++ websites/production/activemq/content/resource-adapter-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,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>The ActiveMQ Resource Adapter allows you to configure several properties that:</p>
+<div class="wiki-content maincontent"><p>The ActiveMQ Resource Adapter allows you to configure several properties that:</p>
 <ul><li>sets the options used for connection used for inbound message delivery</li><li>sets the default options used for the outbound connection factory objects.</li></ul>
 
 
@@ -114,7 +114,7 @@
 
 <p>Sets the XML configuration file used to configure the embedded ActiveMQ broker via Spring if using embedded mode. If this property is omitted then no embedded broker is used and you must <a shape="rect" href="run-broker.html">run the broker</a> in a separate process or deployment unit.</p>
 
-<p>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported. </p>
+<p>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported. </p></div>
         </td>
         <td valign="top">
           <div class="navigation">

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

Modified: websites/production/activemq/content/rest-protocols.html
==============================================================================
--- websites/production/activemq/content/rest-protocols.html (original)
+++ websites/production/activemq/content/rest-protocols.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>There are many ways to map JMS to REST...</p>
+<div class="wiki-content maincontent"><p>There are many ways to map JMS to REST...</p>
 
 <h2 id="RESTprotocols-Crappynon-REST">Crappy non-REST</h2>
 
@@ -148,7 +148,7 @@ POST lockNextMessage/consumerId?max=10
 
 
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rest.html
==============================================================================
--- websites/production/activemq/content/rest.html (original)
+++ websites/production/activemq/content/rest.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>ActiveMQ implements a RESTful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p><p>If you are interested in messaging directly from web browsers you might wanna check out our <a shape="rect" href="ajax.html">Ajax</a> or <a shape="rect" href="websockets.html">WebSockets</a> support or try <a shape="rect" href="web-samples.html">running the REST examples</a></p><h2 id="REST-MappingofRESTtoJMS">Mapping of REST to JMS</h2><p>To publish a message use a HTTP POST. To consume a message use HTTP DELETE or GET.</p><p>ActiveMQ has a Servlet that takes care of the integration between HTTP and the ActiveMQ dispatcher.</p><p><span style="color: rgb(255,153,0);">NOTE: The example below requires servlet mapping on the URL. For posting without the servlet mapping, see examples further down.</span></p><p>You can map a URI to the servlet and then use the relative part of the URI as the topic or queue name. e.g. you could HTTP P
 OST to</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>ActiveMQ implements a RESTful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p><p>If you are interested in messaging directly from web browsers you might wanna check out our <a shape="rect" href="ajax.html">Ajax</a> or <a shape="rect" href="websockets.html">WebSockets</a> support or try <a shape="rect" href="web-samples.html">running the REST examples</a></p><h2 id="REST-MappingofRESTtoJMS">Mapping of REST to JMS</h2><p>To publish a message use a HTTP POST. To consume a message use HTTP DELETE or GET.</p><p>ActiveMQ has a Servlet that takes care of the integration between HTTP and the ActiveMQ dispatcher.</p><p><span style="color: rgb(255,153,0);">NOTE: The example below requires servlet mapping on the URL. For posting without the servlet mapping, see examples further down.</span></p><p>You can map a URI to the servlet and then use the relative part of the URI as the topi
 c or queue name. e.g. you could HTTP POST to</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;">http://www.acme.com/orders/input
 </pre>
 </div></div><p>which would publish the contents of the HTTP POST to the orders.input queue on JMS.&#160;</p><p>Similarly you could perform a HTTP DELETE GET on the above URL to read from the same queue. In this case we will map the MessageServlet from ActiveMQ to the URI</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -174,7 +174,7 @@ at org.apache.activemq.web.MessageServle
 ...</pre>
 </div></div><p style="margin-left: 90.0px;">However, one option in this case would be to specify the content type explicitly:</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;">curl -u admin:admin -d "hello world $(date)" -H "Content-Type: text/plain" -XPOST http://localhost:8161/api/message?destination=queue://abc.def</pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/restful-queue.html
==============================================================================
--- websites/production/activemq/content/restful-queue.html (original)
+++ websites/production/activemq/content/restful-queue.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="RESTfulQueue-RESTfulQueue">RESTful Queue</h2>
+<div class="wiki-content maincontent"><h2 id="RESTfulQueue-RESTfulQueue">RESTful Queue</h2>
 
 <p>This document is intended to document the ideal RESTful interface to message queues in light of</p>
 
@@ -275,7 +275,7 @@ DELETE messageUri
 
 
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/retroactive-consumer.html
==============================================================================
--- websites/production/activemq/content/retroactive-consumer.html (original)
+++ websites/production/activemq/content/retroactive-consumer.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="RetroactiveConsumer-Background">Background</h2>
+<div class="wiki-content maincontent"><h2 id="RetroactiveConsumer-Background">Background</h2>
 
 <p>A retroactive consumer is just a regular JMS <strong>Topic</strong> consumer who indicates that at the start of a subscription every attempt should be used to go back in time and send any old messages (or the last message sent on that topic) that the consumer may have missed.</p>
 
@@ -104,7 +104,7 @@ consumer = session.createConsumer(topic)
 
 <p>In the case of topics, when we connect broker A to broker B, broker B will send broker A all the subscriptions that it has received. Since Broker A replicates messages to each subscription, and we want to avoid receiving duplicates at broker B, we can't send broker A more than 1 subscription for the same topic. So our network bridges keep track of the subscriptions sent across and only send the first subscription to a topic. Subsequent subscriptions increment the reference count of the subscription, but the subscription is not actually sent.</p>
 
-<p>This in essence is the problem. If the first subscription to a topic is not retroactive, it is sent B to A, and the B broker will not get the retroactive messages. Then subsequent subscriptions could be (retroactive), but it will not cause retroactive message to sent from broker A to broker B since the subsequent subscription will not be sent to broker A.</p>
+<p>This in essence is the problem. If the first subscription to a topic is not retroactive, it is sent B to A, and the B broker will not get the retroactive messages. Then subsequent subscriptions could be (retroactive), but it will not cause retroactive message to sent from broker A to broker B since the subsequent subscription will not be sent to broker A.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/rss-and-atom.html
==============================================================================
--- websites/production/activemq/content/rss-and-atom.html (original)
+++ websites/production/activemq/content/rss-and-atom.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,6 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
 <p>We have added support for the <a shape="rect" href="rest.html">REST</a>ful browsing of message queues in the <strong>activemq-web</strong> module. To try out this feature try the <a shape="rect" href="web-samples.html">Web Samples</a>.</p>
 
 <p>Browsing of queues is implemented by a servlet, <strong>QueueBrowseServlet</strong> which allows queues to be browsed using pluggable views. The current views supported are</p>
@@ -86,7 +87,7 @@
 
 <h3 id="RSSandAtom-Examples">Examples</h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=xml" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=xml</a> will browse the queue as XML</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0</a> will browse the FOO.BAR queue using RSS 2.0</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3</a> will browse the FOO.BAR queue using Atom</li></ul>
+<ul><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=xml" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=xml</a> will browse the queue as XML</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=rss_2.0</a> will browse the FOO.BAR queue using RSS 2.0</li><li><a shape="rect" class="external-link" href="http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3" rel="nofollow">http://localhost:8080/queueBrowse/FOO/BAR?view=rss&amp;feedType=atom_0.3</a> will browse the FOO.BAR queue using Atom</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/ruby.html
==============================================================================
--- websites/production/activemq/content/ruby.html (original)
+++ websites/production/activemq/content/ruby.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="Ruby-RubySupport">Ruby Support</h2>
+<div class="wiki-content maincontent"><h2 id="Ruby-RubySupport">Ruby Support</h2>
 
 <p>For Ruby support we recommend the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/Ruby" rel="nofollow">Ruby Stomp Client</a></p>
 
@@ -101,7 +101,7 @@ gem install stomp
 
 <h2 id="Ruby-ActiveMessaging">ActiveMessaging</h2>
 
-<p>If you are working with Rails you might want to check out <a shape="rect" class="external-link" href="http://dev.tirsen.com/trac/activemessaging" rel="nofollow">ActiveMessaging</a>.</p>
+<p>If you are working with Rails you might want to check out <a shape="rect" class="external-link" href="http://dev.tirsen.com/trac/activemessaging" rel="nofollow">ActiveMessaging</a>.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/run-broker.html
==============================================================================
--- websites/production/activemq/content/run-broker.html (original)
+++ websites/production/activemq/content/run-broker.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="RunBroker-RunninganActiveMQBroker">Running an ActiveMQ Broker</h1><p>Note if you want to use an <strong>embedded broker</strong> then see <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">How do I embed a Broker inside a Connection</a></p><p>This page describes how to run a broker using 4.x or later of ActiveMQ.</p><h3 id="RunBroker-RunningthebrokerasaUnixService">Running the broker as a Unix Service</h3><p class="confluence-link">See the&#160; <a shape="rect" href="unix-shell-script.html">Unix Shell Script</a> for details.</p><h3 id="RunBroker-RunningthebrokerusingtheJavaServiceWrapperImplementation">Running the broker using the Java Service Wrapper Implementation</h3><p>See the&#160;<a shape="rect" href="java-service-wrapper.html">Java Service Wrapper Page</a> for details.</p><h3 id="RunBroker-Monitoringthebroker">Monitoring the broker</h3><p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your br
 owser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p></div></div><p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p><h3 id="RunBroker-RunningthebrokerinsideaServletEngine">Running the broker inside a Servlet Engine</h3><p>See the source code (or WAR) of the <a shape="rect" href="web-console.html">Web Console</a> for an 
 example of how to run the broker inside a web application using Spring.</p><h3 id="RunBroker-RunningthebrokerinsideyourJ2EE1.4ApplicationServer">Running the broker inside your J2EE 1.4 Application Server</h3><p>Whether its Apache Geronmio, JBoss 4, WebLogic 9 or some other J2EE 1.4 container you should be able to just reconfigure and then deploy the activemq-*.rar which is included in the binary distribution as a deployment unit in your app server. By default the rar is not configured to start an embedded broker. But by setting the brokerXmlConfig on the resource adapter configuration, the resource adapter will start an embedded broker.</p><p>For more details see <a shape="rect" href="j2ee.html">J2EE</a></p><h3 id="RunBroker-Runningthebrokerfromthesourcecode">Running the broker from the source code</h3><p>From the latest <a shape="rect" href="source.html">checkout</a> of the code you can run a broker using the <a shape="rect" href="activemq-performance-module-users-manual.html">Acti
 veMQ Performance Plugin</a></p><h3 id="RunBroker-Runningthebrokerfrommaven">Running the broker from maven</h3><p>You can download and install the ActiveMQ Startup Maven Plugin via the following command if you are in a directory with a pom.xml. More detailed usage <a shape="rect" href="maven2-activemq-broker-plugin.html">here</a></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h1 id="RunBroker-RunninganActiveMQBroker">Running an ActiveMQ Broker</h1><p>Note if you want to use an <strong>embedded broker</strong> then see <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">How do I embed a Broker inside a Connection</a></p><p>This page describes how to run a broker using 4.x or later of ActiveMQ.</p><h3 id="RunBroker-RunningthebrokerasaUnixService">Running the broker as a Unix Service</h3><p class="confluence-link">See the&#160; <a shape="rect" href="unix-shell-script.html">Unix Shell Script</a> for details.</p><h3 id="RunBroker-RunningthebrokerusingtheJavaServiceWrapperImplementation">Running the broker using the Java Service Wrapper Implementation</h3><p>See the&#160;<a shape="rect" href="java-service-wrapper.html">Java Service Wrapper Page</a> for details.</p><h3 id="RunBroker-Monitoringthebroker">Monitoring the broker</h3><p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.htm
 l">Web Console</a> by pointing your browser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p></div></div><p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p><h3 id="RunBroker-RunningthebrokerinsideaServletEngine">Running the broker inside a Servlet Engine</h3><p>See the source code (or WAR) of the <a shape="rect" href="web
 -console.html">Web Console</a> for an example of how to run the broker inside a web application using Spring.</p><h3 id="RunBroker-RunningthebrokerinsideyourJ2EE1.4ApplicationServer">Running the broker inside your J2EE 1.4 Application Server</h3><p>Whether its Apache Geronmio, JBoss 4, WebLogic 9 or some other J2EE 1.4 container you should be able to just reconfigure and then deploy the activemq-*.rar which is included in the binary distribution as a deployment unit in your app server. By default the rar is not configured to start an embedded broker. But by setting the brokerXmlConfig on the resource adapter configuration, the resource adapter will start an embedded broker.</p><p>For more details see <a shape="rect" href="j2ee.html">J2EE</a></p><h3 id="RunBroker-Runningthebrokerfromthesourcecode">Running the broker from the source code</h3><p>From the latest <a shape="rect" href="source.html">checkout</a> of the code you can run a broker using the <a shape="rect" href="activemq-perf
 ormance-module-users-manual.html">ActiveMQ Performance Plugin</a></p><h3 id="RunBroker-Runningthebrokerfrommaven">Running the broker from maven</h3><p>You can download and install the ActiveMQ Startup Maven Plugin via the following command if you are in a directory with a pom.xml. More detailed usage <a shape="rect" href="maven2-activemq-broker-plugin.html">here</a></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;">mvn org.apache.activemq.tooling:maven-activemq-plugin:5.0-SNAPSHOT:run
 </pre>
 </div></div><p>You can also include it the pom and run it using:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -90,7 +90,7 @@
 </div></div><h2 id="RunBroker-HandlingJMSbrokersgoingdown">Handling JMS brokers going down</h2><p>A common requirement is that if the JMS broker goes down you want to automatically detect the failure and try to reconnect under the covers so that your application does not have to worry about reconnection.</p><p>There is detailed documentation on this in <a shape="rect" href="configuring-transports.html">Configuring Transports</a>; briefly...</p><p>Just change your connection URI in 4.x to</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;">failover:tcp://host:port
 </pre>
-</div></div><p>And the JMS client will auto-reconnect to the broker if it is shutdown and restarted later on.</p>
+</div></div><p>And the JMS client will auto-reconnect to the broker if it is shutdown and restarted later on.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/runtime-configuration.html
==============================================================================
--- websites/production/activemq/content/runtime-configuration.html (original)
+++ websites/production/activemq/content/runtime-configuration.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>From version 5.9.0 a new broker plugin will allow selective changes to a broker xml configuration to take effect without broker restart.<br clear="none">
+<div class="wiki-content maincontent"><p>From version 5.9.0 a new broker plugin will allow selective changes to a broker xml configuration to take effect without broker restart.<br clear="none">
 Consider a retail environment where there are central processors (hubs) and stores(spokes). It is advantageous to be able to add a new store<br clear="none">
 without any down time.<br clear="none">
 The addition of a new store could entail a new network connector and some new authorization policies, both of which can now be modified on the fly.</p>
@@ -107,7 +107,7 @@ If checkPeriod is 0 (default) there is n
 
 
 
-<p>Some more implementation detail and links to the tests can be found in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4682">AMQ-4682</a></p>
+<p>Some more implementation detail and links to the tests can be found in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4682">AMQ-4682</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sample-camel-routes.html
==============================================================================
--- websites/production/activemq/content/sample-camel-routes.html (original)
+++ websites/production/activemq/content/sample-camel-routes.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="SampleCamelRoutes-ExampleofaconfigurationthatshowhowtouseCamelrouteswithJuelandXpath.">Example of a configuration that show how to use Camel routes with Juel and Xpath.</h3>
+<div class="wiki-content maincontent"><h3 id="SampleCamelRoutes-ExampleofaconfigurationthatshowhowtouseCamelrouteswithJuelandXpath.">Example of a configuration that show how to use Camel routes with Juel and Xpath.</h3>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
@@ -222,7 +222,7 @@
     &lt;/camelContext&gt;
 &lt;/beans&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/sample-report.html
==============================================================================
--- websites/production/activemq/content/sample-report.html (original)
+++ websites/production/activemq/content/sample-report.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="samplereport-PerformanceTestReportTemplate">Performance Test Report Template</h2>
+<div class="wiki-content maincontent"><h2 id="samplereport-PerformanceTestReportTemplate">Performance Test Report Template</h2>
 
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>&lt;testResult&gt;
@@ -143,7 +143,7 @@
   &lt;/property&gt;
 &lt;/testResult&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

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



Mime
View raw message