activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [19/51] [abbrv] [partial] activemq-web git commit: Add body.storage type
Date Thu, 14 Dec 2017 14:48:43 GMT
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-version-5-transports.xml
----------------------------------------------------------------------
diff --git a/configuring-version-5-transports.xml b/configuring-version-5-transports.xml
index 3af73cc..41c05a0 100644
--- a/configuring-version-5-transports.xml
+++ b/configuring-version-5-transports.xml
@@ -1,30 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ConfiguringVersion5Transports-Transportconfigurationoptions">Transport configuration options</h2><p>One of the first kinds of URI you are likely to use is a transport URI to connect to a broker using a kind of transport. Generally TCP or VM are the first transports you'll use.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful about whitespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All of the following URI configurations are based on the java.net.URI class which does not allow whitespace to be used. So if you are using <strong><code>failover:</code></strong> or&#160;<strong><code>static:</code></strong> URIs, do not put any whitespace around the <strong><code>','</code> </strong>symbol.</p></div></div><h3 id="ConfiguringVersion5Transports-TheAUTOTransport">The AUTO Tran
 sport</h3><p>Starting with 5.13.0 ActiveMQ has support for automatic wire protocol detection over TCP, SSL, NIO, and NIO SSL. &#160;OpenWire, STOMP, AMQP, and MQTT are supported. &#160;For details see the <a shape="rect" href="auto.xml">AUTO </a>Transport Reference.</p><h3 id="ConfiguringVersion5Transports-TheVMTransport">The VM Transport</h3><p>The VM transport allows clients to connect to each other inside the VM without the overhead of the network communication. The connection used is not that of a socket connection but instead uses direct method invocations to enable a high performance embedded messaging system.</p><p>The first client to use the VM connection will boot an embedded broker. Subsequent connections will attach that the same broker. Once all VM connections to the broker have been closed, the embedded broker will automatically shutdown.</p><p>For more information see the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a></p><h3 id="Configurin
 gVersion5Transports-TheAMQPTransport">The AMQP Transport</h3><p>As of 5.8.0 ActiveMQ has support for AMQP. For details see the <a shape="rect" href="amqp.xml">AMQP</a> Transport Reference.</p><h3 id="ConfiguringVersion5Transports-TheMQTTTransport">The MQTT Transport</h3><p>Starting with 5.6.0 ActiveMQ also supports <a shape="rect" class="external-link" href="http://mqtt.org/" rel="nofollow">MQTT</a>. Its a light weight publish/subscribe messaging transport. See the <a shape="rect" href="mqtt.xml">MQTT</a> Transport Reference for details.</p><h3 id="ConfiguringVersion5Transports-TheTCPTransport">The TCP Transport</h3><p>The TCP transport allows clients to connect a remote ActiveMQ using a a TCP socket.</p><p>For more information see the <a shape="rect" href="tcp-transport-reference.xml">TCP Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheNIOTransport">The NIO Transport</h3><p>Same as the TCP transport, except that the <a shape="rect" class="external-link" href="ht
 tp://en.wikipedia.org/wiki/New_I/O" rel="nofollow">New I/O (NIO)</a> package is used, which may provide better performance. The Java NIO package should not be confused with IBM's <a shape="rect" class="external-link" href="http://java.sys-con.com/read/46658.htm" rel="nofollow">AIO4J </a> package.</p><p>To switch from TCP to NIO, simply change the scheme portion of the URI. Here's an example as defined within a broker's XML configuration file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
-  ...
-  &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;nio&quot; uri=&quot;nio://0.0.0.0:61616&quot;/&gt;  
-  &lt;/&lt;transportConnectors&gt;
-  ...
-&lt;/broker&gt;
-]]></script>
-</div></div><p>Trying to use nio transport url on the client side will instantiate the regular TCP transport. For more information see the <a shape="rect" href="nio-transport-reference.xml">NIO Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheSSLTransport">The SSL Transport</h3><p>This allows you to talk over TCP using SSL. For more information see the <a shape="rect" href="ssl-transport-reference.xml">SSL Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheNIOSSLTransport">The NIO SSL Transport</h3><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Availability</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Implementing SSL transport over NIO. This allows you to connect large number of SSL clients to a single broker instance. It's server side transport-option o
 nly</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
