You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dk...@apache.org on 2017/12/14 14:48:56 UTC
[32/51] [abbrv] [partial] activemq-web git commit: Add body.storage
type
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/auto.xml
----------------------------------------------------------------------
diff --git a/auto.xml b/auto.xml
index 4845e6c..cfb1ec2 100644
--- a/auto.xml
+++ b/auto.xml
@@ -1,19 +1,3 @@
-<div class="wiki-content maincontent"><p>Starting with version 5.13.0, ActiveMQ supports wire format protocol detection.   OpenWire, STOMP, AMQP, and MQTT can be automatically detected.  This allows one transport to be shared for all 4 types of clients.</p><h3 id="AUTO-EnablingAUTOoverTCP">Enabling AUTO over TCP</h3><p>To configure ActiveMQ auto wire format detection over a TCP connection use the <code>auto</code> transport prefix. For example, add the following transport configuration in your XML 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[ <transportConnector name="auto" uri="auto://localhost:5671"/>]]></script>
-</div></div><h3 id="AUTO-EnablingAUTOoverSSL">Enabling AUTO over SSL</h3><p>To configure ActiveMQ auto wire format detection over an SSL connection use the <code>auto+ssl</code> transport prefix. For example, add the following transport configuration in your XML 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[ <transportConnector name="auto+ssl" uri="auto+ssl://localhost:5671"/>
-]]></script>
-</div></div><ul><li>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" class="external-link" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</li></ul><h3 id="AUTO-EnablingAUTOoverNIO">Enabling AUTO over NIO</h3><p>To configure ActiveMQ auto wire format detection over an NIO TCP connection use the <code>auto+nio</code>transport prefix. For example, add the following transport configuration in your XML 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[ <transportConnector name="auto+nio" uri="auto+nio://localhost:5671"/>]]></script>
-</div></div><h3 id="AUTO-EnablingAUTOoverNIOSSL">Enabling AUTO over NIO SSL</h3><p>To configure ActiveMQ auto wire format detection over an NIO SSL connection use the <code>auto+nio+ssl</code> transport prefix. For example, add the following transport configuration in your XML 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[ <transportConnector name="auto+nio+ssl" uri="auto+nio+ssl://localhost:5671"/>]]></script>
-</div></div><h3 id="AUTO-ConfiguringAUTOTransportOptions">Configuring AUTO Transport Options</h3><p>There are some configuration options that can be set.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Parameter Name</p></th><th colspan="1" rowspan="1" class="confluenceTh">Default Value</th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>protocolDetectionTimeOut</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The time before a connection times out in milliseconds. This is similar to maxInactivityDuration. If a client makes a connection to but doesn't send data or enough data for the protocol to be detected then the thread will sit and wait for more data to come in over the socket. This will let the broker kill the connections if they do not complete t
he protocol initialization after a certain period of time. The default is 30 seconds. Set a default to <= 0 to disable this.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxConnectionThreadPoolSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>MAX_INT</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This option allows the configuration of the maximum size of the thread pool that handles connection attempts. Lowering this number can help prevent the broker from running out of threads if there are many different clients attempting to connect at the same time. By default it is turned off by setting to MAX_INT</p></td></tr></tbody></table></div><p><br clear="none">An example that configures the transport with a maximum protocol detection time of 5 seconds:</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[ <transportConnector name="auto" uri="auto://localhost:5671?protocolDetectionTimeOut=5000"/>]]></script>
-</div></div><h3 id="AUTO-ConfiguringWireFormats">Configuring Wire Formats</h3><p>OpenWire is the default Wire Format that ActiveMQ uses.  It provides a highly efficent binary format for high speed messaging.  OpenWire options can be configured on a JMS client's connection URI string or on a Brokers transport bind URI.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Parameter Prefix</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Applies the option to all wire formats.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.default.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Applies the option to the default format which is OpenWire</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p
>wireFormat.stomp.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the STOMP wire format</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span>wireFormat.amqp.</span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the AMQP<span> wire format</span></span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.mqtt.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the MQTT<span> wire format</span></span></p></td></tr></tbody></table></div><p> </p><p>An example of a property that applies to all formats:</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[ <transportConnector name="auto" uri="auto://localhost:5671?wireFormat.maxFrameSize=1000"/>]]></script>
-</div></div><p> </p><p>An example of a property only applied to OpenWire would be:</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[ <transportConnector name="auto" uri="auto://localhost:5671?wireFormat.default.maxFrameSize=1000"/>]]></script>
-</div></div><h3 id="AUTO-ConfiguringEnabledWireProtocols">Configuring Enabled Wire Protocols</h3><p>By default all wire protocols are available.  This can be configured to only enable certain formats by setting the property  auto<code>.protocols.</code> </p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables OpenWire</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>amqp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables AMQP format</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>stomp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables STOMP format</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
"><p>mqtt</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables MQTT format</p></td></tr></tbody></table></div><p> </p><p>An example showing only OpenWire and STOMP enabled:</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[ <transportConnector name="auto" uri="auto://localhost:5671?auto.protocols=default,stomp"/>]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><p>Starting with version 5.13.0, ActiveMQ supports wire format protocol detection.   OpenWire, STOMP, AMQP, and MQTT can be automatically detected.  This allows one transport to be shared for all 4 types of clients.</p><h3>Enabling AUTO over TCP</h3><p>To configure ActiveMQ auto wire format detection over a TCP connection use the <code>auto</code> transport prefix. For example, add the following transport configuration in your XML file:</p><structured-macro ac:macro-id="1b2eaa95-2237-4062-85d0-8f9e9566e4ce" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto" uri="auto://localhost:5671"/></plain-text-body></structured-macro><h3>Enabling AUTO over SSL</h3><p>To configure ActiveMQ auto wire format detection over an SSL connection use the <code>auto+ssl</code> transport prefix. For example, add the following transport configuration in your
XML file:</p><structured-macro ac:macro-id="8fb394d9-660b-4afa-8246-ffef07fecf32" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto+ssl" uri="auto+ssl://localhost:5671"/>
+</plain-text-body></structured-macro><ul><li>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</li></ul><h3>Enabling AUTO over NIO</h3><p>To configure ActiveMQ auto wire format detection over an NIO TCP connection use the <code>auto+nio</code>transport prefix. For example, add the following transport configuration in your XML file:</p><structured-macro ac:macro-id="d64978dd-16ac-4473-8c2d-e077b8e0e8da" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto+nio" uri="auto+nio://localhost:5671"/></plain-text-body></structured-macro><h3>Enabling AUTO over NIO SSL</h3><p>To configure ActiveMQ auto wire format detection over an NIO SSL connection use the <code>auto+nio+ssl</code> transport prefix. For example, add the following transport configuration in your XML file:</p><structur
ed-macro ac:macro-id="45956eda-207b-439f-85f8-45fb5cd8b09d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto+nio+ssl" uri="auto+nio+ssl://localhost:5671"/></plain-text-body></structured-macro><h3>Configuring AUTO Transport Options</h3><p>There are some configuration options that can be set.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Parameter Name</p></th><th colspan="1" rowspan="1">Default Value</th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>protocolDetectionTimeOut</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The time before a connection times out in milliseconds. This is similar to maxInactivityDuration. If a client makes a connection to but doesn't send data or enough data for the protocol to be detected then the thread will sit and wait for more data to come in over the socket. This will let the broke
r kill the connections if they do not complete the protocol initialization after a certain period of time. The default is 30 seconds. Set a default to <= 0 to disable this.</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxConnectionThreadPoolSize</p></td><td colspan="1" rowspan="1"><p>MAX_INT</p></td><td colspan="1" rowspan="1"><p>This option allows the configuration of the maximum size of the thread pool that handles connection attempts. Lowering this number can help prevent the broker from running out of threads if there are many different clients attempting to connect at the same time. By default it is turned off by setting to MAX_INT</p></td></tr></tbody></table><p><br clear="none">An example that configures the transport with a maximum protocol detection time of 5 seconds:</p><structured-macro ac:macro-id="2f645d3e-dbec-42b6-b5ad-c6043c0d1d72" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto"
uri="auto://localhost:5671?protocolDetectionTimeOut=5000"/></plain-text-body></structured-macro><h3>Configuring Wire Formats</h3><p>OpenWire is the default Wire Format that ActiveMQ uses.  It provides a highly efficent binary format for high speed messaging.  OpenWire options can be configured on a JMS client's connection URI string or on a Brokers transport bind URI.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Parameter Prefix</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.</p></td><td colspan="1" rowspan="1"><p>Applies the option to all wire formats.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.default.</p></td><td colspan="1" rowspan="1"><p>Applies the option to the default format which is OpenWire</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.stomp.</p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the STOMP wire format</span></p></td></tr><tr><td colsp
an="1" rowspan="1"><p><span>wireFormat.amqp.</span></p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the AMQP<span> wire format</span></span></p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.mqtt.</p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the MQTT<span> wire format</span></span></p></td></tr></tbody></table><p> </p><p>An example of a property that applies to all formats:</p><structured-macro ac:macro-id="74a2a3a1-104d-440d-8639-b25f6efe924f" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto" uri="auto://localhost:5671?wireFormat.maxFrameSize=1000"/></plain-text-body></structured-macro><p> </p><p>An example of a property only applied to OpenWire would be:</p><structured-macro ac:macro-id="1098c525-7508-4399-954f-3b02ab7b1994" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnect
or name="auto" uri="auto://localhost:5671?wireFormat.default.maxFrameSize=1000"/></plain-text-body></structured-macro><h3>Configuring Enabled Wire Protocols</h3><p>By default all wire protocols are available.  This can be configured to only enable certain formats by setting the property  auto<code>.protocols.</code> </p><table><tbody><tr><th colspan="1" rowspan="1"><p>Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>default</p></td><td colspan="1" rowspan="1"><p>Enables OpenWire</p></td></tr><tr><td colspan="1" rowspan="1"><p>amqp</p></td><td colspan="1" rowspan="1"><p>Enables AMQP format</p></td></tr><tr><td colspan="1" rowspan="1"><p>stomp</p></td><td colspan="1" rowspan="1"><p>Enables STOMP format</p></td></tr><tr><td colspan="1" rowspan="1"><p>mqtt</p></td><td colspan="1" rowspan="1"><p>Enables MQTT format</p></td></tr></tbody></table><p> </p><p>An example showing only OpenWire and STOMP enabled:</p><
structured-macro ac:macro-id="2cc70f63-d57a-470e-848d-b8a7d05d4d06" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body> <transportConnector name="auto" uri="auto://localhost:5671?auto.protocols=default,stomp"/></plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/axis-and-cxf-support.xml
----------------------------------------------------------------------
diff --git a/axis-and-cxf-support.xml b/axis-and-cxf-support.xml
index a7e3f56..eea2e9a 100644
--- a/axis-and-cxf-support.xml
+++ b/axis-and-cxf-support.xml
@@ -1,11 +1,11 @@
-<div class="wiki-content maincontent"><p>ActiveMQ supports both <a shape="rect" class="external-link" href="http://ws.apache.org/axis/">Apache Axis</a> and <a shape="rect" class="external-link" href="http://incubator.apache.org/cxf">Apache CXF</a> out of the box. </p>
+<div class="wiki-content maincontent"><p>ActiveMQ supports both <a shape="rect" href="http://ws.apache.org/axis/">Apache Axis</a> and <a shape="rect" href="http://incubator.apache.org/cxf">Apache CXF</a> out of the box. </p>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Axis support is @deprecated</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Support for Axis is deprecated, and will be removed from ActiveMQ 5.8 onwards.</p></div></div>
+<structured-macro ac:macro-id="a9d73ce4-60e3-4b4f-8fb9-0ff12c48a100" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Axis support is @deprecated</parameter><rich-text-body>
+<p>Support for Axis is deprecated, and will be removed from ActiveMQ 5.8 onwards.</p></rich-text-body></structured-macro>
-<p>Just add the <a shape="rect" href="initial-configuration.xml">required jars</a> to your classpath and you should be able to use JMS transport support inside either web service framework to send and receive messages using ActiveMQ queues or topics for reliable messaging.</p>
+<p>Just add the <link><page ri:content-title="Initial Configuration"></page><link-body>required jars</link-body></link> to your classpath and you should be able to use JMS transport support inside either web service framework to send and receive messages using ActiveMQ queues or topics for reliable messaging.</p>
-<p>For an example of using the JMS transport with Axis, consult <a shape="rect" class="external-link" href="http://ws.apache.org/axis2/1_2/jms-transport.html">JMS Transport reference</a> or try looking at the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/samples/jms/">JMS example</a> that comes with bundled with Axis' binary and source downloads.</p>
+<p>For an example of using the JMS transport with Axis, consult <a shape="rect" href="http://ws.apache.org/axis2/1_2/jms-transport.html">JMS Transport reference</a> or try looking at the <a shape="rect" href="http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/samples/jms/">JMS example</a> that comes with bundled with Axis' binary and source downloads.</p>
-<p>For examples of using JMS transport with CXF, please see its <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/">JMS publish/subscriber sample</a> and the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_queue/">JMS queue sample</a> available in the CXF source and binary downloads.</p></div>
+<p>For examples of using JMS transport with CXF, please see its <a shape="rect" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/">JMS publish/subscriber sample</a> and the <a shape="rect" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_queue/">JMS queue sample</a> available in the CXF source and binary downloads.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/banner.xml
----------------------------------------------------------------------
diff --git a/banner.xml b/banner.xml
index 0ba55b7..224ccbc 100644
--- a/banner.xml
+++ b/banner.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><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>
- <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
- </div>
-</div>
-</div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="b53c059e-781d-4916-b99a-5bccad111511" ac:name="html" ac:schema-version="1"><parameter ac:name="output">html</parameter><parameter ac:name="atlassian-macro-output-type">INLINE</parameter><parameter ac:name="noPanel">true</parameter><plain-text-body><div id="asf_logo">
+ <div id="activemq_logo">
+ <a 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>
+ <a style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
+ </div>
+</div>
+</plain-text-body></structured-macro></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/becoming-a-committer.xml
----------------------------------------------------------------------
diff --git a/becoming-a-committer.xml b/becoming-a-committer.xml
index 84ee20d..f4328d7 100644
--- a/becoming-a-committer.xml
+++ b/becoming-a-committer.xml
@@ -1,4 +1,2 @@
-<div class="wiki-content maincontent"><p>This page details how to become a committer.</p><h3 id="Becomingacommitter-Howtobecomeacommitter">How to become a committer</h3><p>First of all you need to get involved and <a shape="rect" href="contributing.xml">Contribute</a> via the mail list, forums, edit the documention, work on the issue tracker and submit patches.</p><p>Once you're contributing and your work is good, one of our <a shape="rect" href="team.xml">Team</a> may invite you to be a committer (after we've called a vote). When that happens, if you accept, the following process kicks into place...</p><p>Note that becoming a committer is not just about submitting some patches; its also about helping out on the development and user <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>, helping with documentation and the issue tracker.</p><h3 id="Becomingacommitter-Becomingacommittersteps">Becoming a committer steps</h3><ul><li>Download and print the Apache Contributor
License Agreement from <a shape="rect" class="external-link" href="http://www.apache.org/dev/new-committers-guide.html">here</a>. You need to sign it and fax it to Apache. In the past I've found its often faster to also post it via snail mail <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li><li>wait for your name to appear on the list of <a shape="rect" class="external-link" href="http://people.apache.org/~jim/committers.html#unlistedclas">received CLAs</a></li><li>once thats done let us know and we can apply to Apache Infrastructure to have your account created; we'll also need to know<ul><li>your full name</li><li>your preferred email address</li><li>your preferred unix account name</li></ul></li></ul><h3 id="Becomingacommitter-GettingstartedatApache">Getting started at Apache</h3><p>Firstly add yourself to the <a sh
ape="rect" href="team.xml">Team</a> page</p><p>Now go read the instructions on the <a shape="rect" class="external-link" href="http://www.apache.org/dev/new-committers-guide.html">new committers guide</a>. Its also worth viewing <a shape="rect" class="external-link" href="http://www.apache.org/dev">http://www.apache.org/dev</a>.</p><h3 id="Becomingacommitter-EnablingyourGITaccount">Enabling your GIT account</h3><p>Once you've got your Apache account working you need to enable GIT access<strong>. </strong>Add your SSH Key at <a shape="rect" class="external-link" href="https://id.apache.org/">https://id.apache.org/</a><strong><br clear="none"></strong></p><h3 id="Becomingacommitter-ConfiguringGIT">Configuring GIT</h3><p>Configure GIT to use unix line endings.</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[git config --add core.autocrlf input]]></script>
-</div></div><h3 id="Becomingacommitter-GettingKarmainJIRAandConfluence">Getting Karma in JIRA and Confluence</h3><p>Mail the dev list and ask for karma for JIRA / Confluence giving them details of your username you used to register with them both. We can then grant the necessary karma so you can start grabbing JIRA issues or editing the wiki</p></div>
+<div class="wiki-content maincontent"><p>This page details how to become a committer.</p><h3>How to become a committer</h3><p>First of all you need to get involved and <link><page ri:content-title="Contributing"></page><plain-text-link-body>Contribute</plain-text-link-body></link> via the mail list, forums, edit the documention, work on the issue tracker and submit patches.</p><p>Once you're contributing and your work is good, one of our <link><page ri:content-title="Team"></page></link> may invite you to be a committer (after we've called a vote). When that happens, if you accept, the following process kicks into place...</p><p>Note that becoming a committer is not just about submitting some patches; its also about helping out on the development and user <link><page ri:content-title="Discussion Forums"></page></link>, helping with documentation and the issue tracker.</p><h3>Becoming a committer steps</h3><ul><li>Download and print the Apache Contributor License Agreement from <a sh
ape="rect" href="http://www.apache.org/dev/new-committers-guide.html">here</a>. You need to sign it and fax it to Apache. In the past I've found its often faster to also post it via snail mail <emoticon ac:name="smile"></emoticon></li><li>wait for your name to appear on the list of <a shape="rect" href="http://people.apache.org/~jim/committers.html#unlistedclas">received CLAs</a></li><li>once thats done let us know and we can apply to Apache Infrastructure to have your account created; we'll also need to know<ul><li>your full name</li><li>your preferred email address</li><li>your preferred unix account name</li></ul></li></ul><h3>Getting started at Apache</h3><p>Firstly add yourself to the <link><page ri:content-title="Team"></page></link> page</p><p>Now go read the instructions on the <a shape="rect" href="http://www.apache.org/dev/new-committers-guide.html">new committers guide</a>. Its also worth viewing <a shape="rect" class="external-link" href="http://www.apache.org/dev">http:
//www.apache.org/dev</a>.</p><h3>Enabling your GIT account</h3><p>Once you've got your Apache account working you need to enable GIT access<strong>. </strong>Add your SSH Key at <a shape="rect" href="https://id.apache.org/">https://id.apache.org/</a><strong><br clear="none"></strong></p><h3>Configuring GIT</h3><p>Configure GIT to use unix line endings.</p><structured-macro ac:macro-id="c4df4af7-2b1f-45e3-b20f-ca1ed40f7d24" ac:name="code" ac:schema-version="1"><plain-text-body>git config --add core.autocrlf input</plain-text-body></structured-macro><h3>Getting Karma in JIRA and Confluence</h3><p>Mail the dev list and ask for karma for JIRA / Confluence giving them details of your username you used to register with them both. We can then grant the necessary karma so you can start grabbing JIRA issues or editing the wiki</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/benchmark-tests.xml
----------------------------------------------------------------------
diff --git a/benchmark-tests.xml b/benchmark-tests.xml
index 872a089..718448d 100644
--- a/benchmark-tests.xml
+++ b/benchmark-tests.xml
@@ -1,9 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="BenchmarkTests-ActiveMQMavenPerformancetestplugin.">ActiveMQ Maven Performance test plugin.</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ Maven Performance test plugin.</h2>
-<p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself. To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin. The plugin is further documented <a shape="rect" href="activemq-performance-module-users-manual.xml">here</a>.</p>
+<p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself. To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin. The plugin is further documented <link><page ri:content-title="ActiveMQ Performance Module Users Manual"></page><link-body>here</link-body></link>.</p>
-<h2 id="BenchmarkTests-Third-PartyJMSperformancetests">Third-Party JMS performance tests</h2>
+<h2>Third-Party JMS performance tests</h2>
<p>There are a number of third-party JMS performance test tools that can be used to measure the performance of various features of brokers and compare them.</p>
-<ul><li><a shape="rect" class="external-link" href="http://jmeter.apache.org/">Apache JMeter</a></li><li><a shape="rect" class="external-link" href="https://github.com/chirino/jms-benchmark" rel="nofollow">jms-benchmark</a></li></ul></div>
+<ul><li><a shape="rect" href="http://jmeter.apache.org/">Apache JMeter</a></li><li><a shape="rect" href="https://github.com/chirino/jms-benchmark">jms-benchmark</a></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/blazeds.xml
----------------------------------------------------------------------
diff --git a/blazeds.xml b/blazeds.xml
index e619dfe..7d1ea27 100644
--- a/blazeds.xml
+++ b/blazeds.xml
@@ -1,25 +1,24 @@
-<div class="wiki-content maincontent"><h2 id="BlazeDS-BlazeDS">BlazeDS</h2>
+<div class="wiki-content maincontent"><h2>BlazeDS</h2>
-<p>You may also want to check out the <a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html" rel="nofollow">Simplified BlazeDS and JMS article</a> by <a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/" rel="nofollow">Michael Martin</a>.</p>
+<p>You may also want to check out the <a shape="rect" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html">Simplified BlazeDS and JMS article</a> by <a shape="rect" href="http://mmartinsoftware.blogspot.com/">Michael Martin</a>.</p>
-<p>Using the dynamicQueues feature of the <a shape="rect" href="jndi-support.xml">JNDI Support</a> Ryan Gardner created thisworking BlazeDS messaging-config.xml file:</p>
+<p>Using the dynamicQueues feature of the <link><page ri:content-title="JNDI Support"></page></link> Ryan Gardner created thisworking BlazeDS messaging-config.xml 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[
-<?xml version="1.0" encoding="UTF-8"?>
-<service id="message-service" class="flex.messaging.services.MessageService">
+<structured-macro ac:macro-id="b238623f-c9bb-49a6-a5c5-a5549d2610b9" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="message-service" class="flex.messaging.services.MessageService">
<adapters>
- <adapter-definition id="actionscript" class="flex.messaging.services.messaging.adapters.ActionScriptAdapter" default="true" />
- <adapter-definition id="jms" class="flex.messaging.services.messaging.adapters.JMSAdapter"/>
+ <adapter-definition id="actionscript" class="flex.messaging.services.messaging.adapters.ActionScriptAdapter" default="true" />
+ <adapter-definition id="jms" class="flex.messaging.services.messaging.adapters.JMSAdapter"/>
</adapters>
<default-channels>
- <channel ref="my-streaming-amf"/>
- <channel ref="my-polling-amf"/>
+ <channel ref="my-streaming-amf"/>
+ <channel ref="my-polling-amf"/>
</default-channels>
- <destination id="inbound-sms-destination">
+ <destination id="inbound-sms-destination">
<properties>
<jms>
@@ -44,9 +43,8 @@
</initial-context-environment>
</jms>
</properties>
- <adapter ref="jms"/>
+ <adapter ref="jms"/>
</destination>
</service>
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/blob-messages.xml
----------------------------------------------------------------------
diff --git a/blob-messages.xml b/blob-messages.xml
index 8530554..7075369 100644
--- a/blob-messages.xml
+++ b/blob-messages.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="BlobMessages-BlobMessages">Blob Messages</h2>
+<div class="wiki-content maincontent"><h2>Blob Messages</h2>
<p>A common requirement these days is to send around massive files for processing by consumers. Folks want to take advantage of the message broker's features such as reliable, transactional load balancing of queues with smart routing but still manage to deal with huge logical files.</p>
@@ -6,42 +6,35 @@
<p>There are now new createBlobMessage() methods on the ActiveMQSession that you can use for sending BLOBs. </p>
-<h3 id="BlobMessages-SendingBlobMessages">Sending BlobMessages</h3>
+<h3>Sending BlobMessages</h3>
<p>You can send a URL around the JMS network, such as a file or URL which exists on some shared file system or web server using the following code</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[
-BlobMessage message = session.createBlobMessage(new URL("http://some.shared.site.com");
+<structured-macro ac:macro-id="6be5c968-e508-407f-83e5-5e256a77d939" ac:name="code" ac:schema-version="1"><plain-text-body>
+BlobMessage message = session.createBlobMessage(new URL("http://some.shared.site.com");
producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>Or if you are creating files or streams dynamically on the client you may want to upload the file to the broker or some server (Jetty, FTP, WebDav or whatever). In which case you'd use one of the following methods</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[
+<structured-macro ac:macro-id="f990ea28-b4c0-4468-b9ba-5648214461d4" ac:name="code" ac:schema-version="1"><plain-text-body>
// lets use a local file
-BlobMessage message = session.createBlobMessage(new File("/foo/bar");
+BlobMessage message = session.createBlobMessage(new File("/foo/bar");
producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<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[
+<structured-macro ac:macro-id="a43a4699-551e-41b2-a013-f580e8ba0894" ac:name="code" ac:schema-version="1"><plain-text-body>
// lets use a stream
InputStream in = ...;
BlobMessage message = session.createBlobMessage(in);
producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h3 id="BlobMessages-ReceivingBlobMessages">Receiving BlobMessages</h3>
+<h3>Receiving BlobMessages</h3>
-<p>A <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/BlobMessage.html">BlobMessage</a> is a regular JMS message so it can be received just like any other message...</p>
+<p>A <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/BlobMessage.html">BlobMessage</a> is a regular JMS message so it can be received just like any other message...</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[
+<structured-macro ac:macro-id="19b81f57-789a-4d1a-882a-d0f3ebe734be" ac:name="code" ac:schema-version="1"><plain-text-body>
public class MyListener implements MessageListener {
public void onMessage(Message message) {
if (message instanceof BlobMessage) {
@@ -52,22 +45,20 @@ public class MyListener implements MessageListener {
}
}
}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h3 id="BlobMessages-ConfiguringtheBLOBTransferPolicy">Configuring the BLOB Transfer Policy</h3>
+<h3>Configuring the BLOB Transfer Policy</h3>
<p>You can explicitly configure the BlobTransferPolicy on an ActiveMQConnectionFactory, ActiveMQConnection or ActiveMQSession. Typically its done on the factory either via Java code or Spring.</p>
-<p>You can use the <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a> to configure these things via a URI.</p>
+<p>You can use the <link><page ri:content-title="Connection Configuration URI"></page></link> to configure these things via a URI.</p>
<p>For example you can connect to a broker also specifying the uploadUrl to use via</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[
+<structured-macro ac:macro-id="c3816021-f3f7-419b-b3d9-65a52c18ef59" ac:name="code" ac:schema-version="1"><plain-text-body>
tcp://localhost:61616?jms.blobTransferPolicy.uploadUrl=http://foo.com
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
+
</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/board-reports.xml
----------------------------------------------------------------------
diff --git a/board-reports.xml b/board-reports.xml
index 93656c6..591ed09 100644
--- a/board-reports.xml
+++ b/board-reports.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="BoardReports-BoardReports">Board Reports</h2>
+<div class="wiki-content maincontent"><h2>Board Reports</h2>
<p>The following are the Apache Software Foundation Board Reports.</p>
-<ul class="childpages-macro"><li><a shape="rect" href="2007-april.xml">2007 April</a></li></ul></div>
+<structured-macro ac:macro-id="7dc06fda-5630-4ef7-ba59-7c2e26f9b241" 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/books.xml
----------------------------------------------------------------------
diff --git a/books.xml b/books.xml
index 2594158..584bc3e 100644
--- a/books.xml
+++ b/books.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="Books-Books">Books</h1><p>This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>.</p><ul><li><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ in Action</a></li><li><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow">Instant Apache ActiveMQ Messaging Application Development</a></li><li><a shape="rect" class="external-link" href="http://shop.oreilly.com/product/0636920032366.do" rel="nofollow">Mobile and Web Messaging</a></li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">Apache ActiveMQ Reference Guide</a></li></ul><h3 id="Books-ActiveMQinAction">ActiveMQ in Action</h3><p><a shape="rect" class="external-link" href="http://bit.ly/2j
e6cQ" rel="nofollow">ActiveMQ in Action</a> by <a shape="rect" class="external-link" href="http://bruceblog.org/" rel="nofollow">Bruce Snyder</a>, <a shape="rect" class="external-link" href="http://www.nighttale.net/" rel="nofollow">Dejan Bosanac</a> and <a shape="rect" class="external-link" href="http://rajdavies.blogspot.com/" rel="nofollow">Rob Davies</a>. Published by <a shape="rect" class="external-link" href="http://www.manning.com" rel="nofollow">Manning</a>.</p><p><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span></a></p><p>Apache ActiveMQ in Action is a thorough, practical guide to implementing message-oriented systems in Java using ActiveMQ. The book lays out the core of ActiveMQ in clear language, sta
rting with the anatomy of a JMS message and moving quickly through connectors, message persistence, authentication and authorization. With the basics well in hand, you move into interesting examples of ActiveMQ at work, following a running Stock Portfolio application. You'll integrate ActiveMQ with containers like Geronimo and JBoss and learn to tie into popular Java-based technologies like Spring Framework.</p><p>Along the way, you'll pick up best practices forged out of the deep experience the authors bring to the book. You'll learn to integrate with non-Java technologies and explore advanced topics like broker topologies and configuration and performance tuning.</p><h3 id="Books-InstantApacheActiveMQMessagingApplicationDevelopment">Instant Apache ActiveMQ Messaging Application Development</h3><p><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow">Instant Apache ActiveMQ Messaging Application Development</a> by <a shape="rect" class="external-link" href
="http://timbish.blogspot.com/" rel="nofollow">Timothy Bish</a>. Published by <a shape="rect" class="external-link" href="http://www.packtpub.com/" rel="nofollow">Packt Publishing</a>.</p><p><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg" data-image-src="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg"></span></a></p><p>Instant ActiveMQ Application Development How-to is for the developers who are new to Java Message Service application development or new to JMS development using ActiveMQ. Readers will come away ready to solve complicated messaging related problems using the JMS API and ActiveMQ.</p><p>Filled with practical, step-by-step instructions and clear explanations for the most impo
rtant and useful tasks.This is a Packt Instant How-to guide, which provides concise and practical recipes to help you get started writing applications with ActiveMQ using practical examples.</p><h3 id="Books-MobileandWebMessaging">Mobile and Web Messaging</h3><p><a shape="rect" class="external-link" href="http://shop.oreilly.com/product/0636920032366.do" rel="nofollow">Messaging Protocols for Web and Mobile Devices by Jeff Mesnil. Published by OReilly.</a></p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif" data-image-src="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif"></span></p><p>Learn how to use messaging technologies to build responsive and resilient applications for mobile devices and web browsers. With this hands-on guide, you’ll use the STOMP and MQTT messaging protocols to write iOS and web applications capable of sendi
ng and receiving GPS and device sensor data, text messages, and alerts.</p><h3 id="Books-ApacheActiveMQReferenceGuideKit">Apache ActiveMQ Reference Guide Kit</h3><p>The TTM's "<a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">Apache ActiveMQ Reference Guide</a>" (PDF book) provides information to learn how to implement, deploy, administer, and tune Apache ActiveMQ. The Reference Guide includes details on how to work with ActiveMQ components, connectors, client/broker configuration, master/slave configuration, administration, logging, performance tuning and advanced features.</p></div>
+<div class="wiki-content maincontent"><h1>Books</h1><p>This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the <link><page ri:content-title="Mailing Lists"></page></link>.</p><ul><li><a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ in Action</a></li><li><a shape="rect" href="http://goo.gl/RFltj">Instant Apache ActiveMQ Messaging Application Development</a></li><li><a shape="rect" href="http://shop.oreilly.com/product/0636920032366.do">Mobile and Web Messaging</a></li><li><a shape="rect" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php">Apache ActiveMQ Reference Guide</a></li></ul><h3>ActiveMQ in Action</h3><p><a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ in Action</a> by <a shape="rect" href="http://bruceblog.org/">Bruce Snyder</a>, <a shape="rect" href="http://www.nighttale.net/">Dejan Bosanac</a> and <a shape="rect" href="http://rajdavies.blogspot.
com/">Rob Davies</a>. Published by <a shape="rect" href="http://www.manning.com">Manning</a>.</p><p><a shape="rect" href="http://bit.ly/2je6cQ"><image><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image></a></p><p>Apache ActiveMQ in Action is a thorough, practical guide to implementing message-oriented systems in Java using ActiveMQ. The book lays out the core of ActiveMQ in clear language, starting with the anatomy of a JMS message and moving quickly through connectors, message persistence, authentication and authorization. With the basics well in hand, you move into interesting examples of ActiveMQ at work, following a running Stock Portfolio application. You'll integrate ActiveMQ with containers like Geronimo and JBoss and learn to tie into popular Java-based technologies like Spring Framework.</p><p>Along the way, you'll pick up best practices forged out of the deep experience the authors bring to the book. You'll learn to integrate with non-Java tech
nologies and explore advanced topics like broker topologies and configuration and performance tuning.</p><h3>Instant Apache ActiveMQ Messaging Application Development</h3><p><a shape="rect" href="http://goo.gl/RFltj">Instant Apache ActiveMQ Messaging Application Development</a> by <a shape="rect" href="http://timbish.blogspot.com/">Timothy Bish</a>. Published by <a shape="rect" href="http://www.packtpub.com/">Packt Publishing</a>.</p><p><a shape="rect" href="http://goo.gl/RFltj"><image><url ri:value="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg"></url></image></a></p><p>Instant ActiveMQ Application Development How-to is for the developers who are new to Java Message Service application development or new to JMS development using ActiveMQ. Readers will come away ready to solve complicated messaging related problems using the JMS API and ActiveMQ.</p><p>Filled with practical, step-by-step instructions and clear explanations for the m
ost important and useful tasks.This is a Packt Instant How-to guide, which provides concise and practical recipes to help you get started writing applications with ActiveMQ using practical examples.</p><h3>Mobile and Web Messaging</h3><p><a shape="rect" href="http://shop.oreilly.com/product/0636920032366.do">Messaging Protocols for Web and Mobile Devices by Jeff Mesnil. Published by OReilly.</a></p><p><image><url ri:value="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif"></url></image></p><p>Learn how to use messaging technologies to build responsive and resilient applications for mobile devices and web browsers. With this hands-on guide, you’ll use the STOMP and MQTT messaging protocols to write iOS and web applications capable of sending and receiving GPS and device sensor data, text messages, and alerts.</p><h3>Apache ActiveMQ Reference Guide Kit</h3><p>The TTM's "<a shape="rect" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php">Ap
ache ActiveMQ Reference Guide</a>" (PDF book) provides information to learn how to implement, deploy, administer, and tune Apache ActiveMQ. The Reference Guide includes details on how to work with ActiveMQ components, connectors, client/broker configuration, master/slave configuration, administration, logging, performance tuning and advanced features.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broadcasting.xml
----------------------------------------------------------------------
diff --git a/broadcasting.xml b/broadcasting.xml
index 3dcfb57..7d9c98b 100644
--- a/broadcasting.xml
+++ b/broadcasting.xml
@@ -5,8 +5,7 @@ Using the basic building block of a Channel, there exists a functional hierarchy
<p>To use a BlazeChannel create one from the a factory:</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[
+<structured-macro ac:macro-id="f30411e7-098a-436f-aee0-aef2d1b9764d" ac:name="code" ac:schema-version="1"><plain-text-body>
import org.apache.activeblaze.*;
...
BlazeChannelFactory factory = new BlazeChannelFactory();
@@ -14,18 +13,16 @@ BlazeChannel sender = factory.createChannel();
//start the channel and send a message
sender.start();
-String destination = "foo.bar";
-BlazeMessage msg = new BlazeMessage("test payload");
+String destination = "foo.bar";
+BlazeMessage msg = new BlazeMessage("test payload");
sender.broadcast(destination,msg);
//shutdown the sender
sender.shutDown();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>You can similarly subscribe to Topic messages by using a listener</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[
+<structured-macro ac:macro-id="f52abf76-f5a1-49db-b7a5-88dcf8f9b651" ac:name="code" ac:schema-version="1"><plain-text-body>
BlazeChannel receiver = factory.createChannel();
receiver.start();
@@ -33,11 +30,10 @@ receiver.start();
receiver.addBlazeTopicMessageListener(destination, new BlazeMessageListener() {
public void onMessage(BlazeMessage msg) {
- System.out.println("Got a msg: " + msg);
+ System.out.println("Got a msg: " + msg);
}
});
receiver.shutDown();
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-camel-component.xml
----------------------------------------------------------------------
diff --git a/broker-camel-component.xml b/broker-camel-component.xml
index aafa00c..42e61d5 100644
--- a/broker-camel-component.xml
+++ b/broker-camel-component.xml
@@ -1,35 +1,31 @@
-<div class="wiki-content maincontent"><h2 id="BrokerCamelComponent-BrokerCamelComponent">Broker Camel Component</h2><p><strong>Available as of ActiveMQ 5.9</strong></p><p>Embedding Apache Camel inside the ActiveMQ broker provides great flexibility for extending the message broker with the integration power of Camel. Apache Camel routes also benefit in that you can avoid the serialization and network costs of connecting to ActiveMQ remotely - if you use the <a shape="rect" class="external-link" href="http://camel.apache.org/activemq.html">activemq component</a>.</p><p>If however, you want to change the behavior of messages flowing through the ActiveMQ message broker itself you will be limited to the shipped set of ActiveMQ broker <a shape="rect" class="external-link" href="http://activemq.apache.org/interceptors.html">Interceptors</a> - or develop your own <a shape="rect" class="external-link" href="http://activemq.apache.org/developing-plugins.html">Broker plugin</a> and then introd
uce that as a jar on to the class path for the ActiveMQ broker. The <strong><code>broker</code></strong> Camel component makes this even easier. It intercepts messages as they move through the broker itself, allowing them to be modified and manipulated before they are persisted to the message store or delivered to end consumers.</p><p>For example <a shape="rect" class="external-link" href="http://activemq.apache.org/how-should-i-package-applications-using-camel-and-activemq.html">by defining a CamelContext to run inside the broker's JVM </a>the <strong><code>broker</code></strong> component can intercept all messages published to a Topic, say, and publish them to a Queue instead, changing their priority along the way:</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[<route id="setPriority">
- <from uri="broker:topic:test.broker.>"/>
- <setHeader headerName="JMSPriority">
+<div class="wiki-content maincontent"><h2>Broker Camel Component</h2><p><strong>Available as of ActiveMQ 5.9</strong></p><p>Embedding Apache Camel inside the ActiveMQ broker provides great flexibility for extending the message broker with the integration power of Camel. Apache Camel routes also benefit in that you can avoid the serialization and network costs of connecting to ActiveMQ remotely - if you use the <a shape="rect" href="http://camel.apache.org/activemq.html">activemq component</a>.</p><p>If however, you want to change the behavior of messages flowing through the ActiveMQ message broker itself you will be limited to the shipped set of ActiveMQ broker <a shape="rect" href="http://activemq.apache.org/interceptors.html">Interceptors</a> - or develop your own <a shape="rect" href="http://activemq.apache.org/developing-plugins.html">Broker plugin</a> and then introduce that as a jar on to the class path for the ActiveMQ broker. The <strong><code>broker</code></strong> Cam
el component makes this even easier. It intercepts messages as they move through the broker itself, allowing them to be modified and manipulated before they are persisted to the message store or delivered to end consumers.</p><p>For example <a shape="rect" href="http://activemq.apache.org/how-should-i-package-applications-using-camel-and-activemq.html">by defining a CamelContext to run inside the broker's JVM </a>the <strong><code>broker</code></strong> component can intercept all messages published to a Topic, say, and publish them to a Queue instead, changing their priority along the way:</p><structured-macro ac:macro-id="46808b45-4f42-4c77-8d11-b064dc9fa99c" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body><route id="setPriority">
+ <from uri="broker:topic:test.broker.>"/>
+ <setHeader headerName="JMSPriority">
<constant>9</constant>
</setHeader>
- <to uri="broker:queue:test.broker.component.queue"/>
+ <to uri="broker:queue:test.broker.component.queue"/>
</route>
-]]></script>
-</div></div><p>Notes:</p><ul><li>A broker component only adds an intercept into the broker if its started - so the broker component will not add any overhead to the running broker until its used - and then the overhead will be trivial.</li><li>Messages are intercepted by the broker component when they have been received by the broker - but before they are processed (persisted or routed to a destination).</li><li>The <strong><code>IN</code></strong> message on the Exchange is a <strong><code>CamelMessage</code></strong>, but also a JMS Message (messages routed through ActiveMQ from STOMP/MQTT/AMQP etc. are always translated into JMS messages).</li><li>W<a shape="rect" class="external-link" href="http://activemq.apache.org/wildcards.html">ildcards</a> can be used on a destination to intercept messages from destinations matching the wildcard.</li><li>After the intercept, you have to explicitly send the message back to the broker component - this allows you to either drop select me
ssages (by not sending) - or, like in the above case - re-route the message to a different destination.<br clear="none"><br clear="none"></li></ul><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>There is one deliberate caveat though, only intercepted messages can be sent to a <strong><code>broker</code></strong> component. For example, routing a Camel message from another Component e.g. <strong><code>file</code></strong>, will result in an error.</p></div></div><p>Extra classes that have been added to the <strong><code>activemq-broker</code></strong> package to support the <strong><code>broker</code></strong> component. They allow the state of the running broker to be interrogated without using JMX. These classes are:</p><ul><li><a shape="rect" class="external-link" href="http://activemq.apac
he.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/MessageBrokerView.html">org.apache.activemq.broker.view.MessageBrokerView</a> - provides methods to retrieve statistics on a the broker</li><li>From the <strong><code>org.apache.activemq.broker.view.MessageBrokerView</code></strong> - you can retrieve a <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/BrokerDestinationView.html">org.apache.activemq.broker.view.BrokerDestinationView</a> for a particular destination.</li></ul><h3 id="BrokerCamelComponent-Example">Example</h3><p>How to route messages when a destination's queue depth has reached a certain limit:</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[<camelContext id="camel" trace="false" xmlns="http://camel.apache.org/schema/spring">
- <route id="routeAboveQueueLimitTest">
- <from uri="broker:queue:test.broker.queue"/>
+</plain-text-body></structured-macro><p>Notes:</p><ul><li>A broker component only adds an intercept into the broker if its started - so the broker component will not add any overhead to the running broker until its used - and then the overhead will be trivial.</li><li>Messages are intercepted by the broker component when they have been received by the broker - but before they are processed (persisted or routed to a destination).</li><li>The <strong><code>IN</code></strong> message on the Exchange is a <strong><code>CamelMessage</code></strong>, but also a JMS Message (messages routed through ActiveMQ from STOMP/MQTT/AMQP etc. are always translated into JMS messages).</li><li>W<a shape="rect" href="http://activemq.apache.org/wildcards.html">ildcards</a> can be used on a destination to intercept messages from destinations matching the wildcard.</li><li>After the intercept, you have to explicitly send the message back to the broker component - this allows you to either drop select
messages (by not sending) - or, like in the above case - re-route the message to a different destination.<br clear="none"><br clear="none"></li></ul><structured-macro ac:macro-id="7fd157e0-4ac6-4027-9539-96ed3ed4828e" ac:name="warning" ac:schema-version="1"><rich-text-body><p>There is one deliberate caveat though, only intercepted messages can be sent to a <strong><code>broker</code></strong> component. For example, routing a Camel message from another Component e.g. <strong><code>file</code></strong>, will result in an error.</p></rich-text-body></structured-macro><p>Extra classes that have been added to the <strong><code>activemq-broker</code></strong> package to support the <strong><code>broker</code></strong> component. They allow the state of the running broker to be interrogated without using JMX. These classes are:</p><ul><li><a shape="rect" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/MessageBrokerView.html">org.apache.
activemq.broker.view.MessageBrokerView</a> - provides methods to retrieve statistics on a the broker</li><li>From the <strong><code>org.apache.activemq.broker.view.MessageBrokerView</code></strong> - you can retrieve a <a shape="rect" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/BrokerDestinationView.html">org.apache.activemq.broker.view.BrokerDestinationView</a> for a particular destination.</li></ul><h3>Example</h3><p>How to route messages when a destination's queue depth has reached a certain limit:</p><structured-macro ac:macro-id="15dd6e15-edd6-4a5e-9a16-c0faf86e2c2a" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body><camelContext id="camel" trace="false" xmlns="http://camel.apache.org/schema/spring">
+ <route id="routeAboveQueueLimitTest">
+ <from uri="broker:queue:test.broker.queue"/>
<choice>
<when>
<spel>#{@destinationView.queueSize >= 100}</spel>
- <to uri="broker:queue:test.broker.processLater"/>
+ <to uri="broker:queue:test.broker.processLater"/>
</when>
<otherwise>
- <to uri="broker:queue:test.broker.queue"/>
+ <to uri="broker:queue:test.broker.queue"/>
</otherwise>
</choice>
</route>
</camelContext>
-<bean id="brokerView" class="org.apache.activemq.broker.view.MessageBrokerView">
- <constructor-arg value="testBroker"/>
+<bean id="brokerView" class="org.apache.activemq.broker.view.MessageBrokerView">
+ <constructor-arg value="testBroker"/>
</bean>
-<bean id="destinationView" factory-bean="brokerView" factory-method="getDestinationView">
- <constructor-arg value="test.broker.component.route"/>
+<bean id="destinationView" factory-bean="brokerView" factory-method="getDestinationView">
+ <constructor-arg value="test.broker.component.route"/>
</bean>
-]]></script>
-</div></div><p>This is using the Camel Message Router pattern. Note the use of the Spring expression language <strong><code>spel</code></strong> in the <strong><code>when</code></strong> clause.</p><p> </p></div>
+</plain-text-body></structured-macro><p>This is using the Camel Message Router pattern. Note the use of the Spring expression language <strong><code>spel</code></strong> in the <strong><code>when</code></strong> clause.</p><p> </p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-configuration-uri.xml
----------------------------------------------------------------------
diff --git a/broker-configuration-uri.xml b/broker-configuration-uri.xml
index db1e2d7..aa7d8ce 100644
--- a/broker-configuration-uri.xml
+++ b/broker-configuration-uri.xml
@@ -1,12 +1,12 @@
-<div class="wiki-content maincontent"><h3 id="BrokerConfigurationURI-Overview">Overview</h3>
+<div class="wiki-content maincontent"><h3>Overview</h3>
<p>An ActiveMQ broker can be extensivly configured using a single configuration URI. The following URI schemes are supported</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Scheme</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-xbean-uri.xml">Broker XBean URI</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker using an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> from an XML file which is on the classpath (or in 4.2 onwards can be on the file system or an external URL) which uses Spring and xbean-spring to configure the broker </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> broker: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-uri.xml">Broker URI</a> </p></td><
td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker explicitly using a URI syntax </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> properties: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-properties-uri.xml">Broker Properties URI</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker explicitly using a URI syntax </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Scheme</p></th><th colspan="1" rowspan="1"><p>Link</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p> xbean: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="Broker XBean URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker using an <link><page ri:content-title="Xml Configuration"></page></link> from an XML file which is on the classpath (or in 4.2 onwards can be on the file system or an external URL) which uses Spring and xbean-spring to configure the broker </p></td></tr><tr><td colspan="1" rowspan="1"><p> broker: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="Broker URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker explicitly using a URI syntax </p></td></tr><tr><td colspan="1" rowspan="1"><p> properties: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="B
roker Properties URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker explicitly using a URI syntax </p></td></tr></tbody></table>
-<p>For the most flexible and powerful option we recommend the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> via the <a shape="rect" href="broker-xbean-uri.xml">Broker XBean URI</a> to configure AcitveMQ brokers. </p>
+<p>For the most flexible and powerful option we recommend the <link><page ri:content-title="Xml Configuration"></page></link> via the <link><page ri:content-title="Broker XBean URI"></page></link> to configure AcitveMQ brokers. </p>
-<p>If you are worried about jar dependencies then either the <a shape="rect" href="broker-uri.xml">Broker URI</a> or the <a shape="rect" href="broker-properties-uri.xml">Broker Properties URI</a> are useful as they are very simple and require no dependencies on Spring or xbean-spring and don't require any XML.</p></div>
+<p>If you are worried about jar dependencies then either the <link><page ri:content-title="Broker URI"></page></link> or the <link><page ri:content-title="Broker Properties URI"></page></link> are useful as they are very simple and require no dependencies on Spring or xbean-spring and don't require any XML.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-properties-uri.xml
----------------------------------------------------------------------
diff --git a/broker-properties-uri.xml b/broker-properties-uri.xml
index 13f5f95..b905668 100644
--- a/broker-properties-uri.xml
+++ b/broker-properties-uri.xml
@@ -1,10 +1,7 @@
-<div class="wiki-content maincontent"><h2 id="BrokerPropertiesURI-BrokerPropertiesURI">Broker Properties URI</h2><p>From version 4.2 of ActiveMQ onwards the Broker Properties URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> by referencing a properties file which could be on the classpath, a local file or a remote URL.</p><h4 id="BrokerPropertiesURI-Syntax">Syntax</h4><p><strong>properties:name</strong></p><p>Where name is some name which is resolved on the classpath, as a local file or a remote URL which points to the properties file used to configure the broker.</p><h5 id="BrokerPropertiesURI-ExampleURI">Example URI</h5><p>The following examples show variations in using the URI</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>properties:/foo/bar.properties
+<div class="wiki-content maincontent"><h2>Broker Properties URI</h2><p>From version 4.2 of ActiveMQ onwards the Broker Properties URI allows you to <link><page ri:content-title="Run Broker"></page><plain-text-link-body>run a configured broker</plain-text-link-body></link> by referencing a properties file which could be on the classpath, a local file or a remote URL.</p><h4>Syntax</h4><p><strong>properties:name</strong></p><p>Where name is some name which is resolved on the classpath, as a local file or a remote URL which points to the properties file used to configure the broker.</p><h5>Example URI</h5><p>The following examples show variations in using the URI</p><structured-macro ac:macro-id="632155fb-8fe5-43c9-bb92-058d3e71366f" ac:name="noformat" ac:schema-version="1"><plain-text-body>properties:/foo/bar.properties
properties:foo.properties
properties:http://foo.com/foo.properties
-</pre>
-</div></div><p>Here is <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/config/broker.properties">an example properties file</a></p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>## ---------------------------------------------------------------------------
+</plain-text-body></structured-macro><p>Here is <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/config/broker.properties">an example properties file</a></p><structured-macro ac:macro-id="8e337744-7484-4c40-afec-e78bdd572746" ac:name="noformat" ac:schema-version="1"><plain-text-body>## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -25,6 +22,5 @@ useJmx = false
persistent = false
brokerName = Cheese
# END SNIPPET: example
-</pre>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-uri.xml
----------------------------------------------------------------------
diff --git a/broker-uri.xml b/broker-uri.xml
index 1451726..641ffb3 100644
--- a/broker-uri.xml
+++ b/broker-uri.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="BrokerURI-BrokerURI">Broker URI</h2>
+<div class="wiki-content maincontent"><h2>Broker URI</h2>
-<p>The Broker URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> using a single URI for all the configuration.</p>
+<p>The Broker URI allows you to <link><page ri:content-title="Run Broker"></page><link-body>run a configured broker</link-body></link> using a single URI for all the configuration.</p>
-<h4 id="BrokerURI-Syntax">Syntax</h4>
+<h4>Syntax</h4>
<p>The URI is assumed to be a composite uri with multiple uris that are used to bind the connectors of the broker.</p>
@@ -11,23 +11,22 @@
<p>If a composite URI use the network: scheme, then the rest of the URI is bound as a network connector.</p>
-<h5 id="BrokerURI-BrokerOptions">Broker Options</h5>
+<h5>Broker 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>useJmx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker be exposed to JMX?</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>persistent</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker use persistent storage</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>populateJMSXUserID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker popul
ate the <a shape="rect" href="jmsxuserid.xml">JMSXUserID</a> property of messages to indicate the authenticated sender username who sent the message</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useShutdownHook</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>should the broker install a shutdown hook so that it can properly shut itself down on a JVM kill</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>brokerName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the broker</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>deleteAllMessagesOnStartup</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should all the messages in the persistent store be deleted on broker startup</p></td><
/tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>enableStatistics</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should statistics gathering be enabled</p></td></tr></tbody></table></div>
+<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>useJmx</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should the broker be exposed to JMX?</p></td></tr><tr><td colspan="1" rowspan="1"><p>persistent</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should the broker use persistent storage</p></td></tr><tr><td colspan="1" rowspan="1"><p>populateJMSXUserID</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should the broker populate the <link><page ri:content-title="JMSXUserID"></page></link> property of messages to indicate the authenticated sender username who sent the message</p></td></tr><tr><td colspan="1" rowspan="1"><p>useShutdownHook</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>
should the broker install a shutdown hook so that it can properly shut itself down on a JVM kill</p></td></tr><tr><td colspan="1" rowspan="1"><p>brokerName</p></td><td colspan="1" rowspan="1"><p>localhost</p></td><td colspan="1" rowspan="1"><p>The name of the broker</p></td></tr><tr><td colspan="1" rowspan="1"><p>deleteAllMessagesOnStartup</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should all the messages in the persistent store be deleted on broker startup</p></td></tr><tr><td colspan="1" rowspan="1"><p>enableStatistics</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should statistics gathering be enabled</p></td></tr></tbody></table>
-<h5 id="BrokerURI-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
<p>The following example starts up a broker accepting connections on port 61616, and establishes a network connection to remotehost:61616 and disables persistence.</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>broker:(tcp://localhost:61616,network:static:tcp://remotehost:61616)?persistent=false&useJmx=true
-</pre>
-</div></div>
+<structured-macro ac:macro-id="35981ad4-c2b0-4fcf-bb9e-612ecd03d351" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+broker:(tcp://localhost:61616,network:static:tcp://remotehost:61616)?persistent=false&useJmx=true
+</plain-text-body></structured-macro>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">You can use the Broker URI on other transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you are using another transport - such as the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a> then you can refer to the above broker URI properties inside that URL. e.g. using the URL</p>
+<structured-macro ac:macro-id="b7bfcf5a-8d17-471e-a907-133785ea5950" ac:name="info" ac:schema-version="1"><parameter ac:name="title">You can use the Broker URI on other transports</parameter><rich-text-body>
+<p>If you are using another transport - such as the <link><page ri:content-title="VM Transport Reference"></page></link> then you can refer to the above broker URI properties inside that URL. e.g. using the URL</p>
-<p>vm://localhost?broker.persistent=false</p></div></div></div>
+<p>vm://localhost?broker.persistent=false</p></rich-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-xbean-uri.xml
----------------------------------------------------------------------
diff --git a/broker-xbean-uri.xml b/broker-xbean-uri.xml
index 6456dcc..5e76c8b 100644
--- a/broker-xbean-uri.xml
+++ b/broker-xbean-uri.xml
@@ -1,28 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="BrokerXBeanURI-BrokerXBeanURI">Broker XBean URI</h2>
+<div class="wiki-content maincontent"><h2>Broker XBean URI</h2>
-<p>The Broker XBean URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> by referencing an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> on the classpath. The URI points to an XML document which can be parsed via XBean or Spring. This URI is typically on the classpath; though in 4.2 onwards you can point to a file or URL as well.</p>
+<p>The Broker XBean URI allows you to <link><page ri:content-title="Run Broker"></page><link-body>run a configured broker</link-body></link> by referencing an <link><page ri:content-title="Xml Configuration"></page></link> on the classpath. The URI points to an XML document which can be parsed via XBean or Spring. This URI is typically on the classpath; though in 4.2 onwards you can point to a file or URL as well.</p>
-<h4 id="BrokerXBeanURI-Syntax">Syntax</h4>
+<h4>Syntax</h4>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Syntax </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:classPathResource </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where classPathResource is some name which is resolved on the classpath and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:</p>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Syntax </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> xbean:classPathResource </p></td><td colspan="1" rowspan="1"><p> Where classPathResource is some name which is resolved on the classpath and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1"><p> xbean:</p>
file:filePathResource
-<p></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where filePathResource is some name which is resolved on the file system and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:urlResource </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where urlResource is some resource which points to an XML document </p></td></tr></tbody></table></div>
+<p></p></td><td colspan="1" rowspan="1"><p> Where filePathResource is some name which is resolved on the file system and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1"><p> xbean:urlResource </p></td><td colspan="1" rowspan="1"><p> Where urlResource is some resource which points to an XML document </p></td></tr></tbody></table>
-<h5 id="BrokerXBeanURI-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
<p>The following example starts up a broker using the activemq.xml configuration file which is on the classpath</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>xbean:activemq.xml
-</pre>
-</div></div>
+<structured-macro ac:macro-id="6e9a3e33-967a-4bd2-bc8b-e1471f52fcab" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+xbean:activemq.xml
+</plain-text-body></structured-macro>
<p>The following example starts up a broker using the activemq.xml configuration file which is in the current directory</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>xbean:file:./activemq.xml
-</pre>
-</div></div> </div>
+<structured-macro ac:macro-id="f555bed5-94eb-497b-8756-df9a749cf33b" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+xbean:file:./activemq.xml
+</plain-text-body></structured-macro> </div>