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:35 UTC
[11/51] [abbrv] [partial] activemq-web git commit: Add body.storage
type
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml b/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
index f5933e7..9ad8956 100644
--- a/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
+++ b/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Nearly all messaging systems (certainly open source ones) hold either a copy of a persistent message or a reference to a persisted message in memory. This is primarily to try and improve performance, but it also can significantly decrease the complexity of implementation. In fact ActiveMQ version 4 and below worked this - way - by holding references to persisted messages in memory.</p><p>However there is a limitation to this approach, no matter how much memory you have at your disposal, you will hit a limit to the number persistent messages a broker can handle at any particular time.</p><p>To get around this limitation, ActiveMQ introduced a paging cache - for all message stores (except the memory store) to get the best of both worlds - great performance and the ability to hold 100s of millions of messages in persistent store. ActiveMQ is <strong>not</strong> limited by memory availability, but by the size of the disk available to hold the pe
rsistent messages.</p><p>For more information see: <a shape="rect" href="message-cursors.xml">Message Cursors</a></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="726a720b-0202-42db-aa45-6578592397db" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Scaling the Depth of a Queue"></page></link></parameter></structured-macro></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-activemq-to-use-aio-server-transport.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-activemq-to-use-aio-server-transport.xml b/how-do-i-configure-activemq-to-use-aio-server-transport.xml
index 0641644..69d78df 100644
--- a/how-do-i-configure-activemq-to-use-aio-server-transport.xml
+++ b/how-do-i-configure-activemq-to-use-aio-server-transport.xml
@@ -2,7 +2,7 @@
<p>For Windows XP:</p>
-<p>1. Download AIO (Asynchronous IO for Java) from IBM (<a shape="rect" class="external-link" href="http://www.alphaworks.ibm.com/tech/aio4j" rel="nofollow">http://www.alphaworks.ibm.com/tech/aio4j</a>).</p>
+<p>1. Download AIO (Asynchronous IO for Java) from IBM (<a shape="rect" href="http://www.alphaworks.ibm.com/tech/aio4j">http://www.alphaworks.ibm.com/tech/aio4j</a>).</p>
<p>2. Unzip the downloaded file and copy the following files: </p>
@@ -15,8 +15,8 @@
<p>5. Edit ActiveMQ's configuration file (<strong>activemq.xml</strong>, found in the conf folder). Look the following snippet:
<br clear="none" class="atl-forced-newline"></p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre><!-- ==================================================================== -->
+<structured-macro ac:macro-id="8206c53e-2e9b-45bc-a393-0943547bde5e" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+<!-- ==================================================================== -->
<!-- ActiveMQ Broker Configuration -->
<!-- ==================================================================== -->
<broker>
@@ -26,27 +26,23 @@
.
.
</broker>
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
<p><br clear="none" class="atl-forced-newline"></p>
<p> Change the connector settings, change <strong>tcpServerTransport</strong> to <strong>serverTransport</strong> and remove the unneeded parameters):
<br clear="none" class="atl-forced-newline"></p>
- <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre><connector>
+ <structured-macro ac:macro-id="910ac916-db01-4ecd-92d7-49c2996bc791" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+<connector>
<serverTransport uri="activeio:aio://<ip address>:<port>" />
</connector>
- </pre>
-</div></div>
+ </plain-text-body></structured-macro>
<p><br clear="none" class="atl-forced-newline"></p>
<p> Example:
<br clear="none" class="atl-forced-newline"></p>
- <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>
+ <structured-macro ac:macro-id="e6ac3503-9331-425d-8a3c-e928fd877cac" ac:name="noformat" ac:schema-version="1"><plain-text-body>
<connector>
<serverTransport uri="activeio:aio://192.168.0.162:61616" />
</connector>
- </pre>
-</div></div></div>
+ </plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-automatic-reconnection.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-automatic-reconnection.xml b/how-do-i-configure-automatic-reconnection.xml
index c34a2d9..ed460d9 100644
--- a/how-do-i-configure-automatic-reconnection.xml
+++ b/how-do-i-configure-automatic-reconnection.xml
@@ -4,11 +4,9 @@
<p>e.g. connecting to the URL</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="103c4336-24eb-48b3-8809-5d7e5adba995" ac:name="code" ac:schema-version="1"><plain-text-body>
failover:tcp://host1:port1,tcp://host2:port2
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<p>For more detail see <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></p></div>
+<p>For more detail see <link><page ri:content-title="Failover Transport Reference"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-distributed-queues-or-topics.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-distributed-queues-or-topics.xml b/how-do-i-configure-distributed-queues-or-topics.xml
index 7f26bb8..39ed60d 100644
--- a/how-do-i-configure-distributed-queues-or-topics.xml
+++ b/how-do-i-configure-distributed-queues-or-topics.xml
@@ -1,13 +1,14 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIconfiguredistributedqueuesortopics-HowdoIconfiguredistributedqueuesortopics">How do I configure distributed queues or topics</h2>
+<div class="wiki-content maincontent"><h2>How do I configure distributed queues or topics</h2>
-<p>You don't need to explicitly <a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">configure distributed queues or topics</a> as any queue or topic is automatically distributed across other brokers when the brokers are configured in either a store and forward network or a master/slave cluster. </p>
+<p>You don't need to explicitly <link><page ri:content-title="How do I configure the queues I want"></page><link-body>configure distributed queues or topics</link-body></link> as any queue or topic is automatically distributed across other brokers when the brokers are configured in either a store and forward network or a master/slave cluster. </p>
<p>So you just need to connect brokers together to form either</p>
-<ul><li>a <a shape="rect" href="networks-of-brokers.xml">Store and Forward Network of Brokers</a>, which means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time</li><li>a <a shape="rect" href="masterslave.xml">Master/Slave Cluster</a>, which means all messages are replicated across each broker in the master/slave cluster</li></ul>
+<ul><li>a <link><page ri:content-title="Networks of Brokers"></page><link-body>Store and Forward Network of Brokers</link-body></link>, which means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time</li><li>a <link><page ri:content-title="MasterSlave"></page><link-body>Master/Slave Cluster</link-body></link>, which means all messages are replicated across each broker in the master/slave cluster</li></ul>
-<h3 id="HowdoIconfiguredistributedqueuesortopics-Alsosee">Also see</h3>
+<h3>Also see</h3>
-<ul><li><a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-distributed-queues-work.xml">How do distributed queues work</a></li><li><a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></li><li><a shape="rect" href="masterslave.xml">MasterSlave</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I configure the queues I want"></page></link></li><li><link><page ri:content-title="How do distributed queues work"></page></link></li><li><link><page ri:content-title="Networks of Brokers"></page></link></li><li><link><page ri:content-title="MasterSlave"></page></link></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-the-queues-i-want.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-the-queues-i-want.xml b/how-do-i-configure-the-queues-i-want.xml
index f3356b4..541cc19 100644
--- a/how-do-i-configure-the-queues-i-want.xml
+++ b/how-do-i-configure-the-queues-i-want.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><p><span class="error">The license could not be verified: License Certificate has expired!</span></p>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="2affa320-6478-41f3-92c5-b82475c1c623" ac:name="redirect" ac:schema-version="1"><parameter ac:name="location"><link><page ri:content-title="How do I create new destinations"></page></link></parameter></structured-macro></p>
<p>With ActiveMQ there is no real resaon to explicitly setup/configure the queues you are gonna need. If you try to publish or subscribe from any queue or topic it will be silently created on the fly.</p>
<p>Sometimes people put destinations into JNDI so that they can be pulled out by their application without needing to know the real, physical queue/topic name. This is fine, you can just add the ActiveMQQueue and ActiveMQTopic objects into JNDI (or any configuration mechanism you wish).</p>
-<p>Also if you use the ActiveMQInitialContextFactory, then you can explicitly configure which destinations appear in the context using the jndi.properties approach. For more information please refer to the <a shape="rect" href="jndi-support.xml">JNDI Support</a></p></div>
+<p>Also if you use the ActiveMQInitialContextFactory, then you can explicitly configure which destinations appear in the context using the jndi.properties approach. For more information please refer to the <link><page ri:content-title="JNDI Support"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
----------------------------------------------------------------------
diff --git a/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml b/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
index c9a13f0..87aff01 100644
--- a/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
+++ b/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
@@ -2,11 +2,9 @@
<p>You can specify a list of URLs to connect to (for example if you have message brokers running on a number of machines). To specify a list of URLs, use a comma separated list of URLs with a prefix of list:. e.g.</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="25ac053a-6b38-4166-85ed-49477b4e7659" ac:name="code" ac:schema-version="1"><plain-text-body>
list:tcp://localhost:61699,tcp://localhost:61617,tcp://localhost:61698
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<p>The JMS client will then try and connect to each one in turn, in a random order until one is connected. If they all fail to connect a sleep occurs and then this loop is retried a number of times until either a connection can be established or an exception is thrown. For more detail see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p></div>
+<p>The JMS client will then try and connect to each one in turn, in a random order until one is connected. If they all fail to connect a sleep occurs and then this loop is retried a number of times until either a connection can be established or an exception is thrown. For more detail see <link><page ri:content-title="Configuring Transports"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-consume-a-specific-message.xml
----------------------------------------------------------------------
diff --git a/how-do-i-consume-a-specific-message.xml b/how-do-i-consume-a-specific-message.xml
index 1f5aaf1..f37823a 100644
--- a/how-do-i-consume-a-specific-message.xml
+++ b/how-do-i-consume-a-specific-message.xml
@@ -6,13 +6,11 @@
<p>e.g. here is an example selector</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[
-JMSMessageID = 'abc'
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="8edc4aec-e914-4d4b-912f-59a0a0fccd19" ac:name="code" ac:schema-version="1"><plain-text-body>
+JMSMessageID = 'abc'
+</plain-text-body></structured-macro>
<p>Note that this is not a very efficient way of working with JMS (JMS is designed for consumers to be long lived objects working across many messageS), but it can be useful in certain situations.</p>
-<p>Another option is just to use <a shape="rect" href="jmx.xml">JMX</a> directly to browse messages on a queue, process them and then delete them.</p></div>
+<p>Another option is just to use <link><page ri:content-title="JMX"></page></link> directly to browse messages on a queue, process them and then delete them.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-create-new-destinations.xml
----------------------------------------------------------------------
diff --git a/how-do-i-create-new-destinations.xml b/how-do-i-create-new-destinations.xml
index a4613cc..01aa301 100644
--- a/how-do-i-create-new-destinations.xml
+++ b/how-do-i-create-new-destinations.xml
@@ -7,21 +7,21 @@
<p>and the broker will automatically create the physical destinations for you. This avoids spending large amounts of time creating every individual destination you wish to use and possibly then exposing it in some JNDI provider.</p>
-<p>In addition, if you are using JNDI to lookup connection factory and destinations, you can specify which destinations you wish to create by default using the properties file. See the <a shape="rect" href="jndi-support.xml">JNDI Support</a> for more details. </p>
+<p>In addition, if you are using JNDI to lookup connection factory and destinations, you can specify which destinations you wish to create by default using the properties file. See the <link><page ri:content-title="JNDI Support"></page></link> for more details. </p>
-<h3 id="HowdoIcreatenewdestinations-Creatingdestinationsonstartup">Creating destinations on startup</h3>
+<h3>Creating destinations on startup</h3>
-<p>Its completely optional but as of 4.1 you can <a shape="rect" href="configure-startup-destinations.xml">Configure Startup Destinations</a> to specify which destinations are automatically created when the broker starts.</p>
+<p>Its completely optional but as of 4.1 you can <link><page ri:content-title="Configure Startup Destinations"></page></link> to specify which destinations are automatically created when the broker starts.</p>
-<h3 id="HowdoIcreatenewdestinations-Limitingcreationofdestinations">Limiting creation of destinations</h3>
+<h3>Limiting creation of destinations</h3>
-<p>If you need to restrict access or creation of destinations then please use the <a shape="rect" href="security.xml">Security</a> option to disable destinations being auto-created for certain users. </p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Client side destination objects are not the same as server side resources</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 need to restrict access or creation of destinations then please use the <link><page ri:content-title="Security"></page></link> option to disable destinations being auto-created for certain users. </p>
+<structured-macro ac:macro-id="5a28a8d5-28a7-45ad-87a8-b42708854c9a" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Client side destination objects are not the same as server side resources</parameter><rich-text-body>
<p>Note that the ActiveMQ Broker will only create server side resources for destinations when messages are actually sent to them. So you can create as many instances of ActiveMQTopic and ActiveMQQueue on a client without any real overhead until you actually send messages to them on a broker. So a JMS client creating a new ActiveMQQueue POJO does not mean you are creating server side queue resources.</p>
<p>Think of the ActiveMQQueue and ActiveMQTopic classes as like java.net.URL. They are just names which refer to server side resources which are auto-created when they are used.<br clear="none">
-This means that different clients creating different ActiveMQQueue instances will communicate with the same physical queue on a JMS broker if the name is the same.</p></div></div>
+This means that different clients creating different ActiveMQQueue instances will communicate with the same physical queue on a JMS broker if the name is the same.</p></rich-text-body></structured-macro>
-<p>You can browse the currently available queues and topics using <a shape="rect" href="jmx.xml">JMX</a>. You can also use the <a shape="rect" href="jmx.xml">JMX</a> MBeans to create the destinations you require.</p></div>
+<p>You can browse the currently available queues and topics using <link><page ri:content-title="JMX"></page></link>. You can also use the <link><page ri:content-title="JMX"></page></link> MBeans to create the destinations you require.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-debug-activemq-from-my-ide.xml
----------------------------------------------------------------------
diff --git a/how-do-i-debug-activemq-from-my-ide.xml b/how-do-i-debug-activemq-from-my-ide.xml
index 849de9a..0f9fe11 100644
--- a/how-do-i-debug-activemq-from-my-ide.xml
+++ b/how-do-i-debug-activemq-from-my-ide.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>One option is to run your broker in the same JVM as your application; see <a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a>.</p><p>Or you can try uncommenting ACTIVEMQ_DEBUG_OPTS in your activemq start script (bin/activemq or bin\activemq.bat) and start remote debugging in your IDE.</p><p>For IDEA, see this article <a shape="rect" class="external-link" href="http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html" rel="nofollow">http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html</a></p></div>
+<div class="wiki-content maincontent"><p>One option is to run your broker in the same JVM as your application; see <link><page ri:content-title="How To Unit Test JMS Code"></page></link>.</p><p>Or you can try uncommenting ACTIVEMQ_DEBUG_OPTS in your activemq start script (bin/activemq or bin\activemq.bat) and start remote debugging in your IDE.</p><p>For IDEA, see this article <a shape="rect" class="external-link" href="http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html" rel="nofollow">http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html</a></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
----------------------------------------------------------------------
diff --git a/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml b/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
index 6ed70e5..e210d57 100644
--- a/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
+++ b/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
@@ -1,5 +1,3 @@
-<div class="wiki-content maincontent"><p>TCP based transport protocols (including SSL) allow you to define the local address and local port for Socket to use when it's created.<br clear="none"> This can be useful for clients that reside on multi-homed machines or for clients operating in a DMZ, where only pre-defined ports can be used.</p><p>To specify the local address and local port, ActiveMQ supports the use of the path on the URI, e.g.</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[ssl://localhost:5666/localhost:60606
-]]></script>
-</div></div><p> </p><p>where the path following the forward slash "localhost:60606" defines the local address and local port</p></div>
+<div class="wiki-content maincontent"><p>TCP based transport protocols (including SSL) allow you to define the local address and local port for Socket to use when it's created.<br clear="none"> This can be useful for clients that reside on multi-homed machines or for clients operating in a DMZ, where only pre-defined ports can be used.</p><p>To specify the local address and local port, ActiveMQ supports the use of the path on the URI, e.g.</p><structured-macro ac:macro-id="f096e582-9220-4ce7-a139-7ba5c7b744d4" ac:name="code" ac:schema-version="1"><plain-text-body>ssl://localhost:5666/localhost:60606
+</plain-text-body></structured-macro><p> </p><p>where the path following the forward slash "localhost:60606" defines the local address and local port</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-delete-a-destination.xml
----------------------------------------------------------------------
diff --git a/how-do-i-delete-a-destination.xml b/how-do-i-delete-a-destination.xml
index 4bcacd8..bed918b 100644
--- a/how-do-i-delete-a-destination.xml
+++ b/how-do-i-delete-a-destination.xml
@@ -1,12 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIdeleteadestination-HowdoIdeleteadestination">How do I delete a destination</h2>
+<div class="wiki-content maincontent"><h2>How do I delete a destination</h2>
-<p>via Java code or <a shape="rect" href="jmx.xml">JMX</a> you can grab the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a> and call one of the following methods</p>
+<p>via Java code or <link><page ri:content-title="JMX"></page></link> you can grab the <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a> and call one of the following methods</p>
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeQueue(java.lang.String)">removeQueue(String)</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeTopic(java.lang.String)">removeTopic(String)</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeQueue(java.lang.String)">removeQueue(String)</a></li><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeTopic(java.lang.String)">removeTopic(String)</a></li></ul>
-<h3 id="HowdoIdeleteadestination-Seealso">See also</h3>
+<h3>See also</h3>
-<ul><li><a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a></li><li><a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a></li><li><a shape="rect" href="jmx.xml">JMX</a></li><li><a shape="rect" href="web-console.xml">Web Console</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I create new destinations"></page></link></li><li><link><page ri:content-title="How can I monitor ActiveMQ"></page></link></li><li><link><page ri:content-title="JMX"></page></link></li><li><link><page ri:content-title="Web Console"></page></link></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-disable-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-disable-logging.xml b/how-do-i-disable-logging.xml
index 5edf5f1..f660be1 100644
--- a/how-do-i-disable-logging.xml
+++ b/how-do-i-disable-logging.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIdisablelogging-HowdoIdisablelogging?">How do I disable logging?</h2>
+<div class="wiki-content maincontent"><h2>How do I disable logging?</h2>
-<p>See <a shape="rect" href="how-do-i-change-the-logging.xml">How do I change the logging</a></p></div>
+<p>See <link><page ri:content-title="How do I change the logging"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-disable-persistence.xml
----------------------------------------------------------------------
diff --git a/how-do-i-disable-persistence.xml b/how-do-i-disable-persistence.xml
index d123b6c..f300c0d 100644
--- a/how-do-i-disable-persistence.xml
+++ b/how-do-i-disable-persistence.xml
@@ -1,9 +1,9 @@
<div class="wiki-content maincontent"><p>There are three main ways to disable persistence, such as for unit testing JMS code</p>
-<ol><li>Set the NON_PERSISTENT message delivery flag on your MessageProducer</li><li>Set the <strong>persistent=false</strong> flag in the <strong><broker/></strong> element of the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> or on the property <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService</a></li><li>Delete the persistence files before running your tests (a bit hacky)</li></ol>
+<ol><li>Set the NON_PERSISTENT message delivery flag on your MessageProducer</li><li>Set the <strong>persistent=false</strong> flag in the <strong><broker/></strong> element of the <link><page ri:content-title="Xml Configuration"></page></link> or on the property <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService</a></li><li>Delete the persistence files before running your tests (a bit hacky)</li></ol>
-<p>If you are unit testing you may be interested in <a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a>.</p>
+<p>If you are unit testing you may be interested in <link><page ri:content-title="How To Unit Test JMS Code"></page></link>.</p>
-<p>Please refer to the <a shape="rect" href="initial-configuration.xml">Initial Configuration</a> guide on how to disable persistence via system properties, java code or using the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a></p></div>
+<p>Please refer to the <link><page ri:content-title="Initial Configuration"></page></link> guide on how to disable persistence via system properties, java code or using the <link><page ri:content-title="Xml Configuration"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-edit-the-website.xml
----------------------------------------------------------------------
diff --git a/how-do-i-edit-the-website.xml b/how-do-i-edit-the-website.xml
index a152cde..777f479 100644
--- a/how-do-i-edit-the-website.xml
+++ b/how-do-i-edit-the-website.xml
@@ -1,20 +1,20 @@
-<div class="wiki-content maincontent"><p>The website is all contained on a Wiki so that anyone can <a shape="rect" href="contributing.xml">contribute</a></p>
+<div class="wiki-content maincontent"><p>The website is all contained on a Wiki so that anyone can <link><page ri:content-title="Contributing"></page><link-body>contribute</link-body></link></p>
-<h3 id="HowdoIeditthewebsite-Howtoedit">How to edit</h3>
+<h3>How to edit</h3>
<p>You can also click the <strong>edit</strong> button when viewing the website which is located on the bottom of each page.</p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Spam Prevention</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="789e806b-e666-4c9b-ac2f-bd25b7630156" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Spam Prevention</parameter><rich-text-body>
<p>We have been attacked by spammers so we are running a spam-avoiding scheme. So you have to ask to be added to the editing group of Confluence. This is quick and easy to do.</p>
-<p>Just send a quick mail to the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> giving details of your confluence username and we can grant you the necessary editing karma.</p></div></div>
+<p>Just send a quick mail to the <link><page ri:content-title="Discussion Forums"></page></link> giving details of your confluence username and we can grant you the necessary editing karma.</p></rich-text-body></structured-macro>
<p>Note that after you've changed the wiki it is immediately rendered on the <a shape="rect" class="external-link" href="http://cwiki.apache.org/ACTIVEMQ/">http://cwiki.apache.org/ACTIVEMQ/</a> site so you can test it out; then up to an hour or two later it is updated on the Apache site.</p>
-<h3 id="HowdoIeditthewebsite-Howthesiteworks">How the site works</h3>
-<p>There are a few special pages; for example the <a shape="rect" href="navigation.xml">Navigation</a> page is the left hand navigation bar and the <a shape="rect" href="quicklinks.xml">QuickLinks</a> is the top right navigation bar.</p>
+<h3>How the site works</h3>
+<p>There are a few special pages; for example the <link><page ri:content-title="Navigation"></page></link> page is the left hand navigation bar and the <link><page ri:content-title="QuickLinks"></page></link> is the top right navigation bar.</p>
-<p>Other useful <a shape="rect" href="site.xml">links</a> are</p>
+<p>Other useful <link><page ri:content-title="Site"></page><link-body>links</link-body></link> are</p>
-<ul class="childpages-macro"><li><a shape="rect" href="banner.xml">Banner</a></li><li><a shape="rect" href="navigation.xml">Navigation</a></li><li><a shape="rect" href="quicklinks.xml">QuickLinks</a></li><li><a shape="rect" href="siteindex.xml">SiteIndex</a></li><li><a shape="rect" href="sitemap.xml">SiteMap</a></li></ul></div>
+<structured-macro ac:macro-id="bf1b0c9c-5191-4874-9ce5-d01b82b366fa" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Site"></page></link></parameter></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-embed-a-broker-inside-a-connection.xml
----------------------------------------------------------------------
diff --git a/how-do-i-embed-a-broker-inside-a-connection.xml b/how-do-i-embed-a-broker-inside-a-connection.xml
index d054702..b362669 100644
--- a/how-do-i-embed-a-broker-inside-a-connection.xml
+++ b/how-do-i-embed-a-broker-inside-a-connection.xml
@@ -1,136 +1,116 @@
-<div class="wiki-content maincontent"><p>In many messaging topologies there are JMS Brokers (server side) and a JMS client side. Often it makes sense to deploy a broker within your JVM. This allows you to optimise away a network hop; making the networking of JMS as efficient as pure RMI, but with all the usual JMS features of location independence, reliability, load balancing etc.</p><p>There are various ways to embed a broker in ActiveMQ depending on if you are using Java, Spring, XBean or using the ActiveMQConnectionFactory .</p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingexplicitJavacode">Using explicit Java code</h3><p>The following Java code will create an embedded broker</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[BrokerService broker = new BrokerService();
+<div class="wiki-content maincontent"><p>In many messaging topologies there are JMS Brokers (server side) and a JMS client side. Often it makes sense to deploy a broker within your JVM. This allows you to optimise away a network hop; making the networking of JMS as efficient as pure RMI, but with all the usual JMS features of location independence, reliability, load balancing etc.</p><p>There are various ways to embed a broker in ActiveMQ depending on if you are using Java, Spring, XBean or using the ActiveMQConnectionFactory .</p><h3>Using explicit Java code</h3><p>The following Java code will create an embedded broker</p><structured-macro ac:macro-id="9eaa5bb3-576f-42b5-9c4b-04d93d7c7ee6" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
// configure the broker
-broker.addConnector("tcp://localhost:61616");
+broker.addConnector("tcp://localhost:61616");
broker.start();
-]]></script>
-</div></div><p>If you want to lazily bind the transport connector as part of start(), useful when start() will block pending a store lock (as in a slave start), you can use 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[BrokerService broker = new BrokerService();
+</plain-text-body></structured-macro><p>If you want to lazily bind the transport connector as part of start(), useful when start() will block pending a store lock (as in a slave start), you can use the following code</p><structured-macro ac:macro-id="ac608f29-1173-4703-b0cc-192bed0dd67f" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
TransportConnector connector = new TransportConnector();
-connector.setUri(new URI("tcp://localhost:61616"));
+connector.setUri(new URI("tcp://localhost:61616"));
broker.addConnector(connector);
broker.start();
-]]></script>
-</div></div><p>In the same JVM clients can then use the <a shape="rect" href="vm-transport-reference.xml">vm:// transport</a> to connect to the embedded broker - whilst external clients can use the <a shape="rect" href="tcp-transport-reference.xml">tcp:// protocol</a></p><p>If you have more than one embedded broker, ensure that you give them a unique name and - e.g.</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[BrokerService broker = new BrokerService();
+</plain-text-body></structured-macro><p>In the same JVM clients can then use the <link><page ri:content-title="VM Transport Reference"></page><plain-text-link-body>vm:// transport</plain-text-link-body></link> to connect to the embedded broker - whilst external clients can use the <link><page ri:content-title="TCP Transport Reference"></page><plain-text-link-body>tcp:// protocol</plain-text-link-body></link></p><p>If you have more than one embedded broker, ensure that you give them a unique name and - e.g.</p><structured-macro ac:macro-id="ab19815a-2dfd-4e65-a5be-b8210339a28c" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
// configure the broker
-broker.setBrokerName("fred");
-broker.addConnector("tcp://localhost:61616");
+broker.setBrokerName("fred");
+broker.addConnector("tcp://localhost:61616");
broker.start();
-]]></script>
-</div></div><p>Then if you want to connect to the broker named 'fred' from within the same JVM, you can by using the uri <strong>vm://fred</strong></p><p>It is possible to fully configure a broker through application code e.g.</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[BrokerService broker = new BrokerService();
-broker.setBrokerName("fred");
+</plain-text-body></structured-macro><p>Then if you want to connect to the broker named 'fred' from within the same JVM, you can by using the uri <strong>vm://fred</strong></p><p>It is possible to fully configure a broker through application code e.g.</p><structured-macro ac:macro-id="7e0ebf92-ef49-416b-b093-0dd90aa42955" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
+broker.setBrokerName("fred");
broker.setUseShutdownHook(false);
//Add plugin
broker.setPlugins(new BrokerPlugin[]{new JaasAuthenticationPlugin()});
//Add a network connection
-NetworkConnector connector = answer.addNetworkConnector("static://"+"tcp://somehost:61616");
+NetworkConnector connector = answer.addNetworkConnector("static://"+"tcp://somehost:61616");
connector.setDuplex(true);
-broker.addConnector("tcp://localhost:61616");
+broker.addConnector("tcp://localhost:61616");
broker.start();
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please note that you should add plugins before connectors or they will not be initialized</p></div></div><p>For more details on the available properties you can specify, see the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.11.0/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService javadoc</a></p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingtheBrokerFactory">Using the BrokerFactory</h3><p>There is a helper class called <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerFactory.html">BrokerFactory</a> which can be used to create a broker via URI for configuration.</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[BrokerService broker = BrokerFactory.createBroker(new URI(someURI));
-]]></script>
-</div></div><p>The available values of the URI are</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>URI scheme</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</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>xbean:activemq.xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Searches the classpath (and file system) for an XML document with the given URI (activemq.xml in this case) which will then be used as the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>broker:</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>broker:tcp://localhost:61616</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Uses the <a shape="rect" hr
ef="broker-configuration-uri.xml">Broker Configuration URI</a> to confgure the broker</p></td></tr></tbody></table></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingSpring">Using Spring</h3><p>There is a factory bean that can refer to an external ActiveMQ 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[<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:org/apache/activemq/xbean/activemq.xml" />
- <property name="start" value="true" />
+</plain-text-body></structured-macro><structured-macro ac:macro-id="b7967e06-0454-4e9a-af9a-5c24b63b0501" ac:name="note" ac:schema-version="1"><rich-text-body><p>Please note that you should add plugins before connectors or they will not be initialized</p></rich-text-body></structured-macro><p>For more details on the available properties you can specify, see the <a shape="rect" href="http://activemq.apache.org/maven/5.11.0/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService javadoc</a></p><h3>Using the BrokerFactory</h3><p>There is a helper class called <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerFactory.html">BrokerFactory</a> which can be used to create a broker via URI for configuration.</p><structured-macro ac:macro-id="a8d3bdfc-dd6d-4a02-aa2e-76524c94fc34" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = BrokerFactory.createBroker(new URI(someURI));
+</plain-text-body></structured-macro><p>The available values of the URI are</p><table><tbody><tr><th colspan="1" rowspan="1"><p>URI scheme</p></th><th colspan="1" rowspan="1"><p>Example</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>xbean:activemq.xml</p></td><td colspan="1" rowspan="1"><p>Searches the classpath (and file system) for an XML document with the given URI (activemq.xml in this case) which will then be used as the <link><page ri:content-title="Xml Configuration"></page></link></p></td></tr><tr><td colspan="1" rowspan="1"><p>broker:</p></td><td colspan="1" rowspan="1"><p>broker:tcp://localhost:61616</p></td><td colspan="1" rowspan="1"><p>Uses the <link><page ri:content-title="Broker Configuration URI"></page></link> to confgure the broker</p></td></tr></tbody></table><h3>Using Spring</h3><p>There is a factory bean that can refer to an external ActiveMQ XML configuration file<
/p><structured-macro ac:macro-id="2243664c-6d07-401c-94c7-af12ccb45fbf" ac:name="code" ac:schema-version="1"><plain-text-body><bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+ <property name="config" value="classpath:org/apache/activemq/xbean/activemq.xml" />
+ <property name="start" value="true" />
</bean>
-]]></script>
-</div></div><p>In this case the usual Spring 'classpath:org/apache/activemq/xbean/activemq.xml' resource mechanism is being used so that the activemq.xml file would be found on the classpath by looking inside all the directories on the classpath then looking for 'org/apache/activemq/xbean/activemq.xml'. You can of course change this to any value you like. e.g. use classpath:activemq.xml if you just want to drop it in a directory that is in the classpath; like WEB-INF/classes in a web application.</p><p>If you wish you can use a URL instead using the <strong>file:* or *http:</strong> prefixes. For more details see how <a shape="rect" class="external-link" href="http://static.springframework.org/spring/docs/1.2.x/reference/beans.html#context-functionality-resources" rel="nofollow">Spring deals with resources</a></p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingXBean">Using XBean</h3><p>If you are already using <a shape="rect" class="external-link" href="http://geronimo.apache.org/x
bean/">XBean</a> then you can just mix and match your Spring/XBean <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml">XML configuration</a> with ActiveMQ's configuration.</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[<beans
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+</plain-text-body></structured-macro><p>In this case the usual Spring 'classpath:org/apache/activemq/xbean/activemq.xml' resource mechanism is being used so that the activemq.xml file would be found on the classpath by looking inside all the directories on the classpath then looking for 'org/apache/activemq/xbean/activemq.xml'. You can of course change this to any value you like. e.g. use classpath:activemq.xml if you just want to drop it in a directory that is in the classpath; like WEB-INF/classes in a web application.</p><p>If you wish you can use a URL instead using the <strong>file:* or *http:</strong> prefixes. For more details see how <a shape="rect" href="http://static.springframework.org/spring/docs/1.2.x/reference/beans.html#context-functionality-resources">Spring deals with resources</a></p><h3>Using XBean</h3><p>If you are already using <a shape="rect" href="http://geronimo.apache.org/xbean/">XBean</a> then you can just mix and match your Spring/XBean <a shape="rect" hre
f="https://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml">XML configuration</a> with ActiveMQ's configuration.</p><structured-macro ac:macro-id="8349179f-1e83-4dd6-801a-e787987af165" ac:name="code" ac:schema-version="1"><plain-text-body><beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
+ <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
<persistenceFactory>
- <kahaDB directory="${basedir}/target" />
+ <kahaDB directory="${basedir}/target" />
</persistenceFactory>
<transportConnectors>
- <transportConnector uri="tcp://localhost:61636" />
+ <transportConnector uri="tcp://localhost:61636" />
</transportConnectors>
</broker>
</beans>
-]]></script>
-</div></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingSpring2.0">Using Spring 2.0</h3><p>If you are using Spring 2.0 and ActiveMQ 4.1 or later (and xbean-spring 2.5 or later) you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml">example</a> of a regular Spring XML file in Spring 2.0 which also configures a broker.</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[<beans
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+</plain-text-body></structured-macro><h3>Using Spring 2.0</h3><p>If you are using Spring 2.0 and ActiveMQ 4.1 or later (and xbean-spring 2.5 or later) you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml">example</a> of a regular Spring XML file in Spring 2.0 which also configures a broker.</p><structured-macro ac:macro-id="fe131cb2-ea4a-4f1f-a40a-fc78932b400b" ac:name="code" ac:schema-version="1"><plain-text-body><beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<!-- lets create an embedded ActiveMQ Broker -->
- <amq:broker useJmx="false" persistent="false">
+ <amq:broker useJmx="false" persistent="false">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:0" />
+ <amq:transportConnector uri="tcp://localhost:0" />
</amq:transportConnectors>
</amq:broker>
<!-- ActiveMQ destinations to use -->
- <amq:queue id="destination" physicalName="org.apache.activemq.spring.Test.spring.embedded"/>
+ <amq:queue id="destination" physicalName="org.apache.activemq.spring.Test.spring.embedded"/>
<!-- JMS ConnectionFactory to use, configuring the embedded broker using XML -->
- <amq:connectionFactory id="jmsFactory" brokerURL="vm://localhost"/>
+ <amq:connectionFactory id="jmsFactory" brokerURL="vm://localhost"/>
<!-- Spring JMS Template -->
- <bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
- <property name="connectionFactory">
+ <bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory">
<!-- lets wrap in a pool to avoid creating a connection per send -->
- <bean class="org.springframework.jms.connection.SingleConnectionFactory">
- <property name="targetConnectionFactory">
- <ref local="jmsFactory" />
+ <bean class="org.springframework.jms.connection.SingleConnectionFactory">
+ <property name="targetConnectionFactory">
+ <ref local="jmsFactory" />
</property>
</bean>
</property>
</bean>
- <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
- <property name="connectionFactory" ref="jmsFactory"/>
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
</bean>
<!-- a sample POJO which uses a Spring JmsTemplate -->
- <bean id="producer" class="org.apache.activemq.spring.SpringProducer">
- <property name="template">
- <ref bean="myJmsTemplate"></ref>
+ <bean id="producer" class="org.apache.activemq.spring.SpringProducer">
+ <property name="template">
+ <ref bean="myJmsTemplate"></ref>
</property>
- <property name="destination">
- <ref bean="destination" />
+ <property name="destination">
+ <ref bean="destination" />
</property>
- <property name="messageCount">
+ <property name="messageCount">
<value>10</value>
</property>
</bean>
<!-- a sample POJO consumer -->
- <bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
- <property name="template" ref="consumerJmsTemplate"/>
- <property name="destination" ref="destination"/>
+ <bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
+ <property name="template" ref="consumerJmsTemplate"/>
+ <property name="destination" ref="destination"/>
</bean>
</beans>
-]]></script>
-</div></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingActiveMQConnectionFactory">Using ActiveMQConnectionFactory</h3><p>An embedded broker can also be created using an ActiveMQConnectionFactory and using a vm connector as a uri. e.g.</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("vm://localhost?broker.persistent=false");
-]]></script>
-</div></div><p>Use the query parameters "broker.<property>" to configure the broker, where <property> matches the bean properties on the BrokerService.</p><p>The broker will be created upon creation of the first connection.</p><p>You can turn off auto creation by setting the create property on the VM Transport to false:</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("vm://localhost?create=false");
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro><h3>Using ActiveMQConnectionFactory</h3><p>An embedded broker can also be created using an ActiveMQConnectionFactory and using a vm connector as a uri. e.g.</p><structured-macro ac:macro-id="3f36f9a1-bc84-4200-9611-e572416daf76" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+</plain-text-body></structured-macro><p>Use the query parameters "broker.<property>" to configure the broker, where <property> matches the bean properties on the BrokerService.</p><p>The broker will be created upon creation of the first connection.</p><p>You can turn off auto creation by setting the create property on the VM Transport to false:</p><structured-macro ac:macro-id="5d37b378-935e-4ddb-872f-10e99dce2b27" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost?create=false");
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-enable-asynchronous-sending.xml
----------------------------------------------------------------------
diff --git a/how-do-i-enable-asynchronous-sending.xml b/how-do-i-enable-asynchronous-sending.xml
index a768473..c878fb5 100644
--- a/how-do-i-enable-asynchronous-sending.xml
+++ b/how-do-i-enable-asynchronous-sending.xml
@@ -5,9 +5,7 @@
<ul><li>set the useAsyncSend property on the ActiveMQConnectionFactory</li><li>set the property using the URI when you connect to the broker</li></ul>
-<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="44308207-4c2b-4a2a-9a3d-33831df7c467" ac:name="code" ac:schema-version="1"><plain-text-body>
tcp://localhost:61616?jms.useAsyncSend=true
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-enable-debug-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-enable-debug-logging.xml b/how-do-i-enable-debug-logging.xml
index 098ca3a..c95567b 100644
--- a/how-do-i-enable-debug-logging.xml
+++ b/how-do-i-enable-debug-logging.xml
@@ -1,12 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIenabledebuglogging-HowdoIenabledebuglogging?">How do I enable debug logging?</h2>
+<div class="wiki-content maincontent"><h2>How do I enable debug logging?</h2>
-<p>For background see <a shape="rect" href="how-do-i-change-the-logging.xml">How do I change the logging</a>.</p>
+<p>For background see <link><page ri:content-title="How do I change the logging"></page></link>.</p>
<p>You can enable debug logging in ActiveMQ by adding the following line to the <code><strong>conf/log4j.properties</strong></code> 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[
+<structured-macro ac:macro-id="c8dded93-20c3-4af9-a3bf-64b6e312f91d" ac:name="code" ac:schema-version="1"><plain-text-body>
log4j.logger.org.apache.activemq=DEBUG
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-find-the-size-of-a-queue.xml
----------------------------------------------------------------------
diff --git a/how-do-i-find-the-size-of-a-queue.xml b/how-do-i-find-the-size-of-a-queue.xml
index c5f4c35..4869196 100644
--- a/how-do-i-find-the-size-of-a-queue.xml
+++ b/how-do-i-find-the-size-of-a-queue.xml
@@ -1,10 +1,10 @@
<div class="wiki-content maincontent"><p>How do I check on the size of the queue? I know it's not JMS standard, but most JMS implementations have a way to do this.</p>
-<p>You can view the queue depth using the MBeans in ActiveMQ 5.x. Use any JMX management console to see the statistics. See <a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a>.</p>
+<p>You can view the queue depth using the MBeans in ActiveMQ 5.x. Use any JMX management console to see the statistics. See <link><page ri:content-title="How can I monitor ActiveMQ"></page></link>.</p>
-<p>You can also browse the contents of a queue using the JMS <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/QueueBrowser.html" rel="nofollow">QueueBrowser</a>.</p>
+<p>You can also browse the contents of a queue using the JMS <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a>.</p>
-<p>Or you can access statistics <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a></p>
+<p>Or you can access statistics <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link></p>
<p>Through the MBeans, you can monitor individual destinations including message statistics related to the destination. For example, you'll see the following attributes on a destination (Queue or Topic):</p>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-get-started-with-jms.xml
----------------------------------------------------------------------
diff --git a/how-do-i-get-started-with-jms.xml b/how-do-i-get-started-with-jms.xml
index 5e209e9..fc5b877 100644
--- a/how-do-i-get-started-with-jms.xml
+++ b/how-do-i-get-started-with-jms.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIgetstartedwithJMS-HowdoIgetstartedwithJMS">How do I get started with JMS</h2>
+<div class="wiki-content maincontent"><h2>How do I get started with JMS</h2>
-<p>Your best way to get started understanding the JMS API is <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS.html#wp84181" rel="nofollow">Sun's JMS tutorial</a>.</p>
+<p>Your best way to get started understanding the JMS API is <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS.html#wp84181">Sun's JMS tutorial</a>.</p>
-<p>Alternatively you could stick to writing business level POJOs and hide the middleware via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Apache Camel</a> which hides the JMS API from you letting you focus on your business logic via the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/bean-integration.html">Bean Integration</a> </p></div>
+<p>Alternatively you could stick to writing business level POJOs and hide the middleware via <a shape="rect" href="http://activemq.apache.org/camel/">Apache Camel</a> which hides the JMS API from you letting you focus on your business logic via the <a shape="rect" href="http://activemq.apache.org/camel/bean-integration.html">Bean Integration</a> </p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-make-messages-durable.xml
----------------------------------------------------------------------
diff --git a/how-do-i-make-messages-durable.xml b/how-do-i-make-messages-durable.xml
index f0e2b20..420b72c 100644
--- a/how-do-i-make-messages-durable.xml
+++ b/how-do-i-make-messages-durable.xml
@@ -1,12 +1,10 @@
<div class="wiki-content maincontent">
-<p>Durability of messages is defined by the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html" rel="nofollow">MessagerProducer</a>. You can explicitly configure the durability via the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setDeliveryMode(int)" rel="nofollow">setDeliveryMode() method</a>. e.g.</p>
+<p>Durability of messages is defined by the <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html">MessagerProducer</a>. You can explicitly configure the durability via the <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setDeliveryMode(int)">setDeliveryMode() method</a>. e.g.</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="5ec93947-a8e0-4c38-ad32-61b5733ffee4" ac:name="code" ac:schema-version="1"><plain-text-body>
MessageProducer producer = ...;
producer.setDeliveryMode(DeliveryMode.PERSISTENT);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>Note that the default is for durable messages to be used if you don't specify a delivery mode.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-preserve-order-of-messages.xml
----------------------------------------------------------------------
diff --git a/how-do-i-preserve-order-of-messages.xml b/how-do-i-preserve-order-of-messages.xml
index df56587..358180e 100644
--- a/how-do-i-preserve-order-of-messages.xml
+++ b/how-do-i-preserve-order-of-messages.xml
@@ -2,5 +2,6 @@
<p>ActiveMQ will preserve the order of messages sent by a single producer to all consumers on a topic. If there is a single consumer on a queue then the order of messages sent by a single producer will be preserved as well.</p>
<p>If you have multiple consumers on a single queue the consumers will compete for messages and ActiveMQ will load balance across them, so order will be lost. For background on the issue and how it can be solved see</p>
-<ul><li><a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a> which allows only a single consumer to consume from the queue at once to preseve order</li><li><a shape="rect" href="message-groups.xml">Message Groups</a> which splits the messages on a queue into parallel virtual exclusive queues to ensure that messages to a single message group (defined by the JMSXGroupID header) will have their order preserved but that different groups will be load balanced to different consumers.</li></ul></div>
+<ul><li><link><page ri:content-title="Exclusive Consumer"></page></link> which allows only a single consumer to consume from the queue at once to preseve order</li><li><link><page ri:content-title="Message Groups"></page></link> which splits the messages on a queue into parallel virtual exclusive queues to ensure that messages to a single message group (defined by the JMSXGroupID header) will have their order preserved but that different groups will be load balanced to different consumers.</li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-purge-a-queue.xml
----------------------------------------------------------------------
diff --git a/how-do-i-purge-a-queue.xml b/how-do-i-purge-a-queue.xml
index a83ded2..9999e15 100644
--- a/how-do-i-purge-a-queue.xml
+++ b/how-do-i-purge-a-queue.xml
@@ -1,16 +1,17 @@
<div class="wiki-content maincontent"><p>A frequent requirement is to purge a queue (i.e. delete all the messages on it).</p>
-<h3 id="HowdoIpurgeaqueue-Solution">Solution</h3>
+<h3>Solution</h3>
-<p>You can use the <a shape="rect" href="web-console.xml">Web Console</a> to view queues, add/remove queues, purge queues or delete/forward individual messages.</p>
+<p>You can use the <link><page ri:content-title="Web Console"></page></link> to view queues, add/remove queues, purge queues or delete/forward individual messages.</p>
-<p>Another option is to use <a shape="rect" href="jmx.xml">JMX</a> to browse the queues and call the <strong>purge()</strong> method on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/QueueViewMBean.html">QueueViewMBean</a>. </p>
+<p>Another option is to use <link><page ri:content-title="JMX"></page></link> to browse the queues and call the <strong>purge()</strong> method on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/QueueViewMBean.html">QueueViewMBean</a>. </p>
-<p>You could also delete the queue via removeQueue(String) or removeTopic(String) methods on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a></p>
+<p>You could also delete the queue via removeQueue(String) or removeTopic(String) methods on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a></p>
-<p>You can also do it <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a></p>
+<p>You can also do it <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link></p>
-<h3 id="HowdoIpurgeaqueue-AlsoSee">Also See</h3>
+<h3>Also See</h3>
-<ul><li><a shape="rect" href="web-console.xml">Web Console</a></li><li><a shape="rect" href="jmx.xml">JMX</a></li><li><a shape="rect" href="how-do-i-find-the-size-of-a-queue.xml">How do I find the Size of a Queue</a></li><li><a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">How can I see what destinations are used</a></li></ul></div>
+<ul><li><link><page ri:content-title="Web Console"></page></link></li><li><link><page ri:content-title="JMX"></page></link></li><li><link><page ri:content-title="How do I find the Size of a Queue"></page></link></li><li><link><page ri:content-title="How can I see what destinations are used"></page></link></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-restart-embedded-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-restart-embedded-broker.xml b/how-do-i-restart-embedded-broker.xml
index 7dee46e..8942db2 100644
--- a/how-do-i-restart-embedded-broker.xml
+++ b/how-do-i-restart-embedded-broker.xml
@@ -1,34 +1,29 @@
<div class="wiki-content maincontent"><p>Pure restart of the embedded broker is not advisable, since it's state could be corrupted. Therefore, you're advised to instantiate the broker again before restarting it.</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[
-BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
+<structured-macro ac:macro-id="83b8db39-13df-4c7d-8bd8-e959f2722bfb" ac:name="code" ac:schema-version="1"><plain-text-body>
+BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
service.start();
service.waitUntilStarted();
service.stop();
service.waitUntilStopped();
-service = BrokerFactory.createBroker("xbean:activemq.xml");
+service = BrokerFactory.createBroker("xbean:activemq.xml");
service.start();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>In 5.3 however, we allowed the force start of the broker that has been stopped for use cases that need this functionality. You can do it by using </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="2781ad46-6498-41c8-833e-8adb8bbf24ac" ac:name="code" ac:schema-version="1"><plain-text-body>
BrokerService.start(boolean force);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>method.</p>
<p>The following example demonstrates it.</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[
-BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
+<structured-macro ac:macro-id="708b1ca9-f8db-4529-831c-180bd947d7b0" ac:name="code" ac:schema-version="1"><plain-text-body>
+BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
service.start();
service.waitUntilStarted();
@@ -36,8 +31,7 @@ service.stop();
service.waitUntilStopped();
service.start(true);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>However, it's better (more reliable) to instantiate the broker again if it is possible.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
----------------------------------------------------------------------
diff --git a/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml b/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
index 2c370ea..9eec89d 100644
--- a/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
+++ b/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIrestrictconnectionsfromcreatingnewqueuesortopics-HowdoIrestrictconnectionsfromcreatingnewqueuesortopics?">How do I restrict connections from creating new queues or topics?</h2>
+<div class="wiki-content maincontent"><h2>How do I restrict connections from creating new queues or topics?</h2>
-<p>As is described in <a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a> there is no need to create all the destinations up front, you can let the broker create them on the fly.</p>
+<p>As is described in <link><page ri:content-title="How do I create new destinations"></page></link> there is no need to create all the destinations up front, you can let the broker create them on the fly.</p>
-<p>However if you don't want this behaviour, or wish to restrict this behaviour to certain topic or queue <a shape="rect" href="wildcards.xml">Wildcards</a> (areas of the queue or topic name space) then you can use the <a shape="rect" href="security.xml">Security</a> plugins to disallow the <strong>admin</strong> role on whatever areas of the queue and topic namespace you wish</p></div>
+<p>However if you don't want this behaviour, or wish to restrict this behaviour to certain topic or queue <link><page ri:content-title="Wildcards"></page></link> (areas of the queue or topic name space) then you can use the <link><page ri:content-title="Security"></page></link> plugins to disallow the <strong>admin</strong> role on whatever areas of the queue and topic namespace you wish</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-run-a-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-run-a-broker.xml b/how-do-i-run-a-broker.xml
index bc2ac33..ce2da3b 100644
--- a/how-do-i-run-a-broker.xml
+++ b/how-do-i-run-a-broker.xml
@@ -1,6 +1,6 @@
<div class="wiki-content maincontent">
-<h3 id="HowdoIrunabroker-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
-<p>Please see the <a shape="rect" href="run-broker.xml">running a broker page</a></p></div>
+<p>Please see the <link><page ri:content-title="Run Broker"></page><link-body>running a broker page</link-body></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-run-activemq-under-the-kaffe-jvm.xml
----------------------------------------------------------------------
diff --git a/how-do-i-run-activemq-under-the-kaffe-jvm.xml b/how-do-i-run-activemq-under-the-kaffe-jvm.xml
index 491778d..f5f2ddf 100644
--- a/how-do-i-run-activemq-under-the-kaffe-jvm.xml
+++ b/how-do-i-run-activemq-under-the-kaffe-jvm.xml
@@ -14,25 +14,23 @@ OS & version: Linux dev-10 2.6.13-15.8-smp #1 SMP Tue Feb 7 11:07:24 UTC</p>
<p>The following is the activemq.xml that was used:</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="8e4c7537-d5e9-4587-9711-486889e4f14d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
<persistenceAdapter>
- <journaledJDBC useJournal="false" dataDirectory="activemq-data"/>
+ <journaledJDBC useJournal="false" dataDirectory="activemq-data"/>
</persistenceAdapter>
<transportConnectors>
- <transportConnector name="default" uri="tcp://localhost:61616"/>
- <transportConnector name="stomp" uri="stomp://localhost:61613"/>
+ <transportConnector name="default" uri="tcp://localhost:61616"/>
+ <transportConnector name="stomp" uri="stomp://localhost:61613"/>
</transportConnectors>
</broker>
</beans>
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
----------------------------------------------------------------------
diff --git a/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml b/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
index ff5c43b..f2be69e 100644
--- a/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
+++ b/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
@@ -1,14 +1,12 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIsendmessagestodifferentDestinationsfromasingleMessageProducer-HowdoIsendmessagestodifferentDestinationsfromasingleMessageProducer?">How do I send messages to different Destinations from a single MessageProducer?</h2>
+<div class="wiki-content maincontent"><h2>How do I send messages to different Destinations from a single MessageProducer?</h2>
<p>Create the MessageProducer using a null destination; then specify the destination each time you send...</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="cfdfbd31-1bde-4d5f-aa90-0f60d4ed9759" ac:name="code" ac:schema-version="1"><plain-text-body>
MessageProducer producer = session.createProducer(null);
...
producer.send(someDestination, message);
...
producer.send(anotherDestination, message);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-set-the-message-expiration.xml
----------------------------------------------------------------------
diff --git a/how-do-i-set-the-message-expiration.xml b/how-do-i-set-the-message-expiration.xml
index 993ef4e..c652860 100644
--- a/how-do-i-set-the-message-expiration.xml
+++ b/how-do-i-set-the-message-expiration.xml
@@ -1,4 +1,5 @@
<div class="wiki-content maincontent"><p>JMSExpiration on a message is set by the MessageProducer in JMS - either via</p>
-<ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setTimeToLive(long)" rel="nofollow">producer.setTimeToLive()</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#send(javax.jms.Destination,%20javax.jms.Message,%20int,%20int,%20long)" rel="nofollow">producer.send(Destination, Message, int, int, long)</a></li></ul></div>
+<ul><li><a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setTimeToLive(long)">producer.setTimeToLive()</a></li><li><a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#send(javax.jms.Destination,%20javax.jms.Message,%20int,%20int,%20long)">producer.send(Destination, Message, int, int, long)</a></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-unack-the-message-with-stomp.xml
----------------------------------------------------------------------
diff --git a/how-do-i-unack-the-message-with-stomp.xml b/how-do-i-unack-the-message-with-stomp.xml
index 33b345a..18ec01d 100644
--- a/how-do-i-unack-the-message-with-stomp.xml
+++ b/how-do-i-unack-the-message-with-stomp.xml
@@ -4,54 +4,51 @@
<p>Take a look at the following example:</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="bd6d23fc-406a-498a-8d12-05f047cb310f" ac:name="code" ac:schema-version="1"><plain-text-body>
StompConnection connection = new StompConnection();
-connection.open("localhost", 61613);
+connection.open("localhost", 61613);
-connection.connect("system", "manager");
+connection.connect("system", "manager");
-connection.send("/queue/test", "message 1");
-connection.send("/queue/test", "message 2");
-connection.send("/queue/test", "message 3");
+connection.send("/queue/test", "message 1");
+connection.send("/queue/test", "message 2");
+connection.send("/queue/test", "message 3");
HashMap<String, String> headers = new HashMap<String, String>();
-headers.put("activemq.prefetchSize", "1");
-connection.subscribe("/queue/test", "client", headers);
+headers.put("activemq.prefetchSize", "1");
+connection.subscribe("/queue/test", "client", headers);
-connection.begin("tx1");
+connection.begin("tx1");
StompFrame frame = connection.receive();
System.out.println(frame.getBody());
-connection.ack(frame, "tx1");
-connection.abort("tx1");
+connection.ack(frame, "tx1");
+connection.abort("tx1");
-connection.begin("tx2");
-connection.ack(frame, "tx2"); //sending the ack again
+connection.begin("tx2");
+connection.ack(frame, "tx2"); //sending the ack again
frame = connection.receive();
System.out.println(frame.getBody());
-connection.ack(frame, "tx2");
-connection.commit("tx2");
+connection.ack(frame, "tx2");
+connection.commit("tx2");
-connection.begin("tx3");
+connection.begin("tx3");
frame = connection.receive();
System.out.println(frame.getBody());
-connection.ack(frame, "tx3");
-connection.commit("tx3");
-]]></script>
-</div></div>
+connection.ack(frame, "tx3");
+connection.commit("tx3");
+</plain-text-body></structured-macro>
<p>This simple application will print </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="56487b6e-0246-466b-9e13-4c366a548105" ac:name="code" ac:schema-version="1"><plain-text-body>
message 1
message 2
message 3
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>Since the transaction <code>tx1</code> has been aborted, we needed to acknowledge that message again in <code>tx2</code> in order to be able to receive the next message (since the prefetch size used is 1).</p>
<p>Also take a look at these pages for more info:</p>
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling">http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">http://activemq.apache.org/what-is-the-prefetch-limit-for.html</a></li></ul></div>
+<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling">http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">http://activemq.apache.org/what-is-the-prefetch-limit-for.html</a></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-activemq-using-in-jvm-messaging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-activemq-using-in-jvm-messaging.xml b/how-do-i-use-activemq-using-in-jvm-messaging.xml
index d86df89..8f6980f 100644
--- a/how-do-i-use-activemq-using-in-jvm-messaging.xml
+++ b/how-do-i-use-activemq-using-in-jvm-messaging.xml
@@ -1,18 +1,16 @@
<div class="wiki-content maincontent">
-<h3 id="HowdoIuseActiveMQusinginJVMmessaging-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
<p>To use pure in-memory messaging you just need to set the broker URL to 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[
+<structured-macro ac:macro-id="b3266292-d211-4cd5-b05d-8bae5faa307c" ac:name="code" ac:schema-version="1"><plain-text-body>
vm://localhost
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p> </p>
<p>Actually you can use any text after <em>vm://</em> so that you can segment multiple logical JMS brokers within the same JVM and classloader, using the name to distinguish between them.</p>
-<p>There is an example of how to do this along with a description of the available protocols in the <a shape="rect" href="uri-protocols.xml">Protocols overview</a>.</p>
+<p>There is an example of how to do this along with a description of the available protocols in the <link><page ri:content-title="URI Protocols"></page><link-body>Protocols overview</link-body></link>.</p>
-<p>Also see: <a shape="rect" href="how-should-i-use-the-vm-transport.xml">how to optimise the VM transport</a></p></div>
+<p>Also see: <link><page ri:content-title="How should I use the VM transport"></page><link-body>how to optimise the VM transport</link-body></link></p></div>