-  ...
-  &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;nio+ssl&quot; uri=&quot;nio+ssl://0.0.0.0:61616&quot;/&gt;  
-  &lt;/&lt;transportConnectors&gt;
-  ...
-&lt;/broker&gt;
-]]></script>
-</div></div><p>Trying to use <code>nio+ssl</code> transport url on the client side will instantiate the regular SSL transport.</p><h3 id="ConfiguringVersion5Transports-ThePeerTransport">The Peer Transport</h3><p>The Peer transport provides a peer-to-peer network with ActiveMQ. What actually happens is the peer transport uses the VM transport to create and connect to a local embedded broker but which configures the embedded broker to establish network connections to other peer embedded brokers.</p><p>For more information see the <a shape="rect" href="peer-transport-reference.xml">Peer Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheUDPTransport">The UDP Transport</h3><p>This allows you to talk over UDP.</p><p>For more information see the <a shape="rect" href="udp-transport-reference.xml">UDP Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheMulticastTransport">The Multicast Transport</h3><p>This allows you to talk over Multicast.</p><p>For more i
 nformation see the <a shape="rect" href="multicast-transport-reference.xml">Multicast Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheHTTPandHTTPSTransport">The HTTP and HTTPS Transport</h3><p>This allows the ActiveMQ client and broker to tunnel over HTTP. If the client is not JMS you might want to look at <a shape="rect" href="rest.xml">REST</a> or <a shape="rect" href="ajax.xml">Ajax</a> support instead.</p><p>For more information see the <a shape="rect" href="http-and-https-transports-reference.xml">HTTP and HTTPs Transports Reference</a></p><h3 id="ConfiguringVersion5Transports-TheWebSocketsTransport">The WebSockets Transport</h3><p>This transport uses the new HTML5 WebSockets to exchange messages with the broker. For more information see the <a shape="rect" href="websockets.xml">WebSockets</a> Transport Reference</p><h3 id="ConfiguringVersion5Transports-TheStompTransport">The Stomp Transport</h3><p>A plain text transport that can be used with many languages.
  See&#160;<a shape="rect" href="stomp.xml">Stomp</a> for more details.</p><h2 id="ConfiguringVersion5Transports-GeneralPurposeURIs">General Purpose URIs</h2><p>You can configure other features via the URI syntax as follows...</p><h3 id="ConfiguringVersion5Transports-ConnectionConfigurationURI">Connection Configuration URI</h3><p>Any Apache ActiveMQ JMS connection can be configured using the URL or explicitly setting properties on the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves.</p><p>For more information see <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a></p><h3 id="ConfiguringVersion5Transports-Destina
 tionOptions">Destination Options</h3><p>You can configure various consumer related options using <a shape="rect" href="destination-options.xml">Destination Options</a> which allow you to configure destinations using URI syntax.</p><h3 id="ConfiguringVersion5Transports-BrokerConfigurationURI">Broker Configuration URI</h3><p>You can use a <a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a> to configure an embedded broker, either using the BrokerFactory helper class from Java or using the activemq shell script. For more details see <a shape="rect" href="run-broker.xml">How to Run a Broker</a></p><h3 id="ConfiguringVersion5Transports-ConfiguringWireFormats">Configuring Wire Formats</h3><p>Any transport which involves marshalling messages onto some kind of network transport like TCP or UDP will typically use the <a shape="rect" href="openwire.xml">OpenWire</a> format. This is configurable to customize how things appear on the wire.</p><p>For more information 
 see <a shape="rect" href="configuring-wire-formats.xml">Configuring Wire Formats</a></p><h2 id="ConfiguringVersion5Transports-HighLevelProtocolURIs">High Level Protocol URIs</h2><p>The following higher level protocols can be configured via URI</p><h3 id="ConfiguringVersion5Transports-TheFailoverTransport">The Failover Transport</h3><p>The Failover transport layers reconnect logic on top of any of the other transports. This is what used to be the Reliable transport in ActiveMQ 3. Its configuration syntax allows you to specify any number of composite URIs. The Failover transport randomly chooses one of the composite URIs and attempts to establish a connection to it. If it does not succeed or if it subsequently fails, a new connection is established to one of the other URIs in the list.</p><p>For more information see the <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheFanoutTransport">The Fanout Transp
 ort</h3><p>The Fanout transport layers reconnect and replicate logic on top of any of the other transports. It is used replicate commands to multiple brokers.</p><p>For more information see the <a shape="rect" href="fanout-transport-reference.xml">Fanout Transport Reference</a></p><h2 id="ConfiguringVersion5Transports-UsingDiscovery">Using Discovery</h2><p>Often when using transports like TCP you want to use <a shape="rect" href="discovery.xml">Discovery</a> to locate the available brokers. This is different from using, say, <a shape="rect" href="multicast-transport-reference.xml">Multicast</a> - as the actual main communication is over TCP but multicast is purely used to discover the location of brokers.</p><h3 id="ConfiguringVersion5Transports-TheDiscoveryTransport">The Discovery Transport</h3><p>The Discovery transport works just like the reliable transport, except that it uses a discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <a shape
 ="rect" href="discovery-transport-reference.xml">Discovery Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-TheZeroConfTransport">The ZeroConf Transport</h3><p>The ZeroConf transport provides <a shape="rect" href="discovery.xml">Discovery</a> and it works like the <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport</a> but rather than using our own multicast based discovery mechanism (which allows you to configure the exact multicast address and port, etc.), the <a shape="rect" href="zeroconf.xml">ZeroConf</a> transport is used instead.</p><p>For more information see the <a shape="rect" href="zeroconf-transport-reference.xml">ZeroConf Transport Reference</a></p><h3 id="ConfiguringVersion5Transports-Serversideoptions">Server side options</h3><p>There are a number of options that can be used for changing behavior on the server for the&#160;<strong><code>TransportConnector</code></strong> in the ActiveMQ broker configuration. These are:</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</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: red;"> <code>allowLinkStealing</code><br clear="none"></span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This is enabled for default for MQTT transport.</p><p>Link Stealing is where the last of two or more connections with the same id (clientID for JMS) is deemed the valid connection and the older one is closed by the broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>discoveryURI</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p>If set, the multicast discovery address for client connections to find the broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>enableStatusMonitor</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will monitor connections to determine if they are blocked.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>name</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the&#160;<strong><code>TransportConnector</code></strong> instance.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>rebalanceClusterClients</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will automatically re-balance clients across the
  cluster on changes of topology.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClients</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If enabled, will update client connections (if they use the&#160;<strong><code>failover://</code></strong> transport) of changes to the broker cluster.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClientsOnRemove</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will update clients if a broker is removed from the cluster.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterFilter</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Comma separated lis
 t of regular expressions. Brokers with a name matching the pattern will be included for client updates.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>uri</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The bind address for the transport.</p></td></tr></tbody></table></div><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><strong>Note</strong>: properties in <span style="color: rgb(255,0,0);">red</span> are version 5.10 (and higher) options only.</p></div></div><p>Example configuration:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
-   &lt;!-- ... --&gt;
-
-   &lt;transportConnectors&gt;
-     &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616&quot; enableStatusMonitor=&quot;true&quot;/&gt; 
-   &lt;/&lt;transportConnectors&gt;
-
-   &lt;!-- ... --&gt;
-&lt;/broker&gt;]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="19b708b7-5a5a-4415-a812-e6f67dcf36ef" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Configuring Transports"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-wire-formats.xml
----------------------------------------------------------------------
diff --git a/configuring-wire-formats.xml b/configuring-wire-formats.xml
index c73854b..4e25b9d 100644
--- a/configuring-wire-formats.xml
+++ b/configuring-wire-formats.xml
@@ -1,9 +1,5 @@
-<div class="wiki-content maincontent"><h3 id="ConfiguringWireFormats-TheOpenWireWireFormat">The OpenWire Wire Format</h3><p>OpenWire is the default wire format used by ActiveMQ.&#160; It provides a highly efficient binary format for high speed messaging.&#160; OpenWire options can be configured on a JMS client's connection URI or on a broker's transport bind URI.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>cacheEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should commonly repeated values be cached so that less marshaling occurs?</p></td></tr><tr><td colspan="1" rowspan="1" class="conf
 luenceTd"><p><code>cacheSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>1024</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When&#160;<strong><code>cacheEnabled=true</code></strong> then this parameter is used to specify the number of values to be cached.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxInactivityDuration</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>30000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum <a shape="rect" href="activemq-inactivitymonitor.xml">inactivity</a> duration (before which the socket is considered dead) in milliseconds. On some platforms it can take a long time for a socket to die. Therefore allow the broker to kill connections when they have been inactive for the configured period of time. Used by some transports to enable a keep alive heart beat feature.</p><p>Inactivity monitoring is disabled when set to a v
 alue <strong><code>&lt;= 0</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxInactivityDurationInitalDelay</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The initial delay before starting <a shape="rect" href="activemq-inactivitymonitor.xml">inactivity</a> checks.</p><p>Yes, the word&#160;<strong><code>'Inital'</code></strong> is supposed to be misspelled like that.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxFrameSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>MAX_LONG</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum allowed frame size. Can help help prevent OOM DOS attacks.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sizePrefixDisabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code><
 /p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the size of the packet be prefixed before each packet is marshaled?</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>stackTraceEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the stack trace of exception that occur on the broker be sent to the client?</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tcpNoDelayEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Does not affect the wire format, but provides a hint to the peer that&#160;<strong><code>TCP_NODELAY</code></strong> should be enabled on the communications Socket.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tightEncodingEnabled</code></p></td><td colspan="1" rowspan="1
 " class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should wire size be optimized over CPU usage?</p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Use the Correct Prefix!</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Wire format options must have the prefix&#160;<strong><code>wireFormat.</code></strong> to take effect, e.g.,&#160;<strong><code>wireFormat.maxInactivityDuration=10000</code></strong>. Options missing this prefix will be ignored.</p></div></div><h4 id="ConfiguringWireFormats-ExampleConfigurations">Example Configurations</h4><p><strong>Java:</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(&quot;tcp://localhost:61616?wireFormat.cacheEnabled=false&amp;wireFormat.tightEncodingEnabled=false&quot;);]]></script>
