activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [21/51] [abbrv] [partial] activemq-web git commit: Add body.storage type
Date Thu, 14 Dec 2017 14:48:45 GMT
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/stomp-support.xml
----------------------------------------------------------------------
diff --git a/cms/stomp-support.xml b/cms/stomp-support.xml
index 2dfa32b..20d7ad3 100644
--- a/cms/stomp-support.xml
+++ b/cms/stomp-support.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="StompSupport-ActiveMQ-CPPStompSupport">ActiveMQ-CPP Stomp Support</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ-CPP Stomp Support</h2>
 
-<p><a shape="rect" class="external-link" href="http://stomp.codehaus.org" rel="nofollow">Stomp</a> is a simple text-based protocol supported by the ActiveMQ Broker that allows communication from a variety of clients (e.g. C++, Java, .NET, Ruby, Python, etc).  If you'd like to learn more about the stomp protocol, checkout <a shape="rect" class="external-link" href="http://stomp.codehaus.org" rel="nofollow">http://stomp.codehaus.org</a>.  Also, you can see ActiveMQ extensions <a shape="rect" class="external-link" href="http://www.activemq.org/site/stomp.html" rel="nofollow">here</a>.</p>
+<p><a shape="rect" href="http://stomp.codehaus.org">Stomp</a> is a simple text-based protocol supported by the ActiveMQ Broker that allows communication from a variety of clients (e.g. C++, Java, .NET, Ruby, Python, etc).  If you'd like to learn more about the stomp protocol, checkout <a shape="rect" href="http://stomp.codehaus.org">http://stomp.codehaus.org</a>.  Also, you can see ActiveMQ extensions <a shape="rect" href="http://www.activemq.org/site/stomp.html">here</a>.</p>
 
-<p>The ActiveMQ-CPP implementation of the CMS API with stomp has some quirks, as it's a simple protocol and doesn't have the full capabilities of, say, <a shape="rect" href="openwire-support.xml">OpenWire</a>.  The purpose of this page is to document these quirks so that users understand any strange behaviors that they may see occasionally.</p>
+<p>The ActiveMQ-CPP implementation of the CMS API with stomp has some quirks, as it's a simple protocol and doesn't have the full capabilities of, say, <link><page ri:content-title="OpenWire Support"></page><link-body>OpenWire</link-body></link>.  The purpose of this page is to document these quirks so that users understand any strange behaviors that they may see occasionally.</p>
 
-<h3 id="StompSupport-MessagePropertiesinStompCMS">Message Properties in Stomp CMS</h3>
+<h3>Message Properties in Stomp CMS</h3>
 
 <p>Since Stomp is strictly text-based, it does not support a way to specify the type of message properties (called "header" in stomp lingo).  This means that a property sent as an integer could be read by a Stomp CMS client as any of: string, integer, short, long, etc.</p>
 
@@ -12,15 +12,15 @@
 
 <p>The same goes for writing values to an outgoing message.  You can call any of the methods (e.g. setIntProperty).  The resulting value that goes out on the wire is still a string, however.</p>
 
-<h3 id="StompSupport-TemporaryTopicsandQueues">&#160;Temporary Topics and Queues</h3>
+<h3>&#160;Temporary Topics and Queues</h3>
 
 <p>The Stomp Protocol does not support the concept of temporary topics or queues.&#160; If you call the createTemporaryTopic or createTemporaryQueue methods of cms::Session an exception of type NotSupportedException is thrown.&#160; To implement request / response type semantics you will need to use standard Topics and Queues.</p>
 
-<h3 id="StompSupport-UsagenotesonSelectorswithStomp">Usage notes on Selectors with Stomp</h3>
+<h3>Usage notes on Selectors with Stomp</h3>
 
 <p>Stomp as a general rule only allows one session per connection.&#160; In ActiveMQ-CPP we have created a sort of virtual session that allows more than one session to be created per connection.&#160; The one caveat is that there still can only be one selector on the main Stomp Session that we create, so whatever the first session is that is created with a selector will be the only selector that will actually have any effect as none of the newly created sessions will apply a selector even if you pass one in the creation of that Session.&#160; </p>
 
-<h3 id="StompSupport-StompandFailover">Stomp and Failover</h3>
+<h3>Stomp and Failover</h3>
 
 <p>Currently the Stomp protocol is at V1.0 and doesn't supply the necessary features in the protocol to allow the use of Failover with a Stomp based Transport.  The draft version of Stomp v1.1 is under way and includes provisions for keep alive monitoring between broker and client which will allow for detection of dropped connections.  Even with that support though there will be limitations on what can be accomplished on Failover of a Stomp client, transactions will not be able to be restored and message recovery will not be possible.  A Stomp Failover would need to behave almost as a new Stomp connection to the Broker with automatic re-subscription for active consumers, all currently prefetched messages would be purged from the active consumers.  Until the Stomp v1.1 spec is ratified and the ActiveMQ-CPP client code is updated to support this it is not recommended that you combine the Stomp transport and Failover transport.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/support.xml
----------------------------------------------------------------------
diff --git a/cms/support.xml b/cms/support.xml
index 76e2610..191544e 100644
--- a/cms/support.xml
+++ b/cms/support.xml
@@ -1,15 +1,15 @@
-<div class="wiki-content maincontent"><h2 id="Support-GettingHelp">Getting Help</h2>
+<div class="wiki-content maincontent"><h2>Getting Help</h2>
 
-<p>If you are experiencing problems using ActiveMQ then please first try the <a shape="rect" href="faq.xml">FAQ</a>. If you cannot find your issue then report your problem to our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQCPP">Issue Tracker</a></p>
+<p>If you are experiencing problems using ActiveMQ then please first try the <link><page ri:content-title="FAQ"></page></link>. If you cannot find your issue then report your problem to our <a shape="rect" href="http://issues.apache.org/activemq/browse/AMQCPP">Issue Tracker</a></p>
 
-<p>You may also find it useful to discuss your issues with the community on the <a shape="rect" class="external-link" href="http://activemq.apache.org/discussion-forums.html">Discussion Forums</a> or join one of our <a shape="rect" class="external-link" href="http://activemq.apache.org/mailing-lists.html">Mailing Lists</a>.</p>
+<p>You may also find it useful to discuss your issues with the community on the <a shape="rect" href="http://activemq.apache.org/discussion-forums.html">Discussion Forums</a> or join one of our <a shape="rect" href="http://activemq.apache.org/mailing-lists.html">Mailing Lists</a>.</p>
 
-<h3 id="Support-Links">Links</h3>
+<h3>Links</h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQCPP">Issue Tracker</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="faq.xml">FAQ</a></li></ul>
+<ul><li><a shape="rect" href="http://issues.apache.org/activemq/browse/AMQCPP">Issue Tracker</a></li><li><a shape="rect" href="http://activemq.apache.org/discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" href="http://activemq.apache.org/mailing-lists.html">Mailing Lists</a></li><li><link><page ri:content-title="FAQ"></page></link></li></ul>
 
 
-<h3 id="Support-Gettingmorehelp">Getting more help</h3>
+<h3>Getting more help</h3>
 
-<p>For more details on how to get more help such as commercial support see the <a shape="rect" class="external-link" href="http://activemq.apache.org/support.html">main ActiveMQ Support page</a></p></div>
+<p>For more details on how to get more help such as commercial support see the <a shape="rect" href="http://activemq.apache.org/support.html">main ActiveMQ Support page</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/tutorials.xml
----------------------------------------------------------------------
diff --git a/cms/tutorials.xml b/cms/tutorials.xml
index 21ff6d6..f2c630d 100644
--- a/cms/tutorials.xml
+++ b/cms/tutorials.xml
@@ -1,6 +1,7 @@
-<div class="wiki-content maincontent"><h1 id="Tutorials-Tutorials">Tutorials</h1>
+<div class="wiki-content maincontent"><h1>Tutorials</h1>
 
 
 <p>This section lists the various tutorials and articles that cover how to use the ActiveMQ-CPP client.</p>
