activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r956584 [35/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/verify-downloads.html
==============================================================================
--- websites/production/activemq/content/verify-downloads.html (original)
+++ websites/production/activemq/content/verify-downloads.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="VerifyDownloads-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h2 id="VerifyDownloads-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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;">$ pgpk -a KEYS
 $ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
 </pre>
@@ -93,7 +93,7 @@ $ pgp apache-activemq-&lt;version&gt;-bi
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ gpg --import KEYS
 $ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
 </pre>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul>
+</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-examples.html
==============================================================================
--- websites/production/activemq/content/version-5-examples.html (original)
+++ websites/production/activemq/content/version-5-examples.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>Since version<strong> 5.12.0</strong>, Apache ActiveMQ comes with the new tool that can be used to produce and consume messages from the broker.</p><h2 id="Version5Examples-Prerequisites"><span style="color: rgb(34,34,34);">Prerequisites</span></h2><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>Before running the examples you should try&#160;<a shape="rect" href="run-broker.html">running a JMS broker</a>&#160;on your machine. Follow the&#160;<a shape="rect" href="installation.html">Installation</a>&#160;instructions to use a binary distribution of ActiveMQ. To run the broker in a command shell, type:</p><p><span style="color: rgb(34,34,34);">&#160;</span></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>Since version<strong> 5.12.0</strong>, Apache ActiveMQ comes with the new tool that can be used to produce and consume messages from the broker.</p><h2 id="Version5Examples-Prerequisites"><span style="color: rgb(34,34,34);">Prerequisites</span></h2><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>Before running the examples you should try&#160;<a shape="rect" href="run-broker.html">running a JMS broker</a>&#160;on your machine. Follow the&#160;<a shape="rect" href="installation.html">Installation</a>&#160;instructions to use a binary distribution of ActiveMQ. To run the broker in a command shell, type:</p><p><span style="color: rgb(34,34,34);">&#160;</span></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;">bin/activemq console
 </pre>
 </div></div><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>This starts up ActiveMQ.</p><h2 id="Version5Examples-Running">Running</h2><p>From the<a shape="rect" href="unix-shell-script.html"> command line</a> you can run</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -113,7 +113,7 @@ activemq:consumer</pre>
 </div></div><h2 id="Version5Examples-Oldexamples">Old examples</h2><p>In older versions of ActiveMQ, the corresponding examples were located in <code>examples/</code> or&#160;<code>examples/openwire/swissarmy/</code> directories, where you can do the similar tasks with an ant script.</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;">ant producer
 ant consumer</pre>
-</div></div><h2 id="Version5Examples-Otherexamples">Other examples</h2><p>In <code>examples/</code> directory (depending on the version) you can find more examples of using the broker with variety of protocols (mqtt, amqp, ...) and clients (Java, Ruby, JavaScript, ...), so it's the good place to start learning. Also, <code>examples/conf/</code> directory contains a lot of different configuration examples that you can use as a starting point for your deployment.</p><h2 id="Version5Examples-SeeAlso">See Also</h2><ul><li><a shape="rect" href="web-samples.html">Web Samples</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a shape="rect" href="jmx.html">JMX</a></li></ul>
+</div></div><h2 id="Version5Examples-Otherexamples">Other examples</h2><p>In <code>examples/</code> directory (depending on the version) you can find more examples of using the broker with variety of protocols (mqtt, amqp, ...) and clients (Java, Ruby, JavaScript, ...), so it's the good place to start learning. Also, <code>examples/conf/</code> directory contains a lot of different configuration examples that you can use as a starting point for your deployment.</p><h2 id="Version5Examples-SeeAlso">See Also</h2><ul><li><a shape="rect" href="web-samples.html">Web Samples</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a shape="rect" href="jmx.html">JMX</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-getting-started.html
==============================================================================
--- websites/production/activemq/content/version-5-getting-started.html (original)
+++ websites/production/activemq/content/version-5-getting-started.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="Version5GettingStarted-Introduction">Introduction</h2>
+<div class="wiki-content maincontent"><h2 id="Version5GettingStarted-Introduction">Introduction</h2>
 
 <p>This document describes how to install and configure ActiveMQ for both Unix and Windows' platforms.</p>
 
@@ -464,7 +464,7 @@ bin/activemq start xbean:examples/conf/a
 
 <h2 id="Version5GettingStarted-AdditionalResources">Additional Resources</h2>
 
-<p>If you are new to using ActiveMQ, running the <a shape="rect" href="web-samples.html">Web Samples</a> or the <a shape="rect" href="examples.html">Examples</a> is a good next step to learn more about ActiveMQ.</p>
+<p>If you are new to using ActiveMQ, running the <a shape="rect" href="web-samples.html">Web Samples</a> or the <a shape="rect" href="examples.html">Examples</a> is a good next step to learn more about ActiveMQ.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-hello-world.html
==============================================================================
--- websites/production/activemq/content/version-5-hello-world.html (original)
+++ websites/production/activemq/content/version-5-hello-world.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%">
-The following is a very simple JMS application with multiple, concurrent, consumers and producers.  See the <a shape="rect" href="initial-configuration.html">Initial Configuration</a> guide for details on how to setup your classpath correctly.
+<div class="wiki-content maincontent">The following is a very simple JMS application with multiple, concurrent, consumers and producers.  See the <a shape="rect" href="initial-configuration.html">Initial Configuration</a> guide for details on how to setup your classpath correctly.
 
 <p>Things you might do after running this example:</p>
 <ul class="alternate"><li><a shape="rect" href="run-broker.html">Setup a broker</a> instead of using the org.activemq.broker.impl.Main class directly</li><li>Use JNDI to lookup a javax.jms.ConnectionFactory rather than creating ActiveMQConnectionFactory directly.</li><li>Implement the javax.jms.MessageListener interface rather than calling consumer.receive()</li><li>Use transactional sessions</li><li>Use a Topic rather than a queue</li></ul>
@@ -232,7 +232,7 @@ public class App {
     }
 }
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-initial-configuration.html
==============================================================================
--- websites/production/activemq/content/version-5-initial-configuration.html (original)
+++ websites/production/activemq/content/version-5-initial-configuration.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="Version5InitialConfiguration-InitialConfiguration">Initial Configuration</h1><h2 id="Version5InitialConfiguration-DocumentOrganization">Document Organization</h2><ul><li><a shape="rect" href="version-5-initial-configuration.html">#Required JARs</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Optional JARS</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Persistence Support</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Next steps</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Additional Resources</a><ul><li><a shape="rect" href="version-5-initial-configuration.html">#Related Reading</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Specifications</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Related open source projects</a></li></ul></li></ul><p>Firstly you need to add the jars to your classpath.</p><h2 id="Version5InitialConf
 iguration-RequiredJARs">Required JARs</h2><p>To make ActiveMQ easy to use, the default <strong>activemq-all.jar</strong> comes complete with all the libraries required. If you prefer to have explicit control over all the jars used by ActiveMQ here is the full list of individual jars required</p><ul><li>activemq-broker.jar</li><li>activemq-client.jar</li><li>activemq-kahadb-store.jar</li><li>activemq-spring.jar</li><li>slf4j-api.jar</li><li>slf4j-log4j12.jar</li><li>log4j-1.2.17.jar</li><li>J2EE APIs which could be the j2ee.jar from Sun or your J2EE container or you could use Geronimo's freely distributable geronimo-spec-j2ee.jar. If you are inside a servlet container and being dependent on the j2ee.jar causes you troubles, the parts of the J2EE jar we are dependent on are as follows...<ul><li>geronimo-spec-jms.jar</li><li>geronimo-spec-jta.jar</li><li>geronimo-spec-j2ee-management.jar</li></ul></li></ul><p>If you want to grab a J2EE specification jar we recommend the Apache <a shape
 ="rect" class="external-link" href="http://cvs.apache.org/repository/geronimo-spec/jars/">repository</a></p><h2 id="Version5InitialConfiguration-OptionalJARS">Optional JARS</h2><ul><li>spring.jar - if you wish to use the XML configuration file for configuring the Message Broker</li></ul><ul><li>if you wish to use message persistence then you need to add a persistent jar to your classpath (see below). If you just want a lightweight message bus with no durability you can leave this step out but we highly recommend persistence for production deployments.</li></ul><h2 id="Version5InitialConfiguration-PersistenceSupport">Persistence Support</h2><p>The default persistence is the <a shape="rect" href="amq-message-store.html">AMQ Message Store</a>. We do still support persistence via <a shape="rect" href="persistence.html">JDBC and a high performance journal</a>. For full explict control over configuration check out the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>.</p
 ><p>If you're just doing some testing or in-VM SEDA based messaging you may wish to disable persistence. You can use the <a shape="rect" href="xml-configuration.html">Xml Configuration</a> for this.</p><p>You can do this by setting the usePersistence property to false either in the <a shape="rect" href="xml-configuration.html">Xml Configuration</a> or on the <a shape="rect" href="configuring-transports.html">broker URL</a>.</p><h2 id="Version5InitialConfiguration-Nextsteps">Next steps</h2><p>One of the first things you might want to do is <a shape="rect" href="run-broker.html">start a broker</a>. Once you have a broker running you could try using the <a shape="rect" href="jndi-support.html">JNDI Support</a> which shows how to run an example JMS program. Or there are some other <a shape="rect" href="examples.html">example programs</a></p><p>If you don't want to use JNDI you can just instantiate an <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/
 org/apache/activemq/ActiveMQConnectionFactory.html" rel="nofollow">ActiveMQConnectionFactory</a>, configure its properties directly and then you're ready to use the standard JMS API to create Connections, Sessions, MessageProducer and MessageConsumer instances.</p><h2 id="Version5InitialConfiguration-AdditionalResources">Additional Resources</h2><h3 id="Version5InitialConfiguration-RelatedReading">Related Reading</h3><ul><li>Sun's <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/tutorial/" rel="nofollow">JMS Tutorial</a> is a handy place to start looking at how to use the JMS API directly</li><li>The ActiveMQ <a shape="rect" class="external-link" href="http://activemq.org" rel="nofollow">Website</a> for specifics on how to use ActiveMQ</li><li><a shape="rect" href="topologies.html">ActiveMQ Topologies</a></li><li><a shape="rect" href="clustering.html">ActiveMQ Clustering</a></li><li><a shape="rect" href="networks-of-brokers.html">ActiveMQ Network of Broke
 rs</a></li><li><a shape="rect" class="external-link" href="http://www.eecs.harvard.edu/~mdw/proj/seda/" rel="nofollow">Staged Event Driven Architecture (SEDA)</a></li></ul><h3 id="Version5InitialConfiguration-Specifications">Specifications</h3><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">Java Connector Architecture 1.5</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/products/jms/index.jsp" rel="nofollow">Java Messaging Service</a></li><li><a shape="rect" class="external-link" href="http://ws.apache.org/wsif/">WSIF</a></li><li><a shape="rect" class="external-link" href="http://www-128.ibm.com/developerworks/webservices/library/specification/ws-notification/" rel="nofollow">WS-Notification</a></li></ul><h3 id="Version5InitialConfiguration-Relatedopensourceprojects">Related open source projects</h3><ul><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a></l
 i><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes JMS</a></li><li><a shape="rect" class="external-link" href="http://jencks.org/" rel="nofollow">Jencks</a> is a Spring JCA container allowing you to use connection &amp; thread &amp; POJO pooling for consuming JMS in highly concurrent servers</li><li><a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a> is a Spring/POJO remoting layer for JMS. It allows you to reuse all the power of JMS from your POJOs without using any of the JMS APIs directly</li><li><a shape="rect" class="external-link" href="http://www.springframework.org/" rel="nofollow">Spring</a></li><li><a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> is an open wire protocol (similar to HTTP) for communicating with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, Ruby etc.</li><li><a shape="rect" class
 ="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul>