-</div></div><p><strong><br clear="none"></strong></p><p>&#160;</p><p><strong>Spring:</strong></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;bean class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-  &lt;property name=&quot;brokerURL&quot; value=&quot;failover:(tcp://localhost:61616?jms.optimizeAcknowledge=false&amp;wireFormat.maxInactivityDuration=30000)&quot;/&gt;
+<div class="wiki-content maincontent"><h3>The OpenWire Wire Format</h3><p>OpenWire is the default wire format used by ActiveMQ.&#160; It provides a highly efficient binary format for high speed messaging.&#160; OpenWire options can be configured on a JMS client's connection URI or on a broker's transport bind URI.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>cacheEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should commonly repeated values be cached so that less marshaling occurs?</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>cacheSize</code></p></td><td colspan="1" rowspan="1"><p><code>1024</code></p></td><td colspan="1" rowspan="1"><p>When&#160;<strong><code>cacheEnabled=true</code></strong> then this parameter is used to specify the number of va
 lues to be cached.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxInactivityDuration</code></p></td><td colspan="1" rowspan="1"><p><code>30000</code></p></td><td colspan="1" rowspan="1"><p>The maximum <link><page ri:content-title="ActiveMQ InactivityMonitor"></page><plain-text-link-body>inactivity</plain-text-link-body></link> duration (before which the socket is considered dead) in milliseconds. On some platforms it can take a long time for a socket to die. Therefore allow the broker to kill connections when they have been inactive for the configured period of time. Used by some transports to enable a keep alive heart beat feature.</p><p>Inactivity monitoring is disabled when set to a value <strong><code>&lt;= 0</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxInactivityDurationInitalDelay</code></p></td><td colspan="1" rowspan="1"><p><code>10000</code></p></td><td colspan="1" rowspan="1"><p>The initial delay before starting <link><page ri:content
 -title="ActiveMQ InactivityMonitor"></page><plain-text-link-body>inactivity</plain-text-link-body></link> checks.</p><p>Yes, the word&#160;<strong><code>'Inital'</code></strong> is supposed to be misspelled like that.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxFrameSize</code></p></td><td colspan="1" rowspan="1"><p><code>MAX_LONG</code></p></td><td colspan="1" rowspan="1"><p>Maximum allowed frame size. Can help help prevent OOM DOS attacks.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>sizePrefixDisabled</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Should the size of the packet be prefixed before each packet is marshaled?</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>stackTraceEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should the stack trace of exception that occur on the broker be sent to the client?</p></td></tr><tr><td colspa
 n="1" rowspan="1"><p><code>tcpNoDelayEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Does not affect the wire format, but provides a hint to the peer that&#160;<strong><code>TCP_NODELAY</code></strong> should be enabled on the communications Socket.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>tightEncodingEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should wire size be optimized over CPU usage?</p></td></tr></tbody></table><structured-macro ac:macro-id="5f63c58b-03ae-42b4-acb9-5129da2b15db" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Use the Correct Prefix!</parameter><rich-text-body><p>Wire format options must have the prefix&#160;<strong><code>wireFormat.</code></strong> to take effect, e.g.,&#160;<strong><code>wireFormat.maxInactivityDuration=10000</code></strong>. Options missing this prefix will be ignored.</p></rich-t
 ext-body></structured-macro><h4>Example Configurations</h4><p><strong>Java:</strong></p><structured-macro ac:macro-id="82d9cc9e-c50c-4ac4-9e27-ae3d5cc4a5ac" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("tcp://localhost:61616?wireFormat.cacheEnabled=false&amp;wireFormat.tightEncodingEnabled=false");</plain-text-body></structured-macro><p><strong><br clear="none"></strong></p><p>&#160;</p><p><strong>Spring:</strong></p><structured-macro ac:macro-id="554a55c5-5f0b-489e-ab16-f3d317658e94" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;bean class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+  &lt;property name="brokerURL" value="failover:(tcp://localhost:61616?jms.optimizeAcknowledge=false&amp;wireFormat.maxInactivityDuration=30000)"/&gt;
   &lt;!-- other options... --&gt;