-<ul><li>&#160;<a shape="rect" href="handling-advisory-messages.xml">Handling Advisory Messages</a></li></ul></div>
+<ul><li>&#160;<link><page ri:content-title="Handling Advisory Messages"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/using-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/cms/using-activemq-cpp.xml b/cms/using-activemq-cpp.xml
index 6cb2350..64e31a8 100644
--- a/cms/using-activemq-cpp.xml
+++ b/cms/using-activemq-cpp.xml
@@ -1,4 +1,5 @@
-<div class="wiki-content maincontent"><h2 id="UsingActiveMQ-CPP-UsingActiveMQ-CPP">Using ActiveMQ-CPP</h2>
+<div class="wiki-content maincontent"><h2>Using ActiveMQ-CPP</h2>
 
-<ul class="alternate"><li><a shape="rect" href="getting-started.xml">Getting Started</a></li><li><a shape="rect" href="cms-api-overview.xml">CMS API Overview</a></li><li><a shape="rect" href="example.xml">Example</a></li><li><a shape="rect" href="configuring.xml">Configuring</a></li></ul></div>
+<ul class="alternate"><li><link><page ri:content-title="Getting Started"></page></link></li><li><link><page ri:content-title="CMS API Overview"></page></link></li><li><link><page ri:content-title="Example"></page></link></li><li><link><page ri:content-title="Configuring"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/using-the-solaris-cc-compiler.xml
----------------------------------------------------------------------
diff --git a/cms/using-the-solaris-cc-compiler.xml b/cms/using-the-solaris-cc-compiler.xml
index 6fbe8ba..88d7974 100644
--- a/cms/using-the-solaris-cc-compiler.xml
+++ b/cms/using-the-solaris-cc-compiler.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Use the Correct Compiler</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This Entry only applies to the Sun Studio 11 and above compiler. The Sun Workshop compiler does not seem to support building this library.</p></div></div><p>In order to use the Solaris compiler you must set some environment variables and then run the autogen.sh and configure scripts.</p><p>The following variable need to be set</p><ul><li>CC = cc</li><li>CXX = CC</li></ul><p>Underneath the configure script will append -library=stlport4 to the CC command so that the Sun Compiler will use STLPort instead of the broken version of STL that they link in by default and ActiveMQ-CPP uses features that it does not support. By using the STLPort library you get access to the features we
  need, but you must compile your application with STLPort as well to insure compatibility with our library.</p><p>So in you own makefiles you must pass -library=stlport4 to CC when you build and link.</p><p>You can find out more from Sun on this at <a shape="rect" class="external-link" href="http://www.oracle.com/technetwork/server-storage/solaris/cmp-stlport-libcstd-142559.html" rel="nofollow">STL Library Comparison</a></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="e46d64c6-643d-4c72-9b67-1a85207ca018" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Use the Correct Compiler</parameter><rich-text-body><p>This Entry only applies to the Sun Studio 11 and above compiler. The Sun Workshop compiler does not seem to support building this library.</p></rich-text-body></structured-macro><p>In order to use the Solaris compiler you must set some environment variables and then run the autogen.sh and configure scripts.</p><p>The following variable need to be set</p><ul><li>CC = cc</li><li>CXX = CC</li></ul><p>Underneath the configure script will append -library=stlport4 to the CC command so that the Sun Compiler will use STLPort instead of the broken version of STL that they link in by default and ActiveMQ-CPP uses features that it does not support. By using the STLPort library you get access to the features we need, but you must compile your application with STLPort as we
 ll to insure compatibility with our library.</p><p>So in you own makefiles you must pass -library=stlport4 to CC when you build and link.</p><p>You can find out more from Sun on this at <a shape="rect" href="http://www.oracle.com/technetwork/server-storage/solaris/cmp-stlport-libcstd-142559.html">STL Library Comparison</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/what-is-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/cms/what-is-activemq-cpp.xml b/cms/what-is-activemq-cpp.xml
index 0871e00..334e674 100644
--- a/cms/what-is-activemq-cpp.xml
+++ b/cms/what-is-activemq-cpp.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="WhatisActiveMQCPP-WhatisApacheActiveMQCPP?">What is Apache ActiveMQ CPP?</h2>
+<div class="wiki-content maincontent"><h2>What is Apache ActiveMQ CPP?</h2>
 
-<p>Apache ActiveMQ CPP is the C++ client for accessing the <a shape="rect" class="external-link" href="http://activemq.apache.org/">ActiveMQ</a> message broker.</p></div>
+<p>Apache ActiveMQ CPP is the C++ client for accessing the <a shape="rect" href="http://activemq.apache.org/">ActiveMQ</a> message broker.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/code-overview.xml
----------------------------------------------------------------------
diff --git a/code-overview.xml b/code-overview.xml
index 8be68fb..b9132af 100644
--- a/code-overview.xml
+++ b/code-overview.xml
@@ -1,20 +1,20 @@
-<div class="wiki-content maincontent"><h1 id="CodeOverview-Architecture">Architecture</h1>
+<div class="wiki-content maincontent"><h1>Architecture</h1>
 
 <p>The following section walks through the main parts of Apache ActiveMQ and links to the code to help you understand the layout</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/images/BrokerDiagram.png" data-image-src="http://activemq.apache.org/images/BrokerDiagram.png"></span></p>
+<p><image><url ri:value="http://activemq.apache.org/images/BrokerDiagram.png"></url></image></p>
 
-<h2 id="CodeOverview-JMSClient">JMS Client</h2>
+<h2>JMS Client</h2>
 
-<p>The <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/package-summary.html">org.apache.activemq</a> package defines the core JMS client.</p>
+<p>The <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/package-summary.html">org.apache.activemq</a> package defines the core JMS client.</p>
 
-<h2 id="CodeOverview-Transport">Transport</h2>
+<h2>Transport</h2>
 
-<p>The JMS client and the message broker use the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/transport/Transport.html">Transport</a> abstraction for sending around command objects (like a distributed <em>Command Pattern</em>). A TransportChannel typically deals with some kind of networking mechanism (TCP sockets using BIO, using NIO, UDP / multicast, SSL over sockets, JXTA, EmberIO etc). See the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/transport/package-summary.html">org.apache.activemq.transport</a> package for more details</p>
+<p>The JMS client and the message broker use the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/transport/Transport.html">Transport</a> abstraction for sending around command objects (like a distributed <em>Command Pattern</em>). A TransportChannel typically deals with some kind of networking mechanism (TCP sockets using BIO, using NIO, UDP / multicast, SSL over sockets, JXTA, EmberIO etc). See the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/transport/package-summary.html">org.apache.activemq.transport</a> package for more details</p>
 
-<p>So the TransportChannel is basically concerned with sending and receiving <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/Command.html">Command</a> objects (each instance represents some kind of <em>command</em>). Packet is defined in the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">org.apache.activemq.command</a> package which defines all the JMS Message implementations classes (which are Commands) along with a number of other kinds of packets, like subsciptions, message acknowledgements, transactions and so forth.</p>
+<p>So the TransportChannel is basically concerned with sending and receiving <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/Command.html">Command</a> objects (each instance represents some kind of <em>command</em>). Packet is defined in the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">org.apache.activemq.command</a> package which defines all the JMS Message implementations classes (which are Commands) along with a number of other kinds of packets, like subsciptions, message acknowledgements, transactions and so forth.</p>
 
-<h2 id="CodeOverview-WireFormat">WireFormat</h2>
+<h2>WireFormat</h2>
 
 <p>There are various possible ways of encoding messages onto a stream. We may wish to adapt to various different encoding mechanisms - such as to provide simpler wire formats for talking to C / JavaScript or to make a C# friendly encoding.</p>
 
@@ -22,79 +22,79 @@
 
 <p>So if you wish to provide your own binary, <em>on the wire</em> protocol then we just need a WireFormat implementation of your protocol, then we can use this with any transport (TCP BIO, NIO, JXTA etc).</p>
 
-<p>We use <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/openwire/OpenWireFormat.html">OpenWireFormat</a> by default which is the most efficient &amp; easiest format to use from Java code - so if both ends of the wire are Java then its highly recommended. Though other WireFormats are most welcome.</p>
+<p>We use <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/openwire/OpenWireFormat.html">OpenWireFormat</a> by default which is the most efficient &amp; easiest format to use from Java code - so if both ends of the wire are Java then its highly recommended. Though other WireFormats are most welcome.</p>
 
-<h2 id="CodeOverview-DefaultWireFormat">Default Wire Format</h2>
+<h2>Default Wire Format</h2>
 