+<div class="wiki-content maincontent"><h1 id="Version5InitialConfiguration-InitialConfiguration">Initial Configuration</h1><h2 id="Version5InitialConfiguration-DocumentOrganization">Document Organization</h2><ul><li><a shape="rect" href="version-5-initial-configuration.html">#Required JARs</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Optional JARS</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Persistence Support</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Next steps</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Additional Resources</a><ul><li><a shape="rect" href="version-5-initial-configuration.html">#Related Reading</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Specifications</a></li><li><a shape="rect" href="version-5-initial-configuration.html">#Related open source projects</a></li></ul></li></ul><p>Firstly you need to add the jars to your cla
 sspath.</p><h2 id="Version5InitialConfiguration-RequiredJARs">Required JARs</h2><p>To make ActiveMQ easy to use, the default <strong>activemq-all.jar</strong> comes complete with all the libraries required. If you prefer to have explicit control over all the jars used by ActiveMQ here is the full list of individual jars required</p><ul><li>activemq-broker.jar</li><li>activemq-client.jar</li><li>activemq-kahadb-store.jar</li><li>activemq-spring.jar</li><li>slf4j-api.jar</li><li>slf4j-log4j12.jar</li><li>log4j-1.2.17.jar</li><li>J2EE APIs which could be the j2ee.jar from Sun or your J2EE container or you could use Geronimo's freely distributable geronimo-spec-j2ee.jar. If you are inside a servlet container and being dependent on the j2ee.jar causes you troubles, the parts of the J2EE jar we are dependent on are as follows...<ul><li>geronimo-spec-jms.jar</li><li>geronimo-spec-jta.jar</li><li>geronimo-spec-j2ee-management.jar</li></ul></li></ul><p>If you want to grab a J2EE specificatio
 n jar we recommend the Apache <a shape="rect" class="external-link" href="http://cvs.apache.org/repository/geronimo-spec/jars/">repository</a></p><h2 id="Version5InitialConfiguration-OptionalJARS">Optional JARS</h2><ul><li>spring.jar - if you wish to use the XML configuration file for configuring the Message Broker</li></ul><ul><li>if you wish to use message persistence then you need to add a persistent jar to your classpath (see below). If you just want a lightweight message bus with no durability you can leave this step out but we highly recommend persistence for production deployments.</li></ul><h2 id="Version5InitialConfiguration-PersistenceSupport">Persistence Support</h2><p>The default persistence is the <a shape="rect" href="amq-message-store.html">AMQ Message Store</a>. We do still support persistence via <a shape="rect" href="persistence.html">JDBC and a high performance journal</a>. For full explict control over configuration check out the <a shape="rect" href="xml-configu
 ration.html">Xml Configuration</a>.</p><p>If you're just doing some testing or in-VM SEDA based messaging you may wish to disable persistence. You can use the <a shape="rect" href="xml-configuration.html">Xml Configuration</a> for this.</p><p>You can do this by setting the usePersistence property to false either in the <a shape="rect" href="xml-configuration.html">Xml Configuration</a> or on the <a shape="rect" href="configuring-transports.html">broker URL</a>.</p><h2 id="Version5InitialConfiguration-Nextsteps">Next steps</h2><p>One of the first things you might want to do is <a shape="rect" href="run-broker.html">start a broker</a>. Once you have a broker running you could try using the <a shape="rect" href="jndi-support.html">JNDI Support</a> which shows how to run an example JMS program. Or there are some other <a shape="rect" href="examples.html">example programs</a></p><p>If you don't want to use JNDI you can just instantiate an <a shape="rect" class="external-link" href="http:
 //activemq.codehaus.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html" rel="nofollow">ActiveMQConnectionFactory</a>, configure its properties directly and then you're ready to use the standard JMS API to create Connections, Sessions, MessageProducer and MessageConsumer instances.</p><h2 id="Version5InitialConfiguration-AdditionalResources">Additional Resources</h2><h3 id="Version5InitialConfiguration-RelatedReading">Related Reading</h3><ul><li>Sun's <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/tutorial/" rel="nofollow">JMS Tutorial</a> is a handy place to start looking at how to use the JMS API directly</li><li>The ActiveMQ <a shape="rect" class="external-link" href="http://activemq.org" rel="nofollow">Website</a> for specifics on how to use ActiveMQ</li><li><a shape="rect" href="topologies.html">ActiveMQ Topologies</a></li><li><a shape="rect" href="clustering.html">ActiveMQ Clustering</a></li><li><a shape="rect" href="networks-of-b
 rokers.html">ActiveMQ Network of Brokers</a></li><li><a shape="rect" class="external-link" href="http://www.eecs.harvard.edu/~mdw/proj/seda/" rel="nofollow">Staged Event Driven Architecture (SEDA)</a></li></ul><h3 id="Version5InitialConfiguration-Specifications">Specifications</h3><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">Java Connector Architecture 1.5</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/products/jms/index.jsp" rel="nofollow">Java Messaging Service</a></li><li><a shape="rect" class="external-link" href="http://ws.apache.org/wsif/">WSIF</a></li><li><a shape="rect" class="external-link" href="http://www-128.ibm.com/developerworks/webservices/library/specification/ws-notification/" rel="nofollow">WS-Notification</a></li></ul><h3 id="Version5InitialConfiguration-Relatedopensourceprojects">Related open source projects</h3><ul><li><a shape="rect" class="external-link" href="http://geroni
 mo.apache.org/">Apache Geronimo</a></li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/" rel="nofollow">Hermes JMS</a></li><li><a shape="rect" class="external-link" href="http://jencks.org/" rel="nofollow">Jencks</a> is a Spring JCA container allowing you to use connection &amp; thread &amp; POJO pooling for consuming JMS in highly concurrent servers</li><li><a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a> is a Spring/POJO remoting layer for JMS. It allows you to reuse all the power of JMS from your POJOs without using any of the JMS APIs directly</li><li><a shape="rect" class="external-link" href="http://www.springframework.org/" rel="nofollow">Spring</a></li><li><a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> is an open wire protocol (similar to HTTP) for communicating with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, R
 uby etc.</li><li><a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-installation.html