-&lt;/bean&gt;]]></script>
-</div></div><p>&#160;</p><p>&#160;</p><p><strong><br clear="none"></strong></p><p>&#160;</p></div>
+&lt;/bean&gt;</plain-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p><strong><br clear="none"></strong></p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/connection-configuration-uri.xml
----------------------------------------------------------------------
diff --git a/connection-configuration-uri.xml b/connection-configuration-uri.xml
index 25b0f20..6648827 100644
--- a/connection-configuration-uri.xml
+++ b/connection-configuration-uri.xml
@@ -1,8 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ConnectionConfigurationURI-ConnectionConfigurationURI">Connection Configuration URI</h2><p>An Apache ActiveMQ connection can be configured by explicitly setting properties on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves via the bean properties or using the following URI syntax.</p><h3 id="ConnectionConfigurationURI-Example">Example</h3><p>You set the property called&#160;<strong><code>jms.$PROPERTY</code></strong> on a regular connection URI. For example you can set the&#160;<strong><code>brokerURL</code></strong> on your <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectio
 nFactory.html">ActiveMQConnectionFactory</a> to the following value to enable <a shape="rect" href="async-sends.xml">Async Sends</a></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[tcp://localhost:61616?jms.useAsyncSend=true
-]]></script>
-</div></div><h3 id="ConnectionConfigurationURI-ConnectionOptions">Connection Options</h3><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Use the Correct Prefix!</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The following options should be prefixed with&#160;<strong><code>jms.</code></strong> when used on a&#160;<strong><code>brokerURL</code></strong> or a broker's transport connector.</p></div></div><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><code>alwaysSessionAsync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><
 code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <strong><code>true</code></strong> a separate thread is used for dispatching messages for each Session in the Connection.</p><p>A separate thread is always used when there's more than one session, or the session isn't in <strong><code>Session.AUTO_ACKNOWLEDGE</code></strong> or <strong><code>Session.DUPS_OK_ACKNOWLEDGE</code></strong> mode.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>alwaysSyncSend</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When&#160;<strong><code>true</code></strong> a&#160;<strong><code>MessageProducer</code></strong> will always use Sync sends when sending a Message even if it is not required for the Delivery Mode.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>auditDepth</code></p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p><code>2048</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The size of the message window that will be audited for duplicates and out of order messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>auditMaximumProducerNumber</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>64</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum number of producers that will be audited.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>checkForDuplicates</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When&#160;<strong><code>true</code></strong> the consumer will check for duplicate messages and properly handle the message to make sure that it is not processed twice inadvertently.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>clientID</code></p
 ></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets the JMS clientID to use for the connection.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>closeTimeout</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>15000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets the timeout, in milliseconds, before a close is considered complete. Normally a&#160;<strong><code>close()</code></strong> on a connection waits for confirmation from the broker.</p><p>This allows the close operation to timeout preventing the client from hanging when no broker is available.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumerExpiryCheckEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Controls whether message expiratio
 n checking is done in each&#160;<strong><code>MessageConsumer</code></strong> prior to dispatching a message. Disabling this check can lead to consumption of expired messages. (since 5.11).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>copyMessageOnSend</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should a JMS message be copied to a new JMS Message object as part of the&#160;<strong><code>send()</code></strong> method in JMS. This is enabled by default to be compliant with the JMS specification.</p><p>For a performance boost set to&#160;<strong><code>false</code></strong> if you do not mutate JMS messages after they are sent.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>disableTimeStampsByDefault</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="con
 fluenceTd"><p>Sets whether or not timestamps on messages should be disabled or not.</p><p>For a small performance boost set to <strong><code>false</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>dispatchAsync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker <a shape="rect" href="consumer-dispatch-async.xml">dispatch messages asynchronously</a> to the consumer?</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>nestedMapAndListEnabled</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Controls whether <a shape="rect" href="structured-message-properties-and-mapmessages.xml">Structured Message Properties and MapMessages</a> are supported so that Message properties and&#160;<strong><code>MapMessage</code></strong> 
 entries can contain nested Map and List objects. Available from version 4.1.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>objectMessageSerializationDefered</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When an object is set on an <strong><code>ObjectMessage</code></strong> the JMS spec requires the object be serialized by that set method.</p><p>When&#160;<strong><code>true</code></strong> the object will not be serialized. The object may subsequently be serialized if the message needs to be sent over a socket or stored to disk.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>optimizeAcknowledge</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables an optimized acknowledgement mode where messages are acknowledged in batches rather 
 than individually. Alternatively, you could use&#160;<strong><code>Session.DUPS_OK_ACKNOWLEDGE</code></strong> acknowledgement mode for the consumers which can often be faster.</p><p><strong>WARNING</strong>: enabling this issue could cause some issues with auto-acknowledgement on reconnection.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>optimizeAcknowledgeTimeOut</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>300</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If &gt; 0, specifies the max time, in milliseconds, between batch acknowledgements when&#160;<strong><code>optimizeAcknowledge</code></strong> is enabled. (since 5.6).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>optimizedAckScheduledAckInterval</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If &gt; 0, specifies a <span style="l
 ine-height: 1.4285715;">time interval upon which all the outstanding ACKs are delivered when optimized acknowledge is used so that a long running consumer that doesn't receive any more messages will eventually ACK the last few un-ACK'ed messages (since 5.7).</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>optimizedMessageDispatch</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If&#160;<strong><code>true</code></strong> a larger prefetch limit is used - only applicable for durable topic subscribers.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useAsyncSend</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Forces the use of <a shape="rect" href="async-sends.xml">Async Sends</a> which adds a massive performance boost; but means that 
 the&#160;<strong><code>send()</code></strong> method will return immediately whether the message has been sent or not which could lead to message loss.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useCompression</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables the use of compression on the message's body.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useRetroactiveConsumer</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>warnAboutUnstartedConnectionTimeout<
 /code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>500</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The timeout, in milliseconds, from the time of connection creation to when a warning is generated if the connection is not properly started via <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()" rel="nofollow">Connection.start()</a> and a message is received by a consumer. It is a very common gotcha to forget to <a shape="rect" href="i-am-not-receiving-any-messages-what-is-wrong.xml">start the connection and then wonder why no messages are delivered</a> so this option makes the default case to create a warning if the user forgets.</p><p>To disable the warning just set the value to <strong><code>&lt; 0</code></strong>.</p></td></tr></tbody></table></div><h3 id="ConnectionConfigurationURI-NestedOptions">Nested Options</h3><p>You can also configure nested objects on the connectio
 n object using the given prefixes. See the javadoc for a breakdown of each individual property.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Object configured</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>See Also</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>jms.blobTransferPolicy.*</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/blob/BlobTransferPolicy.html">BlobTransferPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="unresolved" href="#">Blob Message</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>jms.prefetchPolicy.*</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="re
 ct" class="external-link" href="http://http//activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQPrefetchPolicy.html" rel="nofollow">ActiveMQPrefetchPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="what-is-the-prefetch-limit-for.xml">What is the Prefetch Limit For?</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>jms.redeliveryPolicy.*</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/RedeliveryPolicy.html">RedeliveryPolicy</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" href="redelivery-policy.xml">Redelivery Policy</a></p></td></tr></tbody></table></div><p>For example you could set</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[tcp://localhost:61616?jms.prefetchPolicy.all=100&amp;jms.redeliveryPolicy.maximumRedeliveries=5