-<p>The default wire format writes a byte which indicates the kind of Command which is being sent (see the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.5.0/activemq-core/apidocs/org/apache/activemq/command/CommandTypes.html">CommandTypes</a> interface which defines all the int constants for each type of command.</p>
+<p>The default wire format writes a byte which indicates the kind of Command which is being sent (see the <a shape="rect" href="http://activemq.apache.org/maven/5.5.0/activemq-core/apidocs/org/apache/activemq/command/CommandTypes.html">CommandTypes</a> interface which defines all the int constants for each type of command.</p>
 
 <p>The core JMS Message types each have a unique byte ID for</p>
 <ul><li>Message</li><li>ObjectMessage</li><li>TextMessage</li><li>MapMessage</li><li>BytesMessage</li><li>StreamMessage</li></ul>
 
 
-<p>Then in addition there are various other <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">types of command</a> such as</p>
-<ul><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/ConnectionInfo.html">ConnectionInfo </a> for when a new connection is established with a message broker</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/ConsumerInfo.html">ConsumerInfo</a> when a new consumer is created on a connection</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/MessageAck.html">MessageAck</a> to acknowledge a message ID</li><li><a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/TransactionInfo.html">TransactionInfo</a> to denote a transaction</li></ul>
+<p>Then in addition there are various other <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">types of command</a> such as</p>
+<ul><li><a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/ConnectionInfo.html">ConnectionInfo </a> for when a new connection is established with a message broker</li><li><a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/ConsumerInfo.html">ConsumerInfo</a> when a new consumer is created on a connection</li><li><a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/MessageAck.html">MessageAck</a> to acknowledge a message ID</li><li><a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/TransactionInfo.html">TransactionInfo</a> to denote a transaction</li></ul>
 
 
-<p>There are a few others; the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">org.apache.activemq.command</a> package describes them in their gory detail.</p>
+<p>There are a few others; the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/command/package-summary.html">org.apache.activemq.command</a> package describes them in their gory detail.</p>
 
 <p>Basically the DefaultWireFormat has a default encoding of each of these commands. So after the first byte which indicates the type of packet is written, there is a specific wire format per packet type.</p>
 
 <p>For new wire formats it may be that you only need to support a small subset of these types. e.g. you might just have a simple publish message, consume message &amp; message ack.</p>
 
-<h1 id="CodeOverview-MessageBroker">Message Broker</h1>
+<h1>Message Broker</h1>
 
-<p>The APIs for the message broker (server side of the JMS client) are defined in the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/package-summary.html">org.apache.activemq.broker</a>. There are various other packages which define different parts, from the message stores to the message routing and so forth. </p>
+<p>The APIs for the message broker (server side of the JMS client) are defined in the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/package-summary.html">org.apache.activemq.broker</a>. There are various other packages which define different parts, from the message stores to the message routing and so forth. </p>
 
-<p>To see an overview of these packages try the <a shape="rect" href="javadocs.xml">JavaDocs</a></p>
+<p>To see an overview of these packages try the <link><page ri:content-title="JavaDocs"></page></link></p>
 
 <hr>
 
-<p></p><p>
-</p><h1>ActiveMQ System Overview</h1>
+<p></p><p><structured-macro ac:macro-id="80c4987f-5dd0-4292-8a02-226cf9e5c410" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;h1&gt;ActiveMQ System Overview&lt;/h1&gt;
 
-<h2>Introduction</h2>
+&lt;h2&gt;Introduction&lt;/h2&gt;
 
-<p>ActiveMQ is the system responsible for creating and managing network connections used for communication between clients and the broker. This document hopes to outline the inner workings of this system with in order to make it easier to understand for future developers. It will give a high-level overview of the system and outline the major players. We will also cover a few other interesting classes that may be useful to others working on the system. Most of this document is written with the server side code in mind. This is because the client-side communication systems are architecturally simple and understanding the server will make understanding clients trivial by comparison.</p>
+&lt;p&gt;ActiveMQ is the system responsible for creating and managing network connections used for communication between clients and the broker. This document hopes to outline the inner workings of this system with in order to make it easier to understand for future developers. It will give a high-level overview of the system and outline the major players. We will also cover a few other interesting classes that may be useful to others working on the system. Most of this document is written with the server side code in mind. This is because the client-side communication systems are architecturally simple and understanding the server will make understanding clients trivial by comparison.&lt;/p&gt;
 
-<p>We assume the reader has basic understanding of JMS. Refer to the official Java docs for more information.</p>
+&lt;p&gt;We assume the reader has basic understanding of JMS. Refer to the official Java docs for more information.&lt;/p&gt;
 
-<h2>Overview: The Big Players</h2>
+&lt;h2&gt;Overview: The Big Players&lt;/h2&gt;
 
-<p>The core classes involved in the ActiveMQ communication system are Transports. These include the <code>Transport</code>, <code>TransportServer</code>, and <code>TransportFactory</code> hierarchies. <code>Transport</code>s and <code>TransportServer</code>s are wrappers around sockets and server sockets respectively. <code>TransportFactory</code>s (as you may have guessed) are factories that create <code>Transport</code>s and <code>TransportServers</code>. <code>Transport</code>s are connected to <code>Broker</code>s and transmit <code>Command</code>s, which represent all major actions to be taken by ActiveMQ (more on this later). The following example illustrates how these pieces fit together.</p>
+&lt;p&gt;The core classes involved in the ActiveMQ communication system are Transports. These include the &lt;code&gt;Transport&lt;/code&gt;, &lt;code&gt;TransportServer&lt;/code&gt;, and &lt;code&gt;TransportFactory&lt;/code&gt; hierarchies. &lt;code&gt;Transport&lt;/code&gt;s and &lt;code&gt;TransportServer&lt;/code&gt;s are wrappers around sockets and server sockets respectively. &lt;code&gt;TransportFactory&lt;/code&gt;s (as you may have guessed) are factories that create &lt;code&gt;Transport&lt;/code&gt;s and &lt;code&gt;TransportServers&lt;/code&gt;. &lt;code&gt;Transport&lt;/code&gt;s are connected to &lt;code&gt;Broker&lt;/code&gt;s and transmit &lt;code&gt;Command&lt;/code&gt;s, which represent all major actions to be taken by ActiveMQ (more on this later). The following example illustrates how these pieces fit together.&lt;/p&gt;
 
-<p>The primary class needed to create a JMS "provider" application is the <code>Broker</code> class. The default ActiveMQ binary will use a <code>BrokerService</code> class to wrap around <code>Broker</code>s. When the application is started, it instantiates a <code>BrokerService</code> and instructs it to bind to a specific (local) address, say "tcp://localhost:61616". The <code>Broker</code> will use the scheme in the given address and find the proper <code>TransportFactory</code>, <code>TcpTransportFactory</code> in this example. This factory will then be used to create a <code>TcpTransportServer</code> that will be bound to "localhost:61616". Once the <code>TransportServer</code> is started, it will continually pole its socket for incoming connections. Successfully connected incoming sockets will be wrapped in a <code>TcpTransport</code> instance and passed back (indirectly) to the <code>Broker</code>. The <code>Broker</code> will then start polling the new <code>Transport</code
 > for incoming <code>Command</code>s to process.</p>
+&lt;p&gt;The primary class needed to create a JMS &amp;quot;provider&amp;quot; application is the &lt;code&gt;Broker&lt;/code&gt; class. The default ActiveMQ binary will use a &lt;code&gt;BrokerService&lt;/code&gt; class to wrap around &lt;code&gt;Broker&lt;/code&gt;s. When the application is started, it instantiates a &lt;code&gt;BrokerService&lt;/code&gt; and instructs it to bind to a specific (local) address, say &amp;quot;tcp://localhost:61616&amp;quot;. The &lt;code&gt;Broker&lt;/code&gt; will use the scheme in the given address and find the proper &lt;code&gt;TransportFactory&lt;/code&gt;, &lt;code&gt;TcpTransportFactory&lt;/code&gt; in this example. This factory will then be used to create a &lt;code&gt;TcpTransportServer&lt;/code&gt; that will be bound to &amp;quot;localhost:61616&amp;quot;. Once the &lt;code&gt;TransportServer&lt;/code&gt; is started, it will continually pole its socket for incoming connections. Successfully connected incoming sockets will be wrapped in a &
 lt;code&gt;TcpTransport&lt;/code&gt; instance and passed back (indirectly) to the &lt;code&gt;Broker&lt;/code&gt;. The &lt;code&gt;Broker&lt;/code&gt; will then start polling the new &lt;code&gt;Transport&lt;/code&gt; for incoming &lt;code&gt;Command&lt;/code&gt;s to process.&lt;/p&gt;
 
-<p>The final pieces missing from the above example are the <code>TransportConnection</code> and <code>TransportConnector</code> classes. These classes are used to connect <code>Broker</code>s to <code>Transport</code>s and <code>TransportServer</code>s respectively.</p>
+&lt;p&gt;The final pieces missing from the above example are the &lt;code&gt;TransportConnection&lt;/code&gt; and &lt;code&gt;TransportConnector&lt;/code&gt; classes. These classes are used to connect &lt;code&gt;Broker&lt;/code&gt;s to &lt;code&gt;Transport&lt;/code&gt;s and &lt;code&gt;TransportServer&lt;/code&gt;s respectively.&lt;/p&gt;
 
-<h2>Class Details</h2>
+&lt;h2&gt;Class Details&lt;/h2&gt;
 
-<p>This section will explain some of the more interesting details of the mentioned classes separately.
+&lt;p&gt;This section will explain some of the more interesting details of the mentioned classes separately.
 
-</p><h3>Transports, TransportServers, and TransportFactories</h3>
+&lt;h3&gt;Transports, TransportServers, and TransportFactories&lt;/h3&gt;
 
-<p>The basic principles of how these classes operate are very simple: <code>Transport</code>s and <code>TransportServer</code>s are wrappers around sockets and server sockets used to hide implementation, and <code>TransportFactory</code>s are factory classes for the mentioned classes. The only caveats are how <code>TransportFactory</code>s are chosen and configured based on URIs they are supplied.</p>
+&lt;p&gt;The basic principles of how these classes operate are very simple: &lt;code&gt;Transport&lt;/code&gt;s and &lt;code&gt;TransportServer&lt;/code&gt;s are wrappers around sockets and server sockets used to hide implementation, and &lt;code&gt;TransportFactory&lt;/code&gt;s are factory classes for the mentioned classes. The only caveats are how &lt;code&gt;TransportFactory&lt;/code&gt;s are chosen and configured based on URIs they are supplied.&lt;/p&gt;
 
-<p>The <code>TransportFactory</code> class is abstract and incapable of creating <code>Transport</code> or <code>TransportServer</code> classes directly. It, nevertheless, is the class used to create <code>Transport</code>s and <code>TransportServer</code>s. <code>TransportFactory</code> delegates its responsibilities to its subclasses based on the choice of subclass provided by the <code>FactoryFinder</code> class, which uses the URI's scheme to find a matching factory classes based on text files stored under the META-INF directory.</p>
+&lt;p&gt;The &lt;code&gt;TransportFactory&lt;/code&gt; class is abstract and incapable of creating &lt;code&gt;Transport&lt;/code&gt; or &lt;code&gt;TransportServer&lt;/code&gt; classes directly. It, nevertheless, is the class used to create &lt;code&gt;Transport&lt;/code&gt;s and &lt;code&gt;TransportServer&lt;/code&gt;s. &lt;code&gt;TransportFactory&lt;/code&gt; delegates its responsibilities to its subclasses based on the choice of subclass provided by the &lt;code&gt;FactoryFinder&lt;/code&gt; class, which uses the URI's scheme to find a matching factory classes based on text files stored under the META-INF directory.&lt;/p&gt;
 
-<p>Configuration of the created <code>Transport</code>s is done entirely to reflection. <code>Transport</code>s are configured through calls to <code>compositeConfigure</code>, which are made by the factory at the time of the <code>Transport</code>'s creation. <code>compositeConfigure</code> uses the <code>IntrospectionSupport</code> class to call setters for parameters passed in through the URI. For example, creating a <code>Transport</code> using the URI "ssl://localhost:61616/?needClientAuth=true" would result in the creation of an <code>SslTransport</code> object whose <code>setNeedClientAuth</code> method (if it exists) is called with the value of <code>true</code> immediately after its creation. <code>TransportServer</code>s operate in a similar fashion. The only difference is that the call to <code>IntrospectionSupport</code> is made from the <code>doBind</code> method of the <code>TransportFactory</code>.</p>
+&lt;p&gt;Configuration of the created &lt;code&gt;Transport&lt;/code&gt;s is done entirely to reflection. &lt;code&gt;Transport&lt;/code&gt;s are configured through calls to &lt;code&gt;compositeConfigure&lt;/code&gt;, which are made by the factory at the time of the &lt;code&gt;Transport&lt;/code&gt;'s creation. &lt;code&gt;compositeConfigure&lt;/code&gt; uses the &lt;code&gt;IntrospectionSupport&lt;/code&gt; class to call setters for parameters passed in through the URI. For example, creating a &lt;code&gt;Transport&lt;/code&gt; using the URI &amp;quot;ssl://localhost:61616/?needClientAuth=true&amp;quot; would result in the creation of an &lt;code&gt;SslTransport&lt;/code&gt; object whose &lt;code&gt;setNeedClientAuth&lt;/code&gt; method (if it exists) is called with the value of &lt;code&gt;true&lt;/code&gt; immediately after its creation. &lt;code&gt;TransportServer&lt;/code&gt;s operate in a similar fashion. The only difference is that the call to &lt;code&gt;IntrospectionSuppo
 rt&lt;/code&gt; is made from the &lt;code&gt;doBind&lt;/code&gt; method of the &lt;code&gt;TransportFactory&lt;/code&gt;.&lt;/p&gt;
 
-<h3>Commands</h3>
+&lt;h3&gt;Commands&lt;/h3&gt;
 
-<p><code>Command</code>s are the main means for communication within <code>Broker</code>s. Each <code>Command</code> represents an action to be taken. <code>Command</code> subclasses include <code>ConnectionInfo</code>, <code>KeepAliveInfo</code>, and <code>Message</code>, which result in processing of new connections, maintenance of old connections, and processing of user messages respectively. These classes are de-serialized from <code>Transport</code>s using Marshalers. Whenever new data is found in a socket, the first byte is read to determine what type of <code>Command</code> being received. The proper Marshaller is then selected to de-serialize the <code>Command</code> (e.g. to de-serialize a <code>ConnectionInfo</code>, the <code>ConnectionInfoMarshaller</code> is used).</p>
+&lt;p&gt;&lt;code&gt;Command&lt;/code&gt;s are the main means for communication within &lt;code&gt;Broker&lt;/code&gt;s. Each &lt;code&gt;Command&lt;/code&gt; represents an action to be taken. &lt;code&gt;Command&lt;/code&gt; subclasses include &lt;code&gt;ConnectionInfo&lt;/code&gt;, &lt;code&gt;KeepAliveInfo&lt;/code&gt;, and &lt;code&gt;Message&lt;/code&gt;, which result in processing of new connections, maintenance of old connections, and processing of user messages respectively. These classes are de-serialized from &lt;code&gt;Transport&lt;/code&gt;s using Marshalers. Whenever new data is found in a socket, the first byte is read to determine what type of &lt;code&gt;Command&lt;/code&gt; being received. The proper Marshaller is then selected to de-serialize the &lt;code&gt;Command&lt;/code&gt; (e.g. to de-serialize a &lt;code&gt;ConnectionInfo&lt;/code&gt;, the &lt;code&gt;ConnectionInfoMarshaller&lt;/code&gt; is used).&lt;/p&gt;
 
-<h3>TransportConnections and TransportConnectors</h3>
+&lt;h3&gt;TransportConnections and TransportConnectors&lt;/h3&gt;
 
-<p>Every <code>TransportServer</code> is connected to a <code>Broker</code> using a <code>TransportConnector</code>. The server's accept listener (which is called when a new <code>Transport</code> is constructed) is set to call the given <code>TransportConnector</code>'s <code>createConnection</code> method with the new <code>Transport</code>. When called, <code>createConnection</code> creates a new <code>TransportConnection</code> that links the given <code>Transport</code> and the supporting <code>Broker</code> together; the <code>Transport</code>'s transport listener is set to the <code>TransportConnection</code>'s <code>onCommand</code> method, which is then called whenever a new <code>Command</code> is received.</p>
+&lt;p&gt;Every &lt;code&gt;TransportServer&lt;/code&gt; is connected to a &lt;code&gt;Broker&lt;/code&gt; using a &lt;code&gt;TransportConnector&lt;/code&gt;. The server's accept listener (which is called when a new &lt;code&gt;Transport&lt;/code&gt; is constructed) is set to call the given &lt;code&gt;TransportConnector&lt;/code&gt;'s &lt;code&gt;createConnection&lt;/code&gt; method with the new &lt;code&gt;Transport&lt;/code&gt;. When called, &lt;code&gt;createConnection&lt;/code&gt; creates a new &lt;code&gt;TransportConnection&lt;/code&gt; that links the given &lt;code&gt;Transport&lt;/code&gt; and the supporting &lt;code&gt;Broker&lt;/code&gt; together; the &lt;code&gt;Transport&lt;/code&gt;'s transport listener is set to the &lt;code&gt;TransportConnection&lt;/code&gt;'s &lt;code&gt;onCommand&lt;/code&gt; method, which is then called whenever a new &lt;code&gt;Command&lt;/code&gt; is received.&lt;/p&gt;
 
-<p><code>Command</code>s and <code>AbstractConnection</code> (the superclass of <code>TransportConnection</code>) form a visitor pattern. <code>onCommand</code> will call <code>AbstractConnection</code>'s service method which will make a series of calls in line with the visitor patter and eventually, the proper <code>Command</code> subclass to be passed to the corresponding method of the <code>Broker</code> for processing.</p>
+&lt;p&gt;&lt;code&gt;Command&lt;/code&gt;s and &lt;code&gt;AbstractConnection&lt;/code&gt; (the superclass of &lt;code&gt;TransportConnection&lt;/code&gt;) form a visitor pattern. &lt;code&gt;onCommand&lt;/code&gt; will call &lt;code&gt;AbstractConnection&lt;/code&gt;'s service method which will make a series of calls in line with the visitor patter and eventually, the proper &lt;code&gt;Command&lt;/code&gt; subclass to be passed to the corresponding method of the &lt;code&gt;Broker&lt;/code&gt; for processing.&lt;/p&gt;
 
-<h3>BrokerFilters and BrokerPlugins</h3>
+&lt;h3&gt;BrokerFilters and BrokerPlugins&lt;/h3&gt;
 
-<p>While not used directly by the communication system, <code>BrokerFilter</code>s and <code>BrokerPlugin</code>s provide an effective and easy to use way of modifying Broker behavior. <code>BrokerFilter</code>s allow for one to modify a few <code>Broker</code> methods without touching the rest (as the name suggests). The <code>BrokerFilter</code> passes on all of its responsibilities to a <code>Broker</code> it receives in its constructor. Subclassing <code>BrokerFilter</code> allows us to perform additional actions before passing the work down to the underlying <code>Broker</code>.</p>
+&lt;p&gt;While not used directly by the communication system, &lt;code&gt;BrokerFilter&lt;/code&gt;s and &lt;code&gt;BrokerPlugin&lt;/code&gt;s provide an effective and easy to use way of modifying Broker behavior. &lt;code&gt;BrokerFilter&lt;/code&gt;s allow for one to modify a few &lt;code&gt;Broker&lt;/code&gt; methods without touching the rest (as the name suggests). The &lt;code&gt;BrokerFilter&lt;/code&gt; passes on all of its responsibilities to a &lt;code&gt;Broker&lt;/code&gt; it receives in its constructor. Subclassing &lt;code&gt;BrokerFilter&lt;/code&gt; allows us to perform additional actions before passing the work down to the underlying &lt;code&gt;Broker&lt;/code&gt;.&lt;/p&gt;
 
-<p>The power of the <code>BrokerFilter</code> class comes from the fact that multiple filters can be cascaded to create different functional combinations. As an example, the <code>JaasAuthenticationBroker</code> is a subclass of <code>BrokerFilter</code> that modifies the methods used for adding and removing connections to allow for JAAS authentication. <code>AuthorizationBroker</code> is another subclass of <code>BrokerFilter</code>. This class modifies the destination regulation methods to enforce access levels. With this architecture, one can create a <code>JaasAuthenticationBroker</code> and have it use an <code>AuthorizationBroker</code> as its underlying broker (which would use another broker itself, etc.).</p>
+&lt;p&gt;The power of the &lt;code&gt;BrokerFilter&lt;/code&gt; class comes from the fact that multiple filters can be cascaded to create different functional combinations. As an example, the &lt;code&gt;JaasAuthenticationBroker&lt;/code&gt; is a subclass of &lt;code&gt;BrokerFilter&lt;/code&gt; that modifies the methods used for adding and removing connections to allow for JAAS authentication. &lt;code&gt;AuthorizationBroker&lt;/code&gt; is another subclass of &lt;code&gt;BrokerFilter&lt;/code&gt;. This class modifies the destination regulation methods to enforce access levels. With this architecture, one can create a &lt;code&gt;JaasAuthenticationBroker&lt;/code&gt; and have it use an &lt;code&gt;AuthorizationBroker&lt;/code&gt; as its underlying broker (which would use another broker itself, etc.).&lt;/p&gt;
 
-<p><code>BrokerPlugin</code>s are simple classes that will wrap their corresponding <code>Brokers</code> around the one they are given. i.e. "installing" an <code>AuthorizationPlugin</code> on an existing <code>Broker</code> will create an <code>AuthorizationBroker</code> that uses the original <code>Broker</code> internally. The main reason for the existence of <code>BrokerPlugin</code>s is to allow for one to configure the <code>Broker</code> used by the <code>BrokerService</code> class (either through code or XML configuration and spring).</p>
-<p></p></div>
+&lt;p&gt;&lt;code&gt;BrokerPlugin&lt;/code&gt;s are simple classes that will wrap their corresponding &lt;code&gt;Brokers&lt;/code&gt; around the one they are given. i.e. &amp;quot;installing&amp;quot; an &lt;code&gt;AuthorizationPlugin&lt;/code&gt; on an existing &lt;code&gt;Broker&lt;/code&gt; will create an &lt;code&gt;AuthorizationBroker&lt;/code&gt; that uses the original &lt;code&gt;Broker&lt;/code&gt; internally. The main reason for the existence of &lt;code&gt;BrokerPlugin&lt;/code&gt;s is to allow for one to configure the &lt;code&gt;Broker&lt;/code&gt; used by the &lt;code&gt;BrokerService&lt;/code&gt; class (either through code or XML configuration and spring).&lt;/p&gt;
+</plain-text-body></structured-macro></p><p></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/command-agent.xml
----------------------------------------------------------------------
diff --git a/command-agent.xml b/command-agent.xml
index 2672f5a..cd299b2 100644
--- a/command-agent.xml
+++ b/command-agent.xml
@@ -1,41 +1,39 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Removed in 5.9</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><ul class="alternate"><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4406">https://issues.apache.org/jira/browse/AMQ-4406</a></li></ul>
-</div></div>
-<h2 id="CommandAgent-CommandAgent">Command Agent</h2>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="333621b0-0930-4059-9eeb-3ca28a0e2e4b" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Removed in 5.9</parameter><rich-text-body><ul class="alternate"><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4406">https://issues.apache.org/jira/browse/AMQ-4406</a></li></ul>
+</rich-text-body></structured-macro>
+<h2>Command Agent</h2>
 
 <p>From 4.2 onwards Apache ActiveMQ allows you to communicate with a broker Command Agent to be able to perform administration queries and commands. This allows you to use the message bus itself to communicate with the message broker to list available queues, topics, subscriptions, to view metadata, browse queues and so forth.</p>
 
-<h3 id="CommandAgent-EnablingtheCommandAgent">Enabling the Command Agent</h3>
+<h3>Enabling the Command Agent</h3>
 
 <p>To enable the command agent, in the activemq.xml (or your spring.xml you use to configure the broker) add the following</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="b0bfb924-553e-4cc7-9cbf-d469cb1fa83f" ac:name="code" ac:schema-version="1"><plain-text-body>
 &lt;beans&gt;
-  &lt;broker useJmx=&quot;true&quot; xmlns=&quot;http://activemq.apache.org/schema/core&quot;&gt;
+  &lt;broker useJmx="true" xmlns="http://activemq.apache.org/schema/core"&gt;
     ...
         &lt;managementContext&gt;
-            &lt;managementContext createConnector=&quot;true&quot;/&gt;
+            &lt;managementContext createConnector="true"/&gt;
         &lt;/managementContext&gt;
     ...
   &lt;/broker&gt;
 
-  &lt;commandAgent xmlns=&quot;http://activemq.apache.org/schema/core&quot;/&gt;
+  &lt;commandAgent xmlns="http://activemq.apache.org/schema/core"/&gt;
   ...
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The broker will then have a command agent connected which will listen on the topic <strong>ActiveMQ.Agent</strong>.</p>
 
-<h3 id="CommandAgent-UsingJabber(XMPP)totalktotheBroker">Using Jabber (XMPP) to talk to the Broker</h3>
+<h3>Using Jabber (XMPP) to talk to the Broker</h3>
 
-<p>You can use the <a shape="rect" href="xmpp.xml">XMPP</a> support to talk with the broker. For example follow the instructions in <a shape="rect" href="xmpp.xml">XMPP</a> to connect via a Jabber client, then just join the room <strong>ActiveMQ.Agent</strong> and talk to the broker!</p>
+<p>You can use the <link><page ri:content-title="XMPP"></page></link> support to talk with the broker. For example follow the instructions in <link><page ri:content-title="XMPP"></page></link> to connect via a Jabber client, then just join the room <strong>ActiveMQ.Agent</strong> and talk to the broker!</p>
 
-<p>The following image shows the <a shape="rect" class="external-link" href="http://jivesoftware.com/products/spark/" rel="nofollow">Spark</a> client in action talking to the broker</p>
+<p>The following image shows the <a shape="rect" href="http://jivesoftware.com/products/spark/">Spark</a> client in action talking to the broker</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="command-agent.data/help.png" data-image-src="/confluence/download/attachments/35957/help.png?version=1&amp;modificationDate=1164085283000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="3231" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="help.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35957" data-linked-resource-container-version="10"></span></p>
+<p><image><attachment ri:filename="help.png"></attachment></image></p>
 
-<h3 id="CommandAgent-Usingtheinteractiveconsole">Using the interactive console</h3>
+<h3>Using the interactive console</h3>
 
 <p>The activemq-core module has a simple Java class called SimpleConsole which you can run in your IDE to get an interactive console for communicating with a broker over JMS. Type in the various commands (or help to get more help) and the results are returned on the console.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/community.xml
----------------------------------------------------------------------
diff --git a/community.xml b/community.xml
index aa5c720..a7d575a 100644
--- a/community.xml
+++ b/community.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="articles.xml">Articles</a></li><li><a shape="rect" href="books.xml">Books</a></li><li><a shape="rect" href="contributing.xml">Contributing</a></li><li><a shape="rect" href="discussion-forums.xml">Discussion Forums</a></li><li><a shape="rect" href="faq.xml">FAQ</a><ul class="childpages-macro"><li><a shape="rect" href="configuration.xml">Configuration</a></li><li><a shape="rect" href="developing-activemq.xml">Developing ActiveMQ</a></li><li><a shape="rect" href="errors.xml">Errors</a></li><li><a shape="rect" href="general.xml">General</a></li><li><a shape="rect" href="jms.xml">JMS</a></li><li><a shape="rect" href="persistence-questions.xml">Persistence Questions</a></li><li><a shape="rect" href="terminology.xml">Terminology</a></li><li><a shape="rect" href="using-apache-activemq.xml">Using Apache ActiveMQ</a></li></ul></li><li><a shape="rect" href="mailing-lists.xml">Mailing Lists</a><ul class
 ="childpages-macro"><li><a shape="rect" href="all-forums.xml">All Forums</a></li><li><a shape="rect" href="developer-forum.xml">Developer Forum</a></li><li><a shape="rect" href="user-forum.xml">User Forum</a></li></ul></li><li><a shape="rect" href="pmc-templates.xml">PMC Templates</a></li><li><a shape="rect" href="privacy-policy.xml">Privacy Policy</a></li><li><a shape="rect" href="projects-using-activemq.xml">Projects Using ActiveMQ</a></li><li><a shape="rect" href="security-advisories.xml">Security Advisories</a></li><li><a shape="rect" href="sponsorship.xml">Sponsorship</a></li><li><a shape="rect" href="support.xml">Support</a></li><li><a shape="rect" href="team.xml">Team</a></li><li><a shape="rect" href="tips-for-getting-help.xml">Tips for getting help</a></li><li><a shape="rect" href="users.xml">Users</a></li></ul>&#160;</div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="ec681140-ace7-4fe2-9a89-04db683a3be3" ac:name="children" ac:schema-version="1"><parameter ac:name="depth">2</parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/compile-activemq-with-gcj.xml
----------------------------------------------------------------------
diff --git a/compile-activemq-with-gcj.xml b/compile-activemq-with-gcj.xml
index f4ecd95..679c78a 100644
--- a/compile-activemq-with-gcj.xml
+++ b/compile-activemq-with-gcj.xml
@@ -1,38 +1,35 @@
 <div class="wiki-content maincontent">
-<p>You can use <a shape="rect" class="external-link" href="http://gcc.gnu.org/java/" rel="nofollow">GCJ</a> to build ActiveMQ as a shared library you can reuse from C++.</p>
+<p>You can use <a shape="rect" href="http://gcc.gnu.org/java/">GCJ</a> to build ActiveMQ as a shared library you can reuse from C++.</p>
 
-<h3 id="CompileActiveMQwithGCJ-NativecompileActiveMQHOWTO">Native compile ActiveMQ HOWTO</h3>
+<h3>Native compile ActiveMQ HOWTO</h3>
 
-<h4 id="CompileActiveMQwithGCJ-Abstract">Abstract</h4>
+<h4>Abstract</h4>
 <p>This document describes how to native compile ActiveMQ for use in a C++ environment. The version of ActiveMQ used is 3.2 in this howto. To compile you'll need GCC 4.0.2, or later, with both Java, and C/C++ support.</p>
 
-<h4 id="CompileActiveMQwithGCJ-ToolsSetup">Tools Setup</h4>
+<h4>Tools Setup</h4>
 <p>If you don't already have GCC 4.0.2 installed you need to download and build it. See GCC manuals for complete instructions on how to build GCC but below is a short descriptions of the steps involved. The GCC build steps assumes that you already have an older GCC compiler installed.</p>
 
 <ul><li>Unpack GCC into an arbitrary directory, for example /opt/gccbuild, and then create a separate output directory. Your directory structure should look similar to this;
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>        /opt/gccbuild/gcc-4.0.2
+<structured-macro ac:macro-id="93a6eb11-be7b-4c05-8174-292ba8661d7f" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+        /opt/gccbuild/gcc-4.0.2
         /opt/gccbuild/output
-</pre>
-</div></div></li><li>Go to the output directory and run configure.
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>        cd /opt/gccbuild/output
+</plain-text-body></structured-macro></li><li>Go to the output directory and run configure.
+<structured-macro ac:macro-id="3c50361b-035c-4d89-8c23-36ca3362dd3a" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+        cd /opt/gccbuild/output
         ../gcc-4.0.2/configure --prefix=/opt/gcc402
                                --enable-shared
                                --enable-threads=posix
                                --enable-languages=c,c++,java
-</pre>
-</div></div></li><li>Run make.
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>        make bootstrap
+</plain-text-body></structured-macro></li><li>Run make.
+<structured-macro ac:macro-id="d567ed56-a7ef-4dd5-97ea-ce0d50cdda52" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+        make bootstrap
         make install
-</pre>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Download ActiveMQ and copy the JARs to a new empty directory /opt/app, including
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>        activeio-1.1.jar
+<structured-macro ac:macro-id="0f658903-01d0-4f47-b9b5-96a68be84721" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+        activeio-1.1.jar
         activemq-core-3.2.jar
         commons-logging-1.0.3.jar
         concurrent-1.3.4.jar
@@ -41,18 +38,17 @@
         geronimo-spec-jms-1.1-rc4.jar
         geronimo-spec-jta-1.0.1B-rc4.jar
         log4j-1.2.8.jar
-</pre>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
-<h4 id="CompileActiveMQwithGCJ-WritetheGlueCode">Write the Glue Code</h4>
+<h4>Write the Glue Code</h4>
 <p>Either access the ActiveMQ classes directly from C++ or write a facade object in Java that handles all startup and shutdown logic of ActiveMQ. Save the glue files in the same directory as for the ActiveMQ jars.</p>
 
 <p>An CNI example using a Java object starting the MQ.</p>
 
-<h5 id="CompileActiveMQwithGCJ-Bootstrap.cpp">Bootstrap.cpp</h5>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>#include &lt;gcj/cni.h&gt;
+<h5>Bootstrap.cpp</h5>
+<structured-macro ac:macro-id="74a1f7b3-5e16-4ec2-a7bf-10b5c5130735" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+#include &lt;gcj/cni.h&gt;
 #include &lt;iostream&gt;
 #include &lt;java/lang/System.h&gt;
 #include &lt;java/lang/Throwable.h&gt;
@@ -92,11 +88,10 @@ int main(int argc, char* argv[])
         t-&gt;printStackTrace() ;
     }
 }