==============================================================================
--- websites/production/activemq/content/version-5-installation.html (original)
+++ websites/production/activemq/content/version-5-installation.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="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div>
+<div class="wiki-content maincontent"><div class="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-performance-tuning.html
==============================================================================
--- websites/production/activemq/content/version-5-performance-tuning.html (original)
+++ websites/production/activemq/content/version-5-performance-tuning.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>For a more complete overview see <a shape="rect" href="performance.html">Performance</a>.</p>
+<div class="wiki-content maincontent"><p>For a more complete overview see <a shape="rect" href="performance.html">Performance</a>.</p>
 
 <p>There are trade-offs between performance and reliabilty. <br clear="none">
 By default, activemq strikes a balance between the two, so there are some things you can change to increase throughput.</p>
@@ -109,7 +109,7 @@ By default, activemq strikes a balance b
 <h2 id="Version5PerformanceTuning-FilebasedPersistence">File based Persistence</h2>
 
 <p>The default persistence store is the <a shape="rect" href="amq-message-store.html">AMQ Message Store</a></p>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-run-broker.html
==============================================================================
--- websites/production/activemq/content/version-5-run-broker.html (original)
+++ websites/production/activemq/content/version-5-run-broker.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="Version5RunBroker-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>The <a shape="rect" href="download.html">binary distribution</a> of ActiveMQ comes with a script called 'activemq' which allows you to run a broker. <br clear="none">For details regarding the activemq init script file review&#160; <a shape="rect" href="unix-shell-script.html">Unix Shell Script</a>&#160; and&#160; <a shape="rect" href="activemq-command-line-tools-reference.html">ActiveMQ Command Line Tools Reference</a></p><p>&#160;</p><p>Typing the following will run an ActiveMQ Broker using the out of the box configuration in the foreground</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><h1 id="Version5RunBroker-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>The <a shape="rect" href="download.html">binary distribution</a> of ActiveMQ comes with a script called 'activemq' which allows you to run a broker. <br clear="none">For details regarding the activemq init script file review&#160; <a shape="rect" href="unix-shell-script.html">Unix Shell Script</a>&#160; and&#160; <a shape="rect" href="activemq-command-line-tools-reference.html">ActiveMQ Command Line Tools Reference</a></p><p>&#160;</p><p>Typing the following will run an ActiveMQ Broker using the out of the box configuration in the foreground</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">bin/activemq console
 </pre>
 </div></div><p>You can then use a <a shape="rect" href="broker-configuration-uri.html">Broker Configuration URI</a> to specify how to start and configure your broker using a single URI. For example</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -102,7 +102,7 @@
 </div></div><h2 id="Version5RunBroker-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-version-5-transports.html">Configuring Version 5 Transports</a>; briefly...</p><p>Just change your connection URI i 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/version-5-topologies.html