-]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><h2>Connection Configuration URI</h2><p>An Apache ActiveMQ connection can be configured by explicitly setting properties on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> or <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> objects themselves via the bean properties or using the following URI syntax.</p><h3>Example</h3><p>You set the property called&#160;<strong><code>jms.$PROPERTY</code></strong> on a regular connection URI. For example you can set the&#160;<strong><code>brokerURL</code></strong> on your <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> to the following value to enable <link><page ri:content-title="Async Sends"></page></link></p><structured-macro ac:macro
 -id="cdb20bb5-233a-4d06-a1d6-95b6a9d4082e" ac:name="code" ac:schema-version="1"><plain-text-body>tcp://localhost:61616?jms.useAsyncSend=true
+</plain-text-body></structured-macro><h3>Connection Options</h3><structured-macro ac:macro-id="677dbbcf-a4ab-498d-b67a-2360c5dec022" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Use the Correct Prefix!</parameter><rich-text-body><p>The following options should be prefixed with&#160;<strong><code>jms.</code></strong> when used on a&#160;<strong><code>brokerURL</code></strong> or a broker's transport connector.</p></rich-text-body></structured-macro><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>alwaysSessionAsync</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>When <strong><code>true</code></strong> a separate thread is used for dispatching messages for each Session in the Connection.</p><p>A separate thread is always used when there's more t
 han one session, or the session isn't in <strong><code>Session.AUTO_ACKNOWLEDGE</code></strong> or <strong><code>Session.DUPS_OK_ACKNOWLEDGE</code></strong> mode.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>alwaysSyncSend</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When&#160;<strong><code>true</code></strong> a&#160;<strong><code>MessageProducer</code></strong> will always use Sync sends when sending a Message even if it is not required for the Delivery Mode.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>auditDepth</code></p></td><td colspan="1" rowspan="1"><p><code>2048</code></p></td><td colspan="1" rowspan="1"><p>The size of the message window that will be audited for duplicates and out of order messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>auditMaximumProducerNumber</code></p></td><td colspan="1" rowspan="1"><p><code>64</code></p></td><td colspan="1" rowspan="1"><p>Maximum number of p
 roducers that will be audited.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>checkForDuplicates</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>When&#160;<strong><code>true</code></strong> the consumer will check for duplicate messages and properly handle the message to make sure that it is not processed twice inadvertently.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>clientID</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>Sets the JMS clientID to use for the connection.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>closeTimeout</code></p></td><td colspan="1" rowspan="1"><p><code>15000</code></p></td><td colspan="1" rowspan="1"><p>Sets the timeout, in milliseconds, before a close is considered complete. Normally a&#160;<strong><code>close()</code></strong> on a connection waits for confirmation from the broker.</p><p>This allows the close operation
  to timeout preventing the client from hanging when no broker is available.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumerExpiryCheckEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Controls whether message expiration checking is done in each&#160;<strong><code>MessageConsumer</code></strong> prior to dispatching a message. Disabling this check can lead to consumption of expired messages. (since 5.11).</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>copyMessageOnSend</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should a JMS message be copied to a new JMS Message object as part of the&#160;<strong><code>send()</code></strong> method in JMS. This is enabled by default to be compliant with the JMS specification.</p><p>For a performance boost set to&#160;<strong><code>false</code></strong> if you do not mutate JMS messages after they are sent.</p>
 </td></tr><tr><td colspan="1" rowspan="1"><p><code>disableTimeStampsByDefault</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Sets whether or not timestamps on messages should be disabled or not.</p><p>For a small performance boost set to <strong><code>false</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>dispatchAsync</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Should the broker <link><page ri:content-title="Consumer Dispatch Async"></page><plain-text-link-body>dispatch messages asynchronously</plain-text-link-body></link> to the consumer?</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>nestedMapAndListEnabled</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Controls whether <link><page ri:content-title="Structured Message Properties and MapMessages"></page></link> are supported so that
  Message properties and&#160;<strong><code>MapMessage</code></strong> entries can contain nested Map and List objects. Available from version 4.1.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>objectMessageSerializationDefered</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When an object is set on an <strong><code>ObjectMessage</code></strong> the JMS spec requires the object be serialized by that set method.</p><p>When&#160;<strong><code>true</code></strong> the object will not be serialized. The object may subsequently be serialized if the message needs to be sent over a socket or stored to disk.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>optimizeAcknowledge</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Enables an optimized acknowledgement mode where messages are acknowledged in batches rather than individually. Alternatively, you could use&#160;<st
 rong><code>Session.DUPS_OK_ACKNOWLEDGE</code></strong> acknowledgement mode for the consumers which can often be faster.</p><p><strong>WARNING</strong>: enabling this issue could cause some issues with auto-acknowledgement on reconnection.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>optimizeAcknowledgeTimeOut</code></p></td><td colspan="1" rowspan="1"><p><code>300</code></p></td><td colspan="1" rowspan="1"><p>If &gt; 0, specifies the max time, in milliseconds, between batch acknowledgements when&#160;<strong><code>optimizeAcknowledge</code></strong> is enabled. (since 5.6).</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>optimizedAckScheduledAckInterval</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>If &gt; 0, specifies a <span style="line-height: 1.4285715;">time interval upon which all the outstanding ACKs are delivered when optimized acknowledge is used so that a long running consumer that doesn't receive any mo
 re messages will eventually ACK the last few un-ACK'ed messages (since 5.7).</span></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>optimizedMessageDispatch</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>If&#160;<strong><code>true</code></strong> a larger prefetch limit is used - only applicable for durable topic subscribers.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>useAsyncSend</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Forces the use of <link><page ri:content-title="Async Sends"></page></link> which adds a massive performance boost; but means that the&#160;<strong><code>send()</code></strong> method will return immediately whether the message has been sent or not which could lead to message loss.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>useCompression</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan
 ="1" rowspan="1"><p>Enables the use of compression on the message's body.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>useRetroactiveConsumer</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>warnAboutUnstartedConnectionTimeout</code></p></td><td colspan="1" rowspan="1"><p><code>500</code></p></td><td colspan="1" rowspan="1"><p>The timeout, in milliseconds, from the time of connection creation to when a warning is generated if the connection is not properly started via <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()">Connection.start()</a> and a message is received by a consumer. It is a very common gotcha to forget to <link><
 page ri:content-title="I am not receiving any messages, what is wrong"></page><plain-text-link-body>start the connection and then wonder why no messages are delivered</plain-text-link-body></link> so this option makes the default case to create a warning if the user forgets.</p><p>To disable the warning just set the value to <strong><code>&lt; 0</code></strong>.</p></td></tr></tbody></table><h3>Nested Options</h3><p>You can also configure nested objects on the connection object using the given prefixes. See the javadoc for a breakdown of each individual property.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Object configured</p></th><th colspan="1" rowspan="1"><p>See Also</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>jms.blobTransferPolicy.*</code></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/blob/BlobTransferPolicy.html">BlobTransferPolicy</
 a></p></td><td colspan="1" rowspan="1"><p><link><page ri:content-title="Blob Message"></page><plain-text-link-body>Blob Message</plain-text-link-body></link></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>jms.prefetchPolicy.*</code></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://http//activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQPrefetchPolicy.html">ActiveMQPrefetchPolicy</a></p></td><td colspan="1" rowspan="1"><p><link><page ri:content-title="What is the Prefetch Limit For?"></page></link></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>jms.redeliveryPolicy.*</code></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/RedeliveryPolicy.html">RedeliveryPolicy</a></p></td><td colspan="1" rowspan="1"><p><link><page ri:content-title="Redelivery Policy"></page></link></p></td></tr></tbody></table><p>For example you could set</p><structured-macro ac:macro-id="0255c160-be
 b2-4274-9d9c-5c9fcf102482" ac:name="code" ac:schema-version="1"><plain-text-body>tcp://localhost:61616?jms.prefetchPolicy.all=100&amp;jms.redeliveryPolicy.maximumRedeliveries=5
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/connection-factory-properties.xml
----------------------------------------------------------------------
diff --git a/connection-factory-properties.xml b/connection-factory-properties.xml
index 0439247..3cc7b8f 100644
--- a/connection-factory-properties.xml
+++ b/connection-factory-properties.xml
@@ -3,27 +3,27 @@
 
 <p>The Connection Factory properties that can be configured are:</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>Required</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>ServerUrl</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>UserName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Clientid</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p>Password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>UseInboundSession</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Required</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th></tr><tr><td colspan="1" rowspan="1"><p>ServerUrl</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>UserName</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>Clientid</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>Password</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>UseInboundSession</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td></tr>
 </tbody></table>
 
 
 