-</pre>
-</div></div>
-<h5 id="CompileActiveMQwithGCJ-MQAdapter.java">MQAdapter.java</h5>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>import org.activemq.*;
+</plain-text-body></structured-macro>
+<h5>MQAdapter.java</h5>
+<structured-macro ac:macro-id="2fefcabc-d370-4e1e-b1a7-94883d3d3591" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+import org.activemq.*;
 import java.util.Hashtable ;
 import javax.jms.*;
 import javax.naming.*;
@@ -180,17 +175,16 @@ public class MQAdapter
         }
     }
 }
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h4 id="CompileActiveMQwithGCJ-CompiletheJavaandC++Code">Compile the Java and C++ Code</h4>
+<h4>Compile the Java and C++ Code</h4>
 <p>The Java code must be BC compiled to be able to dynamically link required classes as needed, see reference for more information on BC compilation. Use the suggested script to compile all ActiveMQ JARs and create a class map database.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Note</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Using -Bsymbolic does not seem to work, use -symbolic instead.</p></div></div>
+<structured-macro ac:macro-id="fa02f16f-d456-4563-950b-2c2b97495410" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Note</parameter><rich-text-body>
+<p>Using -Bsymbolic does not seem to work, use -symbolic instead.</p></rich-text-body></structured-macro>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>    compile.sh:
+<structured-macro ac:macro-id="cc0d4ed4-9457-4de6-a80d-20aab110eddd" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+    compile.sh:
 
     #!/bin/sh
 