==============================================================================
--- websites/production/activemq/content/version-5-topologies.html (original)
+++ websites/production/activemq/content/version-5-topologies.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="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div>
+<div class="wiki-content maincontent"><div class="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-web-samples.html
==============================================================================
--- websites/production/activemq/content/version-5-web-samples.html (original)
+++ websites/production/activemq/content/version-5-web-samples.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>There are a few example programs demonstrating the <a shape="rect" href="rest.html">REST</a> messaging or <a shape="rect" href="ajax.html">Ajax</a> in the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/">activemq/activemq-web-demo</a> module. </p>
+<div class="wiki-content maincontent"><p>There are a few example programs demonstrating the <a shape="rect" href="rest.html">REST</a> messaging or <a shape="rect" href="ajax.html">Ajax</a> in the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/">activemq/activemq-web-demo</a> module. </p>
 
 <h2 id="Version5WebSamples-RunningtheWebSamples">Running the Web Samples</h2>
 
@@ -81,7 +81,7 @@
 <p>The steps to running the Web Samples are</p>
 
 <ul><li><a shape="rect" href="download.html">Download</a> a binary distribution</li><li><a shape="rect" href="run-broker.html">Run the Message Broker</a> e.g. by running bin/activemq</li><li>point your browser to <a shape="rect" class="external-link" href="http://localhost:8161/demo" rel="nofollow">http://localhost:8161/demo</a></li></ul>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/version-5-xml-configuration.html
==============================================================================
--- websites/production/activemq/content/version-5-xml-configuration.html (original)
+++ websites/production/activemq/content/version-5-xml-configuration.html Wed Jul  1 20:13:48 2015
@@ -62,7 +62,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -83,8 +83,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-transport connectors which consist of transport channels and wire formats TODO: add a link to a page explaining what transport connectors are how to configure and use them.
-	<ul><li>network connectors using network channels or discovery TODO: add a link to a page explaining what network connectors are how to configure and use them.</li><li>discovery agents TODO: add a link to a page explaining what discovery agents are how to configure and use them.</li><li>persistence providers &amp; locations TODO: add a link to a page explaining what persistence providers are how to configure and use them.</li><li>custom message containers (such as last image caching etc)</li></ul>
+<div class="wiki-content maincontent"><ul><li>transport connectors which consist of transport channels and wire formats TODO: add a link to a page explaining what transport connectors are how to configure and use them.</li><li>network connectors using network channels or discovery TODO: add a link to a page explaining what network connectors are how to configure and use them.</li><li>discovery agents TODO: add a link to a page explaining what discovery agents are how to configure and use them.</li><li>persistence providers &amp; locations TODO: add a link to a page explaining what persistence providers are how to configure and use them.</li><li>custom message containers (such as last image caching etc)</li></ul>
 
 
 <p>We use <a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> to perform the XML configuration.</p>
@@ -269,7 +268,7 @@ Or of you want to explicitly configure t
 
 <p>So we use the <a shape="rect" class="external-link" href="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html#beans-basics" rel="nofollow">Spring XML</a> configuration file format, which allows any beans / POJOs to be wired together and configured. However often Spring's XML can be kinda verbose at times, so we have implemented an ActiveMQ extension to the Spring XML which knows about the common, standard ActiveMQ things you're likely to do (e.g. tags like connector, wireFormat, serverTransport, persistence) - but at any time you can fall back to the normal Spring way of doing things (with tags like bean, property etc).</p>
 
-<p>To see documentation of the XML file we use or to get access to the XSD/DTD see the <a shape="rect" href="xml-reference.html">Xml Reference</a></p>
+<p>To see documentation of the XML file we use or to get access to the XSD/DTD see the <a shape="rect" href="xml-reference.html">Xml Reference</a></p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/virtual-destinations.html
==============================================================================
--- websites/production/activemq/content/virtual-destinations.html (original)
+++ websites/production/activemq/content/virtual-destinations.html Wed Jul  1 20:13:48 2015
@@ -62,7 +62,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -83,7 +83,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p><em>Virtual Destinations</em> allow us to create logical destinations that clients can use to produce and consume from but which map onto one or more <em>physical destinations</em>. It allows us to provide more flexible loosely coupled messaging configurations.</p>
+<div class="wiki-content maincontent"><p><em>Virtual Destinations</em> allow us to create logical destinations that clients can use to produce and consume from but which map onto one or more <em>physical destinations</em>. It allows us to provide more flexible loosely coupled messaging configurations.</p>
 
 <h2 id="VirtualDestinations-VirtualTopics">Virtual Topics</h2>
 