-<h4 id="ConnectionFactoryProperties-ServerUrl">ServerUrl </h4>
+<h4>ServerUrl </h4>
 
 <p>The URL to the ActiveMQ server that you want this connection to connect to.  If using an embedded broker, this value should be 'vm://localhost'.</p>
 
-<h4 id="ConnectionFactoryProperties-UserName">UserName</h4>
+<h4>UserName</h4>
 
 <p>The default user name that will be used to establish connections to the ActiveMQ server.</p>
 
-<h4 id="ConnectionFactoryProperties-Password">Password</h4>
+<h4>Password</h4>
 
 <p>The default password that will be used to log the default user into the ActiveMQ server.</p>
 
-<h4 id="ConnectionFactoryProperties-Clientid">Clientid</h4>
+<h4>Clientid</h4>
 
 <p>The client id that will be set on the connection that is established to the ActiveMQ server.</p>
 
-<h4 id="ConnectionFactoryProperties-UseInboundSession">UseInboundSession</h4>
+<h4>UseInboundSession</h4>
 
 <p>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/connectivity.xml
----------------------------------------------------------------------
diff --git a/connectivity.xml b/connectivity.xml
index 2bccfb1..a63dfff 100644
--- a/connectivity.xml
+++ b/connectivity.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ is designed to support a large number if <a shape="rect" href="cross-language-clients.xml">Cross Language Clients</a>, speak a wide range of <a shape="rect" href="protocols.xml">Protocols</a> and be usable in a wide variety of <a shape="rect" href="containers.xml">Containers</a> in addition to being usable in a stand alone Java SE platform.</p>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is designed to support a large number if <link><page ri:content-title="Cross Language Clients"></page></link>, speak a wide range of <link><page ri:content-title="Protocols"></page></link> and be usable in a wide variety of <link><page ri:content-title="Containers"></page></link> in addition to being usable in a stand alone Java SE platform.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="ajax.xml">Ajax</a></li><li><a shape="rect" href="containers.xml">Containers</a><ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.xml">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.xml">BlazeDS</a></li><li><a shape="rect" href="geronimo.xml">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.xml">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="integrating-apache-activemq-with-jboss.xml">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.xml">J2EE</a></li><li><a shape="rect" href="jboss-integration.xml">JBoss Integration</a></li><li><a shape="rect" href="jca-container.xml">JCA Container</a></li><li><a shape="rect" href="jndi-support.xml">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.xml">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.xml">OSGi Integrati
 on</a></li><li><a shape="rect" href="resource-adapter.xml">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-genericjmsra.xml">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.xml">Spring Support</a></li><li><a shape="rect" href="sun-jndi.xml">Sun JNDI</a></li><li><a shape="rect" href="tomcat.xml">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.xml">WebLogic Integration</a></li><li><a shape="rect" href="zos.xml">zOS</a></li></ul></li><li><a shape="rect" href="cross-language-clients.xml">Cross Language Clients</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-c-clients.xml">ActiveMQ C++ Clients</a></li><li><a shape="rect" href="c-integration.xml">C Integration</a></li><li><a shape="rect" href="delphi-and-freepascal.xml">Delphi and FreePascal</a></li></ul></li><li><a shape="rect" href="jms-to-jms-bridge.xml">JMS to JMS Bridge</a></li><li><a shape="rect" href="protocols.xml">Protocols</a><ul class="childpages-macro"><li
 ><a shape="rect" href="amqp.xml">AMQP</a></li><li><a shape="rect" href="auto.xml">AUTO</a></li><li><a shape="rect" href="mqtt.xml">MQTT</a></li><li><a shape="rect" href="openwire.xml">OpenWire</a></li><li><a shape="rect" href="rest.xml">REST</a></li><li><a shape="rect" href="rss-and-atom.xml">RSS and Atom</a></li><li><a shape="rect" href="stomp.xml">Stomp</a></li><li><a shape="rect" href="wsif.xml">WSIF</a></li><li><a shape="rect" href="ws-notification.xml">WS Notification</a></li><li><a shape="rect" href="xmpp.xml">XMPP</a></li></ul></li><li><a shape="rect" href="websockets.xml">WebSockets</a></li></ul> </div>