@@ -203,69 +197,61 @@ public class MQAdapter
         gcj -shared -findirect-dispatch -fjni -fPIC -Wl,-symbolic -o ${JAR_FILE}.so ${JAR_FILE}
         gcj-dbtool -a classmap.db ${JAR_FILE} ${JAR_FILE}.so
     done
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
 
 <ul><li>Run the above script and set environment property GCJ_PROPERTIES.
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           ./compile.sh
+<structured-macro ac:macro-id="769e79ed-10bc-4951-99dd-ff9bb4786940" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           ./compile.sh
            export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/opt/app/classmap.db"
-</pre>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Java compile MQAdapter.java
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           gcj --classpath=./geronimo-spec-jms-1.1-rc4.jar:./activemq-core-3.2.jar -C MQAdapter.java
-</pre>
-</div></div></li></ul>
+<structured-macro ac:macro-id="829b8d71-c144-4232-890b-1cc6b89514a6" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           gcj --classpath=./geronimo-spec-jms-1.1-rc4.jar:./activemq-core-3.2.jar -C MQAdapter.java
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Generate CNI header for MQAdapter.class
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           gcjh MQAdapter
-</pre>
-</div></div></li></ul>
+<structured-macro ac:macro-id="0c9263bc-06f4-4058-b810-168ce4bc66e9" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           gcjh MQAdapter
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>JAR the Java glue code
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           fastjar cf MQAdapter.jar MQAdapter.class
-</pre>
-</div></div></li></ul>
+<structured-macro ac:macro-id="97d07144-63e6-4fcc-92da-bad27355c062" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           fastjar cf MQAdapter.jar MQAdapter.class
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Native compile the Java JAR into a shared library, add output directory to LD_LIBRARY_PATH.
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           gcj -shared -findirect-dispatch -fjni -fPIC -Wl,-symbolic -o MQAdapter.so MQAdapter.jar
+<structured-macro ac:macro-id="1d7dd7b5-cc71-4188-94a8-b06eff1d1889" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           gcj -shared -findirect-dispatch -fjni -fPIC -Wl,-symbolic -o MQAdapter.so MQAdapter.jar
            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/app
 
