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:33 UTC
[09/51] [abbrv] [partial] activemq-web git commit: Add body.storage
type
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-lightweight-is-sending-a-message.xml
----------------------------------------------------------------------
diff --git a/how-lightweight-is-sending-a-message.xml b/how-lightweight-is-sending-a-message.xml
index 7a9cfdd..8eda934 100644
--- a/how-lightweight-is-sending-a-message.xml
+++ b/how-lightweight-is-sending-a-message.xml
@@ -1,12 +1,12 @@
<div class="wiki-content maincontent">
-<h3 id="Howlightweightissendingamessage-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
-<p>It depends <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)"></p>
+<p>It depends <emoticon ac:name="smile"></emoticon></p>
<p>If you are in a JMS transaction, are using non-durable messaging then its fairly lightweight and fast - typically just blocking until the message has got onto the socket buffer. Though if you are using durable messaging and not using JMS transactions then by default we will perform a blocking request-response with the broker to ensure the message is persisted to disk by the time the call to send() is complete - which is pretty slow.</p>
-<p>However if you really want it to be very lightweight and fast, <a shape="rect" href="configuring-transports.xml">enable async sending</a> on your JMS connection.</p>
+<p>However if you really want it to be very lightweight and fast, <link><page ri:content-title="Configuring Transports"></page><link-body>enable async sending</link-body></link> on your JMS connection.</p>
<p>If you really want low latency, such as in a GUI thread or very high performance server, you probably want to enable asynchronous sending. The only downside of asynchronous sending is if the send fails for whatever reason (security exception typically or some transport failure), then you don't get an exception thrown in the sender thread, since all the work is done asynchronously, though your ErrorListener will get notified.</p>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-should-i-implement-request-response-with-jms.xml
----------------------------------------------------------------------
diff --git a/how-should-i-implement-request-response-with-jms.xml b/how-should-i-implement-request-response-with-jms.xml
index bd87e5d..2e91e5e 100644
--- a/how-should-i-implement-request-response-with-jms.xml
+++ b/how-should-i-implement-request-response-with-jms.xml
@@ -1,31 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="HowshouldIimplementrequestresponsewithJMS-HowshouldIimplementrequestresponsewithJMS?">How should I implement request response with JMS?</h2>
+<div class="wiki-content maincontent"><h2>How should I implement request response with JMS?</h2>
-<p>The simplest solution is to use <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/spring-remoting.html">Camel as a Spring Remoting provider</a> which allows you to hide all the JMS API from your business logic and letting Camel provide the request/response handling code for you.</p>
+<p>The simplest solution is to use <a shape="rect" href="http://activemq.apache.org/camel/spring-remoting.html">Camel as a Spring Remoting provider</a> which allows you to hide all the JMS API from your business logic and letting Camel provide the request/response handling code for you.</p>
<p>However if you wish to write the JMS client code yourself, please read on how it works...</p>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-UsingtheJMSAPItoimplementrequest-response">Using the JMS API to implement request-response</h3>
+<h3>Using the JMS API to implement request-response</h3>
<p>You might think at first that to implement request-response type operations in JMS that you should create a new consumer with a selector per request; or maybe create a new temporary queue per request.</p>
<p>Creating temporary destinations, consumers, producers and connections are all synchronous request-response operations with the broker and so should be avoided for processing each request as it results in lots of chat with the JMS broker.</p>
-<p>The best way to implement request-response over JMS is to create a temporary queue and consumer per client on startup, set JMSReplyTo property on each message to the temporary queue and then use a <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html#setJMSCorrelationID(java.lang.String)" rel="nofollow">correlationID on each message</a> to correlate request messages to response messages. This avoids the overhead of creating and closing a consumer for each request (which is expensive). It also means you can share the same producer & consumer across many threads if you want (or pool them maybe).</p>
+<p>The best way to implement request-response over JMS is to create a temporary queue and consumer per client on startup, set JMSReplyTo property on each message to the temporary queue and then use a <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html#setJMSCorrelationID(java.lang.String)">correlationID on each message</a> to correlate request messages to response messages. This avoids the overhead of creating and closing a consumer for each request (which is expensive). It also means you can share the same producer & consumer across many threads if you want (or pool them maybe).</p>
-<p>The <a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo library</a> is an implementation of Spring remoting using JMS. (Spring remoting is a kind of POJO based remoting where the remoting code is invisible to your business logic code).</p>
+<p>The <a shape="rect" href="http://lingo.codehaus.org/">Lingo library</a> is an implementation of Spring remoting using JMS. (Spring remoting is a kind of POJO based remoting where the remoting code is invisible to your business logic code).</p>
<p>It uses exactly this pattern; of using correlation IDs to correlate requests to responses. The server side just has to remember to put the inbound message's correlation ID on the response.</p>
-<p>The actual class which does this is the <a shape="rect" class="external-link" href="http://lingo.codehaus.org/maven/apidocs/org/logicblaze/lingo/jms/impl/MultiplexingRequestor.html" rel="nofollow">MultiplexingRequestor</a> . It may be just using Spring remoting with Lingo is the simplest way of implementing request response - or maybe you could just use Lingo's <a shape="rect" class="external-link" href="http://lingo.codehaus.org/maven/apidocs/org/logicblaze/lingo/jms/Requestor.html" rel="nofollow">Requestor</a> interface to keep the JMS semantics.</p>
+<p>The actual class which does this is the <a shape="rect" href="http://lingo.codehaus.org/maven/apidocs/org/logicblaze/lingo/jms/impl/MultiplexingRequestor.html">MultiplexingRequestor</a> . It may be just using Spring remoting with Lingo is the simplest way of implementing request response - or maybe you could just use Lingo's <a shape="rect" href="http://lingo.codehaus.org/maven/apidocs/org/logicblaze/lingo/jms/Requestor.html">Requestor</a> interface to keep the JMS semantics.</p>
-<p>More details <a shape="rect" class="external-link" href="http://docs.codehaus.org/display/LINGO/Request+Response+with+JMS" rel="nofollow">here</a></p>
+<p>More details <a shape="rect" href="http://docs.codehaus.org/display/LINGO/Request+Response+with+JMS">here</a></p>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-Clientside">Client side</h3>
+<h3>Client side</h3>
<p>So the client side creates a consumer on a temporary queue as follows...</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="e5020b3a-4e69-470a-b610-ea3fbee197fb" ac:name="code" ac:schema-version="1"><plain-text-body>
// client side
Destination tempDest = session.createTemporaryQueue();
MessageConsumer responseConsumer = session.createConsumer(tempDest);
@@ -36,13 +35,11 @@ message.setJMSReplyTo(tempDest)
message.setJMSCorrelationID(myCorrelationID);
producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-Serverside">Server side</h3>
+<h3>Server side</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="785c40c9-dacb-477c-b52b-d6cf5a93efdd" ac:name="code" ac:schema-version="1"><plain-text-body>
public void onMessage(Message request) {
Message response = session.createMessage();
@@ -50,15 +47,13 @@ public void onMessage(Message request) {
producer.send(request.getJMSReplyTo(), response)
}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h2 id="HowshouldIimplementrequestresponsewithJMS-FullExamples">Full Examples</h2>
+<h2>Full Examples</h2>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-ServerSide">Server Side</h3>
+<h3>Server Side</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="c70ef9de-68d0-4a3f-914d-a38cd43b1119" ac:name="code" ac:schema-version="1"><parameter ac:name="type">java</parameter><plain-text-body>
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -75,8 +70,8 @@ public class Server implements MessageListener {
private MessageProtocol messageProtocol;
static {
- messageBrokerUrl = "tcp://localhost:61616";
- messageQueueName = "client.messages";
+ messageBrokerUrl = "tcp://localhost:61616";
+ messageQueueName = "client.messages";
ackMode = Session.AUTO_ACKNOWLEDGE;
}
@@ -146,13 +141,11 @@ public class Server implements MessageListener {
new Server();
}
}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-ClientSide">Client Side</h3>
+<h3>Client Side</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="a2819c9c-22b8-449b-b6d3-1938be462d9e" ac:name="code" ac:schema-version="1"><parameter ac:name="type">java</parameter><plain-text-body>
import org.apache.activemq.ActiveMQConnectionFactory;
import javax.jms.*;
@@ -166,12 +159,12 @@ public class Client implements MessageListener {
private MessageProducer producer;
static {
- clientQueueName = "client.messages";
+ clientQueueName = "client.messages";
ackMode = Session.AUTO_ACKNOWLEDGE;
}
public Client() {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
Connection connection;
try {
connection = connectionFactory.createConnection();
@@ -194,7 +187,7 @@ public class Client implements MessageListener {
//Now create the actual message you want to send
TextMessage txtMessage = session.createTextMessage();
- txtMessage.setText("MyProtocolMessage");
+ txtMessage.setText("MyProtocolMessage");
//Set the reply to field to the temp queue you created above, this is the queue the server
//will respond to
@@ -225,7 +218,7 @@ public class Client implements MessageListener {
if (message instanceof TextMessage) {
TextMessage textMessage = (TextMessage) message;
messageText = textMessage.getText();
- System.out.println("messageText = " + messageText);
+ System.out.println("messageText = " + messageText);
}
} catch (JMSException e) {
//Handle the exception appropriately
@@ -236,27 +229,24 @@ public class Client implements MessageListener {
new Client();
}
}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h3 id="HowshouldIimplementrequestresponsewithJMS-ProtocolClass">Protocol Class</h3>
+<h3>Protocol Class</h3>
<p>This class is needed to run the client/server example above. Delegating the handling of messages to a seperate class is solely a personal preference.</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="03110497-2192-42aa-b217-ccd1d89e36e2" ac:name="code" ac:schema-version="1"><parameter ac:name="type">java</parameter><plain-text-body>
public class MessageProtocol {
public String handleProtocolMessage(String messageText) {
String responseText;
- if ("MyProtocolMessage".equalsIgnoreCase(messageText)) {
- responseText = "I recognize your protocol message";
+ if ("MyProtocolMessage".equalsIgnoreCase(messageText)) {
+ responseText = "I recognize your protocol message";
} else {
- responseText = "Unknown protocol message: " + messageText;
+ responseText = "Unknown protocol message: " + messageText;
}
return responseText;
}
}
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-should-i-package-applications-using-camel-and-activemq.xml
----------------------------------------------------------------------
diff --git a/how-should-i-package-applications-using-camel-and-activemq.xml b/how-should-i-package-applications-using-camel-and-activemq.xml
index 74759d9..98bb981 100644
--- a/how-should-i-package-applications-using-camel-and-activemq.xml
+++ b/how-should-i-package-applications-using-camel-and-activemq.xml
@@ -1,12 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="HowshouldIpackageapplicationsusingCamelandActiveMQ-HowshouldIpackageapplicationsusingCamelandActiveMQ">How should I package applications using Camel and ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2>How should I package applications using Camel and ActiveMQ</h2>
-<p>So you may wish to use Camel's <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> inside the ActiveMQ Broker. In which case the stand alone broker is already packaged to work with Camel out of the box; just add your EIP routing rules to ActiveMQ's <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> like the example routing rule which ships with ActiveMQ 5.x or later. If you want to include some Java routing rules, then just add your jar to somewhere inside ActiveMQ's lib directory.</p>
+<p>So you may wish to use Camel's <link><page ri:content-title="Enterprise Integration Patterns"></page></link> inside the ActiveMQ Broker. In which case the stand alone broker is already packaged to work with Camel out of the box; just add your EIP routing rules to ActiveMQ's <link><page ri:content-title="Xml Configuration"></page></link> like the example routing rule which ships with ActiveMQ 5.x or later. If you want to include some Java routing rules, then just add your jar to somewhere inside ActiveMQ's lib directory.</p>
<p>If you wish to use ActiveMQ and/or Camel in a standalone application, we recommend you just create a normal Spring application; then add the necessary jars and customise the Spring XML and you're good to go.</p>
-<h3 id="HowshouldIpackageapplicationsusingCamelandActiveMQ-WhatjarsdoIneed">What jars do I need</h3>
+<h3>What jars do I need</h3>
+
+<ul><li><link><page ri:content-title="Initial Configuration"></page><link-body>what jars are required for ActiveMQ</link-body></link></li><li><a shape="rect" href="http://activemq.apache.org/camel/what-jars-do-i-need.html">what jars are required for Camel</a></li></ul>
-<ul><li><a shape="rect" href="initial-configuration.xml">what jars are required for ActiveMQ</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/what-jars-do-i-need.html">what jars are required for Camel</a></li></ul>
</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-should-i-use-the-vm-transport.xml
----------------------------------------------------------------------
diff --git a/how-should-i-use-the-vm-transport.xml b/how-should-i-use-the-vm-transport.xml
index ae26596..df7fdcd 100644
--- a/how-should-i-use-the-vm-transport.xml
+++ b/how-should-i-use-the-vm-transport.xml
@@ -1,30 +1,28 @@
<div class="wiki-content maincontent">
-<h3 id="HowshouldIusetheVMtransport-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
-<p><a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.xml">Using the VM transport</a> to connect to an in-JVM broker is the fastest and most efficient transport you can use.</p>
+<p><link><page ri:content-title="How do I use ActiveMQ using in JVM messaging"></page><link-body>Using the VM transport</link-body></link> to connect to an in-JVM broker is the fastest and most efficient transport you can use.</p>
<p>This is because by default there is no serialization to a socket or operating system socket resources used up; its purely an in-JVM List used to exchange messages with clients and the broker. Sometimes you want the VM transport to work as an async SEDA queue; other times you want to inline the processing so that there are less thread context switches which can improve throughput in high performance scenarios.</p>
<p>One thing to note with the VM transport is that messages are passed by reference. One slight exception to this is the JMS ObjectMessage. (see below for details on how to disable it in ActiveMQ 4.x)</p>
<p> You can also further optimise things by setting the <strong>copyMessageOnSend</strong> property to be false; which avoids making a copy of the ObjectMessage to send; though this assumes that you don't try and resuse the ObjectMessage instance; you just create it once and send it once and don't try and change the body of the message after sending it.</p>
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful of ClassLoaders</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Note that you should only perform the above optimisation if all the producers and consumers are in a compatible class loader. For example if you have 2 WARs with their own jars which are sending messages to each other, you could get strange ClassCastExceptions occuring due to the same class being loaded in each class loader; so sometimes serializing ObjectMessage is a good thing to avoid ClassPath hell - so only perform the above optimisation if you are sure you're ClassPaths are OK</p></div></div>
+<structured-macro ac:macro-id="86215832-e59d-4c91-a3d4-21bf38859198" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Be careful of ClassLoaders</parameter><rich-text-body>
+<p>Note that you should only perform the above optimisation if all the producers and consumers are in a compatible class loader. For example if you have 2 WARs with their own jars which are sending messages to each other, you could get strange ClassCastExceptions occuring due to the same class being loaded in each class loader; so sometimes serializing ObjectMessage is a good thing to avoid ClassPath hell - so only perform the above optimisation if you are sure you're ClassPaths are OK</p></rich-text-body></structured-macro>
-<h3 id="HowshouldIusetheVMtransport-DisablingObjectserializationwithObjectMessageforActiveMQ4.x">Disabling Object serialization with ObjectMessage for ActiveMQ 4.x</h3>
+<h3>Disabling Object serialization with ObjectMessage for ActiveMQ 4.x</h3>
<p>The JMS specification dictates that the body of an ObjectMessage must be serialized when you call send() to avoid the object changing under your feet affecting what view the consumer sees of the object.</p>
<p>You can disable the automatic serialization of ObjectMessage payloads so that the objects are passed by value in 4.x by setting the <strong>objectMessageSerializationDefered</strong> flag to true on the ActiveMQConnectionFactory (or ActiveMQConnection).</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 factory = new ActiveMQConnectionFactory("vm://localhost");
+<structured-macro ac:macro-id="95dfa68c-f295-45ed-8a8f-1c45802a06f5" ac:name="code" ac:schema-version="1"><plain-text-body>
+ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
factory.setObjectMessageSerializationDefered(true);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p> </p>
<p> </p>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-become-a-committer-on-the-activemq-project.xml
----------------------------------------------------------------------
diff --git a/how-to-become-a-committer-on-the-activemq-project.xml b/how-to-become-a-committer-on-the-activemq-project.xml
index 42eb9ff..a862d0b 100644
--- a/how-to-become-a-committer-on-the-activemq-project.xml
+++ b/how-to-become-a-committer-on-the-activemq-project.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="HowtoBecomeaCommitterontheActiveMQProject-HowtoBecomeaCommitterontheActiveMQProject">How to Become a Committer on the ActiveMQ Project</h1><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><span>This page is under active development so the ideas here are very fluid right now.</span></p></div></div><p><span style="line-height: 1.4285715;">As outlined on <a shape="rect" class="external-link" href="http://www.apache.org/foundation/how-it-works.html">How It Works document</a> and the </span><a shape="rect" class="external-link" href="https://www.apache.org/foundation/how-it-works.html#roles" style="line-height: 1.4285715;">ASF roles</a> defined there, we want to actively<span style="line-height: 1.4285715;"> </span><span style="line-height: 1.4285715;"> enco
urage folks to move from being contributors to the ActiveMQ TLP toward becoming full-fledged committers on the project. </span><span style="line-height: 1.4285715;">In an effort to provide more transparency on what it takes to become a committer on the ActiveMQ project, we are assembling our thoughts here. </span><span style="line-height: 1.4285715;">As we work through the identification of the skills and values we feel are necessary to become a committer on the ActiveMQ project, we should continue to discuss our thoughts on the dev@activemq mailing list so that everyone is able to participate. </span></p><p>Below is the list of some of the guidelines we believe make up a good candidate for being offered committership:</p><p> </p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects </li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists </li><li>Willingness to contribute to the documentation</li>
<li>Willingness to mentor and be mentored</li><li>Helping to promote the community and this project, including outside of Apache</li><li>Sustained interest and contribution</li></ul></div>
+<div class="wiki-content maincontent"><h1>How to Become a Committer on the ActiveMQ Project</h1><structured-macro ac:macro-id="e493ce13-fb9f-4f9f-a147-09caf854f661" ac:name="warning" ac:schema-version="1"><rich-text-body><p><span>This page is under active development so the ideas here are very fluid right now.</span></p></rich-text-body></structured-macro><p><span style="line-height: 1.4285715;">As outlined on <a shape="rect" href="http://www.apache.org/foundation/how-it-works.html">How It Works document</a> and the </span><a shape="rect" href="https://www.apache.org/foundation/how-it-works.html#roles" style="line-height: 1.4285715;">ASF roles</a> defined there, we want to actively<span style="line-height: 1.4285715;"> </span><span style="line-height: 1.4285715;"> encourage folks to move from being contributors to the ActiveMQ TLP toward becoming full-fledged committers on the project. </span><span style="line-height: 1.4285715;">In an effort to provide more transpare
ncy on what it takes to become a committer on the ActiveMQ project, we are assembling our thoughts here. </span><span style="line-height: 1.4285715;">As we work through the identification of the skills and values we feel are necessary to become a committer on the ActiveMQ project, we should continue to discuss our thoughts on the dev@activemq mailing list so that everyone is able to participate. </span></p><p>Below is the list of some of the guidelines we believe make up a good candidate for being offered committership:</p><p> </p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects </li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists </li><li>Willingness to contribute to the documentation</li><li>Willingness to mentor and be mentored</li><li>Helping to promote the community and this project, including outside of Apache</li><li>Sustained interest and contribution</li></ul></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-configure-a-new-database.xml
----------------------------------------------------------------------
diff --git a/how-to-configure-a-new-database.xml b/how-to-configure-a-new-database.xml
index c7c3142..f09d1c2 100644
--- a/how-to-configure-a-new-database.xml
+++ b/how-to-configure-a-new-database.xml
@@ -5,41 +5,37 @@
<p>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[
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://localhost/activemq"/>
- <property name="username" value="activemq"/>
- <property name="password" value="activemq"/>
- <property name="poolPreparedStatements" value="true"/>
+<structured-macro ac:macro-id="8c9473ba-d5ec-4a14-b9dc-dcefecdec2c2" ac:name="code" ac:schema-version="1"><plain-text-body>
+ <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://localhost/activemq"/>
+ <property name="username" value="activemq"/>
+ <property name="password" value="activemq"/>
+ <property name="poolPreparedStatements" value="true"/>
</bean>
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p><strong>For AMQ 3.x</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-<bean id="mssql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName">
+<structured-macro ac:macro-id="3423b393-7e75-4fe6-baf4-6d8d7d26dc7e" ac:name="code" ac:schema-version="1"><plain-text-body>
+<bean id="mssql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName">
<value>com.microsoft.jdbc.sqlserver.SQLServerDriver</value>
</property>
- <property name="url">
+ <property name="url">
<value>jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=activedb</value>
</property>
- <property name="username">
+ <property name="username">
<value>sa</value>
</property>
- <property name="password">
+ <property name="password">
<value></value>
</property>
- <property name="poolPreparedStatements">
+ <property name="poolPreparedStatements">
<value>true</value>
</property>
</bean>
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>2. Set the datasource reference to use the new jdbc configuration e.g <jdbcPersistence dataSourceRef="mssql-ds"/></p>
<p>3. Place the jdbc driver in the directory "activemq_home/lib/optional".</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-deal-with-large-number-of-threads-in-clients.xml
----------------------------------------------------------------------
diff --git a/how-to-deal-with-large-number-of-threads-in-clients.xml b/how-to-deal-with-large-number-of-threads-in-clients.xml
index a3b7fa7..3b36146 100644
--- a/how-to-deal-with-large-number-of-threads-in-clients.xml
+++ b/how-to-deal-with-large-number-of-threads-in-clients.xml
@@ -1,33 +1,27 @@
-<div class="wiki-content maincontent"><p>If you study thread allocation in ActiveMQ clients, you'll notice that by default there is one thread allocated by every session. This basically means that session will use its <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html" rel="nofollow">ThreadPoolExecutor</a> to execute its tasks. Up until version 5.7 this executor was unbound which could lead to OOM problems in rare case where are a large number of busy sessions in the same JVM could cause uncontrollable spikes in thread creation. </p>
+<div class="wiki-content maincontent"><p>If you study thread allocation in ActiveMQ clients, you'll notice that by default there is one thread allocated by every session. This basically means that session will use its <a shape="rect" href="http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html">ThreadPoolExecutor</a> to execute its tasks. Up until version 5.7 this executor was unbound which could lead to OOM problems in rare case where are a large number of busy sessions in the same JVM could cause uncontrollable spikes in thread creation. </p>
<p>In 5.7 we bounded this executor to a maximum of 1000 threads by default, which we believe should be enough for most use cases. In case of large number of busy sessions, each of them could end up using large number of threads and eventually OOM your application. There are couple of things you can do. The first obvious thing is to decrease the max thread limit a session can use, like this:</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 connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+<structured-macro ac:macro-id="1bc48d77-6421-4fdb-ab92-c96802229184" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connectionFactory.setMaxThreadPoolSize(10);
Connection conn = connectionFactory.createConnection();
-conn.start();]]></script>
-</div></div>
+conn.start();</plain-text-body></structured-macro>
<p>On the other hand this can lead to the scenario where a single session exaust its max thread number. A default behavior of <code>ThreadPoolExecutor</code> in this case is to throw an exception, so you'll notice it. A workaround for this scenario is to provide a rejected task handler that will synchronize the execution with the calling thread, like this</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 connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+<structured-macro ac:macro-id="b9389b13-20a8-4080-aafe-1fa75119999c" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connectionFactory.setRejectedTaskHandler(new ThreadPoolExecutor.CallerRunsPolicy());
Connection conn = connectionFactory.createConnection();
-conn.start();]]></script>
-</div></div>
+conn.start();</plain-text-body></structured-macro>
<p>This will prevent the <code>ThreadPoolExecutor</code> from throwing an exception when it reaches its bound. Instead it will execute the rejected task in the calling thread.</p>
<p>Finally, you can eliminate these threads completly, you can do that by setting <code>alwaysSessionAsync</code> property 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 connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+<structured-macro ac:macro-id="707b37e8-ac2b-487b-be52-ebf66d194721" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connectionFactory.setAlwaysSessionAsync(false);
Connection conn = connectionFactory.createConnection();
-conn.start();]]></script>
-</div></div>
+conn.start();</plain-text-body></structured-macro>
<p>However you need to have in mind that this approach can affect performance of the whole system.</p>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-deploy-activemq-ra-versionrar-to-weblogic.xml
----------------------------------------------------------------------
diff --git a/how-to-deploy-activemq-ra-versionrar-to-weblogic.xml b/how-to-deploy-activemq-ra-versionrar-to-weblogic.xml
index fd11756..62494e8 100644
--- a/how-to-deploy-activemq-ra-versionrar-to-weblogic.xml
+++ b/how-to-deploy-activemq-ra-versionrar-to-weblogic.xml
@@ -1,12 +1,11 @@
<div class="wiki-content maincontent">
-<h3 id="Howtodeployactivemq-ra-version.rartoweblogic-ThisisaguideonhowtodeployActiveMQ'sresouceadaptertoweblogic9.1.">This is a guide on how to deploy ActiveMQ's resouce adapter to weblogic 9.1.</h3>
+<h3>This is a guide on how to deploy ActiveMQ's resouce adapter to weblogic 9.1.</h3>
<ol><li>Create a new domain in weblogic using the configuration wizard (Start menu BEA Products -> Tools -> configuration Wizard ).</li><li>Add the jar dependencies (these are the jars inside the rar file..for some reason weblogic is not loading these from the rar file)  in the classpath . One way to do this is by dropping the jars in the lib directory of the domain (<%BEA_HOME%>\user_projects\domains\<%DOMAIN_NAME%>\lib). </li></ol>
<ol><li>Add the BrokerXmlConfig file called "broker-config.xml" in the classpath. This can be found in the rar file "activemq-rar-*.rar". Otherwise, modify ra.xml by providing an absolute path to "broker-config.xml", see below.
-<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="e40688bb-e6be-4280-895d-cc1b33d28668" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
<config-property>
<description>
Sets the XML configuration file used to configure the ActiveMQ broker via
@@ -21,11 +20,11 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>xbean:file:C:\broker-config.xml</config-property-value>
</config-property>
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
<br clear="none" class="atl-forced-newline">
 
<br clear="none" class="atl-forced-newline">
- </li><li>Start the domain's weblogic server (BEA Products -> User Projects -> <domain_name> -> Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -> User Projects -> <domain_name> -> Admin Server Console) and enter the username and password.</li><li>On the main menu, click "Deployments" under "Your Deployed Resources"</li><li>On the deployment table, click "install" button. If the button is disabled, then click "Lock & Edit" to enable it.</li><li>Browse for the activemq-ra-*.rar file then click next (for testing purpose, choose the default onwards).</li><li>Click the "activate changes" button to check if the resource adapter is properly deployed.</li></ol></div>
+ </li><li>Start the domain's weblogic server (BEA Products -> User Projects -> <domain_name> -> Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -> User Projects -> <domain_name> -> Admin Server Console) and enter the username and password.</li><li>On the main menu, click "Deployments" under "Your Deployed Resources"</li><li>On the deployment table, click "install" button. If the button is disabled, then click "Lock & Edit" to enable it.</li><li>Browse for the activemq-ra-*.rar file then click next (for testing purpose, choose the default onwards).</li><li>Click the "activate changes" button to check if the resource adapter is properly deployed.</li></ol>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-disable-auto-destination-creation.xml
----------------------------------------------------------------------
diff --git a/how-to-disable-auto-destination-creation.xml b/how-to-disable-auto-destination-creation.xml
index 1190598..645be12 100644
--- a/how-to-disable-auto-destination-creation.xml
+++ b/how-to-disable-auto-destination-creation.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>see <a shape="rect" href="how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml">How do I restrict connections from creating new queues or topics</a></p></div>
+<div class="wiki-content maincontent"><p>see <link><page ri:content-title="How do I restrict connections from creating new queues or topics"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-disable-multicast-discovery.xml
----------------------------------------------------------------------
diff --git a/how-to-disable-multicast-discovery.xml b/how-to-disable-multicast-discovery.xml
index 19735f1..e93e897 100644
--- a/how-to-disable-multicast-discovery.xml
+++ b/how-to-disable-multicast-discovery.xml
@@ -1,11 +1,5 @@
-<div class="wiki-content maincontent"><p>By default, the <a shape="rect" href="xml-configuration.xml">ActiveMQ xml configuration</a> includes the <a shape="rect" href="discovery.xml">multicast discovery</a> mechanism. The tcp transport connector advertises its self using multicast and a multicast network connector is configured to listen to the same address. In this way, all brokers that share the default multicast address will automatically network with each other. <br clear="none"> If multicast is not required, the multicast attributes of the Transport Connector and Network Connector can be removed.</p><p>To stop advertising your connection URI on the multicast network remove the discoveryUri attribute from the <transportConnector/>:</p><p>replace:</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="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-]]></script>
-</div></div><p>with:</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="openwire" uri="tcp://localhost:61616" />
-]]></script>
-</div></div><p>If you do not require any networked broker support remove the <networkConnector/> altogether. Remove</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[<networkConnector name="default-nc" uri="multicast://default"/>
-]]></script>
-</div></div><p>Alternatively, provide a static networkConnector for each broker you wish to network with by replacing the the discoveryUri with the static transport connection URI of your target broker.</p><p>For more information see the <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport Reference</a></p></div>
+<div class="wiki-content maincontent"><p>By default, the <link><page ri:content-title="Xml Configuration"></page><plain-text-link-body>ActiveMQ xml configuration</plain-text-link-body></link> includes the <link><page ri:content-title="Discovery"></page><plain-text-link-body>multicast discovery</plain-text-link-body></link> mechanism. The tcp transport connector advertises its self using multicast and a multicast network connector is configured to listen to the same address. In this way, all brokers that share the default multicast address will automatically network with each other. <br clear="none"> If multicast is not required, the multicast attributes of the Transport Connector and Network Connector can be removed.</p><p>To stop advertising your connection URI on the multicast network remove the discoveryUri attribute from the <transportConnector/>:</p><p>replace:</p><structured-macro ac:macro-id="9c0c7c8b-3210-4afb-91ac-4eb547e20b7a" ac:name="code" ac:schema-version="1"><pl
ain-text-body><transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+</plain-text-body></structured-macro><p>with:</p><structured-macro ac:macro-id="095890d1-4326-467d-81ff-9f22411ce4c6" ac:name="code" ac:schema-version="1"><plain-text-body><transportConnector name="openwire" uri="tcp://localhost:61616" />
+</plain-text-body></structured-macro><p>If you do not require any networked broker support remove the <networkConnector/> altogether. Remove</p><structured-macro ac:macro-id="9aa1c552-8664-4833-812c-6173fc7855ee" ac:name="code" ac:schema-version="1"><plain-text-body><networkConnector name="default-nc" uri="multicast://default"/>
+</plain-text-body></structured-macro><p>Alternatively, provide a static networkConnector for each broker you wish to network with by replacing the the discoveryUri with the static transport connection URI of your target broker.</p><p>For more information see the <link><page ri:content-title="Discovery Transport Reference"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-to-unit-test-jms-code.xml
----------------------------------------------------------------------
diff --git a/how-to-unit-test-jms-code.xml b/how-to-unit-test-jms-code.xml
index 1dd0b21..3a38262 100644
--- a/how-to-unit-test-jms-code.xml
+++ b/how-to-unit-test-jms-code.xml
@@ -1,18 +1,9 @@
-<div class="wiki-content maincontent"><p>When unit testing code with JMS you'll typically want to avoid the overhead of running separate proceses; plus you'll want to increase startup time as fast as possible as you tend to run unit tests often and want immediate feedback. Also persistence can often cause problems - as previous test case results can adversely affect future test case runs - so you often need to purge queues on startup.</p><p>So when unit testing JMS code we recommend the following</p><ul><li>Use <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">an embedded broker</a> to avoid a separate broker process being required.</li><li>Disable <a shape="rect" href="broker-configuration-uri.xml">broker persistence</a> so that no queue purging is required before/after tests.</li><li>It's often simpler and faster to just use Java code to create the broker via an XML configuration file using Spring etc.</li></ul><p>You can do all of this using the following Jav
a code to create your JMS <strong><code>ConnectionFactory</code></strong> which will also automatically 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[ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
-]]></script>
-</div></div><p>For more configuration options see the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a> and the <a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a></p><p>Or if you really would rather be more explicit you can create the broker first using the following Java 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();
+<div class="wiki-content maincontent"><p>When unit testing code with JMS you'll typically want to avoid the overhead of running separate proceses; plus you'll want to increase startup time as fast as possible as you tend to run unit tests often and want immediate feedback. Also persistence can often cause problems - as previous test case results can adversely affect future test case runs - so you often need to purge queues on startup.</p><p>So when unit testing JMS code we recommend the following</p><ul><li>Use <link><page ri:content-title="How do I embed a Broker inside a Connection"></page><plain-text-link-body>an embedded broker</plain-text-link-body></link> to avoid a separate broker process being required.</li><li>Disable <link><page ri:content-title="Broker Configuration URI"></page><plain-text-link-body>broker persistence</plain-text-link-body></link> so that no queue purging is required before/after tests.</li><li>It's often simpler and faster to just use Java code to create
the broker via an XML configuration file using Spring etc.</li></ul><p>You can do all of this using the following Java code to create your JMS <strong><code>ConnectionFactory</code></strong> which will also automatically create an embedded broker</p><structured-macro ac:macro-id="964aef1a-20fb-4432-a94d-0c00a5328ca4" ac:name="code" ac:schema-version="1"><plain-text-body>ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+</plain-text-body></structured-macro><p>For more configuration options see the <link><page ri:content-title="VM Transport Reference"></page></link> and the <link><page ri:content-title="Broker Configuration URI"></page></link></p><p>Or if you really would rather be more explicit you can create the broker first using the following Java code</p><structured-macro ac:macro-id="e0b3331e-ce0f-494e-8899-e62b59709eea" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
broker.setPersistent(false);
broker.start();
-]]></script>
-</div></div><p>or you could use <a shape="rect" href="spring-support.xml">Spring Support.</a></p><h3 id="HowToUnitTestJMSCode-UsingJNDI">Using JNDI</h3><p>If your application code is using JNDI to lookup the JMS <strong><code>ConnectionFactory</code></strong> and <strong><code>Destination</code></strong>'s to use, then you could use the <a shape="rect" href="jndi-support.xml">JNDI Support</a> in ActiveMQ.</p><p>Add the following <strong><code>jndi.properties</code></strong> to your classpath, e.g., in <strong><code>src/test/resources</code></strong>, if you are using maven:</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[java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-java.naming.provider.url = vm://localhost?broker.persistent=false]]></script>
-</div></div><p>You should then consider using <a shape="rect" href="jndi-support.xml">Dynamic destinations in JNDI</a> so that your code looks up destinations 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[context.lookup("dynamicQueues/FOO.BAR");]]></script>
-</div></div><h3 id="HowToUnitTestJMSCode-UsingTheEmbeddedActiveMQBrokerJUnitRule(ActiveMQ5.13)">Using The <code>EmbeddedActiveMQBroker</code> JUnit Rule (ActiveMQ 5.13)</h3><p>If your test code is using JUnit, then you could use the <strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule provided in the <strong><code>activemq-junit</code></strong> library. Add the <strong><code>activemq-junit</code></strong> library along with the <strong><code>activemq-broker</code></strong> libraries for the version of ActiveMQ you want to test with.  The rule will use whatever version of ActiveMQ it finds in the classpath, so the ActiveMQ libraries need to be specified if they are not already there.</p><p>If you are using Maven, add the following to your <strong><code>pom.xml</code></strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[<dependency>
+</plain-text-body></structured-macro><p>or you could use <link><page ri:content-title="Spring Support"></page><plain-text-link-body>Spring Support.</plain-text-link-body></link></p><h3>Using JNDI</h3><p>If your application code is using JNDI to lookup the JMS <strong><code>ConnectionFactory</code></strong> and <strong><code>Destination</code></strong>'s to use, then you could use the <link><page ri:content-title="JNDI Support"></page></link> in ActiveMQ.</p><p>Add the following <strong><code>jndi.properties</code></strong> to your classpath, e.g., in <strong><code>src/test/resources</code></strong>, if you are using maven:</p><structured-macro ac:macro-id="17e1b668-d297-4975-950f-dbb2ef742cde" ac:name="code" ac:schema-version="1"><plain-text-body>java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url = vm://localhost?broker.persistent=false</plain-text-body></structured-macro><p>You should then consider using <link><page ri:content-title="JNDI Support"></page><plain-text-link-body>Dynamic destinations in JNDI</plain-text-link-body></link> so that your code looks up destinations via</p><structured-macro ac:macro-id="d2677683-9688-427e-9554-dc0eaf165251" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>context.lookup("dynamicQueues/FOO.BAR");</plain-text-body></structured-macro><h3>Using The <code>EmbeddedActiveMQBroker</code> JUnit Rule (ActiveMQ 5.13)</h3><p>If your test code is using JUnit, then you could use the <strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule provided in the <strong><code>activemq-junit</code></strong> library. Add the <strong><code>activemq-junit</code></strong> library along with the <strong><code>activemq-broker</code></strong>
libraries for the version of ActiveMQ you want to test with.  The rule will use whatever version of ActiveMQ it finds in the classpath, so the ActiveMQ libraries need to be specified if they are not already there.</p><p>If you are using Maven, add the following to your <strong><code>pom.xml</code></strong>:</p><structured-macro ac:macro-id="6c23691e-68d8-4990-8b71-a922a216952e" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body><dependency>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-junit</artifactId>
<version>${activemq-junit-version}</version>
@@ -24,24 +15,16 @@ java.naming.provider.url = vm://localhost?broker.persistent=false]]></script>
<artifactId>activemq-broker</artifactId>
<version>${activemq-version}</version>
<scope>test</scope>
-</dependency>]]></script>
-</div></div><p> Then add the <strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule to your test, and JUnit will start the embedded broker at the beginning of each test and stop the broker at the end of the test.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Use The ActiveMQ JUnit Rule</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[@Rule
-public EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker();]]></script>
-</div></div><p>By default, the <strong><code>EmbeddedActiveMQBroker</code></strong> will configure the broker as non-persistent, and the only transport available will be the VM transport. To customize this configuration, either extend the <strong><code>EmbeddedActiveMQBroker</code></strong> class and override the <strong><code>configure()</code></strong> method, or use an XML configuration for the broker.  </p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><strong>Note</strong>: to configure an <strong><code>EmbeddedActiveMQBroker</code></strong> using XML configuration, you may need to add additional libraries to the classpath to support XBean configuration of ActiveMQ.</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="bord
er-bottom-width: 1px;"><b>Customizing An EmbeddedActiveMQBroker Using Java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[@Rule
+</dependency></plain-text-body></structured-macro><p> Then add the <strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule to your test, and JUnit will start the embedded broker at the beginning of each test and stop the broker at the end of the test.</p><structured-macro ac:macro-id="b5da19f2-ebc7-4557-a357-ff6f3d244afa" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><parameter ac:name="title">Use The ActiveMQ JUnit Rule</parameter><plain-text-body>@Rule
+public EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker();</plain-text-body></structured-macro><p>By default, the <strong><code>EmbeddedActiveMQBroker</code></strong> will configure the broker as non-persistent, and the only transport available will be the VM transport. To customize this configuration, either extend the <strong><code>EmbeddedActiveMQBroker</code></strong> class and override the <strong><code>configure()</code></strong> method, or use an XML configuration for the broker.  </p><structured-macro ac:macro-id="abacc4e2-d9bb-4b83-a7f3-301bf125c3e5" ac:name="info" ac:schema-version="1"><rich-text-body><strong>Note</strong>: to configure an <strong><code>EmbeddedActiveMQBroker</code></strong> using XML configuration, you may need to add additional libraries to the classpath to support XBean configuration of ActiveMQ.</rich-text-body></structured-macro><structured-macro ac:macro-id="232d811d-409b-45ba-a74f-999ba056d56c" ac:name="code" ac:schema-
version="1"><parameter ac:name="language">java</parameter><parameter ac:name="title">Customizing An EmbeddedActiveMQBroker Using Java</parameter><plain-text-body>@Rule
EmbeddedActiveMQBroker customizedBroker = new EmbeddedActiveMQBroker() {
@Override
protected void configure() {
// Perform additional configuration here...
}
-}]]></script>
-</div></div><p><span><br clear="none"></span></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Customizing An EmbeddedActiveMQBroker Using XML Configuration</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[@Rule
-EmbeddedActiveMQBroker customizedBroker = new EmbeddedActiveMQBroker("bean:customize-activemq.xml");
-]]></script>
-</div></div><p>Note that to use the XML configuration, you may need to add additional libraries on the classpath to support the XBean configuration of ActiveMQ.  The versions of the <strong><code>spring-context</code></strong> library should correspond with the version used by your selected version of ActiveMQ.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Configuration For XBean Configuration</b></div><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[<dependency>
+}</plain-text-body></structured-macro><p><span><br clear="none"></span></p><structured-macro ac:macro-id="cbaabf0f-fc90-4577-a2f5-d7605414c3db" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><parameter ac:name="title">Customizing An EmbeddedActiveMQBroker Using XML Configuration</parameter><plain-text-body>@Rule
+EmbeddedActiveMQBroker customizedBroker = new EmbeddedActiveMQBroker("bean:customize-activemq.xml");
+</plain-text-body></structured-macro><p>Note that to use the XML configuration, you may need to add additional libraries on the classpath to support the XBean configuration of ActiveMQ.  The versions of the <strong><code>spring-context</code></strong> library should correspond with the version used by your selected version of ActiveMQ.</p><structured-macro ac:macro-id="4139db17-61be-4519-a250-924edb3b8dc3" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><parameter ac:name="title">Maven Configuration For XBean Configuration</parameter><plain-text-body><dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>Appropriate version for activemq-version</version>
@@ -51,10 +34,5 @@ EmbeddedActiveMQBroker customizedBroker = new EmbeddedActiveMQBroker("bean:
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq-version></version>
-</dependency>]]></script>
-</div></div><p>Then you can use the VM URI to connect with the 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[ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://embedded-broker?create=false");]]></script>
-</div></div><p>You can also get a connection factory from the <strong><code>EmbeddedActiveMQBroker</code></strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ConnectionFactory connectionFactory = embeddedBroker.createConnectionFactory();]]></script>
-</div></div></div>
+</dependency></plain-text-body></structured-macro><p>Then you can use the VM URI to connect with the broker</p><structured-macro ac:macro-id="2e52bef4-907c-41ff-bf56-096812c967ac" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://embedded-broker?create=false");</plain-text-body></structured-macro><p>You can also get a connection factory from the <strong><code>EmbeddedActiveMQBroker</code></strong>:</p><structured-macro ac:macro-id="19cc19a7-79f8-4d09-9ac1-61b359a83769" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>ConnectionFactory connectionFactory = embeddedBroker.createConnectionFactory();</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-you-can-help-release.xml
----------------------------------------------------------------------
diff --git a/how-you-can-help-release.xml b/how-you-can-help-release.xml
index 2aa7f19..1465856 100644
--- a/how-you-can-help-release.xml
+++ b/how-you-can-help-release.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="Howyoucanhelprelease-HowtoHelp">How to Help</h2>
+<div class="wiki-content maincontent"><h2>How to Help</h2>
-<p>Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the <a shape="rect" href="mailing-lists.xml">activemq-dev@ mailing list</a> or create a <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ">JIRA</a> issue.</p>
+<p>Everyone in the ActiveMQ community can help with releases; users, developers, commmiters are all encouraged to test out a release and post any comments to the <link><page ri:content-title="Mailing Lists"></page><link-body>activemq-dev@ mailing list</link-body></link> or create a <a shape="rect" href="https://issues.apache.org/activemq/browse/AMQ">JIRA</a> issue.</p>
-<p>ActiveMQ is available in both source and binary distributions. See <a shape="rect" href="getting-started.xml">Getting Started</a>.</p></div>
+<p>ActiveMQ is available in both source and binary distributions. See <link><page ri:content-title="Getting Started"></page></link>.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/http-and-https-transports-reference.xml
----------------------------------------------------------------------
diff --git a/http-and-https-transports-reference.xml b/http-and-https-transports-reference.xml
index ff0283f..95b2cab 100644
--- a/http-and-https-transports-reference.xml
+++ b/http-and-https-transports-reference.xml
@@ -1,32 +1,31 @@
-<div class="wiki-content maincontent"><h3 id="HTTPandHTTPsTransportsReference-HTTPandHTTPSTransports">HTTP and HTTPS Transports</h3>
+<div class="wiki-content maincontent"><h3>HTTP and HTTPS Transports</h3>
<p>The HTTP and HTTPS transports are used to tunnel over HTTP or HTTPS using XML payloads. This allows the ActiveMQ client and broker to tunnel over HTTP avoiding any firewall issues. </p>
-<p>If the client is not JMS you might want to look at <a shape="rect" href="rest.xml">REST</a> or <a shape="rect" href="ajax.xml">Ajax</a> support instead.</p>
+<p>If the client is not JMS you might want to look at <link><page ri:content-title="REST"></page></link> or <link><page ri:content-title="Ajax"></page></link> support instead.</p>
<p>Note that the HTTP Transport is located in the activemq-optional jar.</p>
-<p>ActiveMQ uses a combination of Jetty's Server and SslSocketConnector objects to communicate via the HTTPS transport. When using HTTPS, improper configuration of the corresponding SSL certificates and/or keys may very well lead to the Jetty infinite loop problem described in this <a shape="rect" class="external-link" href="http://www.nabble.com/SslSocketConnector-loops-forever-during-initialization-to14621825.html#a17535467" rel="nofollow">nabble thread</a>. A good reference on creating and configuring keys and certificates can be found <a shape="rect" class="external-link" href="http://docs.codehaus.org/display/JETTY/How+to+configure+SSL" rel="nofollow">here</a>.</p>
+<p>ActiveMQ uses a combination of Jetty's Server and SslSocketConnector objects to communicate via the HTTPS transport. When using HTTPS, improper configuration of the corresponding SSL certificates and/or keys may very well lead to the Jetty infinite loop problem described in this <a shape="rect" href="http://www.nabble.com/SslSocketConnector-loops-forever-during-initialization-to14621825.html#a17535467">nabble thread</a>. A good reference on creating and configuring keys and certificates can be found <a shape="rect" href="http://docs.codehaus.org/display/JETTY/How+to+configure+SSL">here</a>.</p>
-<h4 id="HTTPandHTTPsTransportsReference-ConfigurationSyntax">Configuration Syntax</h4>
+<h4>Configuration Syntax</h4>
<p><a shape="rect" class="external-link" href="http://host:port" rel="nofollow">http://host:port</a>
<a shape="rect" class="external-link" href="https://host:port" rel="nofollow">https://host:port</a></p>
-<h4 id="HTTPandHTTPsTransportsReference-ExampleURI">Example URI</h4>
+<h4>Example URI</h4>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>http://localhost
+<structured-macro ac:macro-id="4d99dd99-68a7-450b-b7b3-d7bf05c8b555" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+http://localhost
https://localhost:8080
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
-<h4 id="HTTPandHTTPsTransportsReference-Dependencies">Dependencies</h4>
+<h4>Dependencies</h4>
<p>Clients that use http(s) transport have some additional dependencies, over tcp ones. Those are </p>
-<ul><li><a shape="rect" class="external-link" href="http://hc.apache.org/httpclient-3.x/">HttpClient</a></li><li>and <a shape="rect" class="external-link" href="http://xstream.codehaus.org/" rel="nofollow">XStream</a></li></ul>
+<ul><li><a shape="rect" href="http://hc.apache.org/httpclient-3.x/">HttpClient</a></li><li>and <a shape="rect" href="http://xstream.codehaus.org/">XStream</a></li></ul>
<p>Make sure you have them in your classpath if you use this transport. Also, if you're configuring networks of brokers with http(s) transport make sure you have them in broker's classpath (somewhere under <code>lib/</code> directory) as the broker will act as a client in that case.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/i-am-having-problems-with-the-spring-jmstemplate.xml
----------------------------------------------------------------------
diff --git a/i-am-having-problems-with-the-spring-jmstemplate.xml b/i-am-having-problems-with-the-spring-jmstemplate.xml
index 7543b20..6698637 100644
--- a/i-am-having-problems-with-the-spring-jmstemplate.xml
+++ b/i-am-having-problems-with-the-spring-jmstemplate.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="IamhavingproblemswiththeSpringJmsTemplate-IamhavingproblemswiththeSpringJmsTemplate">I am having problems with the Spring JmsTemplate</h2>
+<div class="wiki-content maincontent"><h2>I am having problems with the Spring JmsTemplate</h2>
-<p>For more detail see the <a shape="rect" href="jmstemplate-gotchas.xml">JmsTemplate Gotchas</a> page along with the <a shape="rect" href="spring-support.xml">Spring Support</a></p></div>
+<p>For more detail see the <link><page ri:content-title="JmsTemplate Gotchas"></page></link> page along with the <link><page ri:content-title="Spring Support"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/i-am-not-receiving-any-messages-what-is-wrong.xml
----------------------------------------------------------------------
diff --git a/i-am-not-receiving-any-messages-what-is-wrong.xml b/i-am-not-receiving-any-messages-what-is-wrong.xml
index f09c574..18115da 100644
--- a/i-am-not-receiving-any-messages-what-is-wrong.xml
+++ b/i-am-not-receiving-any-messages-what-is-wrong.xml
@@ -1,15 +1,15 @@
-<div class="wiki-content maincontent"><h3 id="Iamnotreceivinganymessages,whatiswrong-Iamnotreceivinganymessages-whatiswrong?">I am not receiving any messages - what is wrong?</h3>
+<div class="wiki-content maincontent"><h3>I am not receiving any messages - what is wrong?</h3>
-<p>A <em>very</em> common gotcha when working with JMS is forgetting to start the JMS connection, creating a consumer and not having it receive any messages. I myself have tripped up over this one many many times! <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)"></p>
+<p>A <em>very</em> common gotcha when working with JMS is forgetting to start the JMS connection, creating a consumer and not having it receive any messages. I myself have tripped up over this one many many times! <emoticon ac:name="smile"></emoticon></p>
-<p>Make sure you call the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()" rel="nofollow">start()</a> method on the JMS connection, otherwise messages will not be dispatched to your consumer.</p>
+<p>Make sure you call the <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Connection.html#start()">start()</a> method on the JMS connection, otherwise messages will not be dispatched to your consumer.</p>
-<p>This is such a common gotcha that as of 4.2 onwards, ActiveMQ will now <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1253">log a warning if a message</a> is received shortly after the connection was created if the connection was not started (as its so easy to forget to do this part <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)">. </p>
+<p>This is such a common gotcha that as of 4.2 onwards, ActiveMQ will now <a shape="rect" href="https://issues.apache.org/activemq/browse/AMQ-1253">log a warning if a message</a> is received shortly after the connection was created if the connection was not started (as its so easy to forget to do this part <emoticon ac:name="smile"></emoticon>. </p>
-<p>For more details see the discussion of the <strong>warnAboutUnstartedConnectionTimeout</strong> property on the <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a></p>
+<p>For more details see the discussion of the <strong>warnAboutUnstartedConnectionTimeout</strong> property on the <link><page ri:content-title="Connection Configuration URI"></page></link></p>
-<h3 id="Iamnotreceivinganymessages,whatiswrong-Ifyouarecallingconnection.start()">If you are calling connection.start()</h3>
+<h3>If you are calling connection.start()</h3>
-<p>Another common gotcha is <a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.xml">due to another consumer grabbing the messages</a>. If its not that then please look at <a shape="rect" href="jmx.xml">JMX</a> or the <a shape="rect" href="web-console.xml">Web Console</a> to determine what consumers are available and their status. Then get some <a shape="rect" href="support.xml">Support</a> to help you resolve your issue.</p></div>
+<p>Another common gotcha is <link><page ri:content-title="I do not receive messages in my second consumer"></page><link-body>due to another consumer grabbing the messages</link-body></link>. If its not that then please look at <link><page ri:content-title="JMX"></page></link> or the <link><page ri:content-title="Web Console"></page></link> to determine what consumers are available and their status. Then get some <link><page ri:content-title="Support"></page></link> to help you resolve your issue.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/i-cannot-connect-to-activemq-from-jconsole.xml
----------------------------------------------------------------------
diff --git a/i-cannot-connect-to-activemq-from-jconsole.xml b/i-cannot-connect-to-activemq-from-jconsole.xml
index ea1f7e2..2b0092c 100644
--- a/i-cannot-connect-to-activemq-from-jconsole.xml
+++ b/i-cannot-connect-to-activemq-from-jconsole.xml
@@ -2,19 +2,15 @@
<p>e.g. on unix (OS X, Linux, Solaris)</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="7b9766cc-e65f-46e3-ac75-a5d24a48e220" ac:name="code" ac:schema-version="1"><plain-text-body>
export ACTIVEMQ_OPTS=$ACTIVEMQ_OPTS -Djava.rmi.server.hostname=<hostname>
activemq
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>or on Windows</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="61232e79-c03a-457a-beda-9bb1d082442f" ac:name="code" ac:schema-version="1"><plain-text-body>
SET ACTIVEMQ_OPTS=%ACTIVEMQ_OPTS% -Djava.rmi.server.hostname=<hostname>
activemq
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/i-do-not-receive-messages-in-my-second-consumer.xml
----------------------------------------------------------------------
diff --git a/i-do-not-receive-messages-in-my-second-consumer.xml b/i-do-not-receive-messages-in-my-second-consumer.xml
index 8ba1cc3..2f407a3 100644
--- a/i-do-not-receive-messages-in-my-second-consumer.xml
+++ b/i-do-not-receive-messages-in-my-second-consumer.xml
@@ -1,11 +1,11 @@
-<div class="wiki-content maincontent"><h3 id="Idonotreceivemessagesinmysecondconsumer-Scenario">Scenario</h3>
+<div class="wiki-content maincontent"><h3>Scenario</h3>
<ul><li>You send 100 messages to a queue.</li><li>Start consumer A, it receives the message</li><li>You start another consumer B, it doesn't receive any messages.</li><li>You kill A.</li><li>Consumer B receives messages now, why?</li></ul>
-<h3 id="Idonotreceivemessagesinmysecondconsumer-Answer">Answer</h3>
+<h3>Answer</h3>
-<p>This is to do with <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch buffers</a>.</p>
+<p>This is to do with <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>prefetch buffers</link-body></link>.</p>
<p>ActiveMQ will try and deliver a number of messages to each consumer as soon as possible to achieve maximum throughput. That means that each consumer typically has 100-1000 messages in RAM ready to be processed so that there is no latency waiting for another message to arrive under periods of high throughput of messages.</p>
@@ -16,11 +16,12 @@
<p>The solution to this problem is to configure the pre-fetch value to something smaller - such as 1, start the consumers together or publish the messages after the consumers have started.</p>
-<p>You can also <a shape="rect" href="how-do-i-change-dispatch-policy.xml">change the dispatch policy</a> to ensure round robin dispatch.</p>
+<p>You can also <link><page ri:content-title="How do I change dispatch policy"></page><link-body>change the dispatch policy</link-body></link> to ensure round robin dispatch.</p>
-<p>To help diagnose these kinds of issues, try <a shape="rect" href="jmx.xml">JMX</a> or the <a shape="rect" href="web-console.xml">Web Console</a></p>
+<p>To help diagnose these kinds of issues, try <link><page ri:content-title="JMX"></page></link> or the <link><page ri:content-title="Web Console"></page></link></p>
-<h3 id="Idonotreceivemessagesinmysecondconsumer-Seealso">See also</h3>
+<h3>See also</h3>
-<ul><li><a shape="rect" href="how-do-i-change-dispatch-policy.xml">How do I change dispatch policy</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 change dispatch policy"></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/i-get-errors-building-the-code-whats-wrong.xml
----------------------------------------------------------------------
diff --git a/i-get-errors-building-the-code-whats-wrong.xml b/i-get-errors-building-the-code-whats-wrong.xml
index 3c224a0..f75dc69 100644
--- a/i-get-errors-building-the-code-whats-wrong.xml
+++ b/i-get-errors-building-the-code-whats-wrong.xml
@@ -1,13 +1,11 @@
<div class="wiki-content maincontent">
<p>We currently use a multi-project maven build system, which can be a little fragile. If you are ever having problems building we suggest you try the following in the root <em>activemq</em> directory</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="a23dd9f7-0dec-40a1-bb2d-a15f3c6c609e" ac:name="code" ac:schema-version="1"><plain-text-body>
mvn clean
rm -rf ~/.m2/repository
mvn
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<p>You may also want to <a shape="rect" href="how-do-i-build-but-disable-the-unit-tests.xml">disable the unit tests</a></p></div>
+<p>You may also want to <link><page ri:content-title="How do I build but disable the unit tests"></page><link-body>disable the unit tests</link-body></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/i-see-nc-client-ids-what-does-that-mean.xml
----------------------------------------------------------------------
diff --git a/i-see-nc-client-ids-what-does-that-mean.xml b/i-see-nc-client-ids-what-does-that-mean.xml
index 7e412d7..d69944c 100644
--- a/i-see-nc-client-ids-what-does-that-mean.xml
+++ b/i-see-nc-client-ids-what-does-that-mean.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Durable subscription ClientIds and SubscriptionNames using the <strong>NC</strong> prefix are the result of durable subscriptions in a <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a>.<br clear="none"> When a durable subscription is being forwarded by a network connector (or demand forwarding bridge), the network durable subscription needs to outlive the subscription that created it. This is achieved by using a well known name for the clientId and subscriptionName that can be easily be mapped to the original subscription. The prefix NC_, and NC-DS_ are used, where NC denotes Network Connector and DS denotes Durable Subscription. The prefix is combined with the local broker name and the target destination.</p><p>The expectation is that the connectionId associated with these subscriptions can change on a reconnect, but the durable subsctiption remains. In this way, the durable subscription can continue to receive messages
even if there is a network partition between the originating broker and the forwarding broker.</p><p>On a restart, the NC durable subscriptions are activated by default, to ensure that no messages are lost. If lost messages are acceptable, it is possible to ensure that the NC durable sub is activated dynamically, when the original subscription is again activated on the remote broker and propagated to the network connector. The network connector configuration 'dynamicOnly' attribute is used to control this behavior.</p><p>A NC durable subscription is only deleted when the original durable consumer is unsubscribed.</p></div>
+<div class="wiki-content maincontent"><p>Durable subscription ClientIds and SubscriptionNames using the <strong>NC</strong> prefix are the result of durable subscriptions in a <link><page ri:content-title="Networks of Brokers"></page></link>.<br clear="none"> When a durable subscription is being forwarded by a network connector (or demand forwarding bridge), the network durable subscription needs to outlive the subscription that created it. This is achieved by using a well known name for the clientId and subscriptionName that can be easily be mapped to the original subscription. The prefix NC_, and NC-DS_ are used, where NC denotes Network Connector and DS denotes Durable Subscription. The prefix is combined with the local broker name and the target destination.</p><p>The expectation is that the connectionId associated with these subscriptions can change on a reconnect, but the durable subsctiption remains. In this way, the durable subscription can continue to receive messages even
if there is a network partition between the originating broker and the forwarding broker.</p><p>On a restart, the NC durable subscriptions are activated by default, to ensure that no messages are lost. If lost messages are acceptable, it is possible to ensure that the NC durable sub is activated dynamically, when the original subscription is again activated on the remote broker and propagated to the network connector. The network connector configuration 'dynamicOnly' attribute is used to control this behavior.</p><p>A NC durable subscription is only deleted when the original durable consumer is unsubscribed.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/ideas.xml
----------------------------------------------------------------------
diff --git a/ideas.xml b/ideas.xml
index 9d379fb..a9a590c 100644
--- a/ideas.xml
+++ b/ideas.xml
@@ -3,5 +3,5 @@
<p>This page hosts various ideas and thoughts...</p>
-<ul class="childpages-macro"><li><a shape="rect" href="restful-queue.xml">RESTful Queue</a></li></ul></div>
+<structured-macro ac:macro-id="c3476a72-5260-45de-8054-3851b07b4b41" ac:name="children" ac:schema-version="1"><parameter ac:name="all">true</parameter></structured-macro></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/in-progress.xml
----------------------------------------------------------------------
diff --git a/in-progress.xml b/in-progress.xml
index 67d57b1..e814bff 100644
--- a/in-progress.xml
+++ b/in-progress.xml
@@ -1,5 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="InProgress-ReleasesInProgress">Releases In Progress</h2>
+<div class="wiki-content maincontent"><h2>Releases In Progress</h2>
<p>The following releases are currently in progress</p>
-</div>
+
+<structured-macro ac:macro-id="fecbeb2a-0e2b-4eac-b0a6-7bd5e152589d" ac:name="children" ac:schema-version="1"><parameter ac:name="sort">creation</parameter><parameter ac:name="reverse">true</parameter></structured-macro></div>