+<structured-macro ac:macro-id="e62fc540-f05e-466a-bda3-36de08652244" ac:name="children" ac:schema-version="1"><parameter ac:name="depth">2</parameter></structured-macro> </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/consumer-dispatch-async.xml
----------------------------------------------------------------------
diff --git a/consumer-dispatch-async.xml b/consumer-dispatch-async.xml
index bf3557e..33ef563 100644
--- a/consumer-dispatch-async.xml
+++ b/consumer-dispatch-async.xml
@@ -1,12 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="ConsumerDispatchAsync-Overview">Overview</h2><p>From ActiveMQ v4: the choice of a broker performing synchronous or asynchronous dispatch to a consumer has become more configurable. It is now configured as a default value on the <a shape="rect" href="connection-configuration-uri.xml">connection URI, Connection and ConnectionFactory</a> as well as with being customizable on a per consumer basis via the <a shape="rect" href="destination-options.xml">Destination Options</a> instead previously just being a transport server setting.</p><p>This makes more sense since you want to do asynchronous message delivery to slower consumers, but synchronous message delivery for faster consumers (to avoid the synchronization and context switching costs of adding another SEDA queue). The downside to using synchronous message delivery is that the producer is more likely to block if there is a slow consumer that he is dispatching messages to.</p><p>The defau
 lt setting is&#160;<strong><code>dispatchAsync=true</code></strong> which is the best setting for high performance. If you want to deal better with slow consumers you will want to enable this setting. If you want better throughput and the chances of having a slow consumer are low, you may want to change this to <strong><code>dispatchAsync=false</code></strong>.</p><h3 id="ConsumerDispatchAsync-ConfiguringAsyncDispatchattheConnectionFactoryLevel">Configuring Async Dispatch at the ConnectionFactory Level</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[((ActiveMQConnectionFactory)connectionFactory).setDispatchAsync(false);
-]]></script>
-</div></div><h3 id="ConsumerDispatchAsync-ConfiguringDispatchAsyncattheConnectionLevel">Configuring Dispatch Async at the Connection Level</h3><p>Configuring the&#160;<strong><code>dispatchAsync</code></strong> setting at this level overrides the settings at the connection factory level.</p><h3 id="ConsumerDispatchAsync-ConfiguringDispatchAsyncattheConsumerLevelusingtheDestinationURI">Configuring Dispatch Async at the Consumer Level using the Destination URI</h3><p>Configuring the&#160;<strong><code>dispatchAsync</code></strong> using <a shape="rect" href="destination-options.xml">Destination Options</a> overrides the settings at the connection and connection factory level.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[queue = new ActiveMQQueue(&quot;TEST.QUEUE?consumer.dispatchAsync=false&quot;);
+<div class="wiki-content maincontent"><h2>Overview</h2><p>From ActiveMQ v4: the choice of a broker performing synchronous or asynchronous dispatch to a consumer has become more configurable. It is now configured as a default value on the <link><page ri:content-title="Connection Configuration URI"></page><plain-text-link-body>connection URI, Connection and ConnectionFactory</plain-text-link-body></link> as well as with being customizable on a per consumer basis via the <link><page ri:content-title="Destination Options"></page></link> instead previously just being a transport server setting.</p><p>This makes more sense since you want to do asynchronous message delivery to slower consumers, but synchronous message delivery for faster consumers (to avoid the synchronization and context switching costs of adding another SEDA queue). The downside to using synchronous message delivery is that the producer is more likely to block if there is a slow consumer that he is dispatching messages t
 o.</p><p>The default setting is&#160;<strong><code>dispatchAsync=true</code></strong> which is the best setting for high performance. If you want to deal better with slow consumers you will want to enable this setting. If you want better throughput and the chances of having a slow consumer are low, you may want to change this to <strong><code>dispatchAsync=false</code></strong>.</p><h3>Configuring Async Dispatch at the ConnectionFactory Level</h3><structured-macro ac:macro-id="b6c7c4b9-0a3b-4d23-9106-5b97ec057de0" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>((ActiveMQConnectionFactory)connectionFactory).setDispatchAsync(false);
+</plain-text-body></structured-macro><h3>Configuring Dispatch Async at the Connection Level</h3><p>Configuring the&#160;<strong><code>dispatchAsync</code></strong> setting at this level overrides the settings at the connection factory level.</p><h3>Configuring Dispatch Async at the Consumer Level using the Destination URI</h3><p>Configuring the&#160;<strong><code>dispatchAsync</code></strong> using <link><page ri:content-title="Destination Options"></page></link> overrides the settings at the connection and connection factory level.</p><structured-macro ac:macro-id="1c757d6c-8c52-4ae7-bb24-8a4c1d6d3f47" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>queue = new ActiveMQQueue("TEST.QUEUE?consumer.dispatchAsync=false");
 consumer = session.createConsumer(queue);