-</pre>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Compile the C++ code
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           g++ -c Bootstrap.cpp
-</pre>
-</div></div></li></ul>
+<structured-macro ac:macro-id="53b7d6ad-6df6-41ac-9966-78ee51ade665" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           g++ -c Bootstrap.cpp
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul><li>Link Bootstrap with the Java code
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>           gcj -o Bootstrap Bootstrap.o -L /opt/app -lgcj -lstdc++ activeio-1.1.jar.so activemq-core-3.2.jar.so
+<structured-macro ac:macro-id="0f038e48-ac55-469e-8193-0f587d4e46bc" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+           gcj -o Bootstrap Bootstrap.o -L /opt/app -lgcj -lstdc++ activeio-1.1.jar.so activemq-core-3.2.jar.so
                commons-logging-1.0.3.jar.so concurrent-1.3.4.jar.so geronimo-spec-jms-1.1-rc4.jar.so
                geronimo-spec-j2ee-management-1.0-rc4.jar.so geronimo-spec-j2ee-jacc-1.0-rc4.jar.so
                geronimo-spec-jta-1.0.1B-rc4.jar.so log4j-1.2.8.jar.so MQAdapter.so
-</pre>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <p>Now, if everything went ok you should be able to run the app. with ./Bootstrap.</p>
 