@@ -253,7 +253,7 @@
       &lt;/networkConnector&gt;
     &lt;/networkConnectors&gt;
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/visualisation-wish-list.html
==============================================================================
--- websites/production/activemq/content/visualisation-wish-list.html (original)
+++ websites/production/activemq/content/visualisation-wish-list.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>There are a zillion different things we could do to visualise the system. Lets use this page to braindump ideas for what kinds of visualisations we could do</p>
+<div class="wiki-content maincontent"><p>There are a zillion different things we could do to visualise the system. Lets use this page to braindump ideas for what kinds of visualisations we could do</p>
 
-<ul><li>show visually the popularity of certain destinations; using size/color/position/stats to indicate hot areas of the system</li><li>visually show the queue sizes &amp; stats?</li><li>could we link the nodes somehow to some web page or something?</li></ul>
+<ul><li>show visually the popularity of certain destinations; using size/color/position/stats to indicate hot areas of the system</li><li>visually show the queue sizes &amp; stats?</li><li>could we link the nodes somehow to some web page or something?</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/visualisation.html
==============================================================================
--- websites/production/activemq/content/visualisation.html (original)
+++ websites/production/activemq/content/visualisation.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>Inspired greatly by <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/talks.html" rel="nofollow">Gregor and Erik's great talk at TSSJS 2006</a> we've started to add some visualisation plugins into Apache ActiveMQ.</p>
+<div class="wiki-content maincontent"><p>Inspired greatly by <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/talks.html" rel="nofollow">Gregor and Erik's great talk at TSSJS 2006</a> we've started to add some visualisation plugins into Apache ActiveMQ.</p>
 
 <h3 id="Visualisation-Connectionvisualisation">Connection visualisation</h3>
 
@@ -98,7 +98,7 @@
 
 <h1 id="Visualisation-ExternalOpenSourceTools">External Open Source Tools</h1>
 
-<ul><li><a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawtio</a> is an open source HTML5 web application for working with Apache ActiveMQ and Apache Camel. It lets you create topics/queues, browse queues or send messages to destinations as well as visualising Camel routes and working with Camel endpoints along with viewing logs and metric charting etc.</li><li><a shape="rect" class="external-link" href="https://github.com/fusesource/fuseide" rel="nofollow">Fuse IDE</a> is an open source set of eclipse plugins for working with Apache ActiveMQ and Apache Camel. Its got tooling for runtime browsing of queues, creating topics/queues. You can drag and drop messages to/from ActiveMQ destinations and Camel endpoints</li></ul>
+<ul><li><a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawtio</a> is an open source HTML5 web application for working with Apache ActiveMQ and Apache Camel. It lets you create topics/queues, browse queues or send messages to destinations as well as visualising Camel routes and working with Camel endpoints along with viewing logs and metric charting etc.</li><li><a shape="rect" class="external-link" href="https://github.com/fusesource/fuseide" rel="nofollow">Fuse IDE</a> is an open source set of eclipse plugins for working with Apache ActiveMQ and Apache Camel. Its got tooling for runtime browsing of queues, creating topics/queues. You can drag and drop messages to/from ActiveMQ destinations and Camel endpoints</li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/vm-protocol.html
==============================================================================
--- websites/production/activemq/content/vm-protocol.html (original)
+++ websites/production/activemq/content/vm-protocol.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>Protocol syntax : vm://logicalname</p>
 
 <p>Javadocs : <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/codehaus/activemq/transport/vm/package-frame.html" rel="nofollow">org.codehaus.activemq.transport.vm</a></p>
@@ -83,7 +84,7 @@
 <ol><li>In a well designed J2EE application server (from a production point of view), you typically have a classloader hierarchy that allows to run EARs and WARs in perfect isolation between each other and from the third-party libraries used by the server internals. If you have clients located in different, isolated classloader hierarchies then a shared reference  will lead to a ClassCastException. Thus it <strong>must</strong> be serialized..</li><li>If you were to send an object by reference, it would be wrapped by an <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/ObjectMessage.html" rel="nofollow">ObjectMessage</a>. Nothing would then prevent you from modifying the object further before sending it. That may sound like it is not a problem but the TCK tests exactly for that, meaning that your JMS implementation would not be J2EE-compliant. Therefore the object <strong>must</strong> be serialized.</li></ol>
 
 