-]]></script>
-</div></div><h3 id="ConsumerDispatchAsync-DisablingAsyncDispatchonBroker'sTransportConnector">Disabling Async Dispatch on Broker's Transport Connector</h3><p>It is possible to disable async dispatch on a specific transport connector via the&#160;<strong><code>disableAsyncDispatch</code></strong> property. Once disabled for this transport, it cannot be enabled by individual clients.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616&quot; disableAsyncDispatch=&quot;true&quot;/&gt;
-]]></script>
-</div></div><p>&#160;</p><p>&#160;</p><p>&#160;</p></div>
+</plain-text-body></structured-macro><h3>Disabling Async Dispatch on Broker's Transport Connector</h3><p>It is possible to disable async dispatch on a specific transport connector via the&#160;<strong><code>disableAsyncDispatch</code></strong> property. Once disabled for this transport, it cannot be enabled by individual clients.</p><structured-macro ac:macro-id="c0d99739-d154-47e1-b5e2-06cf41a2c071" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616" disableAsyncDispatch="true"/&gt;
+</plain-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/consumer-features.xml
----------------------------------------------------------------------
diff --git a/consumer-features.xml b/consumer-features.xml
index 2747bc7..0a963a9 100644
--- a/consumer-features.xml
+++ b/consumer-features.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="consumer-dispatch-async.xml">Consumer Dispatch Async</a></li><li><a shape="rect" href="consumer-priority.xml">Consumer Priority</a></li><li><a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a></li><li><a shape="rect" href="manage-durable-subscribers.xml">Manage Durable Subscribers</a></li><li><a shape="rect" href="message-groups.xml">Message Groups</a></li><li><a shape="rect" href="redelivery-policy.xml">Redelivery Policy</a></li><li><a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a></li><li><a shape="rect" href="selectors.xml">Selectors</a></li><li><a shape="rect" href="slow-consumer-handling.xml">Slow Consumer Handling</a></li><li><a shape="rect" href="subscription-recovery-policy.xml">Subscription Recovery Policy</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="2f85a176-f68a-4245-977e-4dcc32605717" ac:name="children" ac:schema-version="1"><parameter ac:name="">all</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/consumer-priority.xml
----------------------------------------------------------------------
diff --git a/consumer-priority.xml b/consumer-priority.xml
index 23e5c3c..5898aec 100644
--- a/consumer-priority.xml
+++ b/consumer-priority.xml
@@ -1,6 +1,4 @@
-<div class="wiki-content maincontent"><h3 id="ConsumerPriority-Background">Background</h3><p>As well as having a pluggable dispatch policy e.g. round robin, ActiveMQ also supports consumer priorities. This allows us to weight consumers to optimize network hops. For example, you typically want a broker to send messages to regular JMS consumers rather than to other brokers; there's no need to make unnecessary broker-to-broker hops if there are available consumers.</p><h3 id="ConsumerPriority-Example">Example</h3><p>The priority for a consumer is set using <a shape="rect" href="destination-options.xml">Destination Options</a> as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[queue = new ActiveMQQueue(&quot;TEST.QUEUE?consumer.priority=10&quot;);
+<div class="wiki-content maincontent"><h3>Background</h3><p>As well as having a pluggable dispatch policy e.g. round robin, ActiveMQ also supports consumer priorities. This allows us to weight consumers to optimize network hops. For example, you typically want a broker to send messages to regular JMS consumers rather than to other brokers; there's no need to make unnecessary broker-to-broker hops if there are available consumers.</p><h3>Example</h3><p>The priority for a consumer is set using <link><page ri:content-title="Destination Options"></page></link> as follows:</p><structured-macro ac:macro-id="2191e679-8788-42a2-9961-a7799dc2a7e2" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>queue = new ActiveMQQueue("TEST.QUEUE?consumer.priority=10");
 consumer = session.createConsumer(queue);
-]]></script>
-</div></div><p>The range of priority values is: <strong><code>0</code></strong> to <strong><code>127</code></strong>. The highest priority is <strong><code>127</code></strong>. The default priority is <strong><code>0</code></strong>.</p><p>The broker orders a queue's consumers according to their priorities, dispatching messages to the highest priority consumers first. Once a particular consumer's prefetch buffer is full the broker will start dispatching messages to the consumer with the next lowest priority whose prefetch buffer is not full.</p></div>
+</plain-text-body></structured-macro><p>The range of priority values is: <strong><code>0</code></strong> to <strong><code>127</code></strong>. The highest priority is <strong><code>127</code></strong>. The default priority is <strong><code>0</code></strong>.</p><p>The broker orders a queue's consumers according to their priorities, dispatching messages to the highest priority consumers first. Once a particular consumer's prefetch buffer is full the broker will start dispatching messages to the consumer with the next lowest priority whose prefetch buffer is not full.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/containers.xml
----------------------------------------------------------------------
diff --git a/containers.xml b/containers.xml
index 79c96e7..ce61a36 100644
--- a/containers.xml
+++ b/containers.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent"><p>This page lists the various containers that Apache ActiveMQ works inside</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="axis-and-cxf-support.xml">Axis and CXF Support</a></li><li><a shape="rect" href="blazeds.xml">BlazeDS</a></li><li><a shape="rect" href="geronimo.xml">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.xml">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="integrating-apache-activemq-with-jboss.xml">Integrating Apache ActiveMQ with JBoss</a></li><li><a shape="rect" href="j2ee.xml">J2EE</a></li><li><a shape="rect" href="jboss-integration.xml">JBoss Integration</a></li><li><a shape="rect" href="jca-container.xml">JCA Container</a></li><li><a shape="rect" href="jndi-support.xml">JNDI Support</a></li><li><a shape="rect" href="old-osgi-integration.xml">Old OSGi Integration</a></li><li><a shape="rect" href="osgi-integration.xml">OSGi Integration</a></li><li><a shape="rect" href="resource-adapter.xml">Resource Adapter</a></li><li><a shape="rect" href="sjsas-with-genericjmsra.
 xml">SJSAS with GenericJMSRA</a></li><li><a shape="rect" href="spring-support.xml">Spring Support</a></li><li><a shape="rect" href="sun-jndi.xml">Sun JNDI</a></li><li><a shape="rect" href="tomcat.xml">Tomcat</a></li><li><a shape="rect" href="weblogic-integration.xml">WebLogic Integration</a></li><li><a shape="rect" href="zos.xml">zOS</a></li></ul></div>
+<structured-macro ac:macro-id="8cb45622-a2f2-4d5d-b847-53c07d4def3e" ac:name="children" ac:schema-version="1"></structured-macro></div>
 


Mime
View raw message