-<h4 id="CompileActiveMQwithGCJ-References">References</h4>
+<h4>References</h4>
 
-<p><a shape="rect" class="external-link" href="http://gcc.gnu.org/wiki/How%20to%20BC%20compile%20with%20GCJ" rel="nofollow">How to BC compile with GCJ</a></p>
+<p><a shape="rect" href="http://gcc.gnu.org/wiki/How%20to%20BC%20compile%20with%20GCJ">How to BC compile with GCJ</a></p>
 
-<p><a shape="rect" class="external-link" href="http://www.redhat.com/magazine/012oct05/features/java/" rel="nofollow">The state of Java on Linux</a></p></div>
+<p><a shape="rect" href="http://www.redhat.com/magazine/012oct05/features/java/">The state of Java on Linux</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/complex-single-broker-configuration-stomp-only.xml
----------------------------------------------------------------------
diff --git a/complex-single-broker-configuration-stomp-only.xml b/complex-single-broker-configuration-stomp-only.xml
index 0586bab..a690a3b 100644
--- a/complex-single-broker-configuration-stomp-only.xml
+++ b/complex-single-broker-configuration-stomp-only.xml
@@ -3,8 +3,7 @@
 <p>While this is a fairly detailed configuration, it locks down every ActiveMQ service.  It would be ideal if ActiveMQ shipped with a default closed configuration like this.</p>
 
 <p>ActiveMQ is assumed to be installed in /usr/local/activemq/ in this 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="55aa3dea-f2f2-432e-8402-ecd4d24e69fd" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;!--
   ActiveMQ activemq.xml configuration file (/usr/local/activemq/conf/activemq.xml)
 
@@ -13,8 +12,8 @@
   * Uses the Sun JMX connector for remote management.  Point jconsole at:
      service:jmx:rmi:///jndi/rmi://myserver.domain.net:61616/jmxrmi
 
-  * Uses Kaha persistence storage, stored in the &quot;activemq-data&quot; directory.
-    &quot;activemq-data&quot; and &quot;logs&quot; sub-directories must be writable by the
+  * Uses Kaha persistence storage, stored in the "activemq-data" directory.
+    "activemq-data" and "logs" sub-directories must be writable by the
     ActiveMQ user.
 
   * Also see conf/log4j.properties for logging configuration
@@ -22,47 +21,47 @@
 
 &lt;beans&gt;
     &lt;!-- Enables system properties as variables in this configuration file --&gt;
-    &lt;bean class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;/&gt;
+    &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/&gt;
 