-<p>If intra-vm JMS performance were an issue when sending messages in your application, and that you know your messaging boundaries are constrained in your classloader scope, then you could perfectly think of superfast vm protocol that would send messages by reference. This currently does not exist within ActiveMQ for the reasons stated above.</p>
+<p>If intra-vm JMS performance were an issue when sending messages in your application, and that you know your messaging boundaries are constrained in your classloader scope, then you could perfectly think of superfast vm protocol that would send messages by reference. This currently does not exist within ActiveMQ for the reasons stated above.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/vm-transport-reference.html
==============================================================================
--- websites/production/activemq/content/vm-transport-reference.html (original)
+++ websites/production/activemq/content/vm-transport-reference.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="VMTransportReference-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead of the network communication. The connection used is not a socket connection but use direct method invocations which enables a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><h4 id="VMTransportReference-SimpleBrokerConfigurationSyntax">Simple Broker Configuration Syntax</h4><p>This is the normal syntax for a VM connection. It's simple, but provides only a limited amount of configuration of the embedded broker.</p><p><strong>vm://brokerName?transportOptions</strong></p><p>If you want to connect to an already instantiated, embedded broker (e.g. as in case the case of Apache ServiceMix), make
  sure the brokerName used in the <strong>vm://brokerName</strong> url matches the brokerName of the already running broker.</p><h5 id="VMTransportReference-TransportOptions">Transport Options</h5><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>marshal</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, forces each command sent over the transport to be marshalled and unmarshalled using a WireFormat</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name
  of the WireFormat to use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>All the properties with this prefix are used to configure the wireFormat</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>create</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If the broker should be created on demand if it does not already exist.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>waitForStart</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If &gt; 0, indicates the timeout in milliseconds to wait for a broker to start. Values -1 and 0 mean don't wait. Only supported in ActiveMQ 5.2+</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">
 <p>broker.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>All the properties with this prefix are used to configure the broker. See <a shape="rect" href="configuring-wire-formats.html">Configuring Wire Formats</a> for more information</p></td></tr></tbody></table></div><h5 id="VMTransportReference-ExampleURI">Example URI</h5><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+<div class="wiki-content maincontent"><h3 id="VMTransportReference-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead of the network communication. The connection used is not a socket connection but use direct method invocations which enables a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><h4 id="VMTransportReference-SimpleBrokerConfigurationSyntax">Simple Broker Configuration Syntax</h4><p>This is the normal syntax for a VM connection. It's simple, but provides only a limited amount of configuration of the embedded broker.</p><p><strong>vm://brokerName?transportOptions</strong></p><p>If you want to connect to an already instantiated, embedded broker (e.g. as in cas
 e the case of Apache ServiceMix), make sure the brokerName used in the <strong>vm://brokerName</strong> url matches the brokerName of the already running broker.</p><h5 id="VMTransportReference-TransportOptions">Transport Options</h5><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>marshal</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, forces each command sent over the transport to be marshalled and unmarshalled using a WireFormat</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspa
 n="1" class="confluenceTd"><p>The name of the WireFormat to use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>All the properties with this prefix are used to configure the wireFormat</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>create</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If the broker should be created on demand if it does not already exist.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>waitForStart</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If &gt; 0, indicates the timeout in milliseconds to wait for a broker to start. Values -1 and 0 mean don't wait. Only supported in ActiveMQ 5.2+</p></td></tr><tr><td colspan
 ="1" rowspan="1" class="confluenceTd"><p>broker.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>All the properties with this prefix are used to configure the broker. See <a shape="rect" href="configuring-wire-formats.html">Configuring Wire Formats</a> for more information</p></td></tr></tbody></table></div><h5 id="VMTransportReference-ExampleURI">Example URI</h5><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>vm://broker1?marshal=false&amp;broker.persistent=false
 </pre>
 </div></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful with embedded brokers</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you are using the VM transport and wish to explicitly configure an <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded Broker</a> there is a chance that you could create the JMS connections first before the broker starts up. Currently ActiveMQ will auto-create a broker if you use the VM transport and there is not one already configured. (In 5.2 it is possible to use the waitForStart and create=false options for the connection uri)</p><p>So to work around this if you are using Spring you may wish to use the <strong>depends-on</strong> attribute so that your JMS ConnectionFactory depends on the embedded broker to avoid this happening. e.g.</p><div class="code panel p
 dl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -100,7 +100,7 @@
 </div></div><h4 id="VMTransportReference-ConfiguringanEmbeddedBrokerUsinganExternalConfigFile">Configuring an Embedded Broker Using an External Config File</h4><p>&#160;To start an embedded broker using the vm transport and configure it using an external configuration file (i.e. activemq.xml), use the following URI:</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;"> vm://localhost?brokerConfig=xbean:activemq.xml 
 </pre>
-</div></div>
+</div></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/web-console.html
==============================================================================
--- websites/production/activemq/content/web-console.html (original)
+++ websites/production/activemq/content/web-console.html Wed Jul  1 20:13:48 2015
@@ -60,7 +60,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -81,7 +81,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>The ActiveMQ Web Console is a web based administration tool for working with ActiveMQ. When used with the <a shape="rect" href="jmx.html">JMX</a> support it can be an invaluable tool for working with ActiveMQ</p><h3 id="WebConsole-RunningtheWebConsoleonActiveMQ5.0orlater">Running the Web Console on ActiveMQ 5.0 or later</h3><p>We have integrated the Web Console into the binary distribution. So <a shape="rect" href="download.html">Download</a> a binary distribution then follow the instructions for <a shape="rect" href="version-5-run-broker.html">Version 5 Run Broker</a>. Then you can point your web browser at the URL</p><ul><li><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></li></ul><p>And hey presto, you should now have the Web Console running.</p><p>In the event that you are running a standalone broker and the Web Console is not reachable, check that the following lines are included in your ActiveMQ config 
 xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>The ActiveMQ Web Console is a web based administration tool for working with ActiveMQ. When used with the <a shape="rect" href="jmx.html">JMX</a> support it can be an invaluable tool for working with ActiveMQ</p><h3 id="WebConsole-RunningtheWebConsoleonActiveMQ5.0orlater">Running the Web Console on ActiveMQ 5.0 or later</h3><p>We have integrated the Web Console into the binary distribution. So <a shape="rect" href="download.html">Download</a> a binary distribution then follow the instructions for <a shape="rect" href="version-5-run-broker.html">Version 5 Run Broker</a>. Then you can point your web browser at the URL</p><ul><li><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></li></ul><p>And hey presto, you should now have the Web Console running.</p><p>In the event that you are running a standalone broker and the Web Console is not reachable, check that the following lines
  are included in your ActiveMQ config xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
 &lt;property name="locations"&gt;
 &lt;value&gt;file:${activemq.base}/conf/credentials.properties&lt;/value&gt;
@@ -112,7 +112,7 @@ INFO | ActiveMQ WebConsole initialized.<
             &lt;/list&gt;
         &lt;/property&gt;
 </pre>
-</div></div><p>Standard connector is left enabled in this example, but you can remove it in your configuration if you wish.</p><p>Note that these changes will affect the whole web server, so if you're using <a shape="rect" href="rest.html">REST</a> API or blob fileserver be sure to provide appropriate credentials.</p><p>If you're interested in securing 5.3.1 (and 5.3.2) Web consoles, take a look at <a shape="rect" class="external-link" href="http://www.nighttale.net/activemq/securing-activemq-531-console.html" rel="nofollow">this article</a>. For older versions, please refer to <a shape="rect" class="external-link" href="http://it.toolbox.com/blogs/unix-sysadmin/securing-activemq-web-console-27727" rel="nofollow">this article</a></p><h3 id="WebConsole-UsingtheWebConsole">Using the Web Console</h3><p>The web console is depicted in the following image:</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-thumbnail" src="web-console.data
 /web_console.png"></span></p><p>To get started, go to the <a shape="rect" class="external-link" href="http://localhost:8080/activemq-web-console/send.jsp" rel="nofollow">Send</a> page and send a message to a queue (you can send multiple if you like, see the message count field).</p><p>Now that you have sent messages to a queue you should be able to <a shape="rect" class="external-link" href="http://localhost:8080/activemq-web-console/browse.jsp" rel="nofollow">Browse</a> then and view the queue as an RSS or Atom feed.</p><p>The Web Console has many features relative to it's tabs as shown in the following table.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Tab</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Features</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Home</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http:/
 /activemq.apache.org/producer-flow-control.html#ProducerFlowControl-Systemusage">System Usage</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Queues</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Topics</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/advisory-message.html">Viewing Advisory Messages</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Subscribers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Connections</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/protocols.html">Protocols</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Scheduled</p></td><td colspan="1" row
 span="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Send</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a></p></td></tr></tbody></table></div><h1 id="WebConsole-ExternalWebConsoles">External Web Consoles</h1><p>There are a number of external web consoles for Apache ActiveMQ in separate open source projects:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>External Project</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawtio</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>hawtio is an open source HTML5 web applica
 tion for visualising, managing, tracing and debugging Camel routes &amp; endpoints, ActiveMQ brokers, JMX, OSGi and logging. Here is a <a shape="rect" class="external-link" href="http://sensatic.net/activemq/activemq-and-hawtio.html" rel="nofollow">blog entry</a> how to install hawtio as web console for ActiveMQ.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.jboss.org/rhq" rel="nofollow">RHQ</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>RHQ is an open source operational monitoring tool which has support for Apache Camel (along with other Apache projects like Tomcat, httpd, ActiveMQ etc)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><a shape="rect" class="external-link" href="http://www.hermesjms.com/confluence/display/HJMS/Home" rel="nofollow">Hermes JMS</a></td><td colspan="1" rowspan="1" class="confluenceTd">HermesJMS is an extensible console that helps you interact 
 with JMS providers making it simple to publish and edit messages, browse or seach queues and topics, copy messages around and delete them.</td></tr></tbody></table></div>
+</div></div><p>Standard connector is left enabled in this example, but you can remove it in your configuration if you wish.</p><p>Note that these changes will affect the whole web server, so if you're using <a shape="rect" href="rest.html">REST</a> API or blob fileserver be sure to provide appropriate credentials.</p><p>If you're interested in securing 5.3.1 (and 5.3.2) Web consoles, take a look at <a shape="rect" class="external-link" href="http://www.nighttale.net/activemq/securing-activemq-531-console.html" rel="nofollow">this article</a>. For older versions, please refer to <a shape="rect" class="external-link" href="http://it.toolbox.com/blogs/unix-sysadmin/securing-activemq-web-console-27727" rel="nofollow">this article</a></p><h3 id="WebConsole-UsingtheWebConsole">Using the Web Console</h3><p>The web console is depicted in the following image:</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-thumbnail" src="web-console.data
 /web_console.png"></span></p><p>To get started, go to the <a shape="rect" class="external-link" href="http://localhost:8080/activemq-web-console/send.jsp" rel="nofollow">Send</a> page and send a message to a queue (you can send multiple if you like, see the message count field).</p><p>Now that you have sent messages to a queue you should be able to <a shape="rect" class="external-link" href="http://localhost:8080/activemq-web-console/browse.jsp" rel="nofollow">Browse</a> then and view the queue as an RSS or Atom feed.</p><p>The Web Console has many features relative to it's tabs as shown in the following table.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Tab</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Features</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Home</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http:/
 /activemq.apache.org/producer-flow-control.html#ProducerFlowControl-Systemusage">System Usage</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Queues</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Topics</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/advisory-message.html">Viewing Advisory Messages</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Subscribers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Connections</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/protocols.html">Protocols</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Scheduled</p></td><td colspan="1" row
 span="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Send</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/delay-and-schedule-message-delivery.html">Delay and Schedule Message Delivery</a></p></td></tr></tbody></table></div><h1 id="WebConsole-ExternalWebConsoles">External Web Consoles</h1><p>There are a number of external web consoles for Apache ActiveMQ in separate open source projects:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>External Project</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawtio</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>hawtio is an open source HTML5 web applica
 tion for visualising, managing, tracing and debugging Camel routes &amp; endpoints, ActiveMQ brokers, JMX, OSGi and logging. Here is a <a shape="rect" class="external-link" href="http://sensatic.net/activemq/activemq-and-hawtio.html" rel="nofollow">blog entry</a> how to install hawtio as web console for ActiveMQ.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.jboss.org/rhq" rel="nofollow">RHQ</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>RHQ is an open source operational monitoring tool which has support for Apache Camel (along with other Apache projects like Tomcat, httpd, ActiveMQ etc)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><a shape="rect" class="external-link" href="http://www.hermesjms.com/confluence/display/HJMS/Home" rel="nofollow">Hermes JMS</a></td><td colspan="1" rowspan="1" class="confluenceTd">HermesJMS is an extensible console that helps you interact 
 with JMS providers making it simple to publish and edit messages, browse or seach queues and topics, copy messages around and delete them.</td></tr></tbody></table></div></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/web-samples.html
==============================================================================
--- websites/production/activemq/content/web-samples.html (original)
+++ websites/production/activemq/content/web-samples.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,9 +81,9 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>There are a few example programs demonstrating the <a shape="rect" href="rest.html">REST</a>, <a shape="rect" href="ajax.html">Ajax</a> and <a shape="rect" href="websockets.html">WebSockets</a> messaging that comes with the ActiveMQ distribution.</p><p>Up until version 5.8 web demos were included in the default configuration and could be accessed directly using <a shape="rect" class="external-link" href="http://localhost:8161/demo" rel="nofollow">http://localhost:8161/demo</a> url after starting the broker.</p><p>From 5.8 onwards, demos are excluded from default configuration. To start a broker with web examples, use <code>activemq-demo.xml</code> configuration file, like</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<div class="wiki-content maincontent"><p>There are a few example programs demonstrating the <a shape="rect" href="rest.html">REST</a>, <a shape="rect" href="ajax.html">Ajax</a> and <a shape="rect" href="websockets.html">WebSockets</a> messaging that comes with the ActiveMQ distribution.</p><p>Up until version 5.8 web demos were included in the default configuration and could be accessed directly using <a shape="rect" class="external-link" href="http://localhost:8161/demo" rel="nofollow">http://localhost:8161/demo</a> url after starting the broker.</p><p>From 5.8 onwards, demos are excluded from default configuration. To start a broker with web examples, use <code>activemq-demo.xml</code> configuration file, like</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">bin/activemq console xbean:examples/conf/activemq-demo.xml</pre>
-</div></div><h2 id="WebSamples-SeeAlso">See Also</h2><ul><li><a shape="rect" href="examples.html">Examples</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li></ul>
+</div></div><h2 id="WebSamples-SeeAlso">See Also</h2><ul><li><a shape="rect" href="examples.html">Examples</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a shape="rect" href="web-console.html">Web Console</a></li></ul></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/weblogic-integration.html
==============================================================================
--- websites/production/activemq/content/weblogic-integration.html (original)
+++ websites/production/activemq/content/weblogic-integration.html Wed Jul  1 20:13:48 2015
@@ -61,7 +61,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -82,7 +82,7 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<h1 id="WebLogicIntegration-ActiveMQWebLogicIntegration">ActiveMQ WebLogic Integration</h1>
+<div class="wiki-content maincontent"><h1 id="WebLogicIntegration-ActiveMQWebLogicIntegration">ActiveMQ WebLogic Integration</h1>
 
 <p>ActiveMQ clients and brokers can be run in WebLogic Server or WebLogic Express.  This is usually done for licensing reasons:</p>
 <ul><li>WebLogic Server includes JMS client and server features, but it may cost extra to use these JMS features to connect multiple servers together (as opposed to only using JMS internally within one server)</li><li>WebLogic Express disables the JMS features via the license, so while JMS classes are on the class path, there are no JMS features available.<br clear="none">