-    &lt;broker xmlns=&quot;http://activemq.org/config/1.0&quot; brokerName=&quot;SERVER1&quot;
-        populateJMSXUserID=&quot;true&quot; useJmx=&quot;true&quot; persistent=&quot;true&quot;&gt;
+    &lt;broker xmlns="http://activemq.org/config/1.0" brokerName="SERVER1"
+        populateJMSXUserID="true" useJmx="true" persistent="true"&gt;
 
     &lt;!-- Queue setup.  Queues can be created on the fly by any user with
          admin rights, but it is not good to give every user admin rights.  --&gt;
     &lt;destinations&gt;
-        &lt;queue physicalName=&quot;widgets&quot; /&gt;
-        &lt;queue physicalName=&quot;spacecontrol&quot; /&gt;
-        &lt;queue physicalName=&quot;displays&quot; /&gt;
+        &lt;queue physicalName="widgets" /&gt;
+        &lt;queue physicalName="spacecontrol" /&gt;
+        &lt;queue physicalName="displays" /&gt;
     &lt;/destinations&gt;
 
     &lt;!-- We only allow Stomp clients --&gt;
     &lt;transportConnectors&gt;
-        &lt;transportConnector name=&quot;stomp&quot; uri=&quot;stomp://localhost:61613&quot;/&gt;
+        &lt;transportConnector name="stomp" uri="stomp://localhost:61613"/&gt;
     &lt;/transportConnectors&gt;
 
-    &lt;!-- We don&#39;t have any other brokers to connect to --&gt;
+    &lt;!-- We don't have any other brokers to connect to --&gt;
     &lt;networkConnectors&gt;
     &lt;/networkConnectors&gt;
 
     &lt;!-- Do not create an ActiveMQ JMX connector.  Use the Sun JMX connector
          instead, and hook ActiveMQ to it. --&gt;
     &lt;managementContext&gt;
-        &lt;managementContext createConnector=&quot;false&quot; /&gt;
+        &lt;managementContext createConnector="false" /&gt;
     &lt;/managementContext&gt;
 
     &lt;plugins&gt;
         &lt;simpleAuthenticationPlugin&gt;
             &lt;users&gt;
-                &lt;authenticationUser username=&quot;sa&quot; password=&quot;manager&quot; groups=&quot;producers,consumers,admins&quot; /&gt;
-                &lt;authenticationUser username=&quot;frontend&quot; password=&quot;manager&quot; groups=&quot;producers,consumers&quot; /&gt;
-                &lt;authenticationUser username=&quot;backend&quot; password=&quot;manager&quot; groups=&quot;consumers&quot; /&gt;
+                &lt;authenticationUser username="sa" password="manager" groups="producers,consumers,admins" /&gt;
+                &lt;authenticationUser username="frontend" password="manager" groups="producers,consumers" /&gt;
+                &lt;authenticationUser username="backend" password="manager" groups="consumers" /&gt;
             &lt;/users&gt;
         &lt;/simpleAuthenticationPlugin&gt;
         &lt;authorizationPlugin&gt;
             &lt;map&gt;
                 &lt;authorizationMap&gt;
                     &lt;authorizationEntries&gt;
-                        &lt;authorizationEntry queue=&quot;&gt;&quot; write=&quot;producers&quot; read=&quot;consumers&quot; admin=&quot;admins&quot; /&gt;
+                        &lt;authorizationEntry queue="&gt;" write="producers" read="consumers" admin="admins" /&gt;
                     &lt;/authorizationEntries&gt;
                 &lt;/authorizationMap&gt;
             &lt;/map&gt;
@@ -73,7 +72,7 @@
 
     &lt;!-- Do not create ActiveMQ.Agent topic, as it does not work if
          destination security is enabled --&gt;
-    &lt;!-- &lt;commandAgent xmlns=&quot;http://activemq.org/config/1.0&quot;/&gt; --&gt;
+    &lt;!-- &lt;commandAgent xmlns="http://activemq.org/config/1.0"/&gt; --&gt;
 
     &lt;!-- Web Console.  Auth is via JAAS.  Beware: jetty-plus-6.1.4.jar contains the
          JAAS classes, and is not included with ActiveMQ.  You need to download
@@ -81,27 +80,25 @@
          to browse the queue, and that requires a password.
     --&gt;
 
-    &lt;jetty xmlns=&quot;http://mortbay.com/schemas/jetty/1.0&quot;&gt;
+    &lt;jetty xmlns="http://mortbay.com/schemas/jetty/1.0"&gt;
         &lt;connectors&gt;
-            &lt;nioConnector port=&quot;8161&quot; /&gt;
+            &lt;nioConnector port="8161" /&gt;
         &lt;/connectors&gt;
 
         &lt;userRealms&gt;
-            &lt;!-- &quot;name&quot; must match the realm in web.xml, and &quot;loginModuleName&quot; must be defined in login.conf --&gt;
-            &lt;jaasUserRealm name=&quot;ActiveMQ&quot; loginModuleName=&quot;ActiveMQ&quot;
-                    callbackHandlerClass=&quot;org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler&quot; /&gt;
+            &lt;!-- "name" must match the realm in web.xml, and "loginModuleName" must be defined in login.conf --&gt;
+            &lt;jaasUserRealm name="ActiveMQ" loginModuleName="ActiveMQ"
+                    callbackHandlerClass="org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler" /&gt;
         &lt;/userRealms&gt;
 
         &lt;handlers&gt;
-            &lt;webAppContext contextPath=&quot;/admin&quot; resourceBase=&quot;${activemq.base}/webapps/admin&quot; logUrlOnStart=&quot;true&quot; /&gt;
+            &lt;webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true" /&gt;
         &lt;/handlers&gt;
     &lt;/jetty&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Add this XML snippet to the web.xml for the /admin/ app, in order to enable HTTP Authentication to match the activemq.xml configuration above.</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="205793d6-8b74-4d5b-a880-25b0c46d7ebe" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;security-constraint&gt;
     &lt;web-resource-collection&gt;
         &lt;web-resource-name&gt;Web Console&lt;/web-resource-name&gt;
@@ -116,6 +113,5 @@
     &lt;auth-method&gt;BASIC&lt;/auth-method&gt;
     &lt;realm-name&gt;ActiveMQ&lt;/realm-name&gt;
 &lt;/login-config&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/composite-destinations.xml
----------------------------------------------------------------------
diff --git a/composite-destinations.xml b/composite-destinations.xml
index 88524f7..bd18796 100644
--- a/composite-destinations.xml
+++ b/composite-destinations.xml
@@ -6,31 +6,26 @@
 
 <p>We do this using a simple separator of "," allowing a number of destinations to be specified when creating a destintation, or registering destinations in JNDI. e.g. the destination</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="6277290e-e1c1-41c9-8626-0903661ac49b" ac:name="code" ac:schema-version="1"><plain-text-body>
 FOO.A,FOO.B,FOO.C
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Represents 3 different destinations. This could be used with a queue or topic to represent a set of 3 destinations. 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="40832b73-bda0-4200-b10c-cd1aa311a70d" ac:name="code" ac:schema-version="1"><plain-text-body>
 // send to 3 queues as one logical operation
-Queue queue = new ActiveMQQueue(&quot;FOO.A,FOO.B,FOO.C&quot;);
+Queue queue = new ActiveMQQueue("FOO.A,FOO.B,FOO.C");
 producer.send(queue, someMessage);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>If you wish to mix and match the types of destination, you can use a prefix of <strong>queue://</strong> or <strong>topic://</strong> to differentiate the type of destination. e.g. to publish on a queue but also make a notification on a topic as well you could use</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="ae96f102-2093-47a3-8507-ed585b7c2636" ac:name="code" ac:schema-version="1"><plain-text-body>
 // send to queues and topic one logical operation
-Queue queue = new ActiveMQQueue(&quot;FOO.A,topic://NOTIFY.FOO.A&quot;);
+Queue queue = new ActiveMQQueue("FOO.A,topic://NOTIFY.FOO.A");
 producer.send(queue, someMessage);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>Composite destinations can also be configured on the <a shape="rect" href="virtual-destinations.xml#VirtualDestinations-CompositeDestinations">broker side</a>, such that messages sent to a single destination by the client will be transparently copied to multiple physical destinations.</p></div>
+<p>Composite destinations can also be configured on the <link ac:anchor="Composite Destinations"><page ri:content-title="Virtual Destinations"></page><link-body>broker side</link-body></link>, such that messages sent to a single destination by the client will be transparently copied to multiple physical destinations.</p>
+</div>
 


Mime
View raw message