@@ -672,7 +672,7 @@ INFO  BrokerService                  - A
 <pre>INFO  DemandForwardingBridge         - Network connection between vm://FirstBroker#0 and
                                        tcp://localhost:63222(SecondBroker) has been established.
 </pre>
-</div></div></li></ol>
+</div></div></li></ol></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/websockets.html
==============================================================================
--- websites/production/activemq/content/websockets.html (original)
+++ websites/production/activemq/content/websockets.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="WebSockets-Introduction">Introduction</h1>
+<div class="wiki-content maincontent"><h1 id="WebSockets-Introduction">Introduction</h1>
 <p>Besides <a shape="rect" href="ajax.html">Ajax</a> API, starting with version <strong>5.4.0</strong> onwards, you can use HTML5 <a shape="rect" class="external-link" href="http://dev.w3.org/html5/websockets/" rel="nofollow">WebSockets</a> to exchange messages with the broker from your browser. </p>
 
 <p>HTML 5 introduced web sockets, as a standardized way to communicate asynchronously with the server from a web page. This is practically an ideal channel for implementing asynchronous messaging for web pages. Since JavaScript easily handles text and JSON formatted data, <a shape="rect" class="external-link" href="http://activemq.apache.org/stomp/">Stomp</a> protocol is a good choice for the wire protocol to be used over web sockets. Since version <strong>5.9.0</strong>, we also support efficient binary MQTT protocol over Web sockets.</p>
@@ -146,7 +146,7 @@ As of version 5.9.0, we have a similar d
 
 
 
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/what-are-administered-objects.html
==============================================================================
--- websites/production/activemq/content/what-are-administered-objects.html (original)
+++ websites/production/activemq/content/what-are-administered-objects.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="Whatareadministeredobjects-Whatareadministeredobjects?">What are administered objects?</h2>
+<div class="wiki-content maincontent"><h2 id="Whatareadministeredobjects-Whatareadministeredobjects?">What are administered objects?</h2>
 
 <p>Administered objects refers to objects that are configured in <a shape="rect" href="jndi-support.html">JNDI</a> and then accessed by a JMS client. So they are simply client-side objects typically either a ConnectionFactory or a Destination (such as a Queue or Topic).</p>
 
@@ -85,7 +85,7 @@
 <h3 id="Whatareadministeredobjects-SeeAlso">See Also</h3>
 
 <ul><li><a shape="rect" href="how-do-i-create-new-destinations.html">How do I create new destinations</a></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.html">How do I embed a Broker inside a Connection</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.html">How does ConnectionFactory relate to the Broker</a></li></ul>
-
+</div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/what-are-those-topics-activemqadvisory.html
==============================================================================
--- websites/production/activemq/content/what-are-those-topics-activemqadvisory.html (original)
+++ websites/production/activemq/content/what-are-those-topics-activemqadvisory.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>When you look at a broker using <a shape="rect" href="jmx.html">JMX</a> you will see a number of topics starting with <strong>ActiveMQ.Advisory.</strong>. These are the destinations used by the <a shape="rect" href="advisory-message.html">Advisory Message</a> feature of ActiveMQ which allows you to listen to the behaviour of the system.</p>
+<div class="wiki-content maincontent"><p>When you look at a broker using <a shape="rect" href="jmx.html">JMX</a> you will see a number of topics starting with <strong>ActiveMQ.Advisory.</strong>. These are the destinations used by the <a shape="rect" href="advisory-message.html">Advisory Message</a> feature of ActiveMQ which allows you to listen to the behaviour of the system.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/what-happens-when-the-journal-size-is-exceeded.html
==============================================================================
--- websites/production/activemq/content/what-happens-when-the-journal-size-is-exceeded.html (original)
+++ websites/production/activemq/content/what-happens-when-the-journal-size-is-exceeded.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,7 +72,8 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
-<p>If the "preferred" size is exceeded then the last log files keeps growing until the first log files can be overwritten.  When a log file is overwritten, it's size is reset to the "preferred" size.</p>
+<div class="wiki-content maincontent">
+<p>If the "preferred" size is exceeded then the last log files keeps growing until the first log files can be overwritten.  When a log file is overwritten, it's size is reset to the "preferred" size.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">

Modified: websites/production/activemq/content/what-happens-with-a-fast-producer-and-slow-consumer.html
==============================================================================
--- websites/production/activemq/content/what-happens-with-a-fast-producer-and-slow-consumer.html (original)
+++ websites/production/activemq/content/what-happens-with-a-fast-producer-and-slow-consumer.html Wed Jul  1 20:13:48 2015
@@ -51,7 +51,7 @@
       <div>
 
 <!-- Banner -->
-<p></p><p>
+<p>
 	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
@@ -72,9 +72,12 @@
   <tbody>
         <tr>
         <td valign="top" width="100%">
+<div class="wiki-content maincontent">
+
+
 <p>It depends a little on the <a shape="rect" href="qos.html">QoS</a> but in general we implement <em>flow control</em> which means that when we have a very fast producer and a slow consumer, when we get to a high water mark of outstanding messages we will start to tell the producer to slow down (which occurs inside the JMS client automatically, no application code changes are required). The slow down messages will increase exponentially over time until things get back into balance again.</p>
 
-<p>Flow control avoids unnecessary resouce exhaustion and is particularly useful in non-durable messaging modes to avoid running out of memory / disk on a node.</p>
+<p>Flow control avoids unnecessary resouce exhaustion and is particularly useful in non-durable messaging modes to avoid running out of memory / disk on a node.</p></div>
         </td>
         <td valign="top">
           <div class="navigation">



Mime
View raw message