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:25 UTC

[01/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Repository: activemq-web
Updated Branches:
  refs/heads/body.storage [created] 7a7d976c5


http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/kahadb.xml
----------------------------------------------------------------------
diff --git a/kahadb.xml b/kahadb.xml
index 0acef08..2d8f265 100644
--- a/kahadb.xml
+++ b/kahadb.xml
@@ -1,34 +1,27 @@
-<div class="wiki-content maincontent"><p>KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimized for fast persistence. It is the the default storage mechanism since <strong>ActiveMQ 5.4</strong>. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the <a shape="rect" href="amq-message-store.xml">AMQ Message Store</a>.</p><h2 id="KahaDB-Configuration">Configuration</h2><p>To use KahaDB as the broker's persistence adapter configure ActiveMQ as follows (example):</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ &lt;broker brokerName=&quot;broker&quot;&gt;
+<div class="wiki-content maincontent"><p>KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimized for fast persistence. It is the the default storage mechanism since <strong>ActiveMQ 5.4</strong>. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the <link><page ri:content-title="AMQ Message Store"></page></link>.</p><h2>Configuration</h2><p>To use KahaDB as the broker's persistence adapter configure ActiveMQ as follows (example):</p><structured-macro ac:macro-id="a0af1d7a-4046-45b9-85f4-416664b14042" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body> &lt;broker brokerName="broker"&gt;
     &lt;persistenceAdapter&gt;
-      &lt;kahaDB directory=&quot;activemq-data&quot; journalMaxFileLength=&quot;32mb&quot;/&gt;
+      &lt;kahaDB directory="activemq-data" journalMaxFileLength="32mb"/&gt;
     &lt;/persistenceAdapter&gt;
  &lt;/broker&gt;
-]]></script>
-</div></div><h3 id="KahaDB-KahaDBProperties">KahaDB Properties</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>archiveCorruptedIndex</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, corrupted indexes found at startup will be archived (not deleted).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>archiveDataLogs</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, will move a message data log to the archi
 ve directory instead of deleting it.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>checkForCorruptJournalFiles</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, will check for corrupt journal files on startup and try and recover them.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>checkpointInterval</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>5000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Time (ms) before check-pointing the journal.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>checksumJournalFiles</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Create a checksum for a journal file. The presence of a checksum is requi
 red in order for the persistence adapter to be able to detect corrupt journal files.</p><p>Before <strong>ActiveMQ 5.9.0</strong>: the default is <strong><code>false</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>cleanupInterval</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>30000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The interval (in ms) between consecutive checks that determine which journal files, if any, are eligible for removal from the message store. An eligible journal file is one that has no outstanding references.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>compactAcksAfterNoGC</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.14.0</strong>: when the acknowledgement compaction feature is enabled this value controls how many store 
 GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.&#160; The lower the value set the faster the compaction may occur which can impact performance if it runs to often.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>compactAcksIgnoresStoreGrowth</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.14.0</strong>:&#160;when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).&#160; If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim s
 pace faster.&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>concurrentStoreAndDispatchQueues</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>concurrentStoreAndDispatchTopics</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage</p><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>Enabling this property is 
 not recommended.</p></div></div></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>directory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>activemq-data</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The path to the directory to use to store the message store data and log files.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>directoryArchive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Define the directory to move data logs to when they all the messages they contain have been consumed.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>enableAckCompaction</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting controls whether t
 he store will perform periodic compaction of older journal log files that contain only Message acknowledgements. By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>enableIndexWriteAsync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, the index is updated asynchronously.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>enableJournalDiskSyncs</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Ensure every journal write is followed by a disk sync (JMS durability requirement).</span></p><div class="conflu
 ence-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>This property is deprecated as of <strong>ActiveMQ</strong> <strong>5.14.0</strong>.</p><p>From <strong>ActiveMQ</strong> <strong>5.14.0</strong>: see <span style="color: rgb(34,34,34);"><strong><code>journalDiskSyncStrategy</code></strong>.</span></p></div></div></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreMissingJournalfiles</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, reports of missing journal files are ignored.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexCacheSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10000</code></p></td><td colspan
 ="1" rowspan="1" class="confluenceTd"><p>Number of index pages cached in memory.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexDirectory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>From <strong>ActiveMQ 5.10.0</strong>: If set, configures where the KahaDB index files (<strong><code>db.data</code></strong> and&#160;<strong><code>db.redo</code></strong>) will be stored. If not set, the index files are stored in the directory specified by the&#160;<strong><code>directory</code></strong> attribute.</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>indexWriteBatchSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>1000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number of indexes written in a batch.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code><span>journalD
 iskSyncInterval</span></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>1000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Interval (ms) for when to perform a disk sync when&#160;<strong><code>journalDiskSyncStrategy=periodic</code></strong>. A sync will only be performed if a write has occurred to the journal since the last disk sync or when the journal rolls over to a new journal file.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code><span>journalDiskSyncStrategy</span></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>always</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting configures the disk sync policy. The list of available sync strategies are (in order of decreasing safety, and increasing performance):</p><ul><li><p><strong><code>always</code></strong> <span>Ensure every journal write is followed by a disk sync (JM
 S durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write. This is equivalent to the deprecated property&#160;<strong><code>enableJournalDiskSyncs=true</code></strong>.</span></p></li><li><p><strong><code>periodic</code></strong> <span style="color: rgb(34,34,34);">The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput</span>. The disk will also be synced when rolling over to a new journal file. The default interval is 1 second. The default interval offers very good performance, whilst being safer than&#160;<strong><code>never</code></strong> disk syncing, as data loss is limited to a maximum of 1 second's worth. See <strong><code>journalDiskSyncInterval</code></strong> to change the frequency of disk syncs.</p></li><li><p><strong><code>never</code></strong> A sync will never be explicitly called
  and it will be up to the operating system to flush to disk. This is equivalent to setting the deprecated property <strong><code>enableJournalDiskSyncs=false</code></strong>. This is the fastest option but is the least safe as there's no guarantee as to when data is flushed to disk. Consequently message loss <em>can</em> occur on broker failure.</p></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>journalMaxFileLength</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>32mb</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A hint to set the maximum size of the message data logs.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxAsyncJobs</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum number of asynchronous messages that will be queued awaiting storage (should be the same as the
  number of concurrent MessageProducers).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>preallocationScope</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>entire_journal</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting configures how journal data files are preallocated. The default strategy preallocates the journal file on first use using the appender thread.&#160;</p><ul><li><p><strong><code>entire_journal_async</code></strong> will use preallocate ahead of time in a separate thread.</p></li><li><p><strong><code>none</code></strong> disables preallocation.</p></li></ul><p>On SSD, using&#160;<strong><code>entire_journal_async</code></strong> avoids delaying writes pending preallocation on first use.</p><p><strong>Note</strong>: on HDD the additional thread contention for disk has a negative impact. Therefore use the default.</p></td></tr><tr><td colspan="1" rows
 pan="1" class="confluenceTd"><p><code>preallocationStrategy</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sparse_file</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>From <strong>ActiveMQ 5.12.0</strong>:&#160;This setting configures how the broker will try to preallocate the journal files when a new journal file is needed.</p><ul><li><p><strong><code>sparse_file</code></strong> - sets the file length, but does not populate it with any data.</p></li><li><p><strong><code>os_kernel_copy</code></strong> - delegates the preallocation to the Operating System.</p></li><li><p><strong><code>zeros</code></strong>&#160; - each preallocated journal file contains nothing but <strong><code>0x00</code></strong> throughout.</p></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>storeOpenWireVersion</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>11</code></p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p>Determines the version of OpenWire commands that are marshaled to the KahaDB journal.&#160;</p><p>Before <strong>ActiveMQ 5.12.0</strong>: the default value is <strong><code>6</code></strong>.</p><p>Some features of the broker depend on information stored in the OpenWire commands from newer protocol revisions and these may not work correctly if the store version is set to a lower value.&#160; KahaDB stores from broker versions greater than 5.9.0 will in many cases still be readable by the broker but will cause the broker to continue using the older store version meaning newer features may not work as intended.&#160;</p><p>For KahaDB stores that were created in versions prior to <strong>ActiveMQ 5.9.0</strong> it will be necessary to manually set <strong><code>storeOpenWireVersion="6"</code></strong> in order to start a broker without error.</p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-information"><span cla
 ss="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For tuning locking properties see the options listed at <a shape="rect" href="pluggable-storage-lockers.xml">Pluggable storage lockers.</a></p></div></div><p>&#160;</p><h3 id="KahaDB-SlowFileSystemAccessDiagnosticLogging">Slow File System Access Diagnostic Logging</h3><p>You can configure a non zero threshold in milliseconds for database updates. If database operation is slower than that threshold (for example if you set it to <strong><code>500</code></strong>), you may see messages like:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><code>Slow KahaDB access: cleanup took 1277 | org.apache.activemq.store.kahadb.MessageDatabase | ActiveMQ Journal Checkpoint Worker</code></p>
-</div></div><p>You can configure a threshold used to log these messages by using a system property and adjust it to your disk speed so that you can easily pick up runtime anomalies.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><code>-Dorg.apache.activemq.store.kahadb.LOG_SLOW_ACCESS_TIME=1500</code></p>
-</div></div><h1 id="KahaDB-Multi(m)kahaDBPersistenceAdapter">Multi(m) kahaDB Persistence Adapter</h1><p>From <strong>ActiveMQ 5.6</strong>: it's possible to distribute destinations stores across multiple kahdb persistence adapters. When would you do this? If you have one fast producer/consumer destination and another periodic producer destination that has irregular batch consumption then disk usage can grow out of hand as unconsumed messages become distributed across multiple journal files. Having a separate journal for each ensures minimal journal usage. Also, some destination may be critical and require disk synchronization while others may not. In these cases you can use the&#160;<strong><code>mKahaDB</code></strong> persistence adapter and filter destinations using wildcards, just like with destination policy entries.</p><h3 id="KahaDB-Transactions">Transactions</h3><p>Transactions can span multiple journals if the destinations are distributed. This means that two phase completi
 on is necessary, which does impose a performance (additional disk sync) penalty to record the commit outcome. This penalty is only imposed if more than one journal is involved in a transaction.</p><h3 id="KahaDB-Configuration.1">Configuration</h3><p>Each instance of&#160;<strong><code>kahaDB</code></strong> can be configured independently. If no destination is supplied to a <strong><code>filteredKahaDB</code></strong>, the implicit default value will match any destination, queue or topic. This is a handy catch all. If no matching persistence adapter can be found, destination creation will fail with an exception. The <strong><code>filteredKahaDB</code></strong> shares its wildcard matching rules with <a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a>.</p><p>From ActiveMQ 5.15, <strong><code>filteredKahaDB</code></strong>&#160;support a StoreUsage&#160;attribute named <strong><code>usage</code></strong>. This allows individual disk limits to be imposed on
  matching queues.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker brokerName=&quot;broker&quot;&gt;
+</plain-text-body></structured-macro><h3>KahaDB Properties</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Property</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>archiveCorruptedIndex</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, corrupted indexes found at startup will be archived (not deleted).</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>archiveDataLogs</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, will move a message data log to the archive directory instead of deleting it.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>checkForCorruptJournalFiles</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>t
 rue</code></strong>, will check for corrupt journal files on startup and try and recover them.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>checkpointInterval</code></p></td><td colspan="1" rowspan="1"><p><code>5000</code></p></td><td colspan="1" rowspan="1"><p>Time (ms) before check-pointing the journal.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>checksumJournalFiles</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Create a checksum for a journal file. The presence of a checksum is required in order for the persistence adapter to be able to detect corrupt journal files.</p><p>Before <strong>ActiveMQ 5.9.0</strong>: the default is <strong><code>false</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>cleanupInterval</code></p></td><td colspan="1" rowspan="1"><p><code>30000</code></p></td><td colspan="1" rowspan="1"><p>The interval (in ms) between consecutive checks that determine which jour
 nal files, if any, are eligible for removal from the message store. An eligible journal file is one that has no outstanding references.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>compactAcksAfterNoGC</code></p></td><td colspan="1" rowspan="1"><p><code>10</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.14.0</strong>: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.&#160; The lower the value set the faster the compaction may occur which can impact performance if it runs to often.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>compactAcksIgnoresStoreGrowth</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.14.0</strong>:&#160;when the a
 cknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).&#160; If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>concurrentStoreAndDispatchQueues</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>concurrentStoreAndDispatchTopics</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage</p><
 structured-macro ac:macro-id="4e4928d2-fe18-4cc6-ad80-1f090b4d82a8" ac:name="warning" ac:schema-version="1"><rich-text-body><p>Enabling this property is not recommended.</p></rich-text-body></structured-macro></td></tr><tr><td colspan="1" rowspan="1"><p><code>directory</code></p></td><td colspan="1" rowspan="1"><p><code>activemq-data</code></p></td><td colspan="1" rowspan="1"><p>The path to the directory to use to store the message store data and log files.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>directoryArchive</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>Define the directory to move data logs to when they all the messages they contain have been consumed.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>enableAckCompaction</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting controls whether the store wil
 l perform periodic compaction of older journal log files that contain only Message acknowledgements. By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>enableIndexWriteAsync</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, the index is updated asynchronously.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>enableJournalDiskSyncs</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><span>Ensure every journal write is followed by a disk sync (JMS durability requirement).</span></p><structured-macro ac:macro-id="a7c9e966-543c-477f-9948-c3fa4ac1c224" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This property is deprecated 
 as of <strong>ActiveMQ</strong> <strong>5.14.0</strong>.</p><p>From <strong>ActiveMQ</strong> <strong>5.14.0</strong>: see <span style="color: rgb(34,34,34);"><strong><code>journalDiskSyncStrategy</code></strong>.</span></p></rich-text-body></structured-macro></td></tr><tr><td colspan="1" rowspan="1"><p><code>ignoreMissingJournalfiles</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, reports of missing journal files are ignored.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>indexCacheSize</code></p></td><td colspan="1" rowspan="1"><p><code>10000</code></p></td><td colspan="1" rowspan="1"><p>Number of index pages cached in memory.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>indexDirectory</code></p></td><td colspan="1" rowspan="1">&#160;</td><td colspan="1" rowspan="1"><p><span>From <strong>ActiveMQ 5.10.0</strong>: If set, configures where the KahaDB index files (<strong><c
 ode>db.data</code></strong> and&#160;<strong><code>db.redo</code></strong>) will be stored. If not set, the index files are stored in the directory specified by the&#160;<strong><code>directory</code></strong> attribute.</span></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>indexWriteBatchSize</code></p></td><td colspan="1" rowspan="1"><p><code>1000</code></p></td><td colspan="1" rowspan="1"><p>Number of indexes written in a batch.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code><span>journalDiskSyncInterval</span></code></p></td><td colspan="1" rowspan="1"><p><code>1000</code></p></td><td colspan="1" rowspan="1"><p>Interval (ms) for when to perform a disk sync when&#160;<strong><code>journalDiskSyncStrategy=periodic</code></strong>. A sync will only be performed if a write has occurred to the journal since the last disk sync or when the journal rolls over to a new journal file.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code><span>journalDiskSyncStrategy</span></
 code></p></td><td colspan="1" rowspan="1"><p><code>always</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting configures the disk sync policy. The list of available sync strategies are (in order of decreasing safety, and increasing performance):</p><ul><li><p><strong><code>always</code></strong> <span>Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write. This is equivalent to the deprecated property&#160;<strong><code>enableJournalDiskSyncs=true</code></strong>.</span></p></li><li><p><strong><code>periodic</code></strong> <span style="color: rgb(34,34,34);">The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput</span>. The disk will also be synced when rolling over to a new journal file. Th
 e default interval is 1 second. The default interval offers very good performance, whilst being safer than&#160;<strong><code>never</code></strong> disk syncing, as data loss is limited to a maximum of 1 second's worth. See <strong><code>journalDiskSyncInterval</code></strong> to change the frequency of disk syncs.</p></li><li><p><strong><code>never</code></strong> A sync will never be explicitly called and it will be up to the operating system to flush to disk. This is equivalent to setting the deprecated property <strong><code>enableJournalDiskSyncs=false</code></strong>. This is the fastest option but is the least safe as there's no guarantee as to when data is flushed to disk. Consequently message loss <em>can</em> occur on broker failure.</p></li></ul></td></tr><tr><td colspan="1" rowspan="1"><p><code>journalMaxFileLength</code></p></td><td colspan="1" rowspan="1"><p><code>32mb</code></p></td><td colspan="1" rowspan="1"><p>A hint to set the maximum size of the message data logs
 .</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxAsyncJobs</code></p></td><td colspan="1" rowspan="1"><p><code>10000</code></p></td><td colspan="1" rowspan="1"><p>The maximum number of asynchronous messages that will be queued awaiting storage (should be the same as the number of concurrent MessageProducers).</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>preallocationScope</code></p></td><td colspan="1" rowspan="1"><p><code>entire_journal</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.14.0</strong>: this setting configures how journal data files are preallocated. The default strategy preallocates the journal file on first use using the appender thread.&#160;</p><ul><li><p><strong><code>entire_journal_async</code></strong> will use preallocate ahead of time in a separate thread.</p></li><li><p><strong><code>none</code></strong> disables preallocation.</p></li></ul><p>On SSD, using&#160;<strong><code>entire_journal_async</code></strong> avoids 
 delaying writes pending preallocation on first use.</p><p><strong>Note</strong>: on HDD the additional thread contention for disk has a negative impact. Therefore use the default.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>preallocationStrategy</code></p></td><td colspan="1" rowspan="1"><p><code>sparse_file</code></p></td><td colspan="1" rowspan="1"><p>From <strong>ActiveMQ 5.12.0</strong>:&#160;This setting configures how the broker will try to preallocate the journal files when a new journal file is needed.</p><ul><li><p><strong><code>sparse_file</code></strong> - sets the file length, but does not populate it with any data.</p></li><li><p><strong><code>os_kernel_copy</code></strong> - delegates the preallocation to the Operating System.</p></li><li><p><strong><code>zeros</code></strong>&#160; - each preallocated journal file contains nothing but <strong><code>0x00</code></strong> throughout.</p></li></ul></td></tr><tr><td colspan="1" rowspan="1"><p><code>storeOpenWireV
 ersion</code></p></td><td colspan="1" rowspan="1"><p><code>11</code></p></td><td colspan="1" rowspan="1"><p>Determines the version of OpenWire commands that are marshaled to the KahaDB journal.&#160;</p><p>Before <strong>ActiveMQ 5.12.0</strong>: the default value is <strong><code>6</code></strong>.</p><p>Some features of the broker depend on information stored in the OpenWire commands from newer protocol revisions and these may not work correctly if the store version is set to a lower value.&#160; KahaDB stores from broker versions greater than 5.9.0 will in many cases still be readable by the broker but will cause the broker to continue using the older store version meaning newer features may not work as intended.&#160;</p><p>For KahaDB stores that were created in versions prior to <strong>ActiveMQ 5.9.0</strong> it will be necessary to manually set <strong><code>storeOpenWireVersion="6"</code></strong> in order to start a broker without error.</p></td></tr></tbody></table><struct
 ured-macro ac:macro-id="476ef0cf-45ca-4c53-a5ab-0647f124b076" ac:name="info" ac:schema-version="1"><rich-text-body><p>For tuning locking properties see the options listed at <link><page ri:content-title="Pluggable storage lockers"></page><plain-text-link-body>Pluggable storage lockers.</plain-text-link-body></link></p></rich-text-body></structured-macro><p>&#160;</p><h3>Slow File System Access Diagnostic Logging</h3><p>You can configure a non zero threshold in milliseconds for database updates. If database operation is slower than that threshold (for example if you set it to <strong><code>500</code></strong>), you may see messages like:</p><structured-macro ac:macro-id="a5de5cad-c071-444d-8715-af3cc04de0da" ac:name="panel" ac:schema-version="1"><rich-text-body><p><code>Slow KahaDB access: cleanup took 1277 | org.apache.activemq.store.kahadb.MessageDatabase | ActiveMQ Journal Checkpoint Worker</code></p></rich-text-body></structured-macro><p>You can configure a threshold used to log 
 these messages by using a system property and adjust it to your disk speed so that you can easily pick up runtime anomalies.</p><structured-macro ac:macro-id="ab3467ef-2fbe-425b-a490-3f4b35e3efe9" ac:name="panel" ac:schema-version="1"><rich-text-body><p><code>-Dorg.apache.activemq.store.kahadb.LOG_SLOW_ACCESS_TIME=1500</code></p></rich-text-body></structured-macro><h1>Multi(m) kahaDB Persistence Adapter</h1><p>From <strong>ActiveMQ 5.6</strong>: it's possible to distribute destinations stores across multiple kahdb persistence adapters. When would you do this? If you have one fast producer/consumer destination and another periodic producer destination that has irregular batch consumption then disk usage can grow out of hand as unconsumed messages become distributed across multiple journal files. Having a separate journal for each ensures minimal journal usage. Also, some destination may be critical and require disk synchronization while others may not. In these cases you can use the&
 #160;<strong><code>mKahaDB</code></strong> persistence adapter and filter destinations using wildcards, just like with destination policy entries.</p><h3>Transactions</h3><p>Transactions can span multiple journals if the destinations are distributed. This means that two phase completion is necessary, which does impose a performance (additional disk sync) penalty to record the commit outcome. This penalty is only imposed if more than one journal is involved in a transaction.</p><h3>Configuration</h3><p>Each instance of&#160;<strong><code>kahaDB</code></strong> can be configured independently. If no destination is supplied to a <strong><code>filteredKahaDB</code></strong>, the implicit default value will match any destination, queue or topic. This is a handy catch all. If no matching persistence adapter can be found, destination creation will fail with an exception. The <strong><code>filteredKahaDB</code></strong> shares its wildcard matching rules with <link><page ri:content-title="P
 er Destination Policies"></page></link>.</p><p>From ActiveMQ 5.15, <strong><code>filteredKahaDB</code></strong>&#160;support a StoreUsage&#160;attribute named <strong><code>usage</code></strong>. This allows individual disk limits to be imposed on matching queues.</p><structured-macro ac:macro-id="c93a5072-2518-4272-aabd-abc2404ef483" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;broker brokerName="broker"&gt;
 
- &lt;persistenceAdapter&gt;
-  &lt;mKahaDB directory=&quot;${activemq.base}/data/kahadb&quot;&gt;
+&#160;&lt;persistenceAdapter&gt;
+  &lt;mKahaDB directory="${activemq.base}/data/kahadb"&gt;
     &lt;filteredPersistenceAdapters&gt;
       &lt;!-- match all queues --&gt;
-      &lt;filteredKahaDB queue=&quot;&gt;&quot;&gt;
+      &lt;filteredKahaDB queue="&gt;"&gt;
         &lt;usage&gt;
-         &lt;storeUsage limit=&quot;1g&quot; /&gt;
+         &lt;storeUsage limit="1g" /&gt;
         &lt;/usage&gt;
         &lt;persistenceAdapter&gt;
-          &lt;kahaDB journalMaxFileLength=&quot;32mb&quot;/&gt;
+          &lt;kahaDB journalMaxFileLength="32mb"/&gt;
         &lt;/persistenceAdapter&gt;
       &lt;/filteredKahaDB&gt;
       
       &lt;!-- match all destinations --&gt;
       &lt;filteredKahaDB&gt;
         &lt;persistenceAdapter&gt;
-          &lt;kahaDB enableJournalDiskSyncs=&quot;false&quot;/&gt;
+          &lt;kahaDB enableJournalDiskSyncs="false"/&gt;
         &lt;/persistenceAdapter&gt;
       &lt;/filteredKahaDB&gt;
     &lt;/filteredPersistenceAdapters&gt;
@@ -36,17 +29,15 @@
  &lt;/persistenceAdapter&gt;
 
 &lt;/broker&gt;
-]]></script>
-</div></div><h3 id="KahaDB-AutomaticPerDestinationPersistenceAdapter">Automatic Per Destination Persistence Adapter</h3><p>Set <strong><code>perDestination="true"</code></strong> on the catch all, i.e., when no explicit destination is set, <strong><code>filteredKahaDB</code></strong> entry. Each matching destination will be assigned its own <strong><code>kahaDB</code></strong> instance.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker brokerName=&quot;broker&quot;&gt;
+</plain-text-body></structured-macro><h3>Automatic Per Destination Persistence Adapter</h3><p>Set <strong><code>perDestination="true"</code></strong> on the catch all, i.e., when no explicit destination is set, <strong><code>filteredKahaDB</code></strong> entry. Each matching destination will be assigned its own <strong><code>kahaDB</code></strong> instance.</p><structured-macro ac:macro-id="5ac58703-9a86-478c-97e4-e9ac828cc113" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;broker brokerName="broker"&gt;
 
- &lt;persistenceAdapter&gt;
-  &lt;mKahaDB directory=&quot;${activemq.base}/data/kahadb&quot;&gt;
+&#160;&lt;persistenceAdapter&gt;
+  &lt;mKahaDB directory="${activemq.base}/data/kahadb"&gt;
     &lt;filteredPersistenceAdapters&gt;
       &lt;!-- kahaDB per destinations --&gt;
-      &lt;filteredKahaDB perDestination=&quot;true&quot;&gt;
+      &lt;filteredKahaDB perDestination="true"&gt;
         &lt;persistenceAdapter&gt;
-          &lt;kahaDB journalMaxFileLength=&quot;32mb&quot;/&gt;
+          &lt;kahaDB journalMaxFileLength="32mb"/&gt;
         &lt;/persistenceAdapter&gt;
       &lt;/filteredKahaDB&gt;
     &lt;/filteredPersistenceAdapters&gt;
@@ -54,6 +45,5 @@
  &lt;/persistenceAdapter&gt;
 
 &lt;/broker&gt;
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Specifying both <strong><code>perDestination="true"</code></strong> <em>and</em>&#160;<strong><code>queue="&gt;"</code></strong> on the same&#160;<strong><code>filteredKahaDB</code></strong> entry has not been tested. It <em> may</em> result in the following exception being raised:</p><p><code>Reason: java.io.IOException: File '/opt/java/apache-activemq-5.9.0/data/mKahaDB/lock' could not be locked as lock is already held for this jvm</code></p></div></div></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="efcc5f10-3f89-42e4-8573-cda652359bac" ac:name="info" ac:schema-version="1"><rich-text-body><p>Specifying both <strong><code>perDestination="true"</code></strong> <em>and</em>&#160;<strong><code>queue="&gt;"</code></strong> on the same&#160;<strong><code>filteredKahaDB</code></strong> entry has not been tested. It <em> may</em> result in the following exception being raised:</p><p><code>Reason: java.io.IOException: File '/opt/java/apache-activemq-5.9.0/data/mKahaDB/lock' could not be locked as lock is already held for this jvm</code></p></rich-text-body></structured-macro></div>
 


[49/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/02/18/apache-activemq-5111-released.xml
----------------------------------------------------------------------
diff --git a/2015/02/18/apache-activemq-5111-released.xml b/2015/02/18/apache-activemq-5111-released.xml
index 4d8baa5..8e67ea9 100644
--- a/2015/02/18/apache-activemq-5111-released.xml
+++ b/2015/02/18/apache-activemq-5111-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.11.1.</p><p>This release addresses issues in the 5.11.0 release, including AMQ-5564 which addresses a potential memory leak..</p><p>Thank you to Timothy Bish and Claus Ibsen for promptly addressing AMQ-5564. &#160;And thank you to Hadrian Zbarcea for merging commits in preparation for the release.</p><p>&#160;</p><p>Please see the&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5111-release.html">release page</a>&#160;for download links and more information!</p></div>
+<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.11.1.</p><p>This release addresses issues in the 5.11.0 release, including AMQ-5564 which addresses a potential memory leak..</p><p>Thank you to Timothy Bish and Claus Ibsen for promptly addressing AMQ-5564. &#160;And thank you to Hadrian Zbarcea for merging commits in preparation for the release.</p><p>&#160;</p><p>Please see the&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5111-release.html">release page</a>&#160;for download links and more information!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/08/13/apache-activemq-5112-released.xml
----------------------------------------------------------------------
diff --git a/2015/08/13/apache-activemq-5112-released.xml b/2015/08/13/apache-activemq-5112-released.xml
index 67bdf1e..dd62272 100644
--- a/2015/08/13/apache-activemq-5112-released.xml
+++ b/2015/08/13/apache-activemq-5112-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5112-release.html">ActiveMQ 5.11.2</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of <a shape="rect" href="http://activemq.apache.org/activemq-5112-release.html">ActiveMQ 5.11.2</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/08/14/apache-activemq-5120-released.xml
----------------------------------------------------------------------
diff --git a/2015/08/14/apache-activemq-5120-released.xml b/2015/08/14/apache-activemq-5120-released.xml
index 48ddacd..0a9db2f 100644
--- a/2015/08/14/apache-activemq-5120-released.xml
+++ b/2015/08/14/apache-activemq-5120-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is happy to announce the release of <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5120-release.html">ActiveMQ 5.12.0</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is happy to announce the release of <a shape="rect" href="http://activemq.apache.org/activemq-5120-release.html">ActiveMQ 5.12.0</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/10/16/apache-activemq-5121-released.xml
----------------------------------------------------------------------
diff --git a/2015/10/16/apache-activemq-5121-released.xml b/2015/10/16/apache-activemq-5121-released.xml
index 42e7dbd..8d18e88 100644
--- a/2015/10/16/apache-activemq-5121-released.xml
+++ b/2015/10/16/apache-activemq-5121-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5121-release.html">ActiveMQ 5.12.1</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5121-release.html">ActiveMQ 5.12.1</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/11/03/activemq-5113-released.xml
----------------------------------------------------------------------
diff --git a/2015/11/03/activemq-5113-released.xml b/2015/11/03/activemq-5113-released.xml
index 11c5f3b..954a6b8 100644
--- a/2015/11/03/activemq-5113-released.xml
+++ b/2015/11/03/activemq-5113-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5113-release.html">ActiveMQ 5.11.3</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5113-release.html">ActiveMQ 5.11.3</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/12/03/apache-activemq-5130-released.xml
----------------------------------------------------------------------
diff --git a/2015/12/03/apache-activemq-5130-released.xml b/2015/12/03/apache-activemq-5130-released.xml
index ad613b7..715995b 100644
--- a/2015/12/03/apache-activemq-5130-released.xml
+++ b/2015/12/03/apache-activemq-5130-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5130-release.html">ActiveMQ 5.13.0</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5130-release.html">ActiveMQ 5.13.0</a></span></p><p><span style="color: rgb(34,34,34);">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/01/13/apache-activemq-5122-released.xml
----------------------------------------------------------------------
diff --git a/2016/01/13/apache-activemq-5122-released.xml b/2016/01/13/apache-activemq-5122-released.xml
index cb97787..8ec7539 100644
--- a/2016/01/13/apache-activemq-5122-released.xml
+++ b/2016/01/13/apache-activemq-5122-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5122-release.html">ActiveMQ 5.12.2</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5122-release.html">ActiveMQ 5.12.2</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/02/08/apache-activemq-5131-released.xml
----------------------------------------------------------------------
diff --git a/2016/02/08/apache-activemq-5131-released.xml b/2016/02/08/apache-activemq-5131-released.xml
index 7df861b..fe63e02 100644
--- a/2016/02/08/apache-activemq-5131-released.xml
+++ b/2016/02/08/apache-activemq-5131-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5131-release.html">ActiveMQ 5.13.1</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5131-release.html">ActiveMQ 5.13.1</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/03/07/apache-activemq-5132-released.xml
----------------------------------------------------------------------
diff --git a/2016/03/07/apache-activemq-5132-released.xml b/2016/03/07/apache-activemq-5132-released.xml
index 9344380..e97ddeb 100644
--- a/2016/03/07/apache-activemq-5132-released.xml
+++ b/2016/03/07/apache-activemq-5132-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5132-release.html">ActiveMQ 5.13.2</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5132-release.html">ActiveMQ 5.13.2</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/05/03/apache-activemq-5133-released.xml
----------------------------------------------------------------------
diff --git a/2016/05/03/apache-activemq-5133-released.xml b/2016/05/03/apache-activemq-5133-released.xml
index c1dae95..efdc32f 100644
--- a/2016/05/03/apache-activemq-5133-released.xml
+++ b/2016/05/03/apache-activemq-5133-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5133-release.html">ActiveMQ 5.13.3</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5133-release.html">ActiveMQ 5.13.3</a></span></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/07/21/apache-activemq-5134-released.xml
----------------------------------------------------------------------
diff --git a/2016/07/21/apache-activemq-5134-released.xml b/2016/07/21/apache-activemq-5134-released.xml
index ff3633c..eff0a17 100644
--- a/2016/07/21/apache-activemq-5134-released.xml
+++ b/2016/07/21/apache-activemq-5134-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5134-release.html">ActiveMQ 5.13.4</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5134-release.html">ActiveMQ 5.13.4</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/08/08/apache-activemq-5140-released.xml
----------------------------------------------------------------------
diff --git a/2016/08/08/apache-activemq-5140-released.xml b/2016/08/08/apache-activemq-5140-released.xml
index 3e3068a..4401cc1 100644
--- a/2016/08/08/apache-activemq-5140-released.xml
+++ b/2016/08/08/apache-activemq-5140-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5140-release.html">ActiveMQ 5.14.0</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5140-release.html">ActiveMQ 5.14.0</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/10/03/apache-activemq-5141-released.xml
----------------------------------------------------------------------
diff --git a/2016/10/03/apache-activemq-5141-released.xml b/2016/10/03/apache-activemq-5141-released.xml
index 13bd7e3..156499b 100644
--- a/2016/10/03/apache-activemq-5141-released.xml
+++ b/2016/10/03/apache-activemq-5141-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5141-release.html">ActiveMQ 5.14.1</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5141-release.html">ActiveMQ 5.14.1</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2016/12/09/apache-activemq-5142-released.xml
----------------------------------------------------------------------
diff --git a/2016/12/09/apache-activemq-5142-released.xml b/2016/12/09/apache-activemq-5142-released.xml
index 31a5912..846fa43 100644
--- a/2016/12/09/apache-activemq-5142-released.xml
+++ b/2016/12/09/apache-activemq-5142-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5142-release.html">ActiveMQ 5.14.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5142-release.html">ActiveMQ 5.14.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2017/03/03/apache-activemq-5144-released.xml
----------------------------------------------------------------------
diff --git a/2017/03/03/apache-activemq-5144-released.xml b/2017/03/03/apache-activemq-5144-released.xml
index 026f9bf..329bde8 100644
--- a/2017/03/03/apache-activemq-5144-released.xml
+++ b/2017/03/03/apache-activemq-5144-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5144-release.html">ActiveMQ 5.14.4</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5144-release.html">ActiveMQ 5.14.4</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2017/04/17/apache-activemq-5145-released.xml
----------------------------------------------------------------------
diff --git a/2017/04/17/apache-activemq-5145-released.xml b/2017/04/17/apache-activemq-5145-released.xml
index dcd24bf..eab06f0 100644
--- a/2017/04/17/apache-activemq-5145-released.xml
+++ b/2017/04/17/apache-activemq-5145-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the release of <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5145-release.html">ActiveMQ 5.14.5</a><br clear="none">A big thanks to everyone who contributed to this release.<br clear="none">We look forward to your feedback.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the release of <a shape="rect" href="http://activemq.apache.org/activemq-5145-release.html">ActiveMQ 5.14.5</a><br clear="none">A big thanks to everyone who contributed to this release.<br clear="none">We look forward to your feedback.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2017/07/06/apache-activemq-5150-released.xml
----------------------------------------------------------------------
diff --git a/2017/07/06/apache-activemq-5150-released.xml b/2017/07/06/apache-activemq-5150-released.xml
index 3a05092..ceb32c2 100644
--- a/2017/07/06/apache-activemq-5150-released.xml
+++ b/2017/07/06/apache-activemq-5150-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5150-release.html">ActiveMQ 5.15.0</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5150-release.html">ActiveMQ 5.15.0</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2017/10/23/apache-activemq-5152-released.xml
----------------------------------------------------------------------
diff --git a/2017/10/23/apache-activemq-5152-released.xml b/2017/10/23/apache-activemq-5152-released.xml
index 6de7b8f..22a734d 100644
--- a/2017/10/23/apache-activemq-5152-released.xml
+++ b/2017/10/23/apache-activemq-5152-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5152-release.html">ActiveMQ 5.15.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" href="http://activemq.apache.org/activemq-5152-release.html">ActiveMQ 5.15.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/40-rc-1-guide.xml
----------------------------------------------------------------------
diff --git a/40-rc-1-guide.xml b/40-rc-1-guide.xml
index 90e2602..482abca 100644
--- a/40-rc-1-guide.xml
+++ b/40-rc-1-guide.xml
@@ -1,40 +1,21 @@
 <div class="wiki-content maincontent">
-<h1 id="id-4.0RC1Guide-ActiveMQ4.0-RC-1ReleaseGuide">ActiveMQ 4.0-RC-1 Release Guide</h1>
+<h1>ActiveMQ 4.0-RC-1 Release Guide</h1>
 
+<structured-macro ac:macro-id="17ebdd42-c7a8-4eb7-a100-f0f437346bd8" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Release Info"></page></link></parameter></structured-macro>
 
-<h2 id="id-4.0RC1Guide-GeneralReleaseInformation">General Release Information</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://jira.activemq.org/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" rel="nofollow">Current RoadMap</a></li><li><a shape="rect" href="release-guide.xml">Release Guide</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/incubator/SigningReleases">Signing Releases</a></li><li><a shape="rect" class="external-link" href="http://apache.org/dev/mirrors.html">Apache Mirror Guidelines</a></li></ul>
-
-<h2 id="id-4.0RC1Guide-ReleaseManager">Release Manager</h2>
+<h2>Release Manager</h2>
 
 <p><strong>Hiram Chirino</strong></p>
 
-<h2 id="id-4.0RC1Guide-Specialissues">Special issues</h2>
+<h2>Special issues</h2>
 
 <p>We are still in the Incubator so need to ensure that all the proper disclaimers are in place and that the artifacts are all properly named <strong>incubator-activemq</strong>.</p>
 
-<h2 id="id-4.0RC1Guide-OpenIssuesHoldinguptheRelease">Open Issues Holding up the Release</h2>
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Macro params are invalid
-</div>
-
-
-<h2 id="id-4.0RC1Guide-IssuesResolvedforthisRelease">Issues Resolved for this Release</h2>
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Macro params are invalid
-</div>
-
-
-<h2 id="id-4.0RC1Guide-HowtoHelp">How to Help</h2>
+<h2>Open Issues Holding up the Release</h2>
+<structured-macro ac:macro-id="7f85f0ae-2822-4605-ab32-ebb3aa92f7d9" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11727&amp;status=1&amp;status=3&amp;status=4&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;sorter/field=priority&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro><structured-macro ac:macro-id="868dcc2d-8785-4981-a107-a08e9d4fe594" ac:name="jiraissues" ac:schema-version="1"></structured-macro>
 
-<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>
+<h2>Issues Resolved for this Release</h2>
+<structured-macro ac:macro-id="3e18b6b8-907d-438e-bdec-0a23f820a52a" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11727&amp;status=5&amp;status=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;sorter/field=priority&amp;sorter/order=DESC&amp;tempMax=1000&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro><structured-macro ac:macro-id="bba04820-7f10-4ff3-b1a2-53f3286f6910" ac:name="jiraissues" ac:schema-version="1"></structured-macro>
 
-<p>ActiveMQ is available in both source and binary distributions.  See <a shape="rect" href="getting-started.xml">Getting Started</a>.</p></div>
+<structured-macro ac:macro-id="bfcc4b7b-12e5-4794-ae41-818eb0fc337d" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="How you can help release"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/58-migration-guide.xml
----------------------------------------------------------------------
diff --git a/58-migration-guide.xml b/58-migration-guide.xml
index b6209c1..025b75d 100644
--- a/58-migration-guide.xml
+++ b/58-migration-guide.xml
@@ -4,8 +4,9 @@
 <code>activemq-core</code> has been replaced with <code>activemq-client</code> and <code>activemq-broker</code>. The various message stores have their own activemq-xx-store module. The uber module <code>activemq-all</code> remains.</li><li>Changed JMX Mbean ObjectNames will effect scripts or tools that directly reference Mbean names<br clear="none">
 All mbeans now share the type=Broker attribute, which gives them containment. In this way, consumers hang off of destinations, which hang off the broker.<br clear="none">
 The different Mbean types are identified by the presence of specific identifiers in their ObjectNames. The mapping from old to new ObjectName is as follows:
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Old Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> New Name </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Destination </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Queue|Topic,Destination=&lt;destination identifier&gt; </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,destinationType=Queue|Topic,destinationName=&lt;destination identifier&gt; </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Connector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Con
 nector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=clientConnectors </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> NetworkConnector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=NetworkConnector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=networkConnectors </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Connection </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Connection </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=*,connectionViewType=remoteAddress|clientId </p></td></tr></tbody></table></div>
-</li><li>OSGi integration has changed. The full details are at <a shape="rect" href="osgi-integration.xml">OSGi Integration</a>. In summary:
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Type </p></th><th colspan="1" rowspan="1"><p> Old Name </p></th><th colspan="1" rowspan="1"><p> New Name </p></th></tr><tr><td colspan="1" rowspan="1"><p> Broker </p></td><td colspan="1" rowspan="1"><p> Type=Broker </p></td><td colspan="1" rowspan="1"><p> type=Broker </p></td></tr><tr><td colspan="1" rowspan="1"><p> Destination </p></td><td colspan="1" rowspan="1"><p> Type=Queue|Topic,Destination=&lt;destination identifier&gt; </p></td><td colspan="1" rowspan="1"><p> type=Broker,destinationType=Queue|Topic,destinationName=&lt;destination identifier&gt; </p></td></tr><tr><td colspan="1" rowspan="1"><p> Connector </p></td><td colspan="1" rowspan="1"><p> Type=Connector </p></td><td colspan="1" rowspan="1"><p> type=Broker,connector=clientConnectors </p></td></tr><tr><td colspan="1" rowspan="1"><p> NetworkConnector </p></td><td colspan="1" rowspan="1"><p> Type=NetworkConnector </p></td><td colspan="1" rowspan="1"><p> type=Broker,connector
 =networkConnectors </p></td></tr><tr><td colspan="1" rowspan="1"><p> Connection </p></td><td colspan="1" rowspan="1"><p> Type=Connection </p></td><td colspan="1" rowspan="1"><p> type=Broker,connector=*,connectionViewType=remoteAddress|clientId </p></td></tr></tbody></table>
+</li><li>OSGi integration has changed. The full details are at <link><page ri:content-title="OSGi Integration"></page></link>. In summary:
 	<ol><li>There is a single uber OSGI bundle</li><li>The broker and webconsole are now configured via config admin pid files through an OSGi managed service factory.</li></ol>
-	</li><li>The ActiveMQ binary file <code>bin/run.jar</code> has been renamed to <code>bin/activemq.jar</code>.</li></ol></div>
+	</li><li>The ActiveMQ binary file <code>bin/run.jar</code> has been renamed to <code>bin/activemq.jar</code>.</li></ol>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/59-migration-guide.xml
----------------------------------------------------------------------
diff --git a/59-migration-guide.xml b/59-migration-guide.xml
index 6590290..aad8caf 100644
--- a/59-migration-guide.xml
+++ b/59-migration-guide.xml
@@ -1,5 +1,6 @@
 <div class="wiki-content maincontent"><p>There are some changes in 5.9 that may require user intervention</p>
 
 <ol><li>Schema change to JDBC Persistence Adapter. XID column type change.</li></ol>
-<ul><li>If you use XA transactions you need to ensure there are no XA transactions pending completion before you upgrade. Some mode detail in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4628">AMQ-4628</a></li></ul></div>
+<ul><li>If you use XA transactions you need to ensure there are no XA transactions pending completion before you upgrade. Some mode detail in <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-4628">AMQ-4628</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activation-spec-properties.xml
----------------------------------------------------------------------
diff --git a/activation-spec-properties.xml b/activation-spec-properties.xml
index a06d622..3f9100f 100644
--- a/activation-spec-properties.xml
+++ b/activation-spec-properties.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><p>An Activation Spec is used to configure the message delivery to an MDB. The ejb-jar.xml deployment descriptor needs to include a &lt;activation-config&gt; element inside the &lt;message-driven&gt; element like:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;activation-config&gt;
+<div class="wiki-content maincontent"><p>An Activation Spec is used to configure the message delivery to an MDB. The ejb-jar.xml deployment descriptor needs to include a &lt;activation-config&gt; element inside the &lt;message-driven&gt; element like:</p><structured-macro ac:macro-id="67b5dd3d-e074-4650-88dd-258d28a396a4" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;activation-config&gt;
     &lt;activation-config-property&gt;
        &lt;activation-config-property-name&gt;destination&lt;/activation-config-property-name&gt;
        &lt;activation-config-property-value&gt;queue.testQueue&lt;/activation-config-property-value&gt;
@@ -9,6 +8,5 @@
        &lt;activation-config-property-value&gt;javax.jms.Queue&lt;/activation-config-property-value&gt;
     &lt;/activation-config-property&gt;
 &lt;/activation-config&gt;
-]]></script>
-</div></div><p>Here, the value for destination is the physical name of the desired destination. The value for destinationType is the class name that defines the type of destination. It should be javax.jms.Queue or javax.jms.Topic.<br clear="none"> &#160;</p><p>The Activation Spec properties that can be configured are:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Required</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>acknowledgeMode</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Auto-acknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The JMS Acknowledgement mode to use. Valid
  values are: Auto-acknowledge or Dups-ok-acknowledge</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>clientId</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The JMS Client ID to use (only really required for durable topics)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>destinationType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The type of destination; a queue or topic</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>destination</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>yes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The de
 stination name (queue or topic name)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>enableBatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Used to enable transaction batching for increased performance</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxMessagesPerBatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of messages per transaction batch</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxMessagesPerSessions</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This is actually the prefetch 
 size for the subscription. (Yes, badly named).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxSessions</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum number of concurrent sessions to use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>messageSelector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The JMS <a shape="rect" href="selectors.xml">Message Selector</a> to use on the subscription to perform content based routing filtering the messages</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>noLocal</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></t
 d><td colspan="1" rowspan="1" class="confluenceTd"><p>Only required for topic subscriptions; indicates if locally published messages should be included in the subscription or not</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The password for the JMS connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>subscriptionDurability</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NonDurable</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Whether or not a durable (topic) subscription is required. Valid values are: Durable or NonDurable</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>subscriptionName</p></td><td colspan="1" ro
 wspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the durable subscriber. Only used for durable topics and combined with the clientID to uniquely identify the durable topic subscription</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>userName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set in resource adapter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The user for the JMS connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useRAManagedTransaction</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Typically, a resource adapter delivers messages to an endpoint which is managed by a con
 tainer. Normally, this container likes to be the one that wants to control the transaction that the inbound message is being delivered on. But sometimes, you want to deliver to a simpler container system that will not be controlling the inbound transaction. In these cases, if you set useRAManagedTransaction to true, the resource adapter will commit the transaction if no exception was generated from the MessageListener and rollback if an exception is thrown.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>initialRedeliveryDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The delay before redeliveries start. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maximumRedeliveries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p>5</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum number of redeliveries or -1 for no maximum. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>redeliveryBackOffMultiplier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The multiplier to use if exponential back off is enabled. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>redeliveryUseExponentialBackOff</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>no</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>To enable exponential backoff. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1" class="conflue
 nceTd">useJndi</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd">when true, use <span>destination as a jndi name</span></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Maximising Throughput of MDBs</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you want to maximise throughput of MDBs you should really set the <strong>maxSessions</strong> to something fairly large to increase the concurrency. Then set <strong>maxMessagesPerSessions</strong> to something big (say) 1000.</p><p>This assumes you have large numbers of messages available (say more than <strong>maxSessions</strong> * <strong>maxMessagesPerSession</strong>). Otherwise the <a shape="rect" href="what-is-the-prefetch-limit-for
 .xml">prefetch</a> will end up <a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.xml">starving other consumers</a>.</p><p>So if you don't have that many messages available, but maybe they take a while to process then you might want to set a lower value of <strong>maxMessagesPerSessions</strong></p></div></div></div>
+</plain-text-body></structured-macro><p>Here, the value for destination is the physical name of the desired destination. The value for destinationType is the class name that defines the type of destination. It should be javax.jms.Queue or javax.jms.Topic.<br clear="none"> &#160;</p><p>The Activation Spec properties that can be configured are:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Required</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>acknowledgeMode</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>Auto-acknowledge</p></td><td colspan="1" rowspan="1"><p>The JMS Acknowledgement mode to use. Valid values are: Auto-acknowledge or Dups-ok-acknowledge</p></td></tr><tr><td colspan="1" rowspan="1"><p>clientId</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>
 set in resource adapter</p></td><td colspan="1" rowspan="1"><p>The JMS Client ID to use (only really required for durable topics)</p></td></tr><tr><td colspan="1" rowspan="1"><p>destinationType</p></td><td colspan="1" rowspan="1"><p>yes</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>The type of destination; a queue or topic</p></td></tr><tr><td colspan="1" rowspan="1"><p>destination</p></td><td colspan="1" rowspan="1"><p>yes</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>The destination name (queue or topic name)</p></td></tr><tr><td colspan="1" rowspan="1"><p>enableBatch</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Used to enable transaction batching for increased performance</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxMessagesPerBatch</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>10</p></t
 d><td colspan="1" rowspan="1"><p>The number of messages per transaction batch</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxMessagesPerSessions</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>This is actually the prefetch size for the subscription. (Yes, badly named).</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxSessions</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>The maximum number of concurrent sessions to use</p></td></tr><tr><td colspan="1" rowspan="1"><p>messageSelector</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>The JMS <link><page ri:content-title="Selectors"></page><plain-text-link-body>Message Selector</plain-text-link-body></link> to use on the subscription to perform content based routing filtering the messages</p></td></tr><tr><t
 d colspan="1" rowspan="1"><p>noLocal</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Only required for topic subscriptions; indicates if locally published messages should be included in the subscription or not</p></td></tr><tr><td colspan="1" rowspan="1"><p>password</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td><td colspan="1" rowspan="1"><p>The password for the JMS connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>subscriptionDurability</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>NonDurable</p></td><td colspan="1" rowspan="1"><p>Whether or not a durable (topic) subscription is required. Valid values are: Durable or NonDurable</p></td></tr><tr><td colspan="1" rowspan="1"><p>subscriptionName</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan=
 "1" rowspan="1"><p>The name of the durable subscriber. Only used for durable topics and combined with the clientID to uniquely identify the durable topic subscription</p></td></tr><tr><td colspan="1" rowspan="1"><p>userName</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>set in resource adapter</p></td><td colspan="1" rowspan="1"><p>The user for the JMS connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>useRAManagedTransaction</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Typically, a resource adapter delivers messages to an endpoint which is managed by a container. Normally, this container likes to be the one that wants to control the transaction that the inbound message is being delivered on. But sometimes, you want to deliver to a simpler container system that will not be controlling the inbound transaction. In these cases, if you set useRAManagedTransaction to
  true, the resource adapter will commit the transaction if no exception was generated from the MessageListener and rollback if an exception is thrown.</p></td></tr><tr><td colspan="1" rowspan="1"><p>initialRedeliveryDelay</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>1000</p></td><td colspan="1" rowspan="1"><p>The delay before redeliveries start. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>maximumRedeliveries</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>5</p></td><td colspan="1" rowspan="1"><p>The maximum number of redeliveries or -1 for no maximum. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>redeliveryBackOffMultiplier</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>5</p></td><td colspan="1" rowspan="1"><p>The multiplier to use if exponential back off is enabled. Also configurable on the Res
 ourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1"><p>redeliveryUseExponentialBackOff</p></td><td colspan="1" rowspan="1"><p>no</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>To enable exponential backoff. Also configurable on the ResourceAdapter</p></td></tr><tr><td colspan="1" rowspan="1">useJndi</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">false</td><td colspan="1" rowspan="1">when true, use <span>destination as a jndi name</span></td></tr></tbody></table><structured-macro ac:macro-id="f8da2771-f135-46c6-93a9-bdea3c50c06e" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Maximising Throughput of MDBs</parameter><rich-text-body><p>If you want to maximise throughput of MDBs you should really set the <strong>maxSessions</strong> to something fairly large to increase the concurrency. Then set <strong>maxMessagesPerSessions</strong> to something big (say) 1000.</p><p>This assumes you have large numbers of
  messages available (say more than <strong>maxSessions</strong> * <strong>maxMessagesPerSession</strong>). Otherwise the <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch</plain-text-link-body></link> will end up <link><page ri:content-title="I do not receive messages in my second consumer"></page><plain-text-link-body>starving other consumers</plain-text-link-body></link>.</p><p>So if you don't have that many messages available, but maybe they take a while to process then you might want to set a lower value of <strong>maxMessagesPerSessions</strong></p></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-11-release.xml
----------------------------------------------------------------------
diff --git a/activemq-11-release.xml b/activemq-11-release.xml
index 064e993..bd7cd93 100644
--- a/activemq-11-release.xml
+++ b/activemq-11-release.xml
@@ -1,21 +1,18 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 <p>This release represents a major increase in functionality; the new features in this release are:-</p>
 
 <ul><li>distributed queues and topics and clusters of message brokers</li><li>auto-reconnection of clients across a cluster of brokers</li><li>support for high performance non-durable queues</li><li>wildcard support on queues (as well as topics)</li><li>transaction log and JDBC persistence in addition to JDBM and BDB</li><li>JNDI support for easy integration</li><li>HTTP tunnelling support</li><li>auto-broker discovery using Zeroconf (Apple Rendezvous) for a peer based network using high performance pointcast</li><li>composite destinations support (allowing a publish or subscribe operation on several queues and/or topics in one atomic operation, such as writing to N queues in one operation)</li><li>simpler pure-Java configuration API</li><li>heaps of bug fixes and new test cases</li></ul>
 
 
 
-<h2 id="ActiveMQ1.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-1.1.zip" rel="nofollow">activemq-1.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-1.1-src.zip" rel="nofollow">activemq-1.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 1.1.tar.gz" rel="nofollow">activemq-1.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-1.1-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-1.1-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-1.1.zip">activemq-1.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-1.1-src.zip">activemq-1.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-1.1.tar.gz">activemq-1.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-1.1-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.codehaus.org/activemq/distributions/activemq-1.1-src.tar.g
 z <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ1.1Release-Changelog">Changelog</h2>
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<h2>Changelog</h2>
+<structured-macro ac:macro-id="0c7542d0-be14-4142-a2f0-c24003c84dc5" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=10632&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=10632" rel="nofollow">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=10632">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-12-release.xml
----------------------------------------------------------------------
diff --git a/activemq-12-release.xml b/activemq-12-release.xml
index e3efffe..ae2039e 100644
--- a/activemq-12-release.xml
+++ b/activemq-12-release.xml
@@ -1,23 +1,20 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ1.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 <p>This release represents a major increase in functionality; the new features in this release are:-</p>
 
 <ul><li>heaps of bug fixes and new test cases</li></ul>
 
 
 
-<h2 id="ActiveMQ1.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.2.zip" rel="nofollow">activemq-release-1.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.2-src.zip" rel="nofollow">activemq-release-1.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-1.2.tar.gz" rel="nofollow">activemq-release-1.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-1.2-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-1.2-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.2.zip">activemq-release-1.2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.2-src.zip">activemq-release-1.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.2.tar.gz">activemq-release-1.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-1.2-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-1.2-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ1.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11120&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11120&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="4025f22b-ca17-4d67-9e1d-b90c51496e0b" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11120&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-11-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 1.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-13-release.xml
----------------------------------------------------------------------
diff --git a/activemq-13-release.xml b/activemq-13-release.xml
index a4cd0ca..a1200c4 100644
--- a/activemq-13-release.xml
+++ b/activemq-13-release.xml
@@ -1,24 +1,21 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ1.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 <p>This release represents a major increase in functionality; the new features in this release are:-</p>
 
 <ul><li>heaps of bug fixes and new test cases</li></ul>
 
 
 
-<h2 id="ActiveMQ1.3Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.3.zip" rel="nofollow">activemq-release-1.3.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.3-src.zip" rel="nofollow">activemq-release-1.3-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-1.3.tar.gz" rel="nofollow">activemq-release-1.3.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-1.3-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-1.3-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.3.zip">activemq-release-1.3.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.3-src.zip">activemq-release-1.3-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.3.tar.gz">activemq-release-1.3.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-1.3-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-1.3-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ1.3Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11270&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11270&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="e9498894-8bf7-4e20-84c7-203a325fdd64" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11270&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-12-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 1.2 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-14-release.xml
----------------------------------------------------------------------
diff --git a/activemq-14-release.xml b/activemq-14-release.xml
index eee91da..8eeee45 100644
--- a/activemq-14-release.xml
+++ b/activemq-14-release.xml
@@ -1,23 +1,20 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ1.4Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 <p>This release represents a major increase in functionality; the new features in this release are:-</p>
 
 <ul><li>heaps of bug fixes and new test cases</li></ul>
 
 
-<h2 id="ActiveMQ1.4Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.4.zip" rel="nofollow">activemq-release-1.4.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.4-src.zip" rel="nofollow">activemq-release-1.4-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-1.4.tar.gz" rel="nofollow">activemq-release-1.4.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-1.4-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-1.4-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.4.zip">activemq-release-1.4.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.4-src.zip">activemq-release-1.4-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.4.tar.gz">activemq-release-1.4.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-1.4-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-1.4-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ1.4Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11390&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11390&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="616e19c1-e654-47b8-8bed-6eaf54cf6594" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11390&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-13-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 1.3 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-15-release.xml
----------------------------------------------------------------------
diff --git a/activemq-15-release.xml b/activemq-15-release.xml
index 01ee234..b9d91bf 100644
--- a/activemq-15-release.xml
+++ b/activemq-15-release.xml
@@ -1,23 +1,20 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ1.5Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 <p>This release is mostly a bug fix release:-</p>
 
 <ul><li>A few bug fixes for J2EE compliance</li></ul>
 
 
-<h2 id="ActiveMQ1.5Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.5.zip" rel="nofollow">activemq-release-1.5.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.5-src.zip" rel="nofollow">activemq-release-1.5-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-1.5.tar.gz" rel="nofollow">activemq-release-1.5.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-1.5-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-1.5-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.5.zip">activemq-release-1.5.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.5-src.zip">activemq-release-1.5-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-1.5.tar.gz">activemq-release-1.5.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-1.5-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-1.5-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ1.5Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11422&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11422&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="2a076594-8dfd-438b-b38f-875b1182835d" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11422&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-14-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 1.4 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-20-release.xml
----------------------------------------------------------------------
diff --git a/activemq-20-release.xml b/activemq-20-release.xml
index 3612740..818b4d7 100644
--- a/activemq-20-release.xml
+++ b/activemq-20-release.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ2.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This is a major release including lots of new functionality and performance improvements:</p>
 
@@ -10,19 +10,16 @@
 
 <p>This new 2.0 wire format is incompatible with previous releases, so when upgrading please be sure to upgrade across your system. The wire format should not change now for some time, certainly not until another major release.</p>
 
-<h2 id="ActiveMQ2.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.0.zip" rel="nofollow">activemq-release-2.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.0-src.zip" rel="nofollow">activemq-release-2.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-2.0.tar.gz" rel="nofollow">activemq-release-2.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-2.0-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-2.0-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.0.zip">activemq-release-2.0.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.0-src.zip">activemq-release-2.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.0.tar.gz">activemq-release-2.0.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-2.0-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-2.0-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ2.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11420&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11420&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="7b92f849-6cdf-48e6-8a98-9db3ed0834d4" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11420&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-15-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 1.5 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-21-release.xml
----------------------------------------------------------------------
diff --git a/activemq-21-release.xml b/activemq-21-release.xml
index 225e6af..f96d800 100644
--- a/activemq-21-release.xml
+++ b/activemq-21-release.xml
@@ -1,24 +1,21 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This release includes full support for the high performance journal. Our default persistence mechanism is now the journal for short term persistence and then JDBC (via Apache Derby by default) for long term storage. The journal is regularly checkpointed with the database for high performance and high resiliency.</p>
 
 <p>This new release includes a number of performance enhancements in both durable and non durable messaging as well as a number of bug fixes.</p>
 
 
-<h2 id="ActiveMQ2.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.1.zip" rel="nofollow">activemq-release-2.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.1-src.zip" rel="nofollow">activemq-release-2.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/
 activemq/distributions/activemq-release-2.1.tar.gz" rel="nofollow">activemq-release-2.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>[activemq-release-2.1-src.tar.gz</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>http://dist.codehaus.org/activemq/distributions/activemq-release-2.1-src.tar.gz <br clear="none">
-]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.1.zip">activemq-release-2.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.1-src.zip">activemq-release-2.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-release-2.1.tar.gz">activemq-release-2.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p>[activemq-release-2.1-src.tar.gz</p></td><td colspan="1" rowspan="1"><p>http://dist.co
 dehaus.org/activemq/distributions/activemq-release-2.1-src.tar.gz <br clear="none">
+]</p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ2.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11499&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11499&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="3a45cb04-e039-4820-8723-d514abd4526e" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11499&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-20-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 2.0 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 


[19/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

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

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

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

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

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

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

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

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

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


[06/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/java-service-wrapper.xml
----------------------------------------------------------------------
diff --git a/java-service-wrapper.xml b/java-service-wrapper.xml
index db2de76..8363825 100644
--- a/java-service-wrapper.xml
+++ b/java-service-wrapper.xml
@@ -1,11 +1,11 @@
 <div class="wiki-content maincontent"><p>This page provides some useful information on running the ActiveMQ broker as a windows-NT service or a daemon thread in Linux or Unix systems.</p>
 
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">64bit 4gb memory limit</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The ActiveMQ distribution uses an older and free community release of the service wrapper library. This wrapper has a memory limit of 4gb when running on 64bit platforms. You can manually <a shape="rect" class="external-link" href="http://wrapper.tanukisoftware.com/doc/english/download.jsp" rel="nofollow">download a newer release</a> of the wrapper library that does not have this limit, from the vendors website at. It us not possible for Apache ActiveMQ to update and distribute a newer release of the service wrapper, as the vendor changed licensing terms, which does not comply with ASF licensing terms. Therefore out of the box the service wrapper is stuck on that older release.</p>
+<structured-macro ac:macro-id="927644e6-adf6-4e1b-8465-66bcb3401600" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">64bit 4gb memory limit</parameter><rich-text-body>
+<p>The ActiveMQ distribution uses an older and free community release of the service wrapper library. This wrapper has a memory limit of 4gb when running on 64bit platforms. You can manually <a shape="rect" href="http://wrapper.tanukisoftware.com/doc/english/download.jsp">download a newer release</a> of the wrapper library that does not have this limit, from the vendors website at. It us not possible for Apache ActiveMQ to update and distribute a newer release of the service wrapper, as the vendor changed licensing terms, which does not comply with ASF licensing terms. Therefore out of the box the service wrapper is stuck on that older release.</p>
 
-<p>However you can manually upgrade the library.</p></div></div>
+<p>However you can manually upgrade the library.</p></rich-text-body></structured-macro>
 
-<h3 id="JavaServiceWrapper-Windows-NTService">Windows-NT Service</h3>
+<h3>Windows-NT Service</h3>
 
 <p>Here are the steps to install the ActiveMQ broker as an NT service:</p>
 <ol><li>Download the windows binary distribution (i.e. apache-activemq-5.9.0.zip)</li><li>Go to ACTIVEMQ_HOME/bin/win32</li><li>Run InstallService.bat</li></ol>
@@ -21,7 +21,7 @@
 <ol><li>Run UninstallService.bat</li></ol>
 
 
-<h3 id="JavaServiceWrapper-Linux/MacOSXDaemon">Linux/Mac OS X Daemon</h3>
+<h3>Linux/Mac OS X Daemon</h3>
 
 
 <p>Here are the steps to run the ActiveMQ broker as a daemon in Linux or Unix systems:</p>
@@ -33,12 +33,12 @@
 <ol><li>Go to ACTIVEMQ_HOME/linux for linux systems or ACTIVEMQ_HOME/macosx for Mac OS X systems.</li><li>Run ./activemq stop</li></ol>
 
 
-<h3 id="JavaServiceWrapper-ConfiguringtheJavaServiceWrapper">&#160;Configuring the Java Service Wrapper</h3>
+<h3>&#160;Configuring the Java Service Wrapper</h3>
 
 
-<p>ActiveMQ uses the&#160;<a shape="rect" class="external-link" href="http://wrapper.tanukisoftware.org/doc/english/introduction.html" rel="nofollow">Java Service Wrapper</a> to run the broker. To configure how the Java Service Wrapper starts up, you can edit the wrapper.conf located in the bin/win32, bin/linux, or bin/macosx depending on which system you are running it. For more information on the different properties of the Java Service Wrapper, refer to this <a shape="rect" class="external-link" href="http://wrapper.tanukisoftware.org/doc/english/properties.html" rel="nofollow">page</a></p>
+<p>ActiveMQ uses the&#160;<a shape="rect" href="http://wrapper.tanukisoftware.org/doc/english/introduction.html">Java Service Wrapper</a> to run the broker. To configure how the Java Service Wrapper starts up, you can edit the wrapper.conf located in the bin/win32, bin/linux, or bin/macosx depending on which system you are running it. For more information on the different properties of the Java Service Wrapper, refer to this <a shape="rect" href="http://wrapper.tanukisoftware.org/doc/english/properties.html">page</a></p>
 
-<h3 id="JavaServiceWrapper-Troubleshooting">&#160;Troubleshooting</h3>
+<h3>&#160;Troubleshooting</h3>
 
 <p>If you are having problems running the service, turn on the wrapper debugging in the corresponding wrapper.conf file via (wrapper.debug=TRUE)</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javadocs.xml
----------------------------------------------------------------------
diff --git a/javadocs.xml b/javadocs.xml
index 193c24f..69fcca3 100644
--- a/javadocs.xml
+++ b/javadocs.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="JavaDocs-JavaDocsforApacheActiveMQ">JavaDocs for Apache ActiveMQ</h2><p>Versioned JavaDocs for Apache ActiveMQ could be found at</p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/">http://activemq.apache.org/maven/</a>x.y.z/apidocs/index.html kind of url, where <em>x.y.z</em> is broker version you're looking for.</p><p>For example <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.12.1/apidocs/index.html">http://activemq.apache.org/maven/5.12.1/apidocs/index.html</a> contains JavaDocs for <strong>5.12.1</strong>.</p><h2 id="JavaDocs-OtherJavaDocs">Other JavaDocs</h2><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/package-summary.html" rel="nofollow">JMS API</a></li></ul><h2 id="JavaDocs-CMSandC++Documentation">CMS and C++ Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS
  and ActiveMQ-CPP</a></li></ul><h2 id="JavaDocs-NMSandC#Documentation">NMS and C# Documentation</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">NMS API</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>JavaDocs for Apache ActiveMQ</h2><p>Versioned JavaDocs for Apache ActiveMQ could be found at</p><p><a shape="rect" href="http://activemq.apache.org/maven/">http://activemq.apache.org/maven/</a>x.y.z/apidocs/index.html kind of url, where <em>x.y.z</em> is broker version you're looking for.</p><p>For example <a shape="rect" href="http://activemq.apache.org/maven/5.12.1/apidocs/index.html">http://activemq.apache.org/maven/5.12.1/apidocs/index.html</a> contains JavaDocs for <strong>5.12.1</strong>.</p><h2>Other JavaDocs</h2><ul><li><a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/package-summary.html">JMS API</a></li></ul><h2>CMS and C++ Documentation</h2><ul><li><a shape="rect" href="http://activemq.apache.org/cms/">CMS and ActiveMQ-CPP</a></li></ul><h2>NMS and C# Documentation</h2><ul><li><a shape="rect" href="http://activemq.apache.org/nms/">NMS API</a></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javaiointerruptedioexception.xml
----------------------------------------------------------------------
diff --git a/javaiointerruptedioexception.xml b/javaiointerruptedioexception.xml
index fcfaea3..88a4d3b 100644
--- a/javaiointerruptedioexception.xml
+++ b/javaiointerruptedioexception.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>&#160;</p><p>The activemq client will throw an&#160;<a shape="rect" class="external-link" href="http://java.io" rel="nofollow">java.io</a>.InterruptedIOException if &#160;the calling thread has been interrupted while the transport (ResponseCorrelator) is waiting for a response.</p><p>Thread interruption while waiting for a response is treated as an IOException and reported to the transport listener. For an ActiveMQConnection, this will force an async close of the transport, closing the underlying socket.</p><p>Because commands are not idempotent and with an interruption, it is not possible to know if the broker received the command, the only safe course of action is to close the connection.</p><p>If the thread has been interrupted before a request is attempted, the interrupted state is cleared and reset after the request has completed. This allows shutdown operations to complete in the interrupted state.</p></div>
+<div class="wiki-content maincontent"><p>&#160;</p><p>The activemq client will throw an&#160;<a shape="rect" href="http://java.io">java.io</a>.InterruptedIOException if &#160;the calling thread has been interrupted while the transport (ResponseCorrelator) is waiting for a response.</p><p>Thread interruption while waiting for a response is treated as an IOException and reported to the transport listener. For an ActiveMQConnection, this will force an async close of the transport, closing the underlying socket.</p><p>Because commands are not idempotent and with an interruption, it is not possible to know if the broker received the command, the only safe course of action is to close the connection.</p><p>If the thread has been interrupted before a request is attempted, the interrupted state is cleared and reset after the request has completed. This allows shutdown operations to complete in the interrupted state.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml
----------------------------------------------------------------------
diff --git a/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml b/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml
index 0ca7c18..6fd23f9 100644
--- a/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml
+++ b/javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml
@@ -1,13 +1,12 @@
 <div class="wiki-content maincontent"><p>If you get an error 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[
+<structured-macro ac:macro-id="9230e83c-a0c1-4e54-a69b-c47ed6c36b23" ac:name="code" ac:schema-version="1"><plain-text-body>
 Jun 19, 2006 10:35:27 PM org.apache.activemq.broker.BrokerService getBroker
 INFO: ActiveMQ 4.0 JMS Message Broker (localhost) is starting
 Jun 19, 2006 10:35:27 PM org.apache.activemq.broker.BrokerService getBroker
 INFO: For help or more information please see:
 http://incubator.apache.org/activemq/
-java.io.IOException: Failed to create database &#39;derbydb&#39;, see the next
+java.io.IOException: Failed to create database 'derbydb', see the next
 exception for details.
        at
 org.apache.activemq.util.IOExceptionSupport.create(IOExceptionSupport.java:42)
@@ -34,7 +33,7 @@ org.apache.activemq.broker.BrokerService.addConnector(BrokerService.java:133)
        at
 com.ic.ntn.message.HelloWorld$HelloWorldBroker.run(HelloWorld.java:92)
        at java.lang.Thread.run(Thread.java:595)
-Caused by: SQL Exception: Failed to create database &#39;derbydb&#39;, see the next
+Caused by: SQL Exception: Failed to create database 'derbydb', see the next
 exception for details.
        at org.apache.derby.impl.jdbc.Util.newEmbedSQLException(Unknown
 Source)
@@ -60,32 +59,28 @@ Source)
 org.apache.activemq.store.jdbc.TransactionContext.getConnection(TransactionContext.java:54)
        ... 11 more
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Then the error is probably that the JDBC driver (Apache Derby by default) could not write to the persistent file area.</p>
 
-<h3 id="java.io.IOExceptionFailedtocreatedatabase'derbydb',seethenextexceptionfordetails-Workaround">Workaround</h3>
+<h3>Workaround</h3>
 
-<p>Create a directory for the broker to write its files. e.g. in Java code call <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html#setDataDirectory(java.io.File)">setDataDirectory</a></p>
+<p>Create a directory for the broker to write its files. e.g. in Java code call <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html#setDataDirectory(java.io.File)">setDataDirectory</a></p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-File dir = new File(&quot;foo&quot;);
+<structured-macro ac:macro-id="ec2ce45d-ff66-4b44-86af-55df31e71c78" ac:name="code" ac:schema-version="1"><plain-text-body>
+File dir = new File("foo");
 dir.mkdir();
 broker.setDataDirectory(dir);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>or in XML 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[
-&lt;broker dataDirectory=&quot;foo&quot;&gt;...
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="4720743f-31fc-4604-844a-090611fa027b" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;broker dataDirectory="foo"&gt;...
+</plain-text-body></structured-macro>
 
-<h3 id="java.io.IOExceptionFailedtocreatedatabase'derbydb',seethenextexceptionfordetails-See">See</h3>
+<h3>See</h3>
 
-<ul><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">How do I embed a Broker inside a Connection</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I embed a Broker inside a Connection"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javalangnosuchmethoderror.xml
----------------------------------------------------------------------
diff --git a/javalangnosuchmethoderror.xml b/javalangnosuchmethoderror.xml
index a1c4c5b..d501da2 100644
--- a/javalangnosuchmethoderror.xml
+++ b/javalangnosuchmethoderror.xml
@@ -1,31 +1,28 @@
 <div class="wiki-content maincontent"><p>If you get an error like</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="ad648f77-49f7-4ec9-bab0-a19e18153e66" ac:name="code" ac:schema-version="1"><plain-text-body>
 java.lang.NoSuchMethodError:
 javax.jms.Session.createConsumer(Ljavax/jms/Destination;)Ljavax/jms/MessageConsumer;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>or</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="3b8768da-d141-4822-9ac3-66c88cf3df4d" ac:name="code" ac:schema-version="1"><plain-text-body>
 java.lang.AbstractMethodError: 
 javax.jms.ConnectionFactory.createConnection()Ljavax/jms/Connection;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="java.lang.NoSuchMethodError-Fix">Fix</h3>
+<h3>Fix</h3>
 
 <p>You probably have old JMS 1.0.2b versions of the JMS API on your classpath. This is because various methods were added in JMS 1.1 to work with destinations in a polymorphic way (such as to create a consumer from a Destination like the above stack trace).</p>
 
 <p>Please add the JMS 1.1 jars to your container/classpath and try again. </p>
 
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Add to the correct ClassPath</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If the JMS 1.0.2b classes come from your application server you may need to add the JMS 1.1 to your boot classpath to ensure that the JMS 1.1 classes take precedence to the container supplied classes</p></div></div>
+<structured-macro ac:macro-id="84703f19-7c81-4f6a-8c2f-64ecb536de0f" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Add to the correct ClassPath</parameter><rich-text-body>
+<p>If the JMS 1.0.2b classes come from your application server you may need to add the JMS 1.1 to your boot classpath to ensure that the JMS 1.1 classes take precedence to the container supplied classes</p></rich-text-body></structured-macro>
 
 <p>Note that to a user of the JMS API, JMS 1.1 is completely backwards compatible. The only issue with upgrading to JMS 1.1 is that any JMS provider which implements only JMS 1.0.2b and does not implement JMS 1.1 will not work; however if you're using ActiveMQ you should be fine.</p>
 
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml
----------------------------------------------------------------------
diff --git a/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml b/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml
index 9257713..cde862f 100644
--- a/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml
+++ b/javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml
@@ -1,9 +1,8 @@
 <div class="wiki-content maincontent"><p>If you get an error 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[
+<structured-macro ac:macro-id="0dfcf27e-6364-483a-9709-288117d4b6b7" ac:name="code" ac:schema-version="1"><plain-text-body>
 2005-08-14 17:18:45,618 ERROR [org.jboss.resource.deployment.RARDeployment] 
-Starting failed jboss.jca:service=RARDeployment,name=&#39;activemq-ra-3.0.rar&#39;
+Starting failed jboss.jca:service=RARDeployment,name='activemq-ra-3.0.rar'
 org.jboss.deployment.DeploymentException: Error for resource adapter class 
 org.activemq.ra.ActiveMQResourceAdapter accessing property setter 
 ConfigPropertyMetaData@e62121[name=UseEmbeddedBroker type=java.lang.Boolean 
@@ -29,10 +28,9 @@ org.jboss.mx.server.RawDynamicInvoker.invoke(RawDynamicInvoker.java:150)
 org.jboss.mx.server.MBeanServerImpl.invoke(MBeanServerImpl.java:644)
         at 
 org.jboss.system.ServiceController$ServiceProxy.invoke(ServiceController.java:897)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="java.lang.NoSuchMethodExceptionorg.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker-Fix">Fix</h3>
+<h3>Fix</h3>
 
 <p>You are using 3.0 of ActiveMQ. This bug is fixed in 3.1.x so use 3.1-M6 or later.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javalangoutofmemory.xml
----------------------------------------------------------------------
diff --git a/javalangoutofmemory.xml b/javalangoutofmemory.xml
index 2108720..fdf8ff7 100644
--- a/javalangoutofmemory.xml
+++ b/javalangoutofmemory.xml
@@ -1,46 +1,45 @@
 <div class="wiki-content maincontent"><p>Ok, this is manageable. It is possible to configure just about all of the memory utilisation of ActiveMQ. The first thing to determine is what part of the system is running out of memory. Is it the JVM, the broker, the consumers or the producers? </p>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This entry refers to ActiveMQ versions 5.1.x and greater.</p></div></div>
+<structured-macro ac:macro-id="1e867ae9-192f-43d2-b551-5889fe88e50a" ac:name="note" ac:schema-version="1"><rich-text-body>
+<p>This entry refers to ActiveMQ versions 5.1.x and greater.</p></rich-text-body></structured-macro>
 
-<h4 id="java.lang.OutOfMemory-Memory">Memory</h4>
-<h5 id="java.lang.OutOfMemory-JVMMemory">JVM Memory </h5>
+<h4>Memory</h4>
+<h5>JVM Memory </h5>
 <p>Try running the broker in a standalone JVM using <code>bin/activemq</code>. Note the default JVM heap size option that is passed to the Java executable by the script (the exact options may depend upon the JVM that you are using, the examples are for the Sun JVM).</p>
-<ul><li>-Xmx: If your OS has more available memory, consider increasing the total heap memory available to the broker JVM. Note that the JVM will require more memory than the -Xmx value. Thread stacks and the JMVs internal classes will consume additional memory.</li><li>-Xss: If you have <a shape="rect" href="#java.lang.OutOfMemory-NumberofThreads">massive numbers of threads</a> in the Broker JVM, consider reducing the default JVM stack size of each thread with the -Xss option.</li></ul>
+<ul><li>-Xmx: If your OS has more available memory, consider increasing the total heap memory available to the broker JVM. Note that the JVM will require more memory than the -Xmx value. Thread stacks and the JMVs internal classes will consume additional memory.</li><li>-Xss: If you have <link ac:anchor="Number of Threads"><link-body>massive numbers of threads</link-body></link> in the Broker JVM, consider reducing the default JVM stack size of each thread with the -Xss option.</li></ul>
 
 
 <p>If you are running an embedded broker or in a third party container, ensure that the hosting JVM has appropriate values for the maximum heap and stack sizes.</p>
 
-<h5 id="java.lang.OutOfMemory-BrokerMemory">Broker Memory </h5>
-<p>The memory that the broker is allowed to use is not determined by the amount of memory allocated to the JVM. Although the broker is constrained by the amount of memory given to the JVM, the broker manages its memory independently. That is, the broker does not just simply use up all of the memory in the JVM and then die with an OutOfMemory exception. This is where you need to understand the <a shape="rect" href="producer-flow-control.xml#ProducerFlowControl-Systemusage">systemUsage</a> memory limit and the per destination memory limit. </p>
+<h5>Broker Memory </h5>
+<p>The memory that the broker is allowed to use is not determined by the amount of memory allocated to the JVM. Although the broker is constrained by the amount of memory given to the JVM, the broker manages its memory independently. That is, the broker does not just simply use up all of the memory in the JVM and then die with an OutOfMemory exception. This is where you need to understand the <link ac:anchor="System usage"><page ri:content-title="Producer Flow Control"></page><link-body>systemUsage</link-body></link> memory limit and the per destination memory limit. </p>
 
 <p>The memory in ActiveMQ works in a tiered fashion that flows from the JVM -&gt; Broker -&gt; broker features. E.g., the total amount of destination memory limits placed cannot exceed the memory limit of the broker. </p>
 
-<h4 id="java.lang.OutOfMemory-Consumer">Consumer</h4>
-<p>Along with message size, the <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch limit</a> is main reason a consumer will <a shape="rect" href="what-is-the-prefetch-limit-for.xml#WhatisthePrefetchLimitFor?-RamversusPerformancetradeoff">run out of memory</a>. Reducing the prefetch value will reduce the amount of messages queued/stored in memory on the Consumer.</p>
+<h4>Consumer</h4>
+<p>Along with message size, the <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>prefetch limit</link-body></link> is main reason a consumer will <link ac:anchor="Ram versus Performance tradeoff"><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>run out of memory</link-body></link>. Reducing the prefetch value will reduce the amount of messages queued/stored in memory on the Consumer.</p>
 
-<h4 id="java.lang.OutOfMemory-Producer">Producer</h4>
-<p>Unless message size exceeds resource limits, a producer should not run out of memory. A producer may notice the effect of memory limit enforcement by the broker in the form of <a shape="rect" href="my-producer-blocks.xml">blocking</a>.</p>
+<h4>Producer</h4>
+<p>Unless message size exceeds resource limits, a producer should not run out of memory. A producer may notice the effect of memory limit enforcement by the broker in the form of <link><page ri:content-title="My Producer Blocks"></page><link-body>blocking</link-body></link>.</p>
 
 
-<h4 id="java.lang.OutOfMemory-Other">Other </h4>
+<h4>Other </h4>
 
-<h5 id="java.lang.OutOfMemory-SpoolingMessagestoDisk">Spooling Messages to Disk</h5>
+<h5>Spooling Messages to Disk</h5>
 <p>Fast dispatch of messages is only possible when messages are stored in memory. When consumers are slow or absent, memory can quickly become exhausted. <br clear="none">
-The Broker (using <a shape="rect" href="message-cursors.xml">Message Cursors</a>) will spool non-persistent messages to disk when the default memory usage threshold for a destination is reached. This threshold value is specified to the Broker via the &lt;memoryUsage&gt; section of the &lt;systemUsage&gt; configuration in <a shape="rect" href="xml-configuration.xml">activemq.xml</a>. This feature allows producers to continue sending messages when there are slow consumers without exhausting available memory or reverting to <a shape="rect" href="producer-flow-control.xml">producer flow control</a>. In the case of multiple destinations, the combined default memory thresholds may be excessive and they may exceed available memory. In such a case it may make sense to reduce the memory usage 'limit' threshold at which messages are spooled to disk. An alternative option is to configure the 'precentUsage' rather than the absolute usage 'limit'. In this way, memory usage can be confined to a f
 ixed percentage of available memory.</p>
+The Broker (using <link><page ri:content-title="Message Cursors"></page></link>) will spool non-persistent messages to disk when the default memory usage threshold for a destination is reached. This threshold value is specified to the Broker via the &lt;memoryUsage&gt; section of the &lt;systemUsage&gt; configuration in <link><page ri:content-title="XML Configuration"></page><link-body>activemq.xml</link-body></link>. This feature allows producers to continue sending messages when there are slow consumers without exhausting available memory or reverting to <link><page ri:content-title="Producer Flow Control"></page><link-body>producer flow control</link-body></link>. In the case of multiple destinations, the combined default memory thresholds may be excessive and they may exceed available memory. In such a case it may make sense to reduce the memory usage 'limit' threshold at which messages are spooled to disk. An alternative option is to configure the 'precentUsage' rather than the
  absolute usage 'limit'. In this way, memory usage can be confined to a fixed percentage of available memory.</p>
 
-<p>More specific per destination memoryUsage limits can be specified in <a shape="rect" href="xml-configuration.xml">activemq.xml</a> using <a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a>. Some further examples of &lt;destinationPolicy&gt; map entries can be found in the <a shape="rect" href="message-cursors.xml">Message Cursors</a> reference.</p>
+<p>More specific per destination memoryUsage limits can be specified in <link><page ri:content-title="XML Configuration"></page><link-body>activemq.xml</link-body></link> using <link><page ri:content-title="Per Destination Policies"></page></link>. Some further examples of &lt;destinationPolicy&gt; map entries can be found in the <link><page ri:content-title="Message Cursors"></page></link> reference.</p>
 
-<h5 id="java.lang.OutOfMemory-NumberofThreads">Number of Threads</h5>
+<h5>Number of Threads</h5>
 <p>By default, ActiveMQ uses a dedicated thread per destination. If there are large numbers of Destinations there will be a large number of threads and their associated memory resource usage. ActiveMQ can be configured to use a thread pool through the use of the system property: -Dorg.apache.activemq.UseDedicatedTaskRunner=false. This is currently specified in the activemq start script via ACTIVEMQ_OPTS. Using a thread pool can restrict the number of threads required by ActiveMQ and hence reduce memory usage.</p>
 
-<h5 id="java.lang.OutOfMemory-ReallyLargeMessages">Really Large Messages</h5>
-<p>When your message are really large such that you can only allow a few messages in memory at at time, the <a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a> maxPageSize and lazyDispatch can help. maxPageSize controls the amount of messages that are paged into memory for dispatch while lazyDispatch augments that value using the prefetch capacity of the current consumer list. With a prefetch of 1, a single consumer and lazyDispatch, only one message at a time would be loaded into memory at a time.</p>
+<h5>Really Large Messages</h5>
+<p>When your message are really large such that you can only allow a few messages in memory at at time, the <link><page ri:content-title="Per Destination Policies"></page></link> maxPageSize and lazyDispatch can help. maxPageSize controls the amount of messages that are paged into memory for dispatch while lazyDispatch augments that value using the prefetch capacity of the current consumer list. With a prefetch of 1, a single consumer and lazyDispatch, only one message at a time would be loaded into memory at a time.</p>
 
-<h5 id="java.lang.OutOfMemory-LeakingJMSresources">Leaking JMS resources</h5>
-<p>This is the most obvious one for Consumers or Producers; repeatedly obtaining a Session or MessageProducer or MessageConsumer and not closing it. With a java.lang.OutOfMemory, verifying (again) that all not in use JMS resources are released, is worth the time. If you have multiple threads in your application, consider using the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/pool/PooledConnectionFactory.html">PooledConnectionFactory</a> as this will allow JMS resource to be safely shared among threads that follow the pattern: </p>
+<h5>Leaking JMS resources</h5>
+<p>This is the most obvious one for Consumers or Producers; repeatedly obtaining a Session or MessageProducer or MessageConsumer and not closing it. With a java.lang.OutOfMemory, verifying (again) that all not in use JMS resources are released, is worth the time. If you have multiple threads in your application, consider using the <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/pool/PooledConnectionFactory.html">PooledConnectionFactory</a> as this will allow JMS resource to be safely shared among threads that follow the pattern: </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="62a3f40f-6247-4ef1-9ebc-da66cc21ca35" ac:name="code" ac:schema-version="1"><plain-text-body>
 obtainJmsResource(); 
 
 try 
@@ -49,8 +48,7 @@ try
 } finally { 
     releaseJmsResource(); 
 } 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>If you are using ActiveMQ via <a shape="rect" href="spring-support.xml">Spring Support</a> or with JMSTemplates, be sure to check you are not falling for any of the <a shape="rect" href="jmstemplate-gotchas.xml">JmsTemplate Gotchas</a>. It may also be worth recapping on <a shape="rect" href="how-do-i-use-jms-efficiently.xml">How do I use JMS efficiently</a>.</p></div>
+<p>If you are using ActiveMQ via <link><page ri:content-title="Spring Support"></page></link> or with JMSTemplates, be sure to check you are not falling for any of the <link><page ri:content-title="JmsTemplate Gotchas"></page></link>. It may also be worth recapping on <link><page ri:content-title="How do I use JMS efficiently"></page></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml
----------------------------------------------------------------------
diff --git a/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml b/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml
index d5e8420..cdea178 100644
--- a/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml
+++ b/javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml
@@ -1,34 +1,30 @@
 <div class="wiki-content maincontent"><p>If you get exception 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[
+<structured-macro ac:macro-id="c7fff064-ddf6-4be8-b885-84e74304b951" ac:name="code" ac:schema-version="1"><plain-text-body>
 javax.jms.JMSException: Wire format negociation timeout: peer did not send his wire format.
 at org.apache.activemq.util.JMSExceptionSupport.create(JMSExceptionSupport.java:58)
 at org.apache.activemq.ActiveMQConnection.syncSendPacket(ActiveMQConnection.java:1185)
 at org.apache.activemq.ActiveMQConnection.ensureConnectionInfoSent(ActiveMQConnection.java:1263)
 at org.apache.activemq.ActiveMQConnection.start(ActiveMQConnection.java:449)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>it can mean one of three things:</p>
 
-<h1 id="javax.jms.JMSException-Wireformatnegociationtimeout-peerdidnotsendhiswireformat.-1.You'reconnectingtotheportnotusedbyActiveMQTCPtransport">1. You're connecting to the port not used by ActiveMQ TCP transport</h1>
+<h1>1. You're connecting to the port not used by ActiveMQ TCP transport</h1>
 
 <p>Make sure to check that you're connecting to the appropriate <code>host:port</code></p>
 
-<h1 id="javax.jms.JMSException-Wireformatnegociationtimeout-peerdidnotsendhiswireformat.-2.You'reusinglog4jJMSappenderanddoesn'tfilteroutActiveMQlogmessages">2. You're using log4j JMS appender and doesn't filter out ActiveMQ log messages</h1>
+<h1>2. You're using log4j JMS appender and doesn't filter out ActiveMQ log messages</h1>
 
-<p>Be sure to read <a shape="rect" href="how-do-i-use-log4j-jms-appender-with-activemq.xml">How do I use log4j JMS appender with ActiveMQ</a> and more importantly to never send ActiveMQ log messages to JMS appender</p>
+<p>Be sure to read <link><page ri:content-title="How do I use log4j JMS appender with ActiveMQ"></page></link> and more importantly to never send ActiveMQ log messages to JMS appender</p>
 
-<h1 id="javax.jms.JMSException-Wireformatnegociationtimeout-peerdidnotsendhiswireformat.-3.Yourbrokerisprobablyunderheavyload(ornetworkconnectionisunreliable),soconnectionsetupcannotbecompletedinareasonabletime">3. Your broker is probably under heavy load (or network connection is unreliable), so connection setup cannot be completed in a reasonable time</h1>
+<h1>3. Your broker is probably under heavy load (or network connection is unreliable), so connection setup cannot be completed in a reasonable time</h1>
 
-<p>If you experience sporadic exceptions like this, the best solution is to use <a shape="rect" href="failover-transport-reference.xml">failover transport</a>, so that your clients can try connecting again if the first attempt fails. If you're getting these kind of exceptions more frequently you can also try extending wire format negotiation period (default 10 sec). You can do that by using <code>wireFormat.maxInactivityDurationInitalDelay</code> property on the connection URL in your client. For example</p>
+<p>If you experience sporadic exceptions like this, the best solution is to use <link><page ri:content-title="Failover Transport Reference"></page><link-body>failover transport</link-body></link>, so that your clients can try connecting again if the first attempt fails. If you're getting these kind of exceptions more frequently you can also try extending wire format negotiation period (default 10 sec). You can do that by using <code>wireFormat.maxInactivityDurationInitalDelay</code> property on the connection URL in your client. For 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="9d307573-86f2-48c2-887c-50dd112ec50d" ac:name="code" ac:schema-version="1"><plain-text-body>
 tcp://localhost:61616?wireFormat.maxInactivityDurationInitalDelay=30000
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>will use 30 sec timeout.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml
----------------------------------------------------------------------
diff --git a/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml b/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml
index eda0fba..2538580 100644
--- a/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml
+++ b/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml
@@ -1,4 +1,5 @@
 <div class="wiki-content maincontent"><p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
 
-<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul></div>
+<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml
----------------------------------------------------------------------
diff --git a/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml b/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml
index eda0fba..2538580 100644
--- a/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml
+++ b/jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml
@@ -1,4 +1,5 @@
 <div class="wiki-content maincontent"><p>When using JDK 6 (up to JDK 6 Update 3) to run ActiveMQ you can run into this exception. There are two solutions to this:</p>
 
-<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul></div>
+<ul><li>Upgrade to JDK to 1.6.0_04 or above, which includes JAXB 2.1</li><li>Copy JAXB 2.1 to &lt;JAVA_HOME&gt;/lib/endorsed to override the API jars that ship with the JDK</li></ul>
+</div>
 


[07/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/integrating-apache-activemq-with-jboss.xml
----------------------------------------------------------------------
diff --git a/integrating-apache-activemq-with-jboss.xml b/integrating-apache-activemq-with-jboss.xml
index 4a5a397..53905a3 100644
--- a/integrating-apache-activemq-with-jboss.xml
+++ b/integrating-apache-activemq-with-jboss.xml
@@ -1,48 +1,43 @@
-<div class="wiki-content maincontent"><h1 id="IntegratingApacheActiveMQwithJBoss-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
+<div class="wiki-content maincontent"><h1>Integrating Apache ActiveMQ with JBoss</h1>
 
-<p>Integration with application servers is a common scenario in the enterprise Java world, especially when it comes to messaging. <a shape="rect" class="external-link" href="http://activemq.org/" rel="nofollow">ActiveMQ</a> is a JMS 1.1 compliant, open source, Apache Licensed, message oriented middleware (MOM) with <a shape="rect" class="external-link" href="http://activemq.org/site/changes-in-40.html" rel="nofollow">many</a>, <a shape="rect" class="external-link" href="http://activemq.org/site/new-features-in-41.html" rel="nofollow">many</a> features far beyond the JMS specification. ActiveMQ offers many different <a shape="rect" class="external-link" href="http://activemq.org/site/connectivity.html" rel="nofollow">points of connectivity</a>, many <a shape="rect" class="external-link" href="http://activemq.org/site/cross-language-clients.html" rel="nofollow">cross language clients</a> and many <a shape="rect" class="external-link" href="http://activemq.org/site/protocols.html" rel=
 "nofollow">pluggable transport protocols</a> including integration with any J2EE 1.4 application server.</p>
+<p>Integration with application servers is a common scenario in the enterprise Java world, especially when it comes to messaging. <a shape="rect" href="http://activemq.org/">ActiveMQ</a> is a JMS 1.1 compliant, open source, Apache Licensed, message oriented middleware (MOM) with <a shape="rect" href="http://activemq.org/site/changes-in-40.html">many</a>, <a shape="rect" href="http://activemq.org/site/new-features-in-41.html">many</a> features far beyond the JMS specification. ActiveMQ offers many different <a shape="rect" href="http://activemq.org/site/connectivity.html">points of connectivity</a>, many <a shape="rect" href="http://activemq.org/site/cross-language-clients.html">cross language clients</a> and many <a shape="rect" href="http://activemq.org/site/protocols.html">pluggable transport protocols</a> including integration with any J2EE 1.4 application server.</p>
 
-<p>One of the application servers in the open source world is JBoss. A very common requirement is to configure ActiveMQ as the messaging infrastructure within JBoss. Although there is <a shape="rect" class="external-link" href="http://www.activemq.org/site/jboss-integration.html" rel="nofollow">a bit of documentation</a> on this integration, this article seeks to provide much more detail and explanation. So if you have a need to integrate ActiveMQ with JBoss, this article is for you.</p>
+<p>One of the application servers in the open source world is JBoss. A very common requirement is to configure ActiveMQ as the messaging infrastructure within JBoss. Although there is <a shape="rect" href="http://www.activemq.org/site/jboss-integration.html">a bit of documentation</a> on this integration, this article seeks to provide much more detail and explanation. So if you have a need to integrate ActiveMQ with JBoss, this article is for you.</p>
 
 <p>This article explains how to configure JBoss to start up ActiveMQ as part of its lifecycle and how to configure the ActiveMQ resource adapter to handle the messaging and transactionality between ActiveMQ and JBoss.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-Requirements">Requirements</h2>
+<h2>Requirements</h2>
 
 <p>Below are the software requirements for this article with links to download each:</p>
-<ul><li><a shape="rect" class="external-link" href="http://activemq.org/site/download.html" rel="nofollow">Apache ActiveMQ 4.0.1+</a></li><li><a shape="rect" class="external-link" href="http://sourceforge.net/project/showfiles.php?group_id=22866&amp;package_id=16942&amp;release_id=416591" rel="nofollow">JBoss 4.0.4+</a></li><li><a shape="rect" class="external-link" href="http://www.java.com/en/download/index.jsp" rel="nofollow">Sun Java 1.5+</a></li><li><a shape="rect" class="external-link" href="http://ant.apache.org/bindownload.cgi">Apache Ant 1.6+</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.org/site/download.html">Apache ActiveMQ 4.0.1+</a></li><li><a shape="rect" href="http://sourceforge.net/project/showfiles.php?group_id=22866&amp;package_id=16942&amp;release_id=416591">JBoss 4.0.4+</a></li><li><a shape="rect" href="http://www.java.com/en/download/index.jsp">Sun Java 1.5+</a></li><li><a shape="rect" href="http://ant.apache.org/bindownload.cgi">Apache Ant 1.6+</a></li></ul>
 
 
 <p>Though this article is using Unix, the installation and integration will work on any platform running Sun Java. It is recommended that each piece of software be downloaded before working through the steps is this article. Once each piece of software has been downloaded, proceed to the first step.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-InstalltheJ2SE1.5">Install the J2SE 1.5</h2>
+<h2>Install the J2SE 1.5</h2>
 
 <p>The first step in this process is to install Java 1.5 and verify that it runs correctly. Using the link above, find, download and install the correct version of Java for your platform. Once Java is installed and in the PATH, test it to see that it runs correctly using the following command:</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="9bc24ef3-40ca-44c4-8184-3dc2558516dc" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ java -version
-java version &quot;1.5.0_06&quot;
+java version "1.5.0_06"
 Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_06-112)
 Java HotSpot(TM) Client VM (build 1.5.0_06-64, mixed mode, sharing)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Depending upon your platform and the exact build number of Java 1.5, your output may vary slightly. As long as it's Java 1.5 and the version information is output, you should be ready to proceed to the next step.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-InstallApacheAnt">Install Apache Ant</h2>
+<h2>Install Apache Ant</h2>
 
 <p>The second step is to install Apache Ant. Simply download it using the link above, expand somewhere on your hard drive and place the <code>bin</code> directory in the PATH. This will allow you to test it quickly using the commands below:</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="0b584001-7c6f-4418-a373-2baeaa6b5c3b" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ ant -version
 Apache Ant version 1.6.2 compiled on July 16 2004
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>As long as you see the version output above, Ant should be usable. If you did not see the version output or received an error, consult the Ant documentation or mailing list archives to work out the issue. Please note that Ant is not used until the end of this whole exercise to test the integration.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-InstalltheJBossApplicationServer">Install the JBoss Application Server</h2>
+<h2>Install the JBoss Application Server</h2>
 
 <p>The third step in this process is to install JBoss and make sure it runs correctly before installing and configuring ActiveMQ. Upon downloading JBoss-4.0.4, expand it in a place where it can create a directory. Next, run the server using the following commands:</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="ecdb3355-5bad-42a4-a5ee-0ba25b1d0b45" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ cd jboss-4.0.4.GA
 $ ./bin/run.sh -c default
 =========================================================================
@@ -74,19 +69,17 @@ $ ./bin/run.sh -c default
 ...
 15:35:17,360 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
 Started in 22s:238ms
-]]></script>
-</div></div>
-<p>The first few lines of output from the JBoss startup indicates the configuration being used but the last line is the most important one. It tells you that JBoss has been started successfully on your system. For an extra measure of assurance, visit <a shape="rect" class="external-link" href="http://localhost:8080/web-console/" rel="nofollow">http://localhost:8080/web-console/</a> in a web browser to make sure you are able to see the JBoss web console. If you can see this console, everything should be ready to go.</p>
+</plain-text-body></structured-macro>
+<p>The first few lines of output from the JBoss startup indicates the configuration being used but the last line is the most important one. It tells you that JBoss has been started successfully on your system. For an extra measure of assurance, visit <a shape="rect" href="http://localhost:8080/web-console/">http://localhost:8080/web-console/</a> in a web browser to make sure you are able to see the JBoss web console. If you can see this console, everything should be ready to go.</p>
 
-<p>As a side note, the left-hand side of the web-console requires that the <a shape="rect" class="external-link" href="http://java.sun.com/products/plugin/" rel="nofollow">Java plugin</a> be properly installed. This is supposed to take place when installing the J2SE, so if it did not work correctly for you, I suggest that you consult some documentation about any errors you may be seeing. The Java plugin is not required for JBoss or ActiveMQ to function properly, it is simply for the JBoss web-console.</p>
+<p>As a side note, the left-hand side of the web-console requires that the <a shape="rect" href="http://java.sun.com/products/plugin/">Java plugin</a> be properly installed. This is supposed to take place when installing the J2SE, so if it did not work correctly for you, I suggest that you consult some documentation about any errors you may be seeing. The Java plugin is not required for JBoss or ActiveMQ to function properly, it is simply for the JBoss web-console.</p>
 
 <p>Once JBoss is installed properly, shut it down using either the shutdown script or by simply typing ctrl-c to activate the shutdown hook. Once it is shut down, proceed to the next step.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-PrepareforIntegratingApacheActiveMQwiththeJBossApplicationServer">Prepare for Integrating Apache ActiveMQ with the JBoss Application Server</h2>
+<h2>Prepare for Integrating Apache ActiveMQ with the JBoss Application Server</h2>
 
 <p>The fourth step is to prepare your environment for integrating ActiveMQ with JBoss. If you haven't done so already, download Apache ActiveMQ using the link above. As of the writing of this article, the latest released version is 4.0.2-RC4. Upon downloading this archive, expand it in a place where it can create a directory, preferably in the same location where JBoss was expanded. Verify that the ActiveMQ RAR file is included using the following commands:</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="3a69cbcd-8308-4e16-806b-e40caeb29677" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ cd ./incubator-activemq-4.0.2.tar.gz
 $ jar tvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
      0 Mon Sep 25 19:00:50 MDT 2006 META-INF/
@@ -107,25 +100,20 @@ $ jar tvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
 358085 Tue Aug 01 12:23:26 MDT 2006 log4j-1.2.12.jar
    523 Mon Sep 25 19:00:50 MDT 2006 META-INF/DISCLAIMER.txt
  11359 Mon Sep 25 19:00:50 MDT 2006 META-INF/LICENSE.txt
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This is simply a table of contents of the RAR file. There should only be one reason that this will fail - an incomplete download of the ActiveMQ tarball or zip file. Beyond that, depending on the version you download, some of the library versions may be slightly different.</p>
 
 <p>Now go back to the JBoss installation and create a directory for ActiveMQ in the JBoss deploy directory for the default JBoss context. Below are the commands to achieve this task:</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="dfbdd1ea-39da-4687-ad6a-a42d8947ab30" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ mkdir /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
 $ cd /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
 $ pwd
 /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-]]></script>
-</div></div>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> The creation of a directory is not required but is the easiest way to set up the ActiveMQ RAR when you're just getting started. This is due to the flexibility it affords during the development phase for the configuration to be changed very easily. The alternative is to JAR up the directory as a RAR file once the configuration is solid enough that it no longer needs to be changed. But leaving everything in a directory during development is the easiest path.</p>
-</div></div>
+</plain-text-body></structured-macro>
+<structured-macro ac:macro-id="8b393505-f091-411a-ae01-7fa559ed289b" ac:name="panel" ac:schema-version="1"><parameter ac:name="bgColor">#ccccff</parameter><rich-text-body>
+<p><strong><em>NOTE:</em></strong> The creation of a directory is not required but is the easiest way to set up the ActiveMQ RAR when you're just getting started. This is due to the flexibility it affords during the development phase for the configuration to be changed very easily. The alternative is to JAR up the directory as a RAR file once the configuration is solid enough that it no longer needs to be changed. But leaving everything in a directory during development is the easiest path.</p></rich-text-body></structured-macro>
 <p>Now expand the activemq-ra-4.0.2.rar into the current working 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="b59168c6-1886-46c9-8b3b-c33ae6953b52" ac:name="code" ac:schema-version="1"><plain-text-body>
 jar xvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
   created: META-INF/
  inflated: META-INF/MANIFEST.MF
@@ -145,11 +133,9 @@ jar xvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
  inflated: log4j-1.2.12.jar
  inflated: META-INF/DISCLAIMER.txt
  inflated: META-INF/LICENSE.txt
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Below is a quick listing of the contents of that 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="cd5b60d0-b463-4799-862a-2e6bef89f317" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ ls -l
 total 12848
 drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
@@ -164,21 +150,18 @@ drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
 -rw-r--r--   1 bsnyder  bsnyder   358085 Oct 16 16:27 log4j-1.2.12.jar
 -rw-r--r--   1 bsnyder  bsnyder  1901653 Oct 16 16:27 spring-1.2.6.jar
 -rw-r--r--   1 bsnyder  bsnyder    94713 Oct 16 16:27 xbean-spring-2.2.jar
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Now it's time to configure ActiveMQ.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-ConfiguringApacheActiveMQ">Configuring Apache ActiveMQ</h2>
+<h2>Configuring Apache ActiveMQ</h2>
 
 <p>The fifth step is to actually configure ActiveMQ for integration with JBoss. Remember that you should be sitting in the following 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="ec3c4d38-41bf-40f1-9deb-3767135411c9" ac:name="code" ac:schema-version="1"><plain-text-body>
 /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>You may or may not have installed JBoss in <code>/opt</code>, that doesn't particularly matter. What does matter is that you're sitting in the directory that was created above to hold the contents of the expanded ActiveMQ RAR file.</p>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> A RAR file is a Resource adapter ARchive (RAR). Resource adapters are a concept from the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">J2EE Connector Architecture (JCA)</a> and are used to interface with Enterprise Information Systems (EIS), i.e., systems external to the application server (e.g., relational databases, mainframes, MOMs, accounting systems, etc.). Resource adapters are often referred to as J2EE connectors and are very similar to the concept of a device driver for, say, a printer in that they contain information specific to connecting to a particular system. The difference with JCA is that that connection has been formalized in specification for Java. So the overall concepts of JCA is for connection to any EIS, but what does that mean? JCA 1.5 provides connectivity and more via the following contracts:</p>
+<structured-macro ac:macro-id="c0800a73-554e-4dc9-9f81-d0fe7bd1cdfc" ac:name="panel" ac:schema-version="1"><parameter ac:name="bgColor">#ccccff</parameter><rich-text-body>
+<p><strong><em>NOTE:</em></strong> A RAR file is a Resource adapter ARchive (RAR). Resource adapters are a concept from the <a shape="rect" href="http://java.sun.com/j2ee/connector/">J2EE Connector Architecture (JCA)</a> and are used to interface with Enterprise Information Systems (EIS), i.e., systems external to the application server (e.g., relational databases, mainframes, MOMs, accounting systems, etc.). Resource adapters are often referred to as J2EE connectors and are very similar to the concept of a device driver for, say, a printer in that they contain information specific to connecting to a particular system. The difference with JCA is that that connection has been formalized in specification for Java. So the overall concepts of JCA is for connection to any EIS, but what does that mean? JCA 1.5 provides connectivity and more via the following contracts:</p>
 
 <p>Version 1.0 Contracts</p>
 
@@ -192,45 +175,39 @@ drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
 <ul><li>Lifecycle Management Contract: Lets the application server manage the lifecycle &#8211; that is, the startup and shutdown functionality &#8211; of the resource adapter.</li><li>Work Management Contract: Allows the resource adapter to do work by submitting it to an application server for execution. Since the application server does the work for the resource adapter, the resource adapter needn't worry about thread management. Instead, the application server manages this aspect efficiently and can use thread pooling if necessary. Although the work management contract is not required (the resource adapter can choose to manage its own thread for work), it is definitely recommended.</li><li>Transaction Inflow Contract: Allows a resource adapter to propagate an imported transaction to an application server, as well as flow-in transaction completion and crash recovery initiated by an EIS.</li><li>Message Inflow Contract: Allows the resource adapter to synchronously or asynchronously
  deliver messages to endpoints in the application server, irrespective of message style, semantics, and infrastructure.</li></ul>
 
 
-<p><sub>Quoted from</sub> <sub><a shape="rect" class="external-link" href="http://java.sun.com/developer/technicalArticles/J2EE/connectorarch1_5/" rel="nofollow"><sub>What's New in the J2EE Connector Architecture 1.5</sub></a></sub></p>
+<p><sub>Quoted from</sub> <sub><a shape="rect" href="http://java.sun.com/developer/technicalArticles/J2EE/connectorarch1_5/"><sub>What's New in the J2EE Connector Architecture 1.5</sub></a></sub></p>
 
-<p>For more information about JCA, please consult the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/index.jsp" rel="nofollow">J2EE Connector Architecture documentation</a>.</p>
-</div></div>
+<p>For more information about JCA, please consult the <a shape="rect" href="http://java.sun.com/j2ee/connector/index.jsp">J2EE Connector Architecture documentation</a>.</p></rich-text-body></structured-macro>
 <p>Open the <code>META-INF/ra.xml</code> file and look for the following section:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="60f6b9af-051c-4c7d-9266-2ceb2c9a4bbd" ac:name="code" ac:schema-version="1"><parameter ac:name="title">META-INF/ra.xml</parameter><plain-text-body>
 &lt;config-property&gt;
     &lt;description&gt;
       The URL to the ActiveMQ server that you want this connection to connect to.  If using
-      an embedded broker, this value should be &#39;vm://localhost&#39;.
+      an embedded broker, this value should be 'vm://localhost'.
     &lt;/description&gt;
     &lt;config-property-name&gt;ServerUrl&lt;/config-property-name&gt;
     &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
     &lt;config-property-value&gt;tcp://localhost:61616&lt;/config-property-value&gt;
 &lt;!-- &lt;config-property-value&gt;vm://localhost&lt;/config-property-value&gt; --&gt;
   &lt;/config-property&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The section above is used to tell the ActiveMQ RAR where ActiveMQ is located. By default, the in-VM protocol is commented out in favor of the tcp protocol. This will find ActiveMQ running on any interface on the localhost on port 61616. It's ok to just leave this alone if you don't mind the inefficiency of communicating within the JVM via TCP. However, it is recommended that <code>vm://</code> transport be used for an embedded broker, so comment out the <code>tcp://</code> transport and uncomment the <code>vm://</code> transport. Below is an example of this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="fdda2ef7-5c59-424b-bb81-8fe635e3e14f" ac:name="code" ac:schema-version="1"><parameter ac:name="title">META-INF/ra.xml</parameter><plain-text-body>
 &lt;config-property&gt;
     &lt;description&gt;
       The URL to the ActiveMQ server that you want this connection to connect to.  If using
-      an embedded broker, this value should be &#39;vm://localhost&#39;.
+      an embedded broker, this value should be 'vm://localhost'.
     &lt;/description&gt;
     &lt;config-property-name&gt;ServerUrl&lt;/config-property-name&gt;
     &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
     &lt;!-- &lt;config-property-value&gt;tcp://localhost:61616&lt;/config-property-value&gt; --&gt;
     &lt;config-property-value&gt;vm://localhost&lt;/config-property-value&gt;
   &lt;/config-property&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Because we're embedding ActiveMQ inside of JBoss, it is more efficient to use the <code>vm://</code> transport, rather than to perform messaging over the <code>tcp://</code> transport.</p>
 
 <p>Now look further down the <code>META-INF/ra.xml</code> file and locate the following section:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="b727474f-93c3-4537-8228-296b250ffc14" ac:name="code" ac:schema-version="1"><parameter ac:name="title">META-INF/ra.xml</parameter><plain-text-body>
 &lt;config-property&gt;
     &lt;description&gt;
       Sets the XML configuration file used to configure the embedded ActiveMQ broker via
@@ -248,11 +225,9 @@ drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
     &lt;config-property-value&gt;xbean:broker-config.xml&lt;/config-property-value&gt;
     --&gt;
   &lt;/config-property&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The section above needs to be changed to uncomment the second to last line and remove/replace the empty element that is above it. Below is an example of how this should be changed:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="cc4ec3ed-0668-4861-b33c-d5be8a95225c" ac:name="code" ac:schema-version="1"><parameter ac:name="title">META-INF/ra.xml</parameter><plain-text-body>
 &lt;config-property&gt;
     &lt;description&gt;
       Sets the XML configuration file used to configure the embedded ActiveMQ broker via
@@ -267,80 +242,67 @@ drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
     &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
     &lt;config-property-value&gt;xbean:broker-config.xml&lt;/config-property-value&gt;
   &lt;/config-property&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This change tells the ActiveMQ RAR to read a configuration file named <code>broker-config.xml</code> (the <code>xbean:</code> that proceeds the filename is simply a hint to class doing the reading of the configuration file) which is located on the CLASSPATH. In this case, the <code>broker-config.xml</code> file is located in the <code>activemq-ra.rar</code> directory. Save the changes to that file and then open the <code>broker-config.xml</code> file.</p>
 
 <p>The <code>broker-config.xml</code> file <em>is</em> the ActiveMQ configuration file. This is the file used to configure ActiveMQ. The default contents of this file are usable, but should be customized to suit your environment. There are several items of note about this configuration. The most prominent sections to note in this file are the <code>&lt;persistenceAdapter&gt;</code> element and the <code>&lt;transportConnectors&gt;</code> and <code>&lt;networkConnectors&gt;</code> elements as seen below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>broker-config.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;beans xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
+<structured-macro ac:macro-id="af48af35-393f-417b-906d-f17f34eabda8" ac:name="code" ac:schema-version="1"><parameter ac:name="title">broker-config.xml</parameter><plain-text-body>
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
 
-  &lt;broker useJmx=&quot;true&quot;&gt;
+  &lt;broker useJmx="true"&gt;
   ...
     &lt;persistenceAdapter&gt;
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;activemq-data&quot;/&gt;
+      &lt;journaledJDBC journalLogFiles="5" dataDirectory="activemq-data"/&gt;
       &lt;!-- To use a different datasource, use th following syntax : --&gt;
       &lt;!--
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;../data&quot; dataSource=&quot;#postgres-ds&quot;/&gt;
+      &lt;journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/&gt;
        --&gt;
     &lt;/persistenceAdapter&gt;
 
     &lt;transportConnectors&gt;
       &lt;!-- prefixing a connector with discovery: causes the connector to be advertiesed over rendezvous --&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
+      &lt;transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/&gt;
     &lt;/transportConnectors&gt;
 
     &lt;networkConnectors&gt;
       &lt;!-- by default just auto discover the other brokers --&gt;
-      &lt;networkConnector uri=&quot;multicast://default&quot;/&gt;
+      &lt;networkConnector uri="multicast://default"/&gt;
       &lt;!--
-      &lt;networkConnector uri=&quot;static://(tcp://host1:61616,tcp://host2:61616)&quot;/&gt;
+      &lt;networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/&gt;
       --&gt;
     &lt;/networkConnectors&gt;
 
   &lt;/broker&gt;
 
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The first change to this file is to add the brokerName attribute to the broker element and provide a name:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;broker useJmx=&quot;true&quot; brokerName=&quot;bruce.broker1&quot;&gt;
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="03cf582d-73c3-45a2-bd0d-9b0ea96e191a" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;broker useJmx="true" brokerName="bruce.broker1"&gt;
+</plain-text-body></structured-macro>
 <p>In addition, this same name is used further down the configuration to provide a name for the <code>&lt;transportConnector&gt;</code> element:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;transportConnector name=&quot;bruce.broker1&quot; uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="34a54822-38c1-464d-9596-05153a1be414" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;transportConnector name="bruce.broker1" uri="tcp://localhost:61616" discoveryUri="multicast://default"/&gt;
+</plain-text-body></structured-macro>
 <p>Now we'll tell ActiveMQ not to initialize JMX because we'll use the existing one that JBoss has:</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="6722ef5d-9c32-4fba-89a9-405bf8678a2c" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;!-- put the following as the first child of the broker tag --&gt;
-&lt;managementContext&gt;&lt;!-- we&#39;ll use an existing one (JBoss) instead of creating one --&gt;
-  &lt;managementContext createConnector=&quot;false&quot;/&gt;
+&lt;managementContext&gt;&lt;!-- we'll use an existing one (JBoss) instead of creating one --&gt;
+  &lt;managementContext createConnector="false"/&gt;
 &lt;/managementContext&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The <code>&lt;persistenceAdapter&gt;</code> element should be reconfigured to store its data in an appropriate place.  On JBoss, that's most likely within the "data" directory of the server configuration you're using.  We're going to set this dynamically using an XBean and Spring feature that allows us to inject system properties values into the configuration. First this needs to be enabled:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="808a9522-c308-4270-9e82-4374dd0ecebb" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;!-- put the following as the first child of the beans element --&gt;
-&lt;bean xmlns=&quot;&quot; class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;/&gt;
-]]></script>
-</div></div>
+&lt;bean xmlns="" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/&gt;
+</plain-text-body></structured-macro>
 <p>Now, modify the <code>dataDirectory</code> attribute of the <code>journaledJDBC</code> element to be the following: <code>${jboss.server.data.dir}/activemq</code>.</p>
 
-<p>The <code>&lt;transportConnectors&gt;</code> element is used to advertise the ActiveMQ broker for client-to-broker communications and the <code>&lt;networkConnectors&gt;</code> element advertises the ActiveMQ broker for broker-to-broker communications. The default configuration is to use the ActiveMQ <a shape="rect" class="external-link" href="http://www.activemq.org/site/multicast-transport-reference.html" rel="nofollow">multicast transport</a> for both. This is simply an easy configuration under which to get ActiveMQ up and running, so we'll just leave it at that for the time being.</p>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> There are far more configuration options available for ActiveMQ than are noted here. The configuration above is only enough to just get ActiveMQ up and running, nothing more. For more information on the ActiveMQ configuration, see the <a shape="rect" class="external-link" href="http://www.activemq.org/site/xbean-xml-reference-41.html" rel="nofollow">ActiveMQ 4.1 XML Reference</a>.</p>
-</div></div>
+<p>The <code>&lt;transportConnectors&gt;</code> element is used to advertise the ActiveMQ broker for client-to-broker communications and the <code>&lt;networkConnectors&gt;</code> element advertises the ActiveMQ broker for broker-to-broker communications. The default configuration is to use the ActiveMQ <a shape="rect" href="http://www.activemq.org/site/multicast-transport-reference.html">multicast transport</a> for both. This is simply an easy configuration under which to get ActiveMQ up and running, so we'll just leave it at that for the time being.</p>
+<structured-macro ac:macro-id="b2fd7dca-0195-45f9-beaa-a35e3502a0e4" ac:name="panel" ac:schema-version="1"><parameter ac:name="bgColor">#ccccff</parameter><rich-text-body>
+<p><strong><em>NOTE:</em></strong> There are far more configuration options available for ActiveMQ than are noted here. The configuration above is only enough to just get ActiveMQ up and running, nothing more. For more information on the ActiveMQ configuration, see the <a shape="rect" href="http://www.activemq.org/site/xbean-xml-reference-41.html">ActiveMQ 4.1 XML Reference</a>.</p></rich-text-body></structured-macro>
 <p>Now we just need to start up JBoss to assure that it comes up correctly without error using the same commands we used previously to start JBoss:</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="99275948-d5a3-4e82-9827-5827c1f58ed4" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ cd jboss-4.0.4.GA
 $ ./bin/run.sh -c default
 =========================================================================
@@ -372,20 +334,18 @@ $ ./bin/run.sh -c default
 ...
 15:35:17,360 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
 Started in 28s:576ms
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>As long as JBoss comes up without error, you're ready to move on to the next step.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-ConfiguringJBoss">Configuring JBoss</h2>
+<h2>Configuring JBoss</h2>
 
-<p>The sixth step is to configure JBoss to initialize and start ActiveMQ whenever JBoss starts up. This is accomplished using an XML file that abides by the <a shape="rect" class="external-link" href="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd" rel="nofollow">JBoss JCA DTD</a> for data sources. Like most other Java application servers on the market, the JBoss architecture uses the J2EE Connector Architecture to manage connections of any kind including JDBC, JMS, etc. and the JBoss JCA DTD denotes the allowed contents for creating an XML data source instance to configure JBoss JCA. Below is an example XML data source instance for use with JBoss:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq-jms-ds.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+<p>The sixth step is to configure JBoss to initialize and start ActiveMQ whenever JBoss starts up. This is accomplished using an XML file that abides by the <a shape="rect" href="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">JBoss JCA DTD</a> for data sources. Like most other Java application servers on the market, the JBoss architecture uses the J2EE Connector Architecture to manage connections of any kind including JDBC, JMS, etc. and the JBoss JCA DTD denotes the allowed contents for creating an XML data source instance to configure JBoss JCA. Below is an example XML data source instance for use with JBoss:</p>
+<structured-macro ac:macro-id="71943892-d21f-4db7-bcaf-463eb91e23d2" ac:name="code" ac:schema-version="1"><parameter ac:name="title">activemq-jms-ds.xml</parameter><plain-text-body>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
 &lt;!DOCTYPE connection-factories
-    PUBLIC &quot;-//JBoss//DTD JBOSS JCA Config 1.5//EN&quot;
-    &quot;http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd&quot;&gt;
+    PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"&gt;
 
 &lt;connection-factories&gt;
 
@@ -423,26 +383,24 @@ Started in 28s:576ms
       &lt;idle-timeout-minutes&gt;3&lt;/idle-timeout-minutes&gt;
    &lt;/tx-connection-factory&gt;
 
-   &lt;mbean code=&quot;org.jboss.resource.deployment.AdminObject&quot; name=&quot;activemq.queue:name=outboundQueue&quot;&gt;
-      &lt;attribute name=&quot;JNDIName&quot;&gt;activemq/queue/outbound&lt;/attribute&gt;
-      &lt;depends optional-attribute-name=&quot;RARName&quot;&gt;jboss.jca:service=RARDeployment,name=&#39;activemq-ra.rar&#39;&lt;/depends&gt;
-      &lt;attribute name=&quot;Type&quot;&gt;javax.jms.Queue&lt;/attribute&gt;
-      &lt;attribute name=&quot;Properties&quot;&gt;PhysicalName=queue.outbound&lt;/attribute&gt;
+   &lt;mbean code="org.jboss.resource.deployment.AdminObject" name="activemq.queue:name=outboundQueue"&gt;
+      &lt;attribute name="JNDIName"&gt;activemq/queue/outbound&lt;/attribute&gt;
+      &lt;depends optional-attribute-name="RARName"&gt;jboss.jca:service=RARDeployment,name='activemq-ra.rar'&lt;/depends&gt;
+      &lt;attribute name="Type"&gt;javax.jms.Queue&lt;/attribute&gt;
+      &lt;attribute name="Properties"&gt;PhysicalName=queue.outbound&lt;/attribute&gt;
    &lt;/mbean&gt;
 
-   &lt;mbean code=&quot;org.jboss.resource.deployment.AdminObject&quot; name=&quot;activemq.topic:name=inboundTopic&quot;&gt;
-      &lt;attribute name=&quot;JNDIName&quot;&gt;activemq/topic/inbound&lt;/attribute&gt;
-      &lt;depends optional-attribute-name=&quot;RARName&quot;&gt;jboss.jca:service=RARDeployment,name=&#39;activemq-ra.rar&#39;&lt;/depends&gt;
-      &lt;attribute name=&quot;Type&quot;&gt;javax.jms.Topic&lt;/attribute&gt;
-      &lt;attribute name=&quot;Properties&quot;&gt;PhysicalName=topic.inbound&lt;/attribute&gt;
+   &lt;mbean code="org.jboss.resource.deployment.AdminObject" name="activemq.topic:name=inboundTopic"&gt;
+      &lt;attribute name="JNDIName"&gt;activemq/topic/inbound&lt;/attribute&gt;
+      &lt;depends optional-attribute-name="RARName"&gt;jboss.jca:service=RARDeployment,name='activemq-ra.rar'&lt;/depends&gt;
+      &lt;attribute name="Type"&gt;javax.jms.Topic&lt;/attribute&gt;
+      &lt;attribute name="Properties"&gt;PhysicalName=topic.inbound&lt;/attribute&gt;
    &lt;/mbean&gt;
 
 &lt;/connection-factories&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This XML instance configures a JMS <code>QueueConnectionFactory</code> and a JMS <code>TopicConnectionFactory</code> and makes them available via JNDI. Also defined in this file are some {{AdminObject}}s which are used to specify a topic and a queue. This file should be dropped into the JBoss deploy directory. Its name (*-ds.xml) will cause it to be picked up by the JBoss deployer upon startup. Speaking of which, once this file is in place, a quick smoke test can be performed by simply starting up the JBoss server. Below is an example of the output that should be seen:</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="4a3ffbcf-5e58-42dd-8c5f-1d77b501c805" ac:name="code" ac:schema-version="1"><plain-text-body>
 =========================================================================
 
   JBoss Bootstrap Environment
@@ -470,7 +428,7 @@ Started in 28s:576ms
 22:55:48,704 INFO  [Server] Server Temp Dir: /opt/jboss-4.0.4.GA/server/default/tmp
 22:55:48,706 INFO  [Server] Root Deployment Filename: jboss-service.xml
 22:55:49,092 INFO  [ServerInfo] Java version: 1.5.0_06,Apple Computer, Inc.
-22:55:49,101 INFO  [ServerInfo] Java VM: Java HotSpot(TM) Server VM 1.5.0_06-64,&quot;Apple Computer, Inc.&quot;
+22:55:49,101 INFO  [ServerInfo] Java VM: Java HotSpot(TM) Server VM 1.5.0_06-64,"Apple Computer, Inc."
 22:55:49,102 INFO  [ServerInfo] OS-System: Mac OS X 10.4.8,i386
 22:55:49,803 INFO  [Server] Core system initialized
 22:55:53,379 INFO  [WebService] Using RMI server codebase: http://rattlesnake:8083/
@@ -511,10 +469,10 @@ beans [org.apache.activemq.xbean.XBeanBrokerService]; root of BeanFactory hierar
 [org.apache.xbean.spring.context.ClassPathXmlApplicationContext;hashCode=13887543]
 22:56:07,773 INFO  [CollectionFactory] JDK 1.4+ collections available
 22:56:07,778 INFO  [ClassPathXmlApplicationContext] Unable to locate MessageSource with name 
-&#39;messageSource&#39;: using default
+'messageSource': using default
 [org.springframework.context.support.DelegatingMessageSource@5fee96]
 22:56:07,781 INFO  [ClassPathXmlApplicationContext] Unable to locate ApplicationEventMulticaster 
-with name &#39;applicationEventMulticaster&#39;: using default
+with name 'applicationEventMulticaster': using default
 [org.springframework.context.event.SimpleApplicationEventMulticaster@78c714]
 22:56:07,783 INFO  [DefaultListableBeanFactory] Pre-instantiating singletons in factory
  [org.springframework.beans.factory.support.DefaultListableBeanFactory
@@ -546,17 +504,17 @@ using 5 x 20.0 Megs at: /opt/jboss-4.0.4.GA/activemq-data/journal
 22:56:11,847 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
 .../deploy/mail-ra.rar
 22:56:12,251 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory&#39; to
-JNDI name &#39;java:activemq/QueueConnectionFactory&#39;
+'jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory' to
+JNDI name 'java:activemq/QueueConnectionFactory'
 22:56:12,258 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=activemq/TopicConnectionFactory&#39; to
-JNDI name &#39;java:activemq/TopicConnectionFactory&#39;
-22:56:12,265 INFO  [AdminObject] Bound admin object &#39;org.apache.activemq.command.ActiveMQQueue&#39; 
-at &#39;activemq/queue/outbound&#39;
-22:56:12,330 INFO  [AdminObject] Bound admin object &#39;org.apache.activemq.command.ActiveMQTopic&#39; 
-at &#39;activemq/topic/inbound&#39;
+'jboss.jca:service=ConnectionFactoryBinding,name=activemq/TopicConnectionFactory' to
+JNDI name 'java:activemq/TopicConnectionFactory'
+22:56:12,265 INFO  [AdminObject] Bound admin object 'org.apache.activemq.command.ActiveMQQueue' 
+at 'activemq/queue/outbound'
+22:56:12,330 INFO  [AdminObject] Bound admin object 'org.apache.activemq.command.ActiveMQTopic' 
+at 'activemq/topic/inbound'
 22:56:13,246 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=DataSourceBinding,name=DefaultDS&#39; to JNDI name &#39;java:DefaultDS&#39;
+'jboss.jca:service=DataSourceBinding,name=DefaultDS' to JNDI name 'java:DefaultDS'
 22:56:13,842 INFO  [A] Bound to JNDI name: queue/A
 22:56:13,845 INFO  [B] Bound to JNDI name: queue/B
 22:56:13,846 INFO  [C] Bound to JNDI name: queue/C
@@ -569,24 +527,22 @@ at &#39;activemq/topic/inbound&#39;
 22:56:13,994 INFO  [UILServerILService] JBossMQ UIL service available at : /0.0.0.0:8093
 22:56:14,055 INFO  [DLQ] Bound to JNDI name: queue/DLQ
 22:56:14,375 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=JmsXA&#39; to JNDI name &#39;java:JmsXA&#39;
+'jboss.jca:service=ConnectionFactoryBinding,name=JmsXA' to JNDI name 'java:JmsXA'
 22:56:14,525 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
 22:56:14,991 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8080
 22:56:15,071 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8009
 22:56:15,082 INFO  [JkMain] Jk running ID=0 time=0/25  config=null
 22:56:15,108 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
 Started in 26s:398ms
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Note the startup messages from both ActiveMQ and from the <code>AdminObject}}s creating an {{ActiveMQQueue</code> and an <code>ActiveMQTopic</code>. These are good indications that the configuration is correct, but needs to be verified a bit further. This is covered in the next section.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-TestingtheIntegration">Testing the Integration</h2>
+<h2>Testing the Integration</h2>
 
 <p>The seventh and final step is to perform a slightly more comprehensive smoke test of the integration. This can be accomplished using Apache Ant via the examples that come with the ActiveMQ binary distribution. An Ant build.xml file is included which provides easy access to a simple consumer and a simple producer. The producer will be used to send messages that are received by the consumer. To proceed with this testing, just follow the steps below:</p>
 <ol><li>In the first terminal, start up JBoss. The same startup script can be used here as was used above.</li><li>In the second terminal, use the commands below to run the ActiveMQ consumer:
-<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[
-$ cd /opt/incubator-activemq-4.0.2/examples    #note in activemq v5 the directory is just &quot;example&quot; not &quot;examples&quot;
+<structured-macro ac:macro-id="83da24fc-8569-41f8-98e1-80cd0847b639" ac:name="code" ac:schema-version="1"><plain-text-body>
+$ cd /opt/incubator-activemq-4.0.2/examples    #note in activemq v5 the directory is just "example" not "examples"
 $ ant consumer
 Buildfile: build.xml
 
@@ -603,10 +559,8 @@ consumer:
      [java] Consuming queue: TEST.FOO
      [java] Using non-durable subscription
      [java] We are about to wait until we consume: 10 message(s) then we will shutdown
-]]></script>
-</div></div></li><li>In the third terminal, use the commands below to run the ActiveMQ producer:
-<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[
+</plain-text-body></structured-macro></li><li>In the third terminal, use the commands below to run the ActiveMQ producer:
+<structured-macro ac:macro-id="b1fdb2dd-302a-4340-9223-be539c22f866" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ cd /opt/incubator-activemq-4.0.2/examples
 $ ant producer
 Buildfile: build.xml
@@ -680,8 +634,7 @@ description: Time spent by a message before being delivered }
      [java]     }
      [java]   }
      [java] }
-]]></script>
-</div></div></li></ol>
+</plain-text-body></structured-macro></li></ol>
 
 
 <p>Step 1 above just starts up JBoss. Step 2 above starts up a simple message consumer that comes with ActiveMQ. Step 3 above starts up a simple message producer that comes with ActiveMQ. Though the message consumer and message producer are simple utilities, the each one accepts many parameters making them extremely useful for testing ActiveMQ configurations.</p>
@@ -690,123 +643,12 @@ description: Time spent by a message before being delivered }
 
 <p>After setting up one broker within one instance of JBoss, setting up another is made much easier, but requires another machine or operating system instance. But that's a whole separate article and something to address another day.</p>
 
-<h2 id="IntegratingApacheActiveMQwithJBoss-Conclusion">Conclusion</h2>
+<h2>Conclusion</h2>
 
-<p>What has been demonstrated here is the integration of ActiveMQ with the JBoss application server. This integration is quite common and performed by many enterprises. I hope that this was helpful to people interested in the integration of ActiveMQ with JBoss application server. If you have any questions or are interested in consulting services surrounding ActiveMQ, please <a shape="rect" class="external-link" href="http://www.logicblaze.com/contact.jsp" rel="nofollow">contact us</a> for more information.</p>
+<p>What has been demonstrated here is the integration of ActiveMQ with the JBoss application server. This integration is quite common and performed by many enterprises. I hope that this was helpful to people interested in the integration of ActiveMQ with JBoss application server. If you have any questions or are interested in consulting services surrounding ActiveMQ, please <a shape="rect" href="http://www.logicblaze.com/contact.jsp">contact us</a> for more information.</p>
 
-<h3 id="IntegratingApacheActiveMQwithJBoss-Resources">Resources</h3>
+<h3>Resources</h3>
 
 <p>Below are the configurations for use with both Spring 1.x and Spring 2.x:</p>
-
-
-    
-
-<div class="plugin_attachments_container">
-    <div class="plugin_attachments_table_container">
-        <fieldset class="hidden">
-            <input type="hidden" class="plugin_attachments_macro_render_param" name="pageId" value="67786">
-            <input type="hidden" name="deleteConfirmMessage" value="Are you sure you want to send the attached file " _0="_0" to="to" the="the" trash="trash" only="only" a="a" space="space" administrator="administrator" can="can" undo="undo" this="this" action.="action.">
-                                                    <input type="hidden" name="outputType" value="display">
-        </fieldset>
-                
-
-
-
-
-
-
-    
-
-
-
-<table class="attachments aui"><thead><tr><th colspan="1" rowspan="1" class="expand-column attachment-summary-toggle">&#160;</th><th colspan="1" rowspan="1" class="filename-column">            <a shape="rect" href="integrating-apache-activemq-with-jboss.xml?sortBy=name&amp;sortOrder=ascending">File</a>
-        </th><th colspan="1" rowspan="1" class="modified-column">            <span class="propersortedby $sortOrder"><a shape="rect" href="integrating-apache-activemq-with-jboss.xml?sortBy=date&amp;sortOrder=descending">Modified</a></span>
-        </th></tr></thead><tbody><tr class="attachment-row" id="attachment-59670763" data-attachment-id="59670763" data-attachment-idx="1"><td colspan="1" rowspan="1" class="attachment-summary-toggle">
-                    <span class="icon icon-section-closed" title="Show more info"></span>
-                </td><td colspan="1" rowspan="1" class="filename-column">
-                    
-
-    
-
-
-<span class="icon icon-file-unknown" title="File">File</span>                    <a shape="rect" class="filename" href="integrating-apache-activemq-with-jboss.data/amq-spring-1.2.6.tgz?api=v2" title="Download" data-filename="amq-spring-1.2.6.tgz" data-type="application/x-tar" data-linked-resource-container-id="67786">
-                        amq-spring-1.2.6.tgz
-                    </a>
-                                    </td><td colspan="1" rowspan="1" class="attachment-created modified-column">
-                    <span>Oct 03, 2007</span>
-                    <span>by</span>
-                        <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a>                </td></tr><tr class="attachment-summary attachment-summary-59670763 hidden" data-attachment-id="59670763" data-attachment-filename="amq-spring-1.2.6.tgz"><td colspan="1" rowspan="1" class="attachment-summary-toggle"></td><td colspan="2" rowspan="1" class="attachment-details-wrapper">
-
-                    
-                                        <p class="attachment-labels">Labels</p>
-                    
-<div class="labels-section-content content-column" entityid="59670763" entitytype="attachment">
-	<div class="labels-content">
-		
-    <ul class="label-list  has-pen"><li class="no-labels-message">
-            No labels
-        </li><li class="labels-edit-container">
-            <a shape="rect" class="show-labels-editor" href="#" title="Edit Labels">
-                <span class="aui-icon aui-icon-small aui-iconfont-edit-small">Edit Labels</span>
-            </a>
-        </li></ul>
-
-    </div>
-</div>
-
-                                            <div class="attachment-history-wrapper"></div>
-                    
-                                            <div class="attachment-buttons">
-                                                            <a shape="rect" class="aui-button previewAttachmentLink" data-filename="amq-spring-1.2.6.tgz" data-file-src="/confluence/download/attachments/67786/amq-spring-1.2.6.tgz?api=v2" data-linked-resource-default-alias="amq-spring-1.2.6.tgz" data-mime-type="application/x-tar" data-linked-resource-container-id="67786" data-linked-resource-id="59670763">Preview</a>
-                            
-                                                    </div>
-                                    </td></tr><tr class="attachment-row" id="attachment-59670764" data-attachment-id="59670764" data-attachment-idx="2"><td colspan="1" rowspan="1" class="attachment-summary-toggle">
-                    <span class="icon icon-section-closed" title="Show more info"></span>
-                </td><td colspan="1" rowspan="1" class="filename-column">
-                    
-
-    
-
-
-<span class="icon icon-file-unknown" title="File">File</span>                    <a shape="rect" class="filename" href="integrating-apache-activemq-with-jboss.data/amq-spring-2.0.tgz?api=v2" title="Download" data-filename="amq-spring-2.0.tgz" data-type="application/x-tar" data-linked-resource-container-id="67786">
-                        amq-spring-2.0.tgz
-                    </a>
-                                    </td><td colspan="1" rowspan="1" class="attachment-created modified-column">
-                    <span>Oct 03, 2007</span>
-                    <span>by</span>
-                        <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a>                </td></tr><tr class="attachment-summary attachment-summary-59670764 hidden" data-attachment-id="59670764" data-attachment-filename="amq-spring-2.0.tgz"><td colspan="1" rowspan="1" class="attachment-summary-toggle"></td><td colspan="2" rowspan="1" class="attachment-details-wrapper">
-
-                    
-                                        <p class="attachment-labels">Labels</p>
-                    
-<div class="labels-section-content content-column" entityid="59670764" entitytype="attachment">
-	<div class="labels-content">
-		
-    <ul class="label-list  has-pen"><li class="no-labels-message">
-            No labels
-        </li><li class="labels-edit-container">
-            <a shape="rect" class="show-labels-editor" href="#" title="Edit Labels">
-                <span class="aui-icon aui-icon-small aui-iconfont-edit-small">Edit Labels</span>
-            </a>
-        </li></ul>
-
-    </div>
-</div>
-
-                                            <div class="attachment-history-wrapper"></div>
-                    
-                                            <div class="attachment-buttons">
-                                                            <a shape="rect" class="aui-button previewAttachmentLink" data-filename="amq-spring-2.0.tgz" data-file-src="/confluence/download/attachments/67786/amq-spring-2.0.tgz?api=v2" data-linked-resource-default-alias="amq-spring-2.0.tgz" data-mime-type="application/x-tar" data-linked-resource-container-id="67786" data-linked-resource-id="59670764">Preview</a>
-                            
-                                                    </div>
-                                    </td></tr></tbody></table>
-    </div>
-    <div class="plugin_attachments_upload_container">
-            </div>
-
-    <div>
-                    <a shape="rect" class="download-all-link" href="/confluence/pages/downloadallattachments.action?pageId=67786" title="Download all the latest versions of attachments on this page as single zip file.">Download All</a>
-            </div>
-</div>
-</div>
+<structured-macro ac:macro-id="eda15643-f616-42ea-bd14-d9b2d1397323" ac:name="attachments" ac:schema-version="1"></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/integration-tests.xml
----------------------------------------------------------------------
diff --git a/integration-tests.xml b/integration-tests.xml
index 987a85a..152901e 100644
--- a/integration-tests.xml
+++ b/integration-tests.xml
@@ -1,73 +1,63 @@
 <div class="wiki-content maincontent">
 <p>The Integration Tests validate that ActiveMQ Resource Adapter operate correctly when deployed with a J2EE application running in an Application Server such as Apache Geronimo.</p>
 
-<h2 id="IntegrationTests-GettingReady">Getting Ready</h2>
+<h2>Getting Ready</h2>
 
 <p>The instructions on this page reference a few directories that you will need to substitute appropriate values for:</p>
 <ul><li><em>activemq-core</em> is where your ActiveMQ source code is located.</li><li><em>geronimo-home</em> is where your Geronimo home directory is located.</li></ul>
 
 
-<h2 id="IntegrationTests-BuildingtheActiveMQResourceAdapter">Building the ActiveMQ Resource Adapter</h2>
+<h2>Building the ActiveMQ Resource Adapter</h2>
 
 <p>The ActiveMQ Resource Adapter allows a J2EE Application Server to provide transaction management, connection pooling and security to ActiveMQ connection when used by EJBs. The Resource Adapter is deployed in the client EAR that will be using the ActiveMQ.</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="ee6afd83-8b33-4daa-b68f-e794c0025e20" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd activemq-ra
 maven rar:install-snapshot
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>&#160;</p>
 
-<h2 id="IntegrationTests-BuildingtheIntegrationTestEJBmodule">Building the Integration Test EJB module</h2>
+<h2>Building the Integration Test EJB module</h2>
 
 <p>The Integration Test EJB module provides a set of EJBs that the tests are run against.</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="d638161b-414d-4cf3-9e0d-dd21bc6c9245" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd systest/itests/ejb
 maven
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>&#160;</p>
 
-<h2 id="IntegrationTests-BuildingandDeployingtheIntegrationTestEARmodule">Building and Deploying the Integration Test EAR module</h2>
+<h2>Building and Deploying the Integration Test EAR module</h2>
 
 <p>The EAR module packages up the Resource Adapter and the Integration Tests EJBs into a deployable EAR.</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="c636a44d-9d69-4691-8e51-4cefff3a8559" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd systest/itests/ear
 maven -Dgeronimo.home=geronimo-home
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>&#160;</p>
 
-<h2 id="IntegrationTests-StartingGeronimowiththeIntegrationTestEARconfiguration.">Starting Geronimo with the Integration Test EAR configuration.</h2>
+<h2>Starting Geronimo with the Integration Test EAR configuration.</h2>
 
 <p>In a seperate console, issue the following commands</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="2151b074-3e72-4b45-a729-2b872e261a7e" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd geronimo-home
 java -jar bin/server.jar org/activemq/ear/itest
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>&#160;</p>
 
-<h2 id="IntegrationTests-BuildingandrunningtheIntegrationTests.">Building and running the Integration Tests.</h2>
+<h2>Building and running the Integration Tests.</h2>
 
 <p>The following builds and runs the integration tests:</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="84c9c914-c765-4b10-83c9-008b0f80a189" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd systest/itests/client
 maven
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>&#160;</p></div>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/interceptors.xml
----------------------------------------------------------------------
diff --git a/interceptors.xml b/interceptors.xml
index fcd09d6..81b867c 100644
--- a/interceptors.xml
+++ b/interceptors.xml
@@ -1,27 +1,26 @@
-<div class="wiki-content maincontent"><p>ActiveMQ has a sophisticated <em>interceptor stack</em> so that you can attach whatever functionality you require into the broker in an easy way without complicating all of the other broker code. This has really helped us keep the code clean and modular while offering powerful extension points.</p><p>For an example of the kinds of things you can do with interceptors see the following pages</p><ul><li><a shape="rect" href="logging-interceptor.xml">Logging Interceptor</a></li><li><a shape="rect" href="security.xml">Security</a></li><li><a shape="rect" href="visualisation.xml">Visualisation</a></li><li><a shape="rect" href="timestampplugin.xml">TimeStamp on the Broker</a></li><li><a shape="rect" href="statisticsplugin.xml">Get Statistics via Messages</a></li><li><a shape="rect" href="destinations-plugin.xml">Destinations Plugin</a></li></ul><h3 id="Interceptors-Howpluginswork">How plugins work</h3><p>A plugin is an instance of the interface <a s
 hape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerPlugin.html">BrokerPlugin</a> which allows a plugin to add itself into the broker interceptor chain, typically using the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a> as a base class to allow only certain operations to be customized.</p><p>The object that implements the BrokerPlugin interface is called out as a plugin in the message broker's XML configuration file (see example below). Your plugin can then optionally reference other beans that are defined in the XML file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot; xmlns:amq=&quot;http://activemq.org/config/1.0&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans 
+<div class="wiki-content maincontent"><p>ActiveMQ has a sophisticated <em>interceptor stack</em> so that you can attach whatever functionality you require into the broker in an easy way without complicating all of the other broker code. This has really helped us keep the code clean and modular while offering powerful extension points.</p><p>For an example of the kinds of things you can do with interceptors see the following pages</p><ul><li><link><page ri:content-title="Logging Interceptor"></page></link></li><li><link><page ri:content-title="Security"></page></link></li><li><link><page ri:content-title="Visualisation"></page></link></li><li><link><page ri:content-title="TimeStampPlugin"></page><plain-text-link-body>TimeStamp on the Broker</plain-text-link-body></link></li><li><link><page ri:content-title="StatisticsPlugin"></page><plain-text-link-body>Get Statistics via Messages</plain-text-link-body></link></li><li><link><page ri:content-title="Destinations Plugin"></page></link><
 /li></ul><h3>How plugins work</h3><p>A plugin is an instance of the interface <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerPlugin.html">BrokerPlugin</a> which allows a plugin to add itself into the broker interceptor chain, typically using the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a> as a base class to allow only certain operations to be customized.</p><p>The object that implements the BrokerPlugin interface is called out as a plugin in the message broker's XML configuration file (see example below). Your plugin can then optionally reference other beans that are defined in the XML file.</p><structured-macro ac:macro-id="656129f8-6ff6-4792-be1a-034e4eb4bfa9" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;beans xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.org/config/1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans 
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.org/config/1.0 
-http://activemq.apache.org/schema/activemq-core.xsd http://activemq.apache.org/camel/schema/spring  http://activemq.apache.org/camel/schema/spring/camel-spring.xsd&quot;&gt;
+http://activemq.apache.org/schema/activemq-core.xsd http://activemq.apache.org/camel/schema/spring  http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"&gt;
 
 &lt;!-- Allows us to use 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;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot; plugins=&quot;#myPlugin&quot;&gt;
+ &lt;broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data" plugins="#myPlugin"&gt;
 
    &lt;!-- The transport connectors ActiveMQ will listen to --&gt;
    &lt;transportConnectors&gt;
-     &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://localhost:61616&quot; /&gt;
+     &lt;transportConnector name="openwire" uri="tcp://localhost:61616" /&gt;
    &lt;/transportConnectors&gt;
 
   &lt;/broker&gt;
 
-  &lt;bean id=&quot;myPlugin&quot; class=&quot;org.myorg.MyPlugin&quot;&gt;
+  &lt;bean id="myPlugin" class="org.myorg.MyPlugin"&gt;
              &lt;!-- You can reference one or more Spring beans in this file --&gt;
-             &lt;property name=&quot;myMgr&quot; ref=&quot;myManager&quot;/&gt;		 
+             &lt;property name="myMgr" ref="myManager"/&gt;		 
   &lt;/bean&gt;
 
-  &lt;bean id=&quot;myManager&quot; class=&quot;org.myorg.MyManager&quot;&gt;
-             &lt;property name=&quot;fooList&quot;&gt;
+  &lt;bean id="myManager" class="org.myorg.MyManager"&gt;
+             &lt;property name="fooList"&gt;
 	      &lt;list&gt;
 		&lt;value&gt;foo&lt;/value&gt;
                 &lt;value&gt;foo2&lt;/value&gt;
@@ -31,35 +30,31 @@ http://activemq.apache.org/schema/activemq-core.xsd http://activemq.apache.org/c
 
 &lt;/beans&gt;
 
-]]></script>
-</div></div><p>You can also define plugins from within the &lt;plugin&gt; element as this example illustrates.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans xmlns=&quot;http://www.springframework.org/schema/beans&quot; xmlns:amq=&quot;http://activemq.org/config/1.0&quot;
-xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans
+</plain-text-body></structured-macro><p>You can also define plugins from within the &lt;plugin&gt; element as this example illustrates.</p><structured-macro ac:macro-id="4c7bdd02-d993-4579-9dd9-0f0aa25d6464" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;beans xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.org/config/1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.org/config/1.0 
 http://activemq.apache.org/schema/activemq-core.xsd http://activemq.apache.org/camel/schema/spring
-http://activemq.apache.org/camel/schema/spring/camel-spring.xsd&quot;&gt;
+http://activemq.apache.org/camel/schema/spring/camel-spring.xsd"&gt;
 
  &lt;!-- Allows us to use 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;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot;&gt;
+ &lt;broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data"&gt;
 
   &lt;!-- The transport connectors ActiveMQ will listen to --&gt;
   &lt;transportConnectors&gt;
-     &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://localhost:61616&quot; /&gt;
+     &lt;transportConnector name="openwire" uri="tcp://localhost:61616" /&gt;
   &lt;/transportConnectors&gt;
 
   &lt;plugins&gt;
-      &lt;bean xmlns=&quot;http://www.springframework.org/schema/beans&quot; id=&quot;myPlugin&quot; class=&quot;org.myorg.MyPlugin&quot;/&gt;    
+      &lt;bean xmlns="http://www.springframework.org/schema/beans" id="myPlugin" class="org.myorg.MyPlugin"/&gt;    
   &lt;/plugins&gt;
 
  &lt;/broker&gt;
  
 &lt;/beans&gt;
 
-]]></script>
-</div></div><p>At startup, the main or core broker calls your plugin's installPlugin() method. This method creates and returns an object that typically extends <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[import org.apache.activemq.broker.Broker;
+</plain-text-body></structured-macro><p>At startup, the main or core broker calls your plugin's installPlugin() method. This method creates and returns an object that typically extends <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/BrokerFilter.html">BrokerFilter</a>.</p><structured-macro ac:macro-id="cf46422e-34b5-4b0a-9df2-52d5b5d113c6" ac:name="code" ac:schema-version="1"><plain-text-body>import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
 
 public class MyPlugin implements BrokerPlugin {	
@@ -69,9 +64,7 @@ public class MyPlugin implements BrokerPlugin {
         }	
 
 }
-]]></script>
-</div></div><p>The BrokerFilter class is a convenience class that implements the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/Broker.html">Broker</a> interface. This interface defines all the main operations (e.g., addConnection, addSession, etc.) that your implementation can intercept. The class that extends BrokerFilter overrides any of the methods that are defined in the Broker interface so that it can intercept the corresponding core engine's operations. Here's an example of a class that extends BrokerFilter and intercepts/overrides the addConnection() and addSession() Broker methods/operations.</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[import org.apache.activemq.broker.Broker;
+</plain-text-body></structured-macro><p>The BrokerFilter class is a convenience class that implements the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/Broker.html">Broker</a> interface. This interface defines all the main operations (e.g., addConnection, addSession, etc.) that your implementation can intercept. The class that extends BrokerFilter overrides any of the methods that are defined in the Broker interface so that it can intercept the corresponding core engine's operations. Here's an example of a class that extends BrokerFilter and intercepts/overrides the addConnection() and addSession() Broker methods/operations.</p><structured-macro ac:macro-id="f56ae2b6-9bb1-4c36-8e6a-521868d81a33" ac:name="code" ac:schema-version="1"><plain-text-body>import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerFilter;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ConnectionInfo;
@@ -103,6 +96,5 @@ public class MyBroker extends BrokerFilter {
 
 
 
-]]></script>
-</div></div><p>For more details see <a shape="rect" href="developing-plugins.xml">Developing Plugins</a></p></div>
+</plain-text-body></structured-macro><p>For more details see <link><page ri:content-title="Developing Plugins"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/ioexception-could-not-find-class-for-resource.xml
----------------------------------------------------------------------
diff --git a/ioexception-could-not-find-class-for-resource.xml b/ioexception-could-not-find-class-for-resource.xml
index ec41fd4..c7e2e9c 100644
--- a/ioexception-could-not-find-class-for-resource.xml
+++ b/ioexception-could-not-find-class-for-resource.xml
@@ -1,22 +1,20 @@
 <div class="wiki-content maincontent"><p>If you get an exception looking 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[
+<structured-macro ac:macro-id="5c09a37c-461c-400a-8682-4acaa5c967c4" ac:name="code" ac:schema-version="1"><plain-text-body>
 Reason:  java.io.exception : could not find class for resource: META-INF/services/org/apache/activemq/transport/tcp
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
-<h3 id="IOException-couldnotfindclassforresource-Cause">Cause</h3>
+<h3>Cause</h3>
 
 <p>You are probably using the ActiveMQ source code without using the resources</p>
 
-<h3 id="IOException-couldnotfindclassforresource-Quickfix">Quick fix</h3>
+<h3>Quick fix</h3>
 
 <p>Try one of these</p>
 <ul><li>use one of the distribution jars for ActiveMQ</li><li>use Maven to run your program</li><li>try adding activemq/src/conf to your classpath</li></ul>
 
 
-<h3 id="IOException-couldnotfindclassforresource-Background">Background</h3>
+<h3>Background</h3>
 
 <p>Then it means that the files in META-INF/services could not be found on the classpath. These files are used to support loose coupling on ActiveMQ with the transport protocols (e.g. to avoid a classpath dependency on JXTA) and to allow dynamic protocol enhancement without a change to the core.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/irc.xml
----------------------------------------------------------------------
diff --git a/irc.xml b/irc.xml
index 2ff5a8e..9ed2f2f 100644
--- a/irc.xml
+++ b/irc.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Committers and contributors can often be found hanging out in IRC.&#160;<span style="line-height: 1.4285715;">Below is the information about the channel that we use:&#160;</span></p><p><strong>Server:</strong> irc.freenode.net</p><p><strong>Channel:</strong> #apache-activemq</p><p>There are many&#160;<a shape="rect" class="external-link" href="https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients" rel="nofollow">IRC clients</a>&#160;available out there depending on the operating system you are using.&#160;</p><p>&#160;</p><p>Note the IRC channel on codehaus is deprecated as of April 2015; please refrain from using that room. &#160;Likewise, be aware there is a channel named #activemq on the freenode server - please avoid it as well.</p></div>
+<div class="wiki-content maincontent"><p>Committers and contributors can often be found hanging out in IRC.&#160;<span style="line-height: 1.4285715;">Below is the information about the channel that we use:&#160;</span></p><p><strong>Server:</strong> irc.freenode.net</p><p><strong>Channel:</strong> #apache-activemq</p><p>There are many&#160;<a shape="rect" href="https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients">IRC clients</a>&#160;available out there depending on the operating system you are using.&#160;</p><p>&#160;</p><p>Note the IRC channel on codehaus is deprecated as of April 2015; please refrain from using that room. &#160;Likewise, be aware there is a channel named #activemq on the freenode server - please avoid it as well.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/j2ee.xml
----------------------------------------------------------------------
diff --git a/j2ee.xml b/j2ee.xml
index b96734c..9869e48 100644
--- a/j2ee.xml
+++ b/j2ee.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<p>In J2EE 1.4 or later the standard way to integrate with a JMS provider is via JCA 1.5 and a <a shape="rect" href="resource-adapter.xml">Resource Adapter</a>.</p>
+<p>In J2EE 1.4 or later the standard way to integrate with a JMS provider is via JCA 1.5 and a <link><page ri:content-title="Resource Adapter"></page></link>.</p>
 
-<h2 id="J2EE-Introduction">Introduction</h2><p>ActiveMQ includes a Java Connector Architecture (JCA) 1.5 Resource Adapter. JCA 1.5 defines the contract between an J2EE application server and external resources such as databases and messaging middleware. It allows the application server to efficiently pool connections, control transactions and manage security. The Resource Adapter allows ActiveMQ to be used from any J2EE 1.4 application server. We have tested that the Resource Adapter works in the following J2EE 1.4 containers</p><ul><li><a shape="rect" class="external-link" href="http://tomee.apache.org/tomcat-jms.html">TomEE</a> 1</li><li>Geronimo 1</li><li>GlassFish</li><li>JBoss 4</li><li>WebLogic 9</li><li>WebSphere 6</li></ul><h2 id="J2EE-Features">Features</h2><ul><li>Inbound connection delivers messages to MDBs via XA or local transactions.</li><li>Outbound connections support standard container pooling or can reuse the inbound connection/session to avoid XA.</li><li>JTA supp
 ort: Can be enlisted in XA and local transactions.</li><li>XA transaction recovery via XAResource.recover() supported.</li><li>When used outside a JTA transaction, session transaction settings retain normal JMS semantics so that it be used by your web-app tier.</li><li>Can configure and start up embedded broker.</li><li>Can connect to external ActiveMQ broker or embedded broker.</li><li>Inbound message delivery supports fine grain control of concurrency and prefetching.</li><li>Batching so that multiple messages can be delivered within the same transaction for optimal performances.</li></ul><h2 id="J2EE-DownloadingtheRAR">Downloading the RAR</h2><p>The RAR is available via <a shape="rect" class="external-link" href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22activemq-rar%22" rel="nofollow">maven central</a></p><p><span style="color: rgb(102,0,51);font-size: 20.0px;line-height: 1.5;">Deployment Guides</span></p><ul><li><a shape="rect" href="tomee.xml">TomEE</a></li><li><a shap
 e="rect" href="geronimo.xml">Geronimo</a></li><li><a shape="rect" href="integrating-apache-activemq-with-glassfish.xml">Integrating Apache ActiveMQ with Glassfish</a></li><li><a shape="rect" href="jboss-integration.xml">JBoss Integration</a></li></ul><h2 id="J2EE-TheuseofanEmbeddedBroker">The use of an Embedded Broker</h2><p>The ActiveMQ Resource Adapter can connect to a remote broker using any of the available transports, or it can start up an embedded broker. As described in the <a shape="rect" href="resource-adapter-properties.xml">Resource Adapter Properties</a>, you can enable an embedded broker using the <strong>BrokerXmlConfig</strong> property.</p><h2 id="J2EE-ConfigurationReference">Configuration Reference</h2><ul><li><a shape="rect" href="resource-adapter-properties.xml">Resource Adapter Properties</a></li><li><a shape="rect" href="connection-factory-properties.xml">Connection Factory Properties</a></li><li><a shape="rect" href="activation-spec-properties.xml">Activation S
 pec Properties</a></li></ul></div>
+<structured-macro ac:macro-id="bb1a6e8d-0586-4002-8125-6273eff4fed3" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Resource Adapter"></page></link></parameter></structured-macro></div>
 


[08/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/inbound-communication.xml
----------------------------------------------------------------------
diff --git a/inbound-communication.xml b/inbound-communication.xml
index 68de133..c71c92c 100644
--- a/inbound-communication.xml
+++ b/inbound-communication.xml
@@ -1,13 +1,12 @@
 <div class="wiki-content maincontent">
 
 
-<h2 id="InboundCommunication-INLINEConfiguringanMDBtoreceivemessagesfromActiveMQ">Configuring an MDB to receive messages from ActiveMQ</h2>
-<p>There are three MDBs declared in the <a shape="rect" href="inbound-communication.data/ejb-jar.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3249" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="ejb-jar.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">ejb-jar.xml</a> deployment descriptor.  For this example, I will be explaining how to configure the <code>TopicDurableMDB</code> to be invoked by JBoss when a message is received on an ActiveMQ Topic.</p>
+<h2><structured-macro ac:macro-id="266bfef6-a4d2-4ae3-9429-a53a5a694960" ac:name="excerpt" ac:schema-version="1"><parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>Configuring an MDB to receive messages from ActiveMQ</p></rich-text-body></structured-macro></h2>
+<p>There are three MDBs declared in the <link><attachment ri:filename="ejb-jar.xml"><page ri:content-title="JBoss Integration"></page></attachment><link-body>ejb-jar.xml</link-body></link> deployment descriptor.  For this example, I will be explaining how to configure the <code>TopicDurableMDB</code> to be invoked by JBoss when a message is received on an ActiveMQ Topic.</p>
 
-<h3 id="InboundCommunication-TheBean">The Bean</h3>
-<p>In the <a shape="rect" href="inbound-communication.data/ejb-jar.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3249" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="ejb-jar.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">ejb-jar.xml</a> deployment descriptor, the <code>TopicDurableMDB</code> is declared as follows:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>ejb-jar.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ 
+<h3>The Bean</h3>
+<p>In the <link><attachment ri:filename="ejb-jar.xml"><page ri:content-title="JBoss Integration"></page></attachment><link-body>ejb-jar.xml</link-body></link> deployment descriptor, the <code>TopicDurableMDB</code> is declared as follows:</p>
+<structured-macro ac:macro-id="93b54ff4-22bf-4757-8139-2e2fd39d4021" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><parameter ac:name="title">ejb-jar.xml</parameter><plain-text-body> 
 &lt;message-driven&gt;
    ...
    &lt;ejb-name&gt;TopicDurableMDB&lt;/ejb-name&gt;
@@ -27,14 +26,12 @@
    &lt;/activation-config&gt;
    ...
 &lt;/message-driven&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The <code>activation-config</code> element and it's child element, <code>activation-config-property</code>, are new elements for EJBs, so you might not be familiar with them.  I won't go into to much detail about them, but it is important to understand that this is the first mechanism you use to link an MDB to a JCA.  </p>
 
-<h3 id="InboundCommunication-TheConnector">The Connector</h3>
-<p>The two <code>activation-config-properties</code> shown above link to the following elements in the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/checkout/activemq/modules/ra/src/rar/META-INF/ra.xml" rel="nofollow">ra.xml</a> file, which is contained within the <a shape="rect" href="jboss-integration.xml#JBossIntegration-rarfile">activemq-ra-1.2.rar</a> file:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<h3>The Connector</h3>
+<p>The two <code>activation-config-properties</code> shown above link to the following elements in the <a shape="rect" href="http://activemq.codehaus.org/checkout/activemq/modules/ra/src/rar/META-INF/ra.xml">ra.xml</a> file, which is contained within the <link ac:anchor="rarfile" ac:tooltip="The ActiveMQ JCA"><page ri:content-title="JBoss Integration"></page><link-body>activemq-ra-1.2.rar</link-body></link> file:</p>
+<structured-macro ac:macro-id="7bf9366c-c37f-4f3a-8819-fc99e87c4104" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><parameter ac:name="title">ra.xml</parameter><plain-text-body>
 &lt;inbound-resourceadapter&gt;
       ...
          &lt;activationspec&gt;
@@ -48,54 +45,47 @@
          &lt;/activationspec&gt;
       ...
 &lt;/inbound-resourceadapter&gt;
-]]></script>
-</div></div>
-<p>In the <a shape="rect" href="inbound-communication.data/ejb-jar.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3249" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="ejb-jar.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">ejb-jar.xml</a> file section shown above, the value of the <code>Destination</code> property is set to <code>topic.testTopic</code>.  This value is the physical name of the ActiveMQ destination the <code>TopicDurableMDB</code> will be receiving messages from and not a JNDI name.  In other words, the value of the <code>Destination</code> property has no meaning to JBoss.  It is purely an ActiveMQ setting. </p>
+</plain-text-body></structured-macro>
+<p>In the <link><attachment ri:filename="ejb-jar.xml"><page ri:content-title="JBoss Integration"></page></attachment><link-body>ejb-jar.xml</link-body></link> file section shown above, the value of the <code>Destination</code> property is set to <code>topic.testTopic</code>.  This value is the physical name of the ActiveMQ destination the <code>TopicDurableMDB</code> will be receiving messages from and not a JNDI name.  In other words, the value of the <code>Destination</code> property has no meaning to JBoss.  It is purely an ActiveMQ setting. </p>
 
-<h3 id="InboundCommunication-TheGlue">The Glue</h3>
-<p>In JBoss, the thing which connects an inbound JMS destination to an MDB is a JBoss container.  To use ActiveMQ as the inbound message source for the <code>TopicDurableMDB</code> we must configure a new JBoss container.  We do this in the <a shape="rect" href="inbound-communication.data/jboss.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3251" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="jboss.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">jboss.xml</a> file.</p>
+<h3>The Glue</h3>
+<p>In JBoss, the thing which connects an inbound JMS destination to an MDB is a JBoss container.  To use ActiveMQ as the inbound message source for the <code>TopicDurableMDB</code> we must configure a new JBoss container.  We do this in the <link><attachment ri:filename="jboss.xml"><page ri:content-title="JBoss Integration"></page></attachment><link-body>jboss.xml</link-body></link> file.</p>
 
-<p>Three things are needed in the <a shape="rect" href="inbound-communication.data/jboss.xml?version=3&amp;modificationDate=1117021488000&amp;api=v2" data-linked-resource-id="3251" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="jboss.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">jboss.xml</a> file in order to tie an MDB to a connector.  They are:</p>
+<p>Three things are needed in the <link><attachment ri:filename="jboss.xml"><page ri:content-title="JBoss Integration"></page></attachment><link-body>jboss.xml</link-body></link> file in order to tie an MDB to a connector.  They are:</p>
 
 <ol><li>Configure a new <code>invoker-proxy-binding</code> that declares <code>JBossMessageEndpointFactory</code> as the <code>proxy-factory</code></li><li>Configure a new MDB container which uses the new <code>invoker-proxy-binding</code></li><li>Declare which MDBs should go into the new container</li></ol>
 
 
 <p>This first snippet configures a new <code>invoker-proxy-binding</code>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>jboss.xml &#8211; invoker-proxy-binding</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="b0c5918e-6353-42c5-8497-2dc26104f808" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><parameter ac:name="title">jboss.xml -- invoker-proxy-binding</parameter><plain-text-body>
 &lt;invoker-proxy-binding&gt;
    &lt;name&gt;activemq-message-driven-bean&lt;/name&gt;
    &lt;invoker-mbean&gt;default&lt;/invoker-mbean&gt;
    &lt;proxy-factory&gt;org.jboss.ejb.plugins.inflow.JBossMessageEndpointFactory&lt;/proxy-factory&gt;
    ...
 &lt;/invoker-proxy-binding&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>This second snippet configures a new MDB container which uses the <code>invoker-proxy-binding</code> configured above:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>jboss.xml &#8211; container-configuration</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f089de17-bdb2-4912-962b-802892187292" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><parameter ac:name="title">jboss.xml -- container-configuration</parameter><plain-text-body>
 &lt;container-configuration&gt;
    &lt;container-name&gt;ActiveMQ Message Driven Bean&lt;/container-name&gt;
    &lt;call-logging&gt;false&lt;/call-logging&gt;
    &lt;invoker-proxy-binding-name&gt;activemq-message-driven-bean&lt;/invoker-proxy-binding-name&gt;
    ...
 &lt;/container-configuration&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>This third snippet links the <code>TopicDurableMDB</code> to the <a shape="rect" href="jboss-integration.xml#JBossIntegration-rarfile">activemq-ra-1.2.rar</a> connector and tells JBoss to put instances of <code>TopicDurableMDB</code> into the new MDB container declared above:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>jboss.xml &#8211; TopicDurableMDB</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<p>This third snippet links the <code>TopicDurableMDB</code> to the <link ac:anchor="rarfile" ac:tooltip="The ActiveMQ JCA"><page ri:content-title="JBoss Integration"></page><link-body>activemq-ra-1.2.rar</link-body></link> connector and tells JBoss to put instances of <code>TopicDurableMDB</code> into the new MDB container declared above:</p>
+<structured-macro ac:macro-id="88e4dbc4-c3e3-40aa-a1d9-ccf9cd47297e" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><parameter ac:name="title">jboss.xml -- TopicDurableMDB</parameter><plain-text-body>
 &lt;message-driven&gt;
    &lt;ejb-name&gt;TopicDurableMDB&lt;/ejb-name&gt;
    &lt;resource-adapter-name&gt;activemq-ra-1.2-SNAPSHOT.rar&lt;/resource-adapter-name&gt;
    &lt;configuration-name&gt;ActiveMQ Message Driven Bean&lt;/configuration-name&gt;
 &lt;/message-driven&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The above examples highlight the key configuration settings needed to enable MDBs deployed in JBoss to process messages from an ActiveMQ destination.  </p>
 
-<p>You can try the above example, plus a few more, by downloading the <a shape="rect" href="inbound-communication.data/activemq-jboss-test.zip?version=3&amp;modificationDate=1117021355000&amp;api=v2" data-linked-resource-id="3278" data-linked-resource-version="3" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-jboss-test.zip" data-nice-type="Zip Archive" data-linked-resource-content-type="application/zip" data-linked-resource-container-id="35943" data-linked-resource-container-version="53">activemq-jboss-test.zip</a> file which contains the complete sample project.</p></div>
+<p>You can try the above example, plus a few more, by downloading the <link><attachment ri:filename="activemq-jboss-test.zip"><page ri:content-title="JBoss Integration"></page></attachment><link-body>activemq-jboss-test.zip</link-body></link> file which contains the complete sample project.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/index.xml
----------------------------------------------------------------------
diff --git a/index.xml b/index.xml
index a7b0cbd..0ab73ce 100644
--- a/index.xml
+++ b/index.xml
@@ -1,104 +1,2 @@
-<div class="wiki-content maincontent"><h3 id="Index-DownloadActiveMQ5.15.2Today!" style="text-align: center;"><a shape="rect" href="download.xml">Download ActiveMQ 5.15.2 Today!</a></h3><p><a shape="rect" class="external-link" href="http://activemq.apache.org/">Apache ActiveMQ</a> &#8482; is the most popular and powerful open source messaging and <a shape="rect" href="enterprise-integration-patterns.xml">Integration Patterns</a> server.</p><p>Apache ActiveMQ is fast, supports many <a shape="rect" href="cross-language-clients.xml">Cross Language Clients and Protocols</a>, comes with easy to use <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> and many <a shape="rect" href="features.xml">advanced features</a> while fully supporting <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/" rel="nofollow">JMS 1.1</a> and J2EE 1.4. Apache ActiveMQ is released under the <a shape="rect" class="external-link" href="http://ww
 w.apache.org/">Apache</a> <a shape="rect" class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p>Grab yourself a <a shape="rect" href="download.xml">Download</a>, try our <a shape="rect" href="getting-started.xml">Getting Started Guide</a>, surf our <a shape="rect" href="faq.xml">FAQ</a> or start <a shape="rect" href="contributing.xml">Contributing</a> and join us on our <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>.</p><h3 id="Index-Features">Features</h3><p></p><ul><li>Supports a variety of <a shape="rect" href="cross-language-clients.xml">Cross Language Clients and Protocols</a> from Java, C, C++, C#, Ruby, Perl, Python, PHP<ul><li><a shape="rect" href="openwire.xml">OpenWire</a> for high performance clients in Java, C, C++, C#</li><li><a shape="rect" href="stomp.xml">Stomp</a> support so that clients can be written easily in C, Ruby, Perl, Python, PHP, ActionScript/Flash, Smalltalk to talk to ActiveMQ as well as an
 y other popular Message Broker</li><li><a shape="rect" href="amqp.xml">AMQP</a> v1.0 support</li><li><a shape="rect" href="mqtt.xml">MQTT</a> v3.1 support allowing for connections in an IoT environment.</li></ul></li><li>full support for the <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> both in the JMS client and the Message Broker</li><li>Supports many <a shape="rect" href="features.xml">advanced features</a> such as <a shape="rect" href="message-groups.xml">Message Groups</a>, <a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a>, <a shape="rect" href="wildcards.xml">Wildcards</a> and <a shape="rect" href="composite-destinations.xml">Composite Destinations</a></li><li>Fully supports JMS 1.1 and J2EE 1.4 with support for transient, persistent, transactional and XA messaging</li><li><a shape="rect" href="spring-support.xml">Spring Support</a> so that ActiveMQ can be easily embedded into Spring applications and confi
 gured using Spring's XML configuration mechanism</li><li>Tested inside popular J2EE servers such as <a shape="rect" class="external-link" href="http://tomee.apache.org/">TomEE</a>, <a shape="rect" class="external-link" href="http://geronimo.apache.org/">Geronimo</a>, JBoss, GlassFish and WebLogic<ul><li>Includes <a shape="rect" href="resource-adapter.xml">JCA 1.5 resource adaptors</a> for inbound &amp; outbound messaging so that ActiveMQ should auto-deploy in any J2EE 1.4 compliant server</li></ul></li><li>Supports pluggable <a shape="rect" href="uri-protocols.xml">transport protocols</a> such as <a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.xml">in-VM</a>, TCP, SSL, NIO, UDP, multicast, JGroups and JXTA transports</li><li>Supports very fast <a shape="rect" href="persistence.xml">persistence</a> using JDBC along with a high performance journal</li><li>Designed for high performance clustering, client-server, peer based communication</li><li><a shape="rect" href="
 rest.xml">REST</a> API to provide technology agnostic and language neutral web based API to messaging</li><li><a shape="rect" href="ajax.xml">Ajax</a> to support web streaming support to web browsers using pure DHTML, allowing web browsers to be part of the messaging fabric</li><li><a shape="rect" href="axis-and-cxf-support.xml">CXF and Axis Support</a> so that ActiveMQ can be easily dropped into either of these web service stacks to provide reliable messaging</li><li>Can be used as an in memory JMS provider, ideal for <a shape="rect" href="how-to-unit-test-jms-code.xml">unit testing JMS</a></li></ul><h3 id="Index-News">News</h3><p>    
-
-    
-        
-</p><div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~cshannon">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: cshannon" title="cshannon">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/10/23/apache-activemq-5152-released.xml">Apache ActiveMQ 5.15.2 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~cshannon">Christopher L. Shannon</a> posted on Oct 23, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5152-release.html">ActiveMQ 5.15.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~cshannon">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: cshannon" title="cshannon">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/07/06/apache-activemq-5150-released.xml">Apache ActiveMQ 5.15.0 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~cshannon">Christopher L. Shannon</a> posted on Jul 06, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5150-release.html">ActiveMQ 5.15.0</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~dejanb">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: dejanb" title="dejanb">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/04/17/apache-activemq-5145-released.xml">Apache ActiveMQ 5.14.5 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~dejanb">Dejan Bosanac</a> posted on Apr 17, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The ActiveMQ team is pleased to announce the release of <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5145-release.html">ActiveMQ 5.14.5</a><br clear="none">A big thanks to everyone who contributed to this release.<br clear="none">We look forward to your feedback.</p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~cshannon">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: cshannon" title="cshannon">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/03/03/apache-activemq-5144-released.xml">Apache ActiveMQ 5.14.4 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~cshannon">Christopher L. Shannon</a> posted on Mar 03, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5144-release.html">ActiveMQ 5.14.4</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~cshannon">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: cshannon" title="cshannon">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2016/12/09/apache-activemq-5142-released.xml">Apache ActiveMQ 5.14.2 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~cshannon">Christopher L. Shannon</a> posted on Dec 09, 2016</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span style="color: rgb(34,34,34);">The ActiveMQ team is pleased to announce the release of&#160;</span><a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5142-release.html">ActiveMQ 5.14.2</a></p><p><span style="color: rgb(34,34,34);">A big thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p>
-    </div>
-    
-        
-    </div>
-    <h3 id="Index-MoreNews">More News</h3><ul><li><a shape="rect" href="news.xml">Get all the latest Apache ActiveMQ News Here!</a></li></ul></div>
+<div class="wiki-content maincontent"><h3 style="text-align: center;"><link><page ri:content-title="Download"></page><plain-text-link-body>Download ActiveMQ 5.15.2 Today!</plain-text-link-body></link></h3><p><a shape="rect" href="http://activemq.apache.org/">Apache ActiveMQ</a> &#8482; is the most popular and powerful open source messaging and <link><page ri:content-title="Enterprise Integration Patterns"></page><plain-text-link-body>Integration Patterns</plain-text-link-body></link> server.</p><p>Apache ActiveMQ is fast, supports many <link><page ri:content-title="Cross Language Clients"></page><plain-text-link-body>Cross Language Clients and Protocols</plain-text-link-body></link>, comes with easy to use <link><page ri:content-title="Enterprise Integration Patterns"></page></link> and many <link><page ri:content-title="Features"></page><plain-text-link-body>advanced features</plain-text-link-body></link> while fully supporting <a shape="rect" href="http://java.sun.com/products/jms
 /">JMS 1.1</a> and J2EE 1.4. Apache ActiveMQ is released under the <a shape="rect" href="http://www.apache.org/">Apache</a> <a shape="rect" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p>Grab yourself a <link><page ri:content-title="Download"></page></link>, try our <link><page ri:content-title="Getting Started"></page><plain-text-link-body>Getting Started Guide</plain-text-link-body></link>, surf our <link><page ri:content-title="FAQ"></page></link> or start <link><page ri:content-title="Contributing"></page></link> and join us on our <link><page ri:content-title="Discussion Forums"></page></link>.</p><h3>Features</h3><p><structured-macro ac:macro-id="73467dfb-df8a-4bae-991f-9caf3e783f7a" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Features Overview"></page></link></parameter></structured-macro></p><h3>News</h3><p><structured-macro ac:macro-id="94a71fa4-0ab1-4c68-bc99-53dfa96d7548" ac:name="blog-posts" ac
 :schema-version="1"><parameter ac:name="max">5</parameter><parameter ac:name="sort">modified</parameter><parameter ac:name="reverse">true</parameter></structured-macro></p><h3>More News</h3><ul><li><link><page ri:content-title="News"></page><plain-text-link-body>Get all the latest Apache ActiveMQ News Here!</plain-text-link-body></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/initial-configuration.xml
----------------------------------------------------------------------
diff --git a/initial-configuration.xml b/initial-configuration.xml
index f5b6d0a..5818481 100644
--- a/initial-configuration.xml
+++ b/initial-configuration.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="InitialConfiguration-InitialConfiguration">Initial Configuration</h1><h2 id="InitialConfiguration-DocumentOrganization">Document Organization</h2><ul><li><a shape="rect" href="#InitialConfiguration-RequiredJARs">#Required JARs</a></li><li><a shape="rect" href="#InitialConfiguration-OptionalJARS">#Optional JARS</a></li><li><a shape="rect" href="#InitialConfiguration-PersistenceSupport">#Persistence Support</a></li><li><a shape="rect" href="#InitialConfiguration-Nextsteps">#Next steps</a></li><li><a shape="rect" href="#InitialConfiguration-AdditionalResources">#Additional Resources</a><ul><li><a shape="rect" href="#InitialConfiguration-RelatedReading">#Related Reading</a></li><li><a shape="rect" href="#InitialConfiguration-Specifications">#Specifications</a></li><li><a shape="rect" href="#InitialConfiguration-Relatedopensourceprojects">#Related open source projects</a></li></ul></li></ul><p>Firstly you need to add the jars to your classpat
 h.</p><h2 id="InitialConfiguration-RequiredJARs">Required JARs</h2><p>To make ActiveMQ easy to use, the default <strong>activemq-all.jar</strong> comes complete with all the libraries required. If you prefer to have explicit control over all the jars used by ActiveMQ here is the full list of individual jars required</p><ul><li>activemq-broker.jar</li><li>activemq-client.jar</li><li>activeio-core.jar</li><li>activemq-kahadb-store.jar (if you wish to use persistence)</li><li>slf4j-api.jar</li><li>J2EE APIs which could be the j2ee.jar from Sun or your J2EE container or you could use Geronimo's freely distributable geronimo-spec-j2ee.jar. If you are inside a servlet container and being dependent on the j2ee.jar causes you troubles, the parts of the J2EE jar we are dependent on are as follows...<ul><li>geronimo-spec-jms.jar</li><li>geronimo-spec-jta.jar</li><li>geronimo-spec-j2ee-management.jar</li></ul></li></ul><p>If you want to grab a J2EE specification jar we recommend the Apache <a 
 shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/geronimo/">repository</a></p><h2 id="InitialConfiguration-OptionalJARS">Optional JARS</h2><ul><li>spring.jar - if you wish to use the XML configuration file for configuring the Message Broker</li></ul><ul><li>if you wish to use message persistence then you need to add a persistent jar to your classpath (see below). If you just want a lightweight message bus with no durability you can leave this step out but we highly recommend persistence for production deployments.</li></ul><h2 id="InitialConfiguration-PersistenceSupport">Persistence Support</h2><p>We support persistence via <a shape="rect" href="persistence.xml">Specialized KahaDB file system message store or JDBC</a>. For full explict control over configuration check out the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. If you wish to use KahaDB, include kahadb.jar in your classpath. In case of JDBC you'll need to include app
 ropriate database driver.</p><p>If you're just doing some testing or in-VM SEDA based messaging you may wish to disable persistence. You can use the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> for this.</p><p>In 5.x you can do this by setting the <code>persistent=false</code> property to false either in the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> or on the <a shape="rect" href="configuring-transports.xml">broker URL</a>.</p><h2 id="InitialConfiguration-Nextsteps">Next steps</h2><p>One of the first things you might want to do is <a shape="rect" href="run-broker.xml">start a broker</a>. Once you have a broker running you could try some <a shape="rect" href="examples.xml">example programs</a></p><p>If you want to write your own application, you can just instantiate an <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFa
 ctory</a>, configure its properties directly and then you're ready to use the standard JMS API to create Connections, Sessions, MessageProducer and MessageConsumer instances.</p><p>You can also take a look at our <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/">unit tests</a> for more examples on how to use ActiveMQ.</p><h2 id="InitialConfiguration-AdditionalResources">Additional Resources</h2><h3 id="InitialConfiguration-RelatedReading">Related Reading</h3><ul><li>Sun's <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/tutorial/" rel="nofollow">JMS Tutorial</a> is a handy place to start looking at how to use the JMS API directly</li><li>The ActiveMQ <a shape="rect" class="external-link" href="http://activemq.apache.org/">Website</a> for specifics on how to use ActiveMQ</li><li><a shape="rect" href="topologies.xml">ActiveMQ Topologies</a></li><li><a shape="rect" hr
 ef="clustering.xml">ActiveMQ Clustering</a></li><li><a shape="rect" href="networks-of-brokers.xml">ActiveMQ Network of Brokers</a></li><li><a shape="rect" class="external-link" href="http://www.eecs.harvard.edu/~mdw/proj/seda/" rel="nofollow">Staged Event Driven Architecture (SEDA)</a></li></ul><h3 id="InitialConfiguration-Specifications">Specifications</h3><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">Java Connector Architecture 1.5</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/products/jms/index.jsp" rel="nofollow">Java Messaging Service</a></li></ul><h3 id="InitialConfiguration-Relatedopensourceprojects">Related open source projects</h3><ul><li><a shape="rect" class="external-link" href="http://camel.apache.org">Apache Camel</a></li><li><a shape="rect" class="external-link" href="http://geronimo.apache.org/">Apache Geronimo</a></li><li><a shape="rect" class="external-link" href="http://www.her
 mesjms.com/" rel="nofollow">Hermes JMS</a></li><li><a shape="rect" class="external-link" href="http://stomp.github.com/" rel="nofollow">Stomp</a> is an open wire protocol (similar to HTTP) for communicating with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, Ruby etc.</li><li><a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul></div>
+<div class="wiki-content maincontent"><h1>Initial Configuration</h1><h2>Document Organization</h2><ul><li><link ac:anchor="Required JARs"><plain-text-link-body>#Required JARs</plain-text-link-body></link></li><li><link ac:anchor="Optional JARS"><plain-text-link-body>#Optional JARS</plain-text-link-body></link></li><li><link ac:anchor="Persistence Support"><plain-text-link-body>#Persistence Support</plain-text-link-body></link></li><li><link ac:anchor="Next steps"><plain-text-link-body>#Next steps</plain-text-link-body></link></li><li><link ac:anchor="Additional Resources"><plain-text-link-body>#Additional Resources</plain-text-link-body></link><ul><li><link ac:anchor="Related Reading"><plain-text-link-body>#Related Reading</plain-text-link-body></link></li><li><link ac:anchor="Specifications"><plain-text-link-body>#Specifications</plain-text-link-body></link></li><li><link ac:anchor="Related open source projects"><plain-text-link-body>#Related open source projects</plain-text-link-b
 ody></link></li></ul></li></ul><p>Firstly you need to add the jars to your classpath.</p><h2>Required JARs</h2><p>To make ActiveMQ easy to use, the default <strong>activemq-all.jar</strong> comes complete with all the libraries required. If you prefer to have explicit control over all the jars used by ActiveMQ here is the full list of individual jars required</p><ul><li>activemq-broker.jar</li><li>activemq-client.jar</li><li>activeio-core.jar</li><li>activemq-kahadb-store.jar (if you wish to use persistence)</li><li>slf4j-api.jar</li><li>J2EE APIs which could be the j2ee.jar from Sun or your J2EE container or you could use Geronimo's freely distributable geronimo-spec-j2ee.jar. If you are inside a servlet container and being dependent on the j2ee.jar causes you troubles, the parts of the J2EE jar we are dependent on are as follows...<ul><li>geronimo-spec-jms.jar</li><li>geronimo-spec-jta.jar</li><li>geronimo-spec-j2ee-management.jar</li></ul></li></ul><p>If you want to grab a J2EE s
 pecification jar we recommend the Apache <a shape="rect" href="https://dist.apache.org/repos/dist/release/geronimo/">repository</a></p><h2>Optional JARS</h2><ul><li>spring.jar - if you wish to use the XML configuration file for configuring the Message Broker</li></ul><ul><li>if you wish to use message persistence then you need to add a persistent jar to your classpath (see below). If you just want a lightweight message bus with no durability you can leave this step out but we highly recommend persistence for production deployments.</li></ul><h2>Persistence Support</h2><p>We support persistence via <link><page ri:content-title="Persistence"></page><plain-text-link-body>Specialized KahaDB file system message store or JDBC</plain-text-link-body></link>. For full explict control over configuration check out the <link><page ri:content-title="Xml Configuration"></page></link>. If you wish to use KahaDB, include kahadb.jar in your classpath. In case of JDBC you'll need to include appropria
 te database driver.</p><p>If you're just doing some testing or in-VM SEDA based messaging you may wish to disable persistence. You can use the <link><page ri:content-title="Xml Configuration"></page></link> for this.</p><p>In 5.x you can do this by setting the <code>persistent=false</code> property to false either in the <link><page ri:content-title="Xml Configuration"></page></link> or on the <link><page ri:content-title="Configuring Transports"></page><plain-text-link-body>broker URL</plain-text-link-body></link>.</p><h2>Next steps</h2><p>One of the first things you might want to do is <link><page ri:content-title="Run Broker"></page><plain-text-link-body>start a broker</plain-text-link-body></link>. Once you have a broker running you could try some <link><page ri:content-title="Examples"></page><plain-text-link-body>example programs</plain-text-link-body></link></p><p>If you want to write your own application, you can just instantiate an <a shape="rect" href="http://activemq.apac
 he.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a>, configure its properties directly and then you're ready to use the standard JMS API to create Connections, Sessions, MessageProducer and MessageConsumer instances.</p><p>You can also take a look at our <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/">unit tests</a> for more examples on how to use ActiveMQ.</p><h2>Additional Resources</h2><h3>Related Reading</h3><ul><li>Sun's <a shape="rect" href="http://java.sun.com/products/jms/tutorial/">JMS Tutorial</a> is a handy place to start looking at how to use the JMS API directly</li><li>The ActiveMQ <a shape="rect" href="http://activemq.apache.org/">Website</a> for specifics on how to use ActiveMQ</li><li><link><page ri:content-title="Topologies"></page><plain-text-link-body>ActiveMQ Topologies</plain-text-link-body></link></li><li><link><page ri:conte
 nt-title="Clustering"></page><plain-text-link-body>ActiveMQ Clustering</plain-text-link-body></link></li><li><link><page ri:content-title="Networks of Brokers"></page><plain-text-link-body>ActiveMQ Network of Brokers</plain-text-link-body></link></li><li><a shape="rect" href="http://www.eecs.harvard.edu/~mdw/proj/seda/">Staged Event Driven Architecture (SEDA)</a></li></ul><h3>Specifications</h3><ul><li><a shape="rect" href="http://java.sun.com/j2ee/connector/">Java Connector Architecture 1.5</a></li><li><a shape="rect" href="http://java.sun.com/products/jms/index.jsp">Java Messaging Service</a></li></ul><h3>Related open source projects</h3><ul><li><a shape="rect" href="http://camel.apache.org">Apache Camel</a></li><li><a shape="rect" href="http://geronimo.apache.org/">Apache Geronimo</a></li><li><a shape="rect" href="http://www.hermesjms.com/">Hermes JMS</a></li><li><a shape="rect" href="http://stomp.github.com/">Stomp</a> is an open wire protocol (similar to HTTP) for communicating
  with MOMs from different languages. It has clients for languages like C, C#, Python, Perl, Ruby etc.</li><li><a shape="rect" href="http://xbean.org/">XBean</a> is used as the default XML configuration mechanism for ActiveMQ</li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/installation.xml
----------------------------------------------------------------------
diff --git a/installation.xml b/installation.xml
index 0997c93..b8a84e2 100644
--- a/installation.xml
+++ b/installation.xml
@@ -1,22 +1,20 @@
 <div class="wiki-content maincontent">
-<ul><li><a shape="rect" href="download.xml">Download</a> a binary distribution of ActiveMQ and unpack it into some directory.</li></ul>
+<ul><li><link><page ri:content-title="Download"></page></link> a binary distribution of ActiveMQ and unpack it into some directory.</li></ul>
 
 
 <ul><li>To run an ActiveMQ broker, type the following commands from the directory in which you have just unpacked the ActiveMQ distribution.</li></ul>
 
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="0e55a374-0c49-4037-bf66-bffb0864ee9d" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd bin
 activemq
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The ActiveMQ broker should now run. You can configure the broker by specifying an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> file as a parameter to the <em>activemq</em> command.</p>
+<p>The ActiveMQ broker should now run. You can configure the broker by specifying an <link><page ri:content-title="Xml Configuration"></page></link> file as a parameter to the <em>activemq</em> command.</p>
 
-<p>You can now run the <a shape="rect" href="examples.xml">Examples</a> using Ant.</p>
+<p>You can now run the <link><page ri:content-title="Examples"></page></link> using Ant.</p>
 
-<p>See the <a shape="rect" href="initial-configuration.xml">getting started guide</a> for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code</p>
+<p>See the <link><page ri:content-title="Initial Configuration"></page><link-body>getting started guide</link-body></link> for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code</p>
 
-<p>If you want to use JNDI to connect to your JMS provider then please view the <a shape="rect" href="jndi-support.xml">JNDI Support</a>. If you are a Spring user you should read about <a shape="rect" href="spring-support.xml">Spring Support</a></p></div>
+<p>If you want to use JNDI to connect to your JMS provider then please view the <link><page ri:content-title="JNDI Support"></page></link>. If you are a Spring user you should read about <link><page ri:content-title="Spring Support"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/integrating-apache-activemq-with-glassfish.xml
----------------------------------------------------------------------
diff --git a/integrating-apache-activemq-with-glassfish.xml b/integrating-apache-activemq-with-glassfish.xml
index 42cbc8b..4c33d7e 100644
--- a/integrating-apache-activemq-with-glassfish.xml
+++ b/integrating-apache-activemq-with-glassfish.xml
@@ -1,24 +1,14 @@
-<div class="wiki-content maincontent"><h1 id="IntegratingApacheActiveMQwithGlassfish-General">General</h1><p>See this article for a description of how to connect Glassfish 3 to an ActiveMQ 5 broker, and consume messages using a Message Driven Bean: <a shape="rect" class="external-link" href="http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/" rel="nofollow">http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/</a></p><h1 id="IntegratingApacheActiveMQwithGlassfish-Glassfish4.1">Glassfish 4.1</h1><p>&#160;</p><ol><li>Add resource adapter<br clear="none"><ol><li>Download the resource-adapter file suitable to your broker version:<br clear="none"><a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/" rel="nofollow">http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/</a></li><li><p>Deploy the&#160; resource adapter with the name "activemq-rar"</p><div cl
 ass="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: bash; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/asadmin deploy --type rar --name activemq-rar /tmp/activemq-rar-5.11.1.rar]]></script>
-</div></div></li><li><p>Configure resource adapter <br clear="none">(Failover Setup)</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: bash; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/asadmin create-resource-adapter-config   \
-  --property ServerUrl=&#39;failover\:(tcp\://broker-c1.foobar.local\:61616,tcp\://broker-c2.foobar.local\:61616,tcp\://broker-c3.foobar.local\:61616)?initialReconnectDelay\=2000&amp;jms.useCompression\=true&#39;:UserName=&#39;admin&#39;:Password=&#39;admin&#39; activemq-rar]]></script>
-</div></div></li></ol></li><li><p>&#160;Create connector connection pool</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: bash; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/asadmin create-connector-connection-pool \
+<div class="wiki-content maincontent"><h1>General</h1><p>See this article for a description of how to connect Glassfish 3 to an ActiveMQ 5 broker, and consume messages using a Message Driven Bean: <a shape="rect" class="external-link" href="http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/" rel="nofollow">http://geertschuring.wordpress.com/2012/04/20/how-to-connect-glassfish-3-to-activemq-5/</a></p><h1>Glassfish 4.1</h1><p>&#160;</p><ol><li>Add resource adapter<br clear="none"><ol><li>Download the resource-adapter file suitable to your broker version:<br clear="none"><a shape="rect" href="http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/">http://repo1.maven.org/maven2/org/apache/activemq/activemq-rar/</a></li><li><p>Deploy the&#160; resource adapter with the name "activemq-rar"</p><structured-macro ac:macro-id="20855b14-bd0e-4956-afcd-f43690b8e104" ac:name="code" ac:schema-version="1"><parameter ac:name="language">bash</parameter><
 plain-text-body>bin/asadmin deploy --type rar --name activemq-rar /tmp/activemq-rar-5.11.1.rar</plain-text-body></structured-macro></li><li><p>Configure resource adapter <br clear="none">(Failover Setup)</p><structured-macro ac:macro-id="ef4b601a-2fdc-447c-83df-8fa0e0de1745" ac:name="code" ac:schema-version="1"><parameter ac:name="language">bash</parameter><plain-text-body>bin/asadmin create-resource-adapter-config   \
+  --property ServerUrl='failover\:(tcp\://broker-c1.foobar.local\:61616,tcp\://broker-c2.foobar.local\:61616,tcp\://broker-c3.foobar.local\:61616)?initialReconnectDelay\=2000&amp;jms.useCompression\=true':UserName='admin':Password='admin' activemq-rar</plain-text-body></structured-macro></li></ol></li><li><p>&#160;Create connector connection pool</p><structured-macro ac:macro-id="800ed343-3e5a-49cd-97a9-8ba10a1e12a8" ac:name="code" ac:schema-version="1"><parameter ac:name="language">bash</parameter><plain-text-body>bin/asadmin create-connector-connection-pool \
   --raname activemq-rar \
   --connectiondefinition javax.jms.ConnectionFactory \
   --ping true --isconnectvalidatereq true \
-  jms/myConnectionPool]]></script>
-</div></div></li><li><p>Create a connector resource (JNDI-Mapping for connection pool)</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: bash; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/asadmin create-connector-resource \
+  jms/myConnectionPool</plain-text-body></structured-macro></li><li><p>Create a connector resource (JNDI-Mapping for connection pool)</p><structured-macro ac:macro-id="e4c5b6ab-e476-4573-bb15-fad7672dcf6c" ac:name="code" ac:schema-version="1"><parameter ac:name="language">bash</parameter><plain-text-body>bin/asadmin create-connector-resource \
   --poolname jms/myConnectionPool \
-  jms/myConnectionFactory]]></script>
-</div></div></li><li><p>Configure JNDI mapping for a queue</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: bash; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/asadmin create-admin-object \
+  jms/myConnectionFactory</plain-text-body></structured-macro></li><li><p>Configure JNDI mapping for a queue</p><structured-macro ac:macro-id="30bcf588-ad7d-4eac-9d95-625de8800f76" ac:name="code" ac:schema-version="1"><parameter ac:name="language">bash</parameter><plain-text-body>bin/asadmin create-admin-object \
 	  --raname activemq-rar \
   --restype javax.jms.Queue \
   --property PhysicalName=MY.MAGIC.OUT \
   jms/queue/MY.MAGIC.OUT
-]]></script>
-</div></div></li><li>Deploy your message driven beans and use the configured jndi names</li></ol></div>
+</plain-text-body></structured-macro></li><li>Deploy your message driven beans and use the configured jndi names</li></ol></div>
 


[25/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/cms-api-overview.xml
----------------------------------------------------------------------
diff --git a/cms/cms-api-overview.xml b/cms/cms-api-overview.xml
index e0f2b19..25e06dd 100644
--- a/cms/cms-api-overview.xml
+++ b/cms/cms-api-overview.xml
@@ -1,56 +1,48 @@
-<div class="wiki-content maincontent"><h1 id="CMSAPIOverview-WhatisCMS?">What is CMS?</h1>
+<div class="wiki-content maincontent"><h1>What is CMS?</h1>
 
 <p>The CMS API is a C++ corollary to the JMS API in Java which is used to send and receive messages from clients spread out across a network or located on the same machine.&#160; In CMS we've made every attempt to maintain as much parity with the JMS api as possible, diverging only when a JMS feature depended strongly on features in the Java programming language itself.&#160; Even though there are some differences most are quite minor and for the most part CMS adheres to the JMS spec, so having a firm grasp on how JMS works should make using CMS that much easier.&#160;</p>
 
-<p>One of the first places to start if you are already familiar with JMS is to take a look at the CMS <a shape="rect" href="api.xml">API documentation</a></p>
+<p>One of the first places to start if you are already familiar with JMS is to take a look at the CMS <link><page ri:content-title="API"></page><link-body>API documentation</link-body></link></p>
 
-<h1 id="CMSAPIOverview-GettingStartedwithCMS">Getting Started with CMS</h1>
+<h1>Getting Started with CMS</h1>
 
 <p>This section covers the basics of using the CMS API.  In order to aid in the discussion we assume here that you are using ActiveMQ-CPP to connect to an ActiveMQ Broker, of course with CMS you could also link to another implementation of the CMS API in your C++ application and connect to some other Message service.</p>
 
-<h2 id="CMSAPIOverview-TheCMSConnectionFactory">The CMS ConnectionFactory</h2>
+<h2>The CMS ConnectionFactory</h2>
 
 <p>The first interface you will generally use in the CMS API is the ConnectionFactory.  A ConnectionFactory allows you to create CMS Connection objects which maintain a connection the some Messaging service, e.g. an ActiveMQ broker.</p>
 
 <p>The simplest way to obtain an instance of a CMS ConnectionFactory is to use the static method <strong>createCMSConnectionFactory</strong> that all CMS Provider libraries are required to implement.  The code snippet below demonstrates how to obtain a new ConnectionFactory:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Connection Factory</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="9e8b1347-2997-40fb-8c11-b47f647ef70d" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Connection Factory</parameter><plain-text-body>
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-        cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
-]]></script>
-</div></div>
-<p>As you can see the <strong>createCMSConnectionFactory</strong> takes a single string parameter which is in the form of a URI that defines where the Connection that is created is to connect to as well as the protocol that should be used, TCP/IP in the case of the above example.  Additionally configuration information can be encoded in the URI.  Refer to the <a shape="rect" href="configuring.xml">Configuration</a> page for more information on the configuration parameters that can be passed to ActiveMQ-CPP via the URI.</p>
+        cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
+</plain-text-body></structured-macro>
+<p>As you can see the <strong>createCMSConnectionFactory</strong> takes a single string parameter which is in the form of a URI that defines where the Connection that is created is to connect to as well as the protocol that should be used, TCP/IP in the case of the above example.  Additionally configuration information can be encoded in the URI.  Refer to the <link><page ri:content-title="Configuring"></page><link-body>Configuration</link-body></link> page for more information on the configuration parameters that can be passed to ActiveMQ-CPP via the URI.</p>
 
 <p>Once you've created a ConnectionFactory the next thing to do is to create a CMS Connection using the ConnectionFactory.  A Connection is the Object that manages the client's connection to the Provider.  The next section covers the use of a CMS Connection, the code to create a Connection is shown below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Connection</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="bbc275d7-faeb-4c13-a95f-a118fc6a71b4" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Connection</parameter><plain-text-body>
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Upon creation the Connection object attempts to connect to the CMS Provider, if the connection fails then an CMSException is thrown with a description of the error that occurred stored in its Message property.</p>
 
-<h3 id="CMSAPIOverview-ConnectionsandAuthentication">Connections and Authentication</h3>
+<h3>Connections and Authentication</h3>
 
 <p>There are a couple versions of the <strong>createConnection</strong> method that allow you to specify login parameters for the newly created Connection.  The one you would use most often takes a user-name and password pair that is transmitted to the Broker for authentication.  Should the credentials be invalid a CMSException would be thrown.  The sample code below shows how to pass a user-name and password in when creating your Connection object.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Connection with Authentication</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection( &quot;&lt;USERNAME&gt;&quot;, &quot;&lt;PASSWORD&gt;&quot;) );
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="940da753-1288-4b8b-905b-e824cca36495" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Connection with Authentication</parameter><plain-text-body>
+std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection( "&lt;USERNAME&gt;", "&lt;PASSWORD&gt;") );
+</plain-text-body></structured-macro>
 
 <p>If you don't want to hard code values into your source code or write code to read the login data from somewhere else there is another option for passing in the user-name and password, the URI that you pass to <strong>createConnectionFactory</strong> can be encoded so that the connectionFactory will read the values from the system environment when it parses the URI.  The example below shows how to create a connection factory with the login data set in the URI.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Connection Factory with URI values for Authentication data.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="750d8ac2-09b4-448a-89e5-89b097e4e9b9" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Connection Factory with URI values for Authentication data.</parameter><plain-text-body>
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-        cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616?username=${USERNAME}&amp;password=${PASSWORD}&quot; ) );
-]]></script>
-</div></div>
+        cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616?username=${USERNAME}&amp;password=${PASSWORD}" ) );
+</plain-text-body></structured-macro>
 
 <p>As you can see it is pretty simple to have values on the URI come from the system environment.  This method will work for any parameter that you can specify in the URI.</p>
 
-<h2 id="CMSAPIOverview-CMSConnection">CMS Connection</h2>
+<h2>CMS Connection</h2>
 
 <p>The CMS Connection interface defines an object that is the client's active connection to the CMS provider.  In most cases the client will only create one connection object since it is considered a heavyweight object.</p>
 
@@ -61,18 +53,16 @@ std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
 <p>A CMS Connection is created from a CMS ConnectionFactory as we saw previously.  If the ConnectionFactory create call is successful then the Connection object returned is connected to the CMS Provider.  The Connection object is created in a stopped state, no messages will be delivered to Message consumers that a client creates until the Connection is started.  Its normal to leave a Connection in the stopped state until the client has created the initial set of Sessions, Message Producers, and Message Consumers that it intends to use.  Once the setup phase of the client completes it should call the Connection's start method to begin receiving messages from the Provider.  Failing to call the <strong>start</strong> method is a very common error among new users of CMS and JMS clients, if you find you aren't receiving any messages the first thing to check is that you called <strong>start</strong>.</p>
 
 <p>After creating the Connection the client must create a CMS Session in order to create message producers and consumers.  The code snippet below puts together what we've seen so far and then shows how to create a CMS Session object from our Connection instance, the section that follows will discuss the CMS Session in more detail.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Session</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="91e4c1d5-a91e-4c52-a16b-db33cf7cd081" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Session</parameter><plain-text-body>
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
 
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession() );
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="CMSAPIOverview-CMSSession">CMS Session</h2>
+<h2>CMS Session</h2>
 
 <p>Once you've successfully created a CMS Connection the next thing you would normall do is create one or more CMS Session objects using your new Connectio instance.&#160; A Session is defined as a Single Threaded context for producing and consuming messages.&#160;</p>
 
@@ -83,54 +73,49 @@ std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession() );
 <p>&#160;A session can create and service multiple message producers and   consumers.</p>
 
 <p>&#160;When a client creates a CMS session it must specify the mode in which the Session will acknowledge the messages that it receives and dispatches.&#160; The modes supported are summarized in the table below.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Acknowledge Mode <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> AUTO_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> With this acknowledgement mode, the session automatically acknowledges  a client's receipt of a message either when the session has successfully   returned from a call to receive or when the message   listener the session has called to process the message successfully   returns. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> CLIENT_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> With this acknowledgement mode, the client acknowledges a consumed   m
 essage by calling the message's acknowledge method.   Acknowledging a consumed message acknowledges all messages that the   session has consumed. When client acknowledgement mode is used, a client may build up a   large number of unacknowledged messages while attempting to process   them. A CMS provider should provide administrators with a way to   limit client overrun so that clients are not driven to resource   exhaustion and ensuing failure when some resource they are using   is temporarily blocked. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> DUPS_OK_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> This acknowledgement mode instructs the session to lazily acknowledge   the delivery of messages. This is likely to result in the delivery of   some duplicate messages if the JMS provider fails, so it should only be   used by consumers that can tolerate duplicate messages. Use of this    mode can reduce session overhead by minimizing 
 the work the   session does to prevent duplicates. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> SESSION_TRANSACTED </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Session is Transacted and the acknowledge of messages is handled internally. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> INDIVIDUAL_ACKNOWLEDGE<br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Acknowledges are applied to a single message only.&#160; Unlike CLIENT_ACKNOWLEDGE where the acknowledgement applies to all messages received up to that point for the entire session, this mode applied only to a single message allowing the client to be more selective about which messages are acknowledged.&#160; <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Acknowledge Mode <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Description <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1"><p> AUTO_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1"><p> With this acknowledgement mode, the session automatically acknowledges  a client's receipt of a message either when the session has successfully   returned from a call to receive or when the message   listener the session has called to process the message successfully   returns. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> CLIENT_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1"><p> With this acknowledgement mode, the client acknowledges a consumed   message by calling the message's acknowledge method.   Acknowledging a consumed message acknowledges all messages that the   session has consumed. When client acknowledgement 
 mode is used, a client may build up a   large number of unacknowledged messages while attempting to process   them. A CMS provider should provide administrators with a way to   limit client overrun so that clients are not driven to resource   exhaustion and ensuing failure when some resource they are using   is temporarily blocked. </p></td></tr><tr><td colspan="1" rowspan="1"><p> DUPS_OK_ACKNOWLEDGE </p></td><td colspan="1" rowspan="1"><p> This acknowledgement mode instructs the session to lazily acknowledge   the delivery of messages. This is likely to result in the delivery of   some duplicate messages if the JMS provider fails, so it should only be   used by consumers that can tolerate duplicate messages. Use of this    mode can reduce session overhead by minimizing the work the   session does to prevent duplicates. </p></td></tr><tr><td colspan="1" rowspan="1"><p> SESSION_TRANSACTED </p></td><td colspan="1" rowspan="1"><p> Session is Transacted and the acknowledge of messages i
 s handled internally. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> INDIVIDUAL_ACKNOWLEDGE<br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Acknowledges are applied to a single message only.&#160; Unlike CLIENT_ACKNOWLEDGE where the acknowledgement applies to all messages received up to that point for the entire session, this mode applied only to a single message allowing the client to be more selective about which messages are acknowledged.&#160; <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table>
 
 <p>In the previous section we showed you how to create a session, lets take a look at that example again here:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Session</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="c6d7a53d-861a-43b4-819c-5137d744cf64" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Session</parameter><plain-text-body>
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
 
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession() );
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>In this code snippet the Session is created using the createSession with no arguments, this creates a Session that is in the AUTO_ACKNOWLEDGE mode.  To create a Session with one of the modes listed above there is a second create method in the CMS Session interface that takes a single argument specifying the mode, lets take a look at an example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Session with user specified Ack Mode</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="ef257aa8-af41-45e8-9019-1b04f80cadf9" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Session with user specified Ack Mode</parameter><plain-text-body>
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
 
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession(
     cms::Session::CLIENT_ACKNOWLEDGE ) );
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>As you can see there's not much difference here, just specify the mode you want for acknowledgement and you are ready to create your Session resources, in the next few section we will walk through the types of objects that you can create from a Session and show you the basics of using them.</p>
 
-<h2 id="CMSAPIOverview-ObjectscreatedfromCMSSession">Objects created from CMS Session</h2>
+<h2>Objects created from CMS Session</h2>
 
 <p>In this section we cover the types of objects that are created from an instance of a CMS Session object.</p>
 
-<h3 id="CMSAPIOverview-CMSMessages">CMS Messages</h3>
+<h3>CMS Messages</h3>
 
-<p>As its name implies CMS exists to send and receive messages, so it makes sense to start by covering the message that you can send and receive using CMS.  There are four main Message types supported by CMS at the the time of this writing, others may follow but we will stick to the ones that are fully supported right now.  The table below shows the message type along with a brief description of the Message's use, for complete details on the interface and usage of a particular message type, see the <a shape="rect" href="api.xml">CMS API Documentation</a>.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Message Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Message </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The Message interface defines the simplest CMS Message.  Unlike the rest of the CMS Messages the Message type has no body or payload, it can however contains properties set via a collection of property setters that encompass the basic types in C++.  The Message interface is the root of all the Message types in CMS. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> TextMessage </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The TextMessage class carries a payload consisting of a C++ string.  The TextMessage interface extends the Message interface adding methods for setting and getting the payload text and ret
 ains the support for setting Message properties.  Since Java Objects can't be sent to a CMS client from a JMS client directly the Text message is an ideal way to serialize the object to XML and send it to a JMS client. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> BytesMessage </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The BytesMessage payload consists of a series of uninterrupted bytes which the receiver is responsible for interpreting.  The BytesMessage adds methods for getting and setting byte array to the standard set of Message interface methods. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> MapMessage </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The Map message payload is a set of Name / Value pairs.  The Name is a C++ string type and the value is a C++ primitive type or string. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> StreamMessage<br clear="none" class="atl-for
 ced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The Stream Message body consists of a list of self describing primitive types.&#160; The StreamMessage interface provides accessor methods that can read and write the primitive types to/from the message.&#160; The read methods allow primitive type conversion when the conversion would result in no loss of data.<br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table></div>
+<p>As its name implies CMS exists to send and receive messages, so it makes sense to start by covering the message that you can send and receive using CMS.  There are four main Message types supported by CMS at the the time of this writing, others may follow but we will stick to the ones that are fully supported right now.  The table below shows the message type along with a brief description of the Message's use, for complete details on the interface and usage of a particular message type, see the <link><page ri:content-title="API"></page><link-body>CMS API Documentation</link-body></link>.</p>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Message Type </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> Message </p></td><td colspan="1" rowspan="1"><p> The Message interface defines the simplest CMS Message.  Unlike the rest of the CMS Messages the Message type has no body or payload, it can however contains properties set via a collection of property setters that encompass the basic types in C++.  The Message interface is the root of all the Message types in CMS. </p></td></tr><tr><td colspan="1" rowspan="1"><p> TextMessage </p></td><td colspan="1" rowspan="1"><p> The TextMessage class carries a payload consisting of a C++ string.  The TextMessage interface extends the Message interface adding methods for setting and getting the payload text and retains the support for setting Message properties.  Since Java Objects can't be sent to a CMS client from a JMS client directly the Text message is an ideal way to serialize th
 e object to XML and send it to a JMS client. </p></td></tr><tr><td colspan="1" rowspan="1"><p> BytesMessage </p></td><td colspan="1" rowspan="1"><p> The BytesMessage payload consists of a series of uninterrupted bytes which the receiver is responsible for interpreting.  The BytesMessage adds methods for getting and setting byte array to the standard set of Message interface methods. </p></td></tr><tr><td colspan="1" rowspan="1"><p> MapMessage </p></td><td colspan="1" rowspan="1"><p> The Map message payload is a set of Name / Value pairs.  The Name is a C++ string type and the value is a C++ primitive type or string. </p></td></tr><tr><td colspan="1" rowspan="1"><p> StreamMessage<br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> The Stream Message body consists of a list of self describing primitive types.&#160; The StreamMessage interface provides accessor methods that can read and write the primitive types to/from the message.&#160; The read metho
 ds allow primitive type conversion when the conversion would result in no loss of data.<br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table>
 
 
 <p>Now that we've seen the types of Message's we can create lets see how to actually create them and explore some of the operations that are available in the Message classes.</p>
 
-<h3 id="CMSAPIOverview-CreatingaMessage">Creating a Message</h3>
+<h3>Creating a Message</h3>
 
 <p>As you may have already guessed, Messages are created using the CMS Session instance we created previously.  The Session supplies methods for creating each of the four Message types we covered above.  The Session is the Factory that create the providers implementation of the Message interfaces defined in CMS, it knows how to configure the internal data structures and prevents the client from being tied to the provider implementation directly, this is why we have to use the Session to create a Message object instead of creating them directly.  Lets take a look at a code snippet that create a TextMessage instance and sets some properties on that Message.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a TextMessage using a CMS Session instance.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="20593867-a42d-4dbe-8879-99132d2fb6fa" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a TextMessage using a CMS Session instance.</parameter><plain-text-body>
 // Create the ConnectionFactory
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 // Create a Connection
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
@@ -142,31 +127,29 @@ std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession();
 std::auto_ptr&lt;cms::TextMessage&gt; textMessage( session-&gt;createTextMessage() );
 
 // Set the payload
-textMessage-&gt;setText( &quot;Payload Text&quot; );
+textMessage-&gt;setText( "Payload Text" );
 
 // Set some Properties
-textMessage-&gt;setStringProperty( &quot;USER_NAME&quot;, &quot;Steve&quot; );
-textMessage-&gt;setIntProperty( &quot;USER_CODE&quot;, 42 );
+textMessage-&gt;setStringProperty( "USER_NAME", "Steve" );
+textMessage-&gt;setIntProperty( "USER_CODE", 42 );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>As you can see from the code above creating a TextMessage is much like creating a Session or Connection instance, you just call the <strong>createTextMessage</strong> in your instance of a CMS Session and you get back a new TextMessage pointer that you can then populate with text and properties.</p>
 
-<h3 id="CMSAPIOverview-CMSDestinations">CMS Destinations</h3>
+<h3>CMS Destinations</h3>
 
 <p>As its name implies the CMS Destination interface defines an object that represents an endpoint that the Messages are routed to by the Messaging broker.  Clients create Destinations and send messages to them or wait for messages to be received on a destination they have subscribed to.  There are two basic types of Destinations in CMS, the Topic and the Queue, there are two subtypes of these the Temporary Topic and Temporary Queue.  The table below summarizes the four different Destination types.</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Destination Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Topic </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> In CMS a Topic implements publish and subscribe semantics. When you publish a message it goes to all the subscribers who are interested - so zero to many subscribers will receive a copy of the message. Only subscribers who had an active subscription at the time the broker receives the message will get a copy of the message. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> A CMS Queue implements load balancer semantics. A single message will be received by exactly one consumer. If there are no consumers available at the time the message is sent it will 
 be kept until a consumer is available that can process the message. If a consumer receives a message and does not acknowledge it before closing then the message will be redelivered to another consumer. A queue can have many consumers with messages load balanced across the available consumers. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> TemporaryTopic </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> A TemporaryTopic object is a unique Topic object created for the duration of a Connection. It is a system-defined topic that can be consumed only by the Connection that created it. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> TemporaryQueue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> A TemporaryQueue object is a unique Queue object created for the duration of a Connection. It is a system-defined queue that can be consumed only by the Connection that created it. </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Destination Type </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> Topic </p></td><td colspan="1" rowspan="1"><p> In CMS a Topic implements publish and subscribe semantics. When you publish a message it goes to all the subscribers who are interested - so zero to many subscribers will receive a copy of the message. Only subscribers who had an active subscription at the time the broker receives the message will get a copy of the message. </p></td></tr><tr><td colspan="1" rowspan="1"><p> Queue </p></td><td colspan="1" rowspan="1"><p> A CMS Queue implements load balancer semantics. A single message will be received by exactly one consumer. If there are no consumers available at the time the message is sent it will be kept until a consumer is available that can process the message. If a consumer receives a message and does not acknowledge it before closing then the message will be redel
 ivered to another consumer. A queue can have many consumers with messages load balanced across the available consumers. </p></td></tr><tr><td colspan="1" rowspan="1"><p> TemporaryTopic </p></td><td colspan="1" rowspan="1"><p> A TemporaryTopic object is a unique Topic object created for the duration of a Connection. It is a system-defined topic that can be consumed only by the Connection that created it. </p></td></tr><tr><td colspan="1" rowspan="1"><p> TemporaryQueue </p></td><td colspan="1" rowspan="1"><p> A TemporaryQueue object is a unique Queue object created for the duration of a Connection. It is a system-defined queue that can be consumed only by the Connection that created it. </p></td></tr></tbody></table>
 
 
 <p>Now that we've seen what the destination types are, lets look at a code snippet showing how to create a Destination object.  The example below shows how to create a Topic instance using what should now be a pretty familiar pattern.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a Topic from a CMS Session object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="82c12002-b7d4-40e2-a488-8822696f4fa6" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a Topic from a CMS Session object</parameter><plain-text-body>
 // Create the ConnectionFactory
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 // Create a Connection
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
@@ -175,22 +158,20 @@ std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createCon
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession();
 
 // Now create a Topic
-std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( &quot;EXAMPLE-TOPIC&quot; ) );
+std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( "EXAMPLE-TOPIC" ) );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Creating a Topic or Queue requires passing a name for the Destination, the name is similar to an address, messages sent the the "EXAMPLE-TOPIC" destination are received by clients that have subscribed to that same Destination.</p>
 
-<h3 id="CMSAPIOverview-CMSMessageConsumer">CMS MessageConsumer</h3>
+<h3>CMS MessageConsumer</h3>
 
 <p>Now that we've covered how to create messages and destinations we will look at creating a CMS MessageConsumer.  The MessageConsumer allows the client application to receive messages sent by other clients to topics or queues.  Before we talk about receiving Messages with the consumer lets first look at how one is created.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a MessageConsumer from a CMS Session object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="769e2b5e-30f3-4fb3-8309-03bd18dd629f" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a MessageConsumer from a CMS Session object</parameter><plain-text-body>
 // Create the ConnectionFactory
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 // Create a Connection
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
@@ -199,20 +180,18 @@ std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createCon
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession();
 
 // Now create a Topic
-std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( &quot;EXAMPLE-TOPIC&quot; ) );
+std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( "EXAMPLE-TOPIC" ) );
 
 // Now create the Consumer
 std::auto_ptr&lt;cms::MessageConsumer&gt; myConsumer( session-&gt;createConsumer( myTopic ) );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>As you can see the MessageConsumer is created by calling <strong>createConsumer</strong> from an instance of a CMS Session object.  The MessageConsumer is given a Destination to listen for Messages on at the time you create it.  Once you create a MessageConsumer its time to start using it to receive messages, the MessageConsumer two methods for receiving messages, one is synchronous and the other is asynchronous.</p>
 
 <p>The synchronous method of receiving Messages involves a call the to the consumers receive method.  A call to receive will block until a Message is received on the Destination in question if no time-out is given, or will return NULL if the time-out given elapses and no new Messages arrive.  Lets take a look at a simple example of a synchronous message polling loop using CMS.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Synchronous Polling with infinite wait.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f42099c3-9bf7-4874-9268-19bc8d62c3de" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Synchronous Polling with infinite wait.</parameter><plain-text-body>
 while( !done ) {
 
    std::auto_ptr&lt;Message&gt; message( myConsumer-&gt;receive() );
@@ -220,13 +199,11 @@ while( !done ) {
    ...Do Something with the message...
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>As you can see in the code above we called the MessageConsumer's <strong>receive</strong> method expecting that it will return a new Message object at some point.  The code here will block until a new message is received.  This sort of approach assumes that your program has nothing else that it needs to do until a message arrives, however there is an alternative should your application need to perform other processing.  The code sample below shows a polling loop that uses the MessageConsumer's <strong>receiveNoWait</strong> method to poll and return immediately to allow for other processing to occur.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Synchronous Polling with no wait.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="ef3cc255-4b14-4bac-9f6c-ec4d00b4275f" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Synchronous Polling with no wait.</parameter><plain-text-body>
 while( !done ) {
 
    std::auto_ptr&lt;Message&gt; message( myConsumer-&gt;receiveNoWait() );
@@ -238,59 +215,53 @@ while( !done ) {
    ...Perform other application logic before checking for another message...
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The asynchronous method involves implementing the CMS MessageListener interface and passing an instance of your implementation to the MessageConsumer's <strong>setMessageListener</strong> method.  When a new message arrives your listener's <strong>onMessage</strong> method will be called by the consumer in the context of another thread to allow you to process the Message received.  Below is a code snippet that demonstrates implementing the MessageListener interface.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Simple MessageListener Implementation.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="daec29b4-1dd6-4c30-b7a7-3418a030c4ea" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Simple MessageListener Implementation.</parameter><plain-text-body>
 class SimpleListener : public cms::MessageListener {
 
     virtual void onMessage( const Message* message ) {
 
         const TextMessage* textMessage =
             dynamic_cast&lt; const TextMessage* &gt;( message );
-        string text = &quot;&quot;;
+        string text = "";
 
         if( textMessage != NULL ) {
             text = textMessage-&gt;getText();
         } else {
-            text = &quot;NOT A TEXTMESSAGE!&quot;;
+            text = "NOT A TEXTMESSAGE!";
         }
 
-        printf( &quot;Message Received: %s\n&quot;, text.c_str() );
+        printf( "Message Received: %s\n", text.c_str() );
 
     }
 };
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>In the sample above we create a new class called SimpleListener that prints the contents of a TextMessage when received, or print an message indicating that it did not receive a TextMessage as it had expected to.  Notice that the <strong>onMessage</strong> method receives a pointer to the base Message interface and we then attempt to dynamic cast to the type we think we should have received.  This allows your code to process multiple message types in one method.  The pointer passed is owned by the caller or onMessage so you shouldn't store it or delete it, if you need to keep a copy of the Message around you must create a copy by calling Message's <strong>clone</strong> method.</p>
 
 <p>Now that we have a MessageListener implementation to work with its time to see how to setup asynchronous consumption using the MessageConsumer we created previously.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Setting up Async Consumption.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="07dc9d75-a3de-4807-8d00-3700586ea8ea" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Setting up Async Consumption.</parameter><plain-text-body>
 SimpleListener listener;
 
 myConsumer-&gt;setMessageListener( &amp;listener );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>That's it, we will now receive the messages sent to the Destination we created in the onMessage method of our SimpleListener instance.</p>
 
-<h3 id="CMSAPIOverview-CMSMessageProducer">CMS MessageProducer</h3>
+<h3>CMS MessageProducer</h3>
 
 <p>We've seen how to consume Messages now how do we produce them in the first place?  The answer is the CMS MessageProducer which is used to send messages to the broker for distribution to the various clients listening for Messages on the topic or queue.  Creating a MessageProducer is much the same as creating a MessageConsumer, you first create your Connection, Session, and Destination objects then use the Session to create a MessageProducer.  The code snippet below demonstrates how to create a MessageProducer.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a MessageProducer from a CMS Session object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="670ab2a6-abdd-4d93-b57a-c035973b7175" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating a MessageProducer from a CMS Session object</parameter><plain-text-body>
 // Create the ConnectionFactory
 std::auto_ptr&lt;cms::ConnectionFactory&gt; connectionFactory(
-    cms::ConnectionFactory::createCMSConnectionFactory( &quot;tcp://127.0.0.1:61616&quot; ) );
+    cms::ConnectionFactory::createCMSConnectionFactory( "tcp://127.0.0.1:61616" ) );
 
 // Create a Connection
 std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createConnection() );
@@ -299,19 +270,18 @@ std::auto_ptr&lt;cms::Connection&gt; connection( connectionFactory-&gt;createCon
 std::auto_ptr&lt;cms::Session&gt; session( connection-&gt;createSession();
 
 // Now create a Topic
-std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( &quot;EXAMPLE-TOPIC&quot; ) );
+std::auto_ptr&lt;cms::Topic&gt; myTopic( session-&gt;createTopic( "EXAMPLE-TOPIC" ) );
 
 // Now create the Consumer
 std::auto_ptr&lt;cms::MessageProducer&gt; myProducer( session-&gt;createProducer( myTopic ) );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="CMSAPIOverview-CompleteExamples">Complete Examples</h2>
+<h2>Complete Examples</h2>
 
 <p>Now that we've covered most of the basics of the CMS API its time to take a look at some complete examples that demonstrate how you might use the CMS API in your own application.  The first example will show how to create a simple Asynchronous consumer that can receive TextMessage objects from an ActiveMQ broker, then in the second example we will look at a simple producer that publishes TextMessage objects to the destination that our consumer is listening on.</p>
 
-<h3 id="CMSAPIOverview-SimpleAsynchronousConsumer">Simple Asynchronous Consumer</h3>
+<h3>Simple Asynchronous Consumer</h3>
 
 <p>In the Simple Asnychronous Consumer example we wrap the CMS API usage in a class called SimpleAsyncConsumer.  This class exposes a single constructor that allows the user to create an instance of the class that connects to a particular broker and destination and whether the destination is a Queue or Topic.  The user can also specify the Acknowledgement Mode shoukd be <strong>CLIENT_ACKNOWLEDGE</strong> instaned of the default <strong>AUTO_ACKNOWLEDGE</strong> mode.</p>
 
@@ -319,21 +289,20 @@ std::auto_ptr&lt;cms::MessageProducer&gt; myProducer( session-&gt;createProducer
 
 <p>After the <em>runConsumer</em> method returns the main method waits for user input to exit, all messages received while the application is running will be dispatched to the onMessage method of SimpleAsyncConsumer and if the message is a TextMessage its contents will be printed onscreen.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A Simple Asynchronous Consumer example</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="dc030697-ea46-4a1d-a7b3-1272cc3aa953" ac:name="code" ac:schema-version="1"><parameter ac:name="title">A Simple Asynchronous Consumer example</parameter><plain-text-body>
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the &quot;License&quot;); you may not use this file except in compliance with
+ * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -467,19 +436,19 @@ public:
             count++;
             const TextMessage* textMessage =
                 dynamic_cast&lt; const TextMessage* &gt;( message );
-            string text = &quot;&quot;;
+            string text = "";
 
             if( textMessage != NULL ) {
                 text = textMessage-&gt;getText();
             } else {
-                text = &quot;NOT A TEXTMESSAGE!&quot;;
+                text = "NOT A TEXTMESSAGE!";
             }
 
             if( clientAck ) {
                 message-&gt;acknowledge();
             }
 
-            printf( &quot;Message #%d Received: %s\n&quot;, count, text.c_str() );
+            printf( "Message #%d Received: %s\n", count, text.c_str() );
         } catch (CMSException&amp; e) {
             e.printStackTrace();
         }
@@ -488,16 +457,16 @@ public:
     // If something bad happens you see it here as this class is also been
     // registered as an ExceptionListener with the connection.
     virtual void onException( const CMSException&amp; ex AMQCPP_UNUSED ) {
-        printf(&quot;CMS Exception occurred.  Shutting down client.\n&quot;);
+        printf("CMS Exception occurred.  Shutting down client.\n");
         exit(1);
     }
 
     virtual void transportInterrupted() {
-        std::cout &lt;&lt; &quot;The Connection&#39;s Transport has been Interrupted.&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "The Connection's Transport has been Interrupted." &lt;&lt; std::endl;
     }
 
     virtual void transportResumed() {
-        std::cout &lt;&lt; &quot;The Connection&#39;s Transport has been Restored.&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "The Connection's Transport has been Restored." &lt;&lt; std::endl;
     }
 
 private:
@@ -524,9 +493,9 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
 
     activemq::library::ActiveMQCPP::initializeLibrary();
 
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
-    std::cout &lt;&lt; &quot;Starting the example:&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
+    std::cout &lt;&lt; "=====================================================\n";
+    std::cout &lt;&lt; "Starting the example:" &lt;&lt; std::endl;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
 
     // Set the URI to point to the IPAddress of your broker.
     // add any optional params to the url to enable things like
@@ -536,14 +505,14 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     //  http://activemq.apache.org/cms/
     //
     std::string brokerURI =
-        &quot;failover:(tcp://127.0.0.1:61616)&quot;;
+        "failover:(tcp://127.0.0.1:61616)";
 
     //============================================================
     // This is the Destination Name and URI options.  Use this to
     // customize where the consumer listens, to have the consumer
-    // use a topic or queue set the &#39;useTopics&#39; flag.
+    // use a topic or queue set the 'useTopics' flag.
     //============================================================
-    std::string destURI = &quot;TEST.FOO&quot;; //?consumer.prefetchSize=1&quot;;
+    std::string destURI = "TEST.FOO"; //?consumer.prefetchSize=1";
 
     //============================================================
     // set to true to use topics instead of queues
@@ -565,41 +534,39 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     consumer.runConsumer();
 
     // Wait to exit.
-    std::cout &lt;&lt; &quot;Press &#39;q&#39; to quit&quot; &lt;&lt; std::endl;
-    while( std::cin.get() != &#39;q&#39;) {}
+    std::cout &lt;&lt; "Press 'q' to quit" &lt;&lt; std::endl;
+    while( std::cin.get() != 'q') {}
 
     // All CMS resources should be closed before the library is shutdown.
     consumer.close();
 
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
-    std::cout &lt;&lt; &quot;Finished with the example.&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
+    std::cout &lt;&lt; "Finished with the example." &lt;&lt; std::endl;
+    std::cout &lt;&lt; "=====================================================\n";
 
     activemq::library::ActiveMQCPP::shutdownLibrary();
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="CMSAPIOverview-SimpleProducer">Simple Producer</h3>
+<h3>Simple Producer</h3>
 
 <p>Much like the Simple Asynchronous Consumer example the Simple Producer example wraps up the CMS API detials needed to create a producer into a class called <strong>SimpleProducer</strong>.  This class exposes a simillar interface to the consumer example, there is one constructor that allows an instance to be created with configuration options for the broker and destination as well as the number of messages to send to the configured destination.  Once created the client code simply calls the SimpleProducer's <em>run</em> method to publish the specified number of messages.  Once the <em>run</em> method completes the client is free to close the SimpleProducer which cleans up the allocated CMS resources, once closed the application exits.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A Simple Message Producer Example</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="0d0c2d3d-e292-4807-8c9c-feb8c733c7e5" ac:name="code" ac:schema-version="1"><parameter ac:name="title">A Simple Message Producer Example</parameter><plain-text-body>
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the &quot;License&quot;); you may not use this file except in compliance with
+ * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -714,15 +681,15 @@ public:
             string threadIdStr = Long::toString( Thread::currentThread()-&gt;getId() );
 
             // Create a messages
-            string text = (string)&quot;Hello world! from thread &quot; + threadIdStr;
+            string text = (string)"Hello world! from thread " + threadIdStr;
 
             for( unsigned int ix=0; ix&lt;numMessages; ++ix ){
                 TextMessage* message = session-&gt;createTextMessage( text );
 
-                message-&gt;setIntProperty( &quot;Integer&quot;, ix );
+                message-&gt;setIntProperty( "Integer", ix );
 
                 // Tell the producer to send the message
-                printf( &quot;Sent message #%d from thread %s\n&quot;, ix+1, threadIdStr.c_str() );
+                printf( "Sent message #%d from thread %s\n", ix+1, threadIdStr.c_str() );
                 producer-&gt;send( message );
 
                 delete message;
@@ -757,9 +724,9 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
 
     activemq::library::ActiveMQCPP::initializeLibrary();
 
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
-    std::cout &lt;&lt; &quot;Starting the example:&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
+    std::cout &lt;&lt; "=====================================================\n";
+    std::cout &lt;&lt; "Starting the example:" &lt;&lt; std::endl;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
 
     // Set the URI to point to the IPAddress of your broker.
     // add any optional params to the url to enable things like
@@ -769,7 +736,7 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     //  http://activemq.apache.org/cms/
     //
     std::string brokerURI =
-        &quot;failover://(tcp://127.0.0.1:61616)&quot;;
+        "failover://(tcp://127.0.0.1:61616)";
 
     //============================================================
     // Total number of messages for this producer to send.
@@ -779,9 +746,9 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     //============================================================
     // This is the Destination Name and URI options.  Use this to
     // customize where the Producer produces, to have the producer
-    // use a topic or queue set the &#39;useTopics&#39; flag.
+    // use a topic or queue set the 'useTopics' flag.
     //============================================================
-    std::string destURI = &quot;TEST.FOO&quot;;
+    std::string destURI = "TEST.FOO";
 
     //============================================================
     // set to true to use topics instead of queues
@@ -799,13 +766,12 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     // Before exiting we ensure that all CMS resources are closed.
     producer.close();
 
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
-    std::cout &lt;&lt; &quot;Finished with the example.&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
+    std::cout &lt;&lt; "Finished with the example." &lt;&lt; std::endl;
+    std::cout &lt;&lt; "=====================================================\n";
 
     activemq::library::ActiveMQCPP::shutdownLibrary();
 }
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/community.xml
----------------------------------------------------------------------
diff --git a/cms/community.xml b/cms/community.xml
index dbc08cb..f854489 100644
--- a/cms/community.xml
+++ b/cms/community.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="faq.xml">FAQ</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-usage-faqs.xml">ActiveMQ-CPP Usage FAQs</a><ul class="childpages-macro"><li><a shape="rect" href="how-do-i-use-the-ssl-transport.xml">How do I use the SSL Transport</a></li></ul></li><li><a shape="rect" href="building-faqs.xml">Building FAQs</a><ul class="childpages-macro"><li><a shape="rect" href="general-build-issues.xml">General Build Issues</a></li><li><a shape="rect" href="openssl-support.xml">OpenSSL Support</a><ul class="childpages-macro"><li><a shape="rect" href="enable-openssl-support-with-autotools.xml">Enable OpenSSL support with autotools</a></li><li><a shape="rect" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.xml">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.xml">How to enable SSL support on Windows
 </a></li></ul></li><li><a shape="rect" href="solaris-platform.xml">Solaris Platform</a><ul class="childpages-macro"><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-the-solaris-cc-compiler.xml">Using the Solaris CC compiler</a></li></ul></li></ul></li><li><a shape="rect" href="discussion-forums.xml">Discussion Forums</a><ul class="childpages-macro"><li><a shape="rect" href="mailing-lists.xml">Mailing Lists</a></li></ul></li><li><a shape="rect" href="general.xml">General</a><ul class="childpages-macro"><li><a shape="rect" href="are-there-more-faq-entries.xml">Are there more FAQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.xml">What is ActiveMQ CPP</a></li></ul></li></ul></li><li><a shape="rect" href="privacy-policy
 .xml">Privacy Policy</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="4c6961d7-0f3c-42c8-9edb-3800f09ff65b" ac:name="children" ac:schema-version="1"><parameter ac:name="all">true</parameter></structured-macro></div>
 


[14/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/failover-transport-reference.xml
----------------------------------------------------------------------
diff --git a/failover-transport-reference.xml b/failover-transport-reference.xml
index 45204b4..a5ac212 100644
--- a/failover-transport-reference.xml
+++ b/failover-transport-reference.xml
@@ -1,31 +1,13 @@
-<div class="wiki-content maincontent"><h3 id="FailoverTransportReference-TheFailoverTransport">The Failover Transport</h3><p>The Failover transport layers reconnect logic on top of any of the other transports. The configuration syntax allows you to specify any number of composite URIs. The Failover transport randomly chooses one of the composite URIs and attempts to establish a connection to it. If it does not succeed, or if it subsequently fails, a new connection is established choosing one of the other URIs randomly from the list.</p><p>&#160;</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Configuration Syntax</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><code><strong>failover:(uri1,...,uriN)?transportOptions&amp;nestedURIOptions</strong></code></p><p>or</p><p><code><strong>failover:uri1,...,uriN</strong></code></p></div><
 /div><p>&#160;</p><p>Example:<strong><br clear="none"></strong></p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://localhost:61616,tcp://remotehost:61616)?initialReconnectDelay=100
-</pre>
-</div></div><h4 id="FailoverTransportReference-TransportOptions">Transport Options</h4><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>backup</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Initialize and hold a second transport connection - to enable fast failover.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>initialReconnectDelay</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The delay (in ms) before the <em>first</em> reconnect attempt.</p></td></tr><tr><td colsp
 an="1" rowspan="1" class="confluenceTd"><p><code>maxCacheSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>131072</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Size in bytes for the cache of tracked messages.</p><p>Applicable only if <strong><code>trackMessages</code></strong> is <strong><code>true</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxReconnectAttempts</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>-1 | 0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From ActiveMQ 5.6</strong>: default is <strong><code>-1</code></strong>, retry forever. <strong><code>0</code></strong> means disables re-connection, e.g: just try to connect once.<br clear="none" class="atl-forced-newline"> <strong>Before ActiveMQ 5.6</strong>: default is <strong><code>0</code></strong>, retry forever. <br clear="none" class="atl-forced-newline"> <strong>All A
 ctiveMQ versions</strong>: a value <strong><code>&gt;0</code></strong> denotes the maximum number of reconnect attempts before an error is sent back to the client.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>maxReconnectDelay</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>30000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum delay (in ms) between the <em>second and subsequent</em> reconnect attempts.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>nested.*</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From ActiveMQ 5.9:</strong> common URI options that will be applied to each URI in the list<strong>.</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>randomize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code
 >true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, choose a URI at random from the list to use for reconnect.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>reconnectDelayExponent</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>2.0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The exponent used during exponential back-off attempts.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>reconnectSupported</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Determines whether the client should respond to broker <strong><code>ConnectionControl</code></strong> events with a reconnect (see: <strong><code>rebalanceClusterClients</code>).</strong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>startupMaxReconnectAttemp
 ts</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>-1</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A value of <strong><code>-1</code></strong> denotes that the number of connection attempts at startup should be unlimited.</p><p>A value of&#160; <strong><code>&gt;=0 </code></strong>denotes the number of reconnect attempts at startup that will be made after which an error is sent back to the client when the client makes a subsequent reconnect attempt.</p><p><strong>Note</strong>: once successfully connected the <code><strong>maxReconnectAttempts</strong></code> option prevails.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>timeout</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>-1</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From ActiveMQ 5.3</strong>: set the timeout on send operations (in ms) without interruption of re-connection process.&#160;</p></td><
 /tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>trackMessages</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Keep a cache of in-flight messages that will flushed to a broker on reconnect.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateURIsSupported</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From</strong><strong> ActiveMQ 5.4:</strong> determines whether the client should accept updates from the broker to its list of known URIs.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateURIsURL</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From ActiveMQ 5.4:</strong> a URL (or path to a local file) to
  a text file containing a comma separated list of URIs to use for reconnect in the case of failure. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useExponentialBackOff</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong> an exponential back-off is used between reconnect attempts.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>warnAfterReconnectAttempts</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong>From ActiveMQ 5.10:</strong> a value <strong><code>&gt;0</code></strong> specifies the number of reconnect attempts before a warning is logged. A logged warning indicates that there is no current connection but re-connection is being attempted.</p><p>A value of <strong><code>&lt;=0</code></strong> disa
 bles the logging of warnings about reconnect attempts.&#160;</p></td></tr></tbody></table></div><p>&#160;</p><h4 id="FailoverTransportReference-UsingRandomize">Using Randomize</h4><p>The Failover transport chooses a URI at random by default. This effectively load-balances clients over multiple brokers. However, to have a client connect to a primary first and only connect to a secondary backup broker when the primary is unavailable, set <strong><code>randomize=false</code></strong>.</p><p>Example:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://primary:61616,tcp://secondary:61616)?randomize=false
-</pre>
-</div></div><h5 id="FailoverTransportReference-Notes">Notes</h5><p>Under the Failover transport send operations will, by default, block indefinitely when the broker becomes unavailable. There are two options available for handling this scenario. First, either set a <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> directly on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a>, so that it is in place before any request that may require a network hop or second, set the <strong><code>timeout</code></strong> option. The <strong><code>timeout</code></strong> option causes the current send operation to fail after the specified timeout.</p><p>Example:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://primary:61616)?timeout=3000
-</pre>
-</div></div><p>In this example if the connection isn't established the send operation will timeout after 3 seconds. It is important to note that the connection <em>is not killed</em> when a timeout occurs. It is possible, therefore, to resend the affected message(s) later using the <em>same</em> connection once a broker becomes available.</p><h5 id="FailoverTransportReference-Transactions">Transactions</h5><p>The Failover transport tracks transactions by default. In-flight transactions are replayed upon re-connection. For simple scenarios this works as expected. However, there is an assumption regarding acknowledged (or consumer) transactions in that the previously received messages will automatically be replayed upon re-connection. This, however, is not always true when there are many connections and consumers, as re-delivery order is not guaranteed as stale outstanding acknowledgements can interfere with newly delivered messages. This can lead to unacknowledged messages.</p><p><st
 rong>From ActiveMQ 5.3.1</strong>: re-delivery order <strong><em>is</em></strong> tracked and a transaction will fail to commit if outstanding messages are not redelivered after failover. A <strong><code>javax.jms.</code><code>TransactionRolledBackException</code></strong> is thrown if the commit fails. In doubt transactions will result in a rollback such that they can be replayed by the application. In doubt transactions occur when failover happens when a commit message is in-flight. It is not possible to know the exact point of failure. Did failure happen because the transaction commit message was not delivered or was the commit reply lost? In either case, it becomes necessary to rollback the transaction so that the application can get an indication of the failure and deal with any potential problem.</p><h5 id="FailoverTransportReference-Broker-sideOptionsforFailover">Broker-side Options for Failover</h5><p><strong>From ActiveMQ 5.4</strong>: the&#160;<strong><code>TransportConnec
 tor</code></strong> has options available so that the broker can update clients automatically with information regarding the presence of new brokers that are available (or are no longer available) for failover.</p><p>The options are:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClients</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If&#160;<strong><code>true</code></strong>, pass information to connected clients about changes in the topology of the broker cluster.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>rebalanceClusterClients</code></
 p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, connected clients will be asked to re-balance across a cluster of brokers when a new broker joins the network of brokers (note:&#160;<strong><code>priorityBackup=true</code></strong> can override).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterClientsOnRemove</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <strong><code>true</code></strong>, will update clients when a cluster is removed from the network. Having this as separate option enables clients to be updated when new brokers join, but <em>not</em> when brokers leave.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>updateClusterFilter</code></p></td><td colspan="1" rowspan="1" class="con
 fluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Comma separated list of regular expression filters used to match broker names of brokers to designate as being part of the failover cluster for the clients.</p></td></tr></tbody></table></div><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[&lt;broker&gt;
+<div class="wiki-content maincontent"><h3>The Failover Transport</h3><p>The Failover transport layers reconnect logic on top of any of the other transports. The configuration syntax allows you to specify any number of composite URIs. The Failover transport randomly chooses one of the composite URIs and attempts to establish a connection to it. If it does not succeed, or if it subsequently fails, a new connection is established choosing one of the other URIs randomly from the list.</p><p>&#160;</p><structured-macro ac:macro-id="d39731b4-a16a-40b6-929b-c69f97aec3f2" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Configuration Syntax</parameter><rich-text-body><p><code><strong>failover:(uri1,...,uriN)?transportOptions&amp;nestedURIOptions</strong></code></p><p>or</p><p><code><strong>failover:uri1,...,uriN</strong></code></p></rich-text-body></structured-macro><p>&#160;</p><p>Example:<strong><br clear="none"></strong></p><structured-macro ac:macro-id="bc1fc833-6442-4c03
 -99ba-18b2e895565f" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://localhost:61616,tcp://remotehost:61616)?initialReconnectDelay=100
+</plain-text-body></structured-macro><h4>Transport Options</h4><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>backup</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Initialize and hold a second transport connection - to enable fast failover.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>initialReconnectDelay</code></p></td><td colspan="1" rowspan="1"><p><code>10</code></p></td><td colspan="1" rowspan="1"><p>The delay (in ms) before the <em>first</em> reconnect attempt.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxCacheSize</code></p></td><td colspan="1" rowspan="1"><p><code>131072</code></p></td><td colspan="1" rowspan="1"><p>Size in bytes for the cache of tracked messages.</p><p>Applicable only if <strong><code>trackMessages</code></stron
 g> is <strong><code>true</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxReconnectAttempts</code></p></td><td colspan="1" rowspan="1"><p><code>-1 | 0</code></p></td><td colspan="1" rowspan="1"><p><strong>From ActiveMQ 5.6</strong>: default is <strong><code>-1</code></strong>, retry forever. <strong><code>0</code></strong> means disables re-connection, e.g: just try to connect once.<br clear="none" class="atl-forced-newline"> <strong>Before ActiveMQ 5.6</strong>: default is <strong><code>0</code></strong>, retry forever. <br clear="none" class="atl-forced-newline"> <strong>All ActiveMQ versions</strong>: a value <strong><code>&gt;0</code></strong> denotes the maximum number of reconnect attempts before an error is sent back to the client.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>maxReconnectDelay</code></p></td><td colspan="1" rowspan="1"><p><code>30000</code></p></td><td colspan="1" rowspan="1"><p>The maximum delay (in ms) between the <em>secon
 d and subsequent</em> reconnect attempts.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>nested.*</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><strong>From ActiveMQ 5.9:</strong> common URI options that will be applied to each URI in the list<strong>.</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p><code>randomize</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, choose a URI at random from the list to use for reconnect.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>reconnectDelayExponent</code></p></td><td colspan="1" rowspan="1"><p><code>2.0</code></p></td><td colspan="1" rowspan="1"><p>The exponent used during exponential back-off attempts.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>reconnectSupported</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="
 1"><p>Determines whether the client should respond to broker <strong><code>ConnectionControl</code></strong> events with a reconnect (see: <strong><code>rebalanceClusterClients</code>).</strong></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>startupMaxReconnectAttempts</code></p></td><td colspan="1" rowspan="1"><p><code>-1</code></p></td><td colspan="1" rowspan="1"><p>A value of <strong><code>-1</code></strong> denotes that the number of connection attempts at startup should be unlimited.</p><p>A value of&#160; <strong><code>&gt;=0 </code></strong>denotes the number of reconnect attempts at startup that will be made after which an error is sent back to the client when the client makes a subsequent reconnect attempt.</p><p><strong>Note</strong>: once successfully connected the <code><strong>maxReconnectAttempts</strong></code> option prevails.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>timeout</code></p></td><td colspan="1" rowspan="1"><p><code>-1</code></p></td><td
  colspan="1" rowspan="1"><p><strong>From ActiveMQ 5.3</strong>: set the timeout on send operations (in ms) without interruption of re-connection process.&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>trackMessages</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Keep a cache of in-flight messages that will flushed to a broker on reconnect.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateURIsSupported</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><strong>From</strong><strong> ActiveMQ 5.4:</strong> determines whether the client should accept updates from the broker to its list of known URIs.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateURIsURL</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><strong>From ActiveMQ 5.4:</strong> a URL (or path to a local file) to a text file contain
 ing a comma separated list of URIs to use for reconnect in the case of failure. </p></td></tr><tr><td colspan="1" rowspan="1"><p><code>useExponentialBackOff</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong> an exponential back-off is used between reconnect attempts.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>warnAfterReconnectAttempts</code></p></td><td colspan="1" rowspan="1"><p><code>10</code></p></td><td colspan="1" rowspan="1"><p><strong>From ActiveMQ 5.10:</strong> a value <strong><code>&gt;0</code></strong> specifies the number of reconnect attempts before a warning is logged. A logged warning indicates that there is no current connection but re-connection is being attempted.</p><p>A value of <strong><code>&lt;=0</code></strong> disables the logging of warnings about reconnect attempts.&#160;</p></td></tr></tbody></table><p>&#160;</p><h4>Using Randomize</h4><p>The Failover tra
 nsport chooses a URI at random by default. This effectively load-balances clients over multiple brokers. However, to have a client connect to a primary first and only connect to a secondary backup broker when the primary is unavailable, set <strong><code>randomize=false</code></strong>.</p><p>Example:</p><structured-macro ac:macro-id="c9a3b254-4e38-4aff-b023-15778e60ef4b" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://primary:61616,tcp://secondary:61616)?randomize=false
+</plain-text-body></structured-macro><h5>Notes</h5><p>Under the Failover transport send operations will, by default, block indefinitely when the broker becomes unavailable. There are two options available for handling this scenario. First, either set a <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> directly on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a>, so that it is in place before any request that may require a network hop or second, set the <strong><code>timeout</code></strong> option. The <strong><code>timeout</code></strong> option causes the current send operation to fail after the specified timeout.</p><p>Example:</p><structured-macro ac:macro-id="54687531-328b-49c5-802c-658731fa1711" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://primary:61616)?timeout=3
 000
+</plain-text-body></structured-macro><p>In this example if the connection isn't established the send operation will timeout after 3 seconds. It is important to note that the connection <em>is not killed</em> when a timeout occurs. It is possible, therefore, to resend the affected message(s) later using the <em>same</em> connection once a broker becomes available.</p><h5>Transactions</h5><p>The Failover transport tracks transactions by default. In-flight transactions are replayed upon re-connection. For simple scenarios this works as expected. However, there is an assumption regarding acknowledged (or consumer) transactions in that the previously received messages will automatically be replayed upon re-connection. This, however, is not always true when there are many connections and consumers, as re-delivery order is not guaranteed as stale outstanding acknowledgements can interfere with newly delivered messages. This can lead to unacknowledged messages.</p><p><strong>From ActiveMQ 5
 .3.1</strong>: re-delivery order <strong><em>is</em></strong> tracked and a transaction will fail to commit if outstanding messages are not redelivered after failover. A <strong><code>javax.jms.</code><code>TransactionRolledBackException</code></strong> is thrown if the commit fails. In doubt transactions will result in a rollback such that they can be replayed by the application. In doubt transactions occur when failover happens when a commit message is in-flight. It is not possible to know the exact point of failure. Did failure happen because the transaction commit message was not delivered or was the commit reply lost? In either case, it becomes necessary to rollback the transaction so that the application can get an indication of the failure and deal with any potential problem.</p><h5>Broker-side Options for Failover</h5><p><strong>From ActiveMQ 5.4</strong>: the&#160;<strong><code>TransportConnector</code></strong> has options available so that the broker can update clients au
 tomatically with information regarding the presence of new brokers that are available (or are no longer available) for failover.</p><p>The options are:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterClients</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If&#160;<strong><code>true</code></strong>, pass information to connected clients about changes in the topology of the broker cluster.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>rebalanceClusterClients</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, connected clients will be asked to re-balance across a cluster of brokers when a new broker joins the network of brokers (note:&#160;<strong><
 code>priorityBackup=true</code></strong> can override).</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterClientsOnRemove</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>If <strong><code>true</code></strong>, will update clients when a cluster is removed from the network. Having this as separate option enables clients to be updated when new brokers join, but <em>not</em> when brokers leave.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>updateClusterFilter</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>Comma separated list of regular expression filters used to match broker names of brokers to designate as being part of the failover cluster for the clients.</p></td></tr></tbody></table><p>Example:</p><structured-macro ac:macro-id="591e8d97-f040-4870-8ac8-9f0577e9b0a2" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><
 parameter ac:name="theme">Confluence</parameter><plain-text-body>&lt;broker&gt;
   ...
   &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616&quot; updateClusterClients=&quot;true&quot; updateClusterFilter=&quot;.*A.*,.*B.*&quot;/&gt;
+    &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616" updateClusterClients="true" updateClusterFilter=".*A.*,.*B.*"/&gt;
   &lt;/&lt;transportConnectors&gt;
   ...
 &lt;/broker&gt;
-]]></script>
-</div></div><p>When <strong><code>updateClusterClients=true</code></strong> clients need only be configured with the details of one broker in a cluster in order to connect.</p><p>Example:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://primary:61616)
-</pre>
-</div></div><p>When new brokers join the cluster the client is automatically informed of the new broker's URI. The new URI is then available for failover when one of the other known brokers becomes unavailable.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Additional Information</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">See the following blog entry about using the cluster client updates and re-balancing features titled <a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/10/new-features-in-activemq-54-automatic.html" rel="nofollow">New Features in ActiveMQ 5.4: Automatic Cluster Update and Rebalance</a>.</div></div><h5 id="FailoverTransportReference-PriorityBackup">Priority Backup</h5><p><strong>From ActiveMQ 5.6</strong>: if brokers are available in both local and remote networks, it's possible 
 to specify a preference for local brokers over remote brokers using the <strong><code>priorityBackup</code></strong> and <strong><code>priorityURIs</code></strong> options.</p><p>Consider the following URL:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://local:61616,tcp://remote:61616)?randomize=false&amp;priorityBackup=true</pre>
-</div></div><p>Given this URL a client will try to connect and stay connected to the <strong><code>local</code></strong> broker. If <strong><code>local</code></strong> broker fails, it will of course fail over to&#160;<strong><code>remote</code></strong>. However, as <strong><code>priorityBackup</code></strong> parameter is used, the client will constantly try to reconnect to <strong><code> local</code></strong>. Once the client can do so, the client will re-connect to it without any need for manual intervention.</p><p>By default, only the first URI in the list is considered prioritized (<strong><code>local</code></strong>). In most cases this will suffice. However, in some cases it may be necessary to have multiple "local" URIs. The <strong><code>priorityURIs</code></strong> option can be used to specify which URIs are considered prioritized.</p><p>Example:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://local1:61616,tcp://local2:61616,tcp://remote:61616)?randomize=false&amp;priorityBackup=true&amp;priorityURIs=tcp://local1:61616,tcp://local2:61616</pre>
-</div></div><p>In this case the client will prioritize either <strong><code>local1</code></strong> or <strong><code>local2</code></strong> brokers and (re-)connect to them if they are available.</p><h5 id="FailoverTransportReference-ConfiguringNestedURIOptions.">Configuring Nested URI Options.</h5><p><span style="color: rgb(255,0,0);"><span style="color: rgb(0,0,0);"><strong>From ActiveMQ 5.9</strong></span></span>: common URI options can be configured by appending them to the query string of the failover URI where each common URI option has the prefix: <strong><code>nested.</code></strong>&#160;</p><p>Example - instead of doing this:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://broker1:61616?wireFormat.maxInactivityDuration=1000,tcp://broker2:61616?wireFormat.maxInactivityDuration=1000,tcp://broker3:61616?wireFormat.maxInactivityDuration=1000) </pre>
-</div></div><p>do this:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)?nested.wireFormat.maxInactivityDuration=1000</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">Any option that can applied to the query string of an individual URI is a candidate for use with the <strong><code>nested</code></strong> option.</div></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Option Precedence</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">If the same option is specified as both an individual URI option <em>and</em> as a nested option, the nested option definition will take precedence.</div></div><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p></div>
+</plain-text-body></structured-macro><p>When <strong><code>updateClusterClients=true</code></strong> clients need only be configured with the details of one broker in a cluster in order to connect.</p><p>Example:</p><structured-macro ac:macro-id="99da95ca-95f9-4ecc-827e-61a16fab74e9" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://primary:61616)
+</plain-text-body></structured-macro><p>When new brokers join the cluster the client is automatically informed of the new broker's URI. The new URI is then available for failover when one of the other known brokers becomes unavailable.</p><structured-macro ac:macro-id="0462312a-5b88-4989-aeb3-50ea736dce4e" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Additional Information</parameter><rich-text-body>See the following blog entry about using the cluster client updates and re-balancing features titled <a shape="rect" href="http://bsnyderblog.blogspot.com/2010/10/new-features-in-activemq-54-automatic.html">New Features in ActiveMQ 5.4: Automatic Cluster Update and Rebalance</a>.</rich-text-body></structured-macro><h5>Priority Backup</h5><p><strong>From ActiveMQ 5.6</strong>: if brokers are available in both local and remote networks, it's possible to specify a preference for local brokers over remote brokers using the <strong><code>priorityBackup</code></strong> and <
 strong><code>priorityURIs</code></strong> options.</p><p>Consider the following URL:</p><structured-macro ac:macro-id="90acedcc-f375-42b7-9768-744527d3cd9b" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://local:61616,tcp://remote:61616)?randomize=false&amp;priorityBackup=true</plain-text-body></structured-macro><p>Given this URL a client will try to connect and stay connected to the <strong><code>local</code></strong> broker. If <strong><code>local</code></strong> broker fails, it will of course fail over to&#160;<strong><code>remote</code></strong>. However, as <strong><code>priorityBackup</code></strong> parameter is used, the client will constantly try to reconnect to <strong><code> local</code></strong>. Once the client can do so, the client will re-connect to it without any need for manual intervention.</p><p>By default, only the first URI in the list is considered prioritized (<strong><code>local</code></strong>). In most cases this will suffice. Howe
 ver, in some cases it may be necessary to have multiple "local" URIs. The <strong><code>priorityURIs</code></strong> option can be used to specify which URIs are considered prioritized.</p><p>Example:</p><structured-macro ac:macro-id="e7114c68-8a0d-467e-af8f-f0cd720513ed" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://local1:61616,tcp://local2:61616,tcp://remote:61616)?randomize=false&amp;priorityBackup=true&amp;priorityURIs=tcp://local1:61616,tcp://local2:61616</plain-text-body></structured-macro><p>In this case the client will prioritize either <strong><code>local1</code></strong> or <strong><code>local2</code></strong> brokers and (re-)connect to them if they are available.</p><h5>Configuring Nested URI Options.</h5><p><span style="color: rgb(255,0,0);"><span style="color: rgb(0,0,0);"><strong>From ActiveMQ 5.9</strong></span></span>: common URI options can be configured by appending them to the query string of the failover URI where each common URI opt
 ion has the prefix: <strong><code>nested.</code></strong>&#160;</p><p>Example - instead of doing this:</p><structured-macro ac:macro-id="bb73f89c-526b-4c8b-8c13-740e6921273c" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://broker1:61616?wireFormat.maxInactivityDuration=1000,tcp://broker2:61616?wireFormat.maxInactivityDuration=1000,tcp://broker3:61616?wireFormat.maxInactivityDuration=1000) </plain-text-body></structured-macro><p>do this:</p><structured-macro ac:macro-id="e4f99a01-55da-44f7-8af7-743e32eb9107" ac:name="noformat" ac:schema-version="1"><plain-text-body>failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)?nested.wireFormat.maxInactivityDuration=1000</plain-text-body></structured-macro><structured-macro ac:macro-id="9c23d901-5052-481c-aeac-02971ab370cf" ac:name="info" ac:schema-version="1"><rich-text-body>Any option that can applied to the query string of an individual URI is a candidate for use with the <strong><code>nested</cod
 e></strong> option.</rich-text-body></structured-macro><structured-macro ac:macro-id="49f2ce50-8238-4833-a982-e54504803684" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Option Precedence</parameter><rich-text-body>If the same option is specified as both an individual URI option <em>and</em> as a nested option, the nested option definition will take precedence.</rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/fanout-transport-reference.xml
----------------------------------------------------------------------
diff --git a/fanout-transport-reference.xml b/fanout-transport-reference.xml
index bf5154e..08422ae 100644
--- a/fanout-transport-reference.xml
+++ b/fanout-transport-reference.xml
@@ -1,51 +1,44 @@
-<div class="wiki-content maincontent"><h3 id="FanoutTransportReference-TheFanoutTransport">The Fanout Transport</h3>
+<div class="wiki-content maincontent"><h3>The Fanout Transport</h3>
 
-<p>The Fanout transport layers reconnect and replication logic on top of any of the other transports. It utilizes the <a shape="rect" href="discovery-transport-reference.xml">Discovery</a> transport to discover brokers and replicates commands to those brokers.</p>
+<p>The Fanout transport layers reconnect and replication logic on top of any of the other transports. It utilizes the <link><page ri:content-title="Discovery Transport Reference"></page><link-body>Discovery</link-body></link> transport to discover brokers and replicates commands to those brokers.</p>
 
-<h4 id="FanoutTransportReference-ConfigurationSyntax">Configuration Syntax</h4>
+<h4>Configuration Syntax</h4>
 
 <p><strong>fanout:(discoveryURI)?transportOptions</strong><br clear="none">
 or<br clear="none">
 <strong>fanout:discoveryURI</strong></p>
 
-<h5 id="FanoutTransportReference-TransportOptions">Transport Options</h5>
+<h5>Transport Options</h5>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How long to wait before the first reconnect attempt</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan
 ="1" rowspan="1" class="confluenceTd"><p>Should an exponential backoff be used btween reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>2</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The exponent used in the exponential backoff attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>fanOutQueues</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If set to 'true', commands are replicated to queues as well as topics</p></td></tr><tr><td colspan="1"
  rowspan="1" class="confluenceTd"><p>minAckCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>2</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The minimum number of brokers to which connections must be established</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>How long to wait before the first reconnect attempt</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should an exponential backoff be used btween reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1"><p>2</p></td><td colspan="1" rowspan="1"><p>The exponent used in the exponential backoff atte
 mpts</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1"><p>fanOutQueues</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If set to 'true', commands are replicated to queues as well as topics</p></td></tr><tr><td colspan="1" rowspan="1"><p>minAckCount</p></td><td colspan="1" rowspan="1"><p>2</p></td><td colspan="1" rowspan="1"><p>The minimum number of brokers to which connections must be established</p></td></tr></tbody></table>
 
 
 
 <p>The 'fanOutQueues' option is specific to the fanout transport. By default, the fanout does not replicate commands to queues; only topics. Therefore, if you'd like to fanout a message send command to multiple queues on multiple brokers, you'll have to set this option to 'true'.</p>
 
 <p>By default, a client's fanout transport waits for connections to be established to 2 brokers, or the number of static TCP URIs configured (if more than 2). Until this number of connections is established, the client's call to Connection.createSession() does not return. For example, a producer that uses the fanout connector listed below will wait until 2 brokers are running, and connections are established to those two brokers. </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="14dfe3e4-da24-4f67-ae01-1c3435c1ada2" ac:name="code" ac:schema-version="1"><plain-text-body>
 fanout:(multicast://default)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Another example would be a producer using the following fanout connector. </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="6ab706dc-d1f3-409b-a0cc-e7dd193f7f09" ac:name="code" ac:schema-version="1"><plain-text-body>
 fanout:(static:(tcp://localhost:61629,tcp://localhost:61639,tcp://localhost:61649))
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>In this case, three broker connections are needed. However, this required number of connections can be overridden by using the minAckCount transport option. For example, this fanout connector allows the producer to run after connecting to just one 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[
+<structured-macro ac:macro-id="015aa0e2-b6a4-445d-ba33-ebad5395e4be" ac:name="code" ac:schema-version="1"><plain-text-body>
 fanout:(multicast://default)?minAckCount=1
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>It is not recommended that you use the fanout URI for consumers. Also, if a producer fans out across multiple brokers, who happen to be inter-connected, then there is a very high likelihood that a consumer on one of those brokers will get duplicate messages.</p></div></div>
+<structured-macro ac:macro-id="151fccae-78c3-4ec7-a133-2f736fa215f4" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body>
+<p>It is not recommended that you use the fanout URI for consumers. Also, if a producer fans out across multiple brokers, who happen to be inter-connected, then there is a very high likelihood that a consumer on one of those brokers will get duplicate messages.</p></rich-text-body></structured-macro>
 
 
-<h5 id="FanoutTransportReference-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>fanout:(static:(tcp://localhost:61616,tcp://remotehost:61616))?initialReconnectDelay=100
-</pre>
-</div></div>
+<structured-macro ac:macro-id="93ce1f99-ce3f-4d11-8d29-062d4c587a36" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+fanout:(static:(tcp://localhost:61616,tcp://remotehost:61616))?initialReconnectDelay=100
+</plain-text-body></structured-macro>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Applying parameters to discovered transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Because the Discovery transport is utilized for broker discovery, transport parameters are applied to discovered brokers.  See <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport Reference</a>.</p></div></div></div>
+<structured-macro ac:macro-id="aa78e70d-2f24-413a-97b1-54cf7ebb24a8" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Applying parameters to discovered transports</parameter><rich-text-body>
+<p>Because the Discovery transport is utilized for broker discovery, transport parameters are applied to discovered brokers.  See <link><page ri:content-title="Discovery Transport Reference"></page></link>.</p></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/faq.xml
----------------------------------------------------------------------
diff --git a/faq.xml b/faq.xml
index c5dec84..cad40af 100644
--- a/faq.xml
+++ b/faq.xml
@@ -1,65 +1,43 @@
-<div class="wiki-content maincontent"><h2 id="FAQ-FAQ">FAQ</h2>
+<div class="wiki-content maincontent"><h2>FAQ</h2>
 
-<p>Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the <a shape="rect" href="discussion-forums.xml">forums</a>. </p>
+<p>Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the <link><page ri:content-title="Discussion Forums"></page><link-body>forums</link-body></link>. </p>
 
-<p>We <a shape="rect" href="contributing.xml">welcome contributions</a> and this entire website is a <a shape="rect" href="how-does-the-website-work.xml">wiki that you can edit</a> so please join in and help us make the documentation better!</p>
+<p>We <link><page ri:content-title="Contributing"></page><link-body>welcome contributions</link-body></link> and this entire website is a <link><page ri:content-title="How does the website work"></page><link-body>wiki that you can edit</link-body></link> so please join in and help us make the documentation better!</p>
 
-<h3 id="FAQ-General"><a shape="rect" href="general.xml">General</a></h3>
+<h3><link><page ri:content-title="General"></page></link></h3>
 
+<structured-macro ac:macro-id="9965a8dd-121e-405c-a8f6-bd636d0f8f66" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="General"></page></link></parameter></structured-macro>
 
+<h3><link><page ri:content-title="JMS"></page></link></h3>
 
+<structured-macro ac:macro-id="17d3399c-8878-4e5c-8581-083615ad8c32" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="JMS"></page></link></parameter></structured-macro>
 
-<p>General questions about ActiveMQ</p>
+<h3><link><page ri:content-title="Using Apache ActiveMQ"></page></link></h3>
 
-<ul class="childpages-macro"><li><a shape="rect" href="can-i-get-commercial-support.xml">Can I get commercial support</a></li><li><a shape="rect" href="how-can-i-get-help.xml">How can I get help</a></li><li><a shape="rect" href="how-can-i-get-the-source-code-from-subversion.xml">How can I get the source code from subversion</a></li><li><a shape="rect" href="how-does-activemq-compare-to-amqp.xml">How does ActiveMQ compare to AMQP</a></li><li><a shape="rect" href="how-does-activemq-compare-to-artemis.xml">How does ActiveMQ compare to Artemis</a></li><li><a shape="rect" href="how-does-activemq-compare-to-fuse-message-broker.xml">How does ActiveMQ compare to Fuse Message Broker</a></li><li><a shape="rect" href="how-does-activemq-compare-to-jbossmq.xml">How does ActiveMQ compare to JBossMQ</a></li><li><a shape="rect" href="how-does-activemq-compare-to-mantaray.xml">How does ActiveMQ compare to Mantaray</a></li><li><a shape="rect" href="how-does-activemq-compare-to-mule.xml">How does Acti
 veMQ compare to Mule</a></li><li><a shape="rect" href="how-does-activemq-compare-to-spread-toolkit.xml">How does ActiveMQ compare to Spread Toolkit</a></li><li><a shape="rect" href="how-does-openwire-compare-to-stomp.xml">How does OpenWire compare to Stomp</a></li><li><a shape="rect" href="how-does-the-website-work.xml">How does the website work</a></li><li><a shape="rect" href="how-do-i-avoid-maven-downloading-latest-jars.xml">How do I avoid Maven downloading latest jars</a></li><li><a shape="rect" href="how-do-i-build-but-disable-the-unit-tests.xml">How do I build but disable the unit tests</a></li><li><a shape="rect" href="how-do-i-compile-from-the-source.xml">How do I compile from the source</a></li><li><a shape="rect" href="how-do-i-edit-the-website.xml">How do I edit the website</a></li><li><a shape="rect" href="how-fast-is-activemq.xml">How fast is ActiveMQ</a></li><li><a shape="rect" href="should-i-run-activemq-on-windows-in-a-directory-with-spaces.xml">Should I run ActiveMQ
  on Windows in a directory with spaces</a></li><li><a shape="rect" href="what-is-activemq.xml">What is ActiveMQ</a></li><li><a shape="rect" href="what-is-the-license.xml">What is the license</a></li><li><a shape="rect" href="what-jars-do-i-need.xml">What jars do I need</a></li><li><a shape="rect" href="what-open-source-integration-solution-works-best-with-activemq.xml">What open source integration solution works best with ActiveMQ</a></li><li><a shape="rect" href="what-platforms-does-activemq-support.xml">What platforms does ActiveMQ support</a></li><li><a shape="rect" href="what-version-should-i-use.xml">What version should I use</a></li></ul>
+<structured-macro ac:macro-id="2aae721f-14c9-4c89-89f9-7889c8c8ffc2" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Using Apache ActiveMQ"></page></link></parameter></structured-macro>
 
-<h3 id="FAQ-JMS"><a shape="rect" href="jms.xml">JMS</a></h3>
+<h3><link><page ri:content-title="Configuration"></page></link></h3>
 
+<structured-macro ac:macro-id="674e4dec-d64f-42e2-aed1-1816cba23995" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Configuration"></page></link></parameter></structured-macro>
 
-<p>Questions on using the JMS API and <a shape="rect" href="mom.xml">MOM</a> in general</p>
+<h3><link><page ri:content-title="Persistence Questions"></page></link></h3>
 
-<ul class="childpages-macro"><li><a shape="rect" href="can-i-modify-messages-on-a-queue.xml">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.xml">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.xml">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.xml">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.xml">How does ConnectionFactory relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.xml">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.xml">How do I consume a specific message</a></li><li><a shape="rect" href="how-
 do-i-get-started-with-jms.xml">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.xml">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.xml">How do I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.xml">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.xml">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.xml">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.xml">Should I use XA</a></li><li><a shape="rect" href="what-are-administe
 red-objects.xml">What are administered objects</a></li></ul>
+<structured-macro ac:macro-id="afb7acf6-f7b3-4609-a8d1-fc6ffad20bfb" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Persistence Questions"></page></link></parameter></structured-macro>
 
-<h3 id="FAQ-UsingApacheActiveMQ"><a shape="rect" href="using-apache-activemq.xml">Using Apache ActiveMQ</a></h3>
+<h3><link><page ri:content-title="Errors"></page></link></h3>
 
-Questions on using Apache ActiveMQ
+<structured-macro ac:macro-id="55526355-9de4-4e2e-b58c-83642f981502" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Errors"></page></link></parameter></structured-macro>
 
-<ul class="childpages-macro"><li><a shape="rect" href="activemq-command-line-tools-reference.xml">ActiveMQ Command Line Tools Reference</a></li><li><a shape="rect" href="are-destinations-case-sensitive.xml">Are destinations case sensitive</a></li><li><a shape="rect" href="can-i-send-really-large-files-over-activemq.xml">Can I send really large files over ActiveMQ</a></li><li><a shape="rect" href="can-i-use-activemq-5x-or-later-on-java-14.xml">Can I use ActiveMQ 5.x or later on Java 1.4</a></li><li><a shape="rect" href="can-two-brokers-share-the-same-database.xml">Can two brokers share the same database</a></li><li><a shape="rect" href="does-activemq-support-clustering.xml">Does ActiveMQ support clustering</a></li><li><a shape="rect" href="how-can-i-avoid-serialization-of-objects-in-objectmessage.xml">How can I avoid serialization of Objects in ObjectMessage</a></li><li><a shape="rect" href="how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml">How can I get a list of the to
 pics and queues in a broker</a></li><li><a shape="rect" href="how-can-i-make-activemq-faster.xml">How can I make ActiveMQ faster</a></li><li><a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a></li><li><a shape="rect" href="how-can-i-monitor-the-connection-with-the-broker.xml">How can I monitor the connection with the broker</a></li><li><a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">How can I see what destinations are used</a></li><li><a shape="rect" href="how-can-i-support-auto-reconnection.xml">How can I support auto reconnection</a></li><li><a shape="rect" href="how-can-i-support-priority-queues.xml">How can I support priority queues</a></li><li><a shape="rect" href="how-can-i-use-different-network-protocols.xml">How can I use different network protocols</a></li><li><a shape="rect" href="how-do-distributed-queues-work.xml">How do distributed queues work</a></li><li><a shape="rect" href="how-do-i-access-activemq-from-c.xml">How 
 do I access ActiveMQ from C</a></li><li><a shape="rect" href="how-do-i-access-activemq-from-csharp-or-dotnet.xml">How do I access ActiveMQ from CSharp or dotNet</a></li><li><a shape="rect" href="how-do-i-access-activemq-from-ruby-perl-python-php.xml">How do I access ActiveMQ from Ruby, Perl, Python, PHP</a></li><li><a shape="rect" href="how-do-i-bridge-different-jms-providers.xml">How do I bridge different JMS providers</a></li><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="how-do-i-change-the-logging.xml">How do I change the logging</a></li><li><a shape="rect" href="how-do-i-connect-to-one-of-a-number-of-message-brokers.xml">How do I connect to one of a number of message brokers</a></li><li><a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a></li><li><a shape="rect" href="how-do-i-delete-a-destination.xml">How do I delete a destination</a></li><li><a shape="
 rect" href="how-do-i-disable-logging.xml">How do I disable logging</a></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">How do I embed a Broker inside a Connection</a></li><li><a shape="rect" href="how-do-i-enable-asynchronous-sending.xml">How do I enable asynchronous sending</a></li><li><a shape="rect" href="how-do-i-enable-debug-logging.xml">How do I enable debug logging</a></li><li><a shape="rect" href="how-do-i-find-the-size-of-a-queue.xml">How do I find the Size of a Queue</a></li><li><a shape="rect" href="how-do-i-preserve-order-of-messages.xml">How do I preserve order of messages</a></li><li><a shape="rect" href="how-do-i-purge-a-queue.xml">How do I purge a queue</a></li><li><a shape="rect" href="how-do-i-restart-embedded-broker.xml">How do I restart embedded broker</a></li><li><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></li><li><a
  shape="rect" href="how-do-i-run-a-broker.xml">How do I run a broker</a></li><li><a shape="rect" href="how-do-i-set-the-message-expiration.xml">How do I set the message expiration</a></li><li><a shape="rect" href="how-do-i-turn-off-creating-an-embedded-activemq-broker-when-using-the-vm-transport.xml">How do I turn off creating an embedded ActiveMQ broker when using the VM transport</a></li><li><a shape="rect" href="how-do-i-unack-the-message-with-stomp.xml">How do I unack the message with Stomp</a></li><li><a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.xml">How do I use ActiveMQ using in JVM messaging</a></li><li><a shape="rect" href="how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml">How do I use durable subscribers in a network of brokers</a></li><li><a shape="rect" href="how-do-i-use-ivy-with-activemq.xml">How do I use Ivy with ActiveMQ</a></li><li><a shape="rect" href="how-do-i-use-log4j-jms-appender-with-activemq.xml">How do I use log4j JMS append
 er with ActiveMQ</a></li><li><a shape="rect" href="how-do-i-use-ssl.xml">How do I use SSL</a></li><li><a shape="rect" href="how-do-message-groups-compare-to-selectors.xml">How do Message Groups compare to Selectors</a></li><li><a shape="rect" href="how-do-multiple-transports-work.xml">How do multiple transports work</a></li><li><a shape="rect" href="how-do-transactions-work.xml">How Do Transactions Work</a></li><li><a shape="rect" href="how-lightweight-is-sending-a-message.xml">How lightweight is sending a message</a></li><li><a shape="rect" href="how-should-i-package-applications-using-camel-and-activemq.xml">How should I package applications using Camel and ActiveMQ</a></li><li><a shape="rect" href="how-should-i-use-the-vm-transport.xml">How should I use the VM transport</a></li><li><a shape="rect" href="how-to-deal-with-large-number-of-threads-in-clients.xml">How to deal with large number of threads in clients</a></li><li><a shape="rect" href="how-to-disable-auto-destination-crea
 tion.xml">How to disable auto destination creation</a></li><li><a shape="rect" href="i-see-nc-client-ids-what-does-that-mean.xml">I see NC_ client-ids, what does that mean</a></li><li><a shape="rect" href="should-i-deploy-enterprise-integration-patterns-in-the-broker-or-another-application.xml">Should I deploy Enterprise Integration Patterns in the broker or another application</a></li><li><a shape="rect" href="should-i-deploy-the-broker-inside-my-jvm-or-appserver.xml">Should I deploy the broker inside my JVM or AppServer</a></li><li><a shape="rect" href="what-are-those-topics-activemqadvisory.xml">What are those topics ActiveMQ.Advisory</a></li><li><a shape="rect" href="what-happens-with-a-fast-producer-and-slow-consumer.xml">What happens with a fast producer and slow consumer</a></li><li><a shape="rect" href="what-is-the-difference-between-a-virtual-topic-and-a-composite-destination.xml">What is the difference between a Virtual Topic and a Composite Destination</a></li><li><a shap
 e="rect" href="what-is-the-difference-between-discovery-multicast-and-zeroconf.xml">What is the difference between discovery, multicast and zeroconf</a></li><li><a shape="rect" href="what-is-the-prefetch-limit-for.xml">What is the Prefetch Limit For?</a></li><li><a shape="rect" href="while-posting-large-binary-file-to-activemq-is-there-a-way-to-measure-its-progress.xml">While posting large binary file to activeMQ, is there a way to measure its progress</a></li></ul>
+<h3><link><page ri:content-title="Developing ActiveMQ"></page></link></h3>
 
-<h3 id="FAQ-Configuration"><a shape="rect" href="configuration.xml">Configuration</a></h3>
+<structured-macro ac:macro-id="62db6683-cc91-4458-be64-cd302ae61f66" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Developing ActiveMQ"></page></link></parameter></structured-macro>
 
-
-
-
-<p>Questions on configuring ActiveMQ's JMS client or the Message Broker</p>
-
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-enable-detailed-logging.xml">How can I enable detailed logging</a></li><li><a shape="rect" href="how-does-xbean-compare-to-spring-2.xml">How does XBean compare to Spring 2</a></li><li><a shape="rect" href="how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml">How do I configure 10s of 1000s of Queues in a single broker</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml">How do I configure ActiveMQ to hold 100s of millions of Queue Messages</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-use-aio-server-transport.xml">How do I configure ActiveMQ to use AIO server transport</a></li><li><a shape="rect" href="how-do-i-configure-automatic-reconnection.xml">How do I configure automatic reconnection</a></li><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.xml">How do I configure distributed queues or topics</a></li><
 li><a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml">How do I define a local address and local port for TCP or SSL</a></li><li><a shape="rect" href="how-do-i-disable-persistence.xml">How do I disable persistence</a></li><li><a shape="rect" href="how-do-i-run-activemq-under-the-kaffe-jvm.xml">How do I run ActiveMQ under the Kaffe JVM</a></li><li><a shape="rect" href="how-to-configure-a-new-database.xml">How to configure a new database</a></li><li><a shape="rect" href="how-to-deploy-activemq-ra-versionrar-to-weblogic.xml">How to deploy activemq-ra-version.rar to weblogic</a></li><li><a shape="rect" href="how-to-disable-multicast-discovery.xml">How to disable multicast discovery</a></li></ul>
-
-<h3 id="FAQ-PersistenceQuestions"><a shape="rect" href="persistence-questions.xml">Persistence Questions</a></h3>
-
-Questions relating to long term persistence of messages.
-
-<ul class="childpages-macro"><li><a shape="rect" href="are-messages-read-directly-from-the-journal.xml">Are messages read directly from the journal</a></li><li><a shape="rect" href="does-activemq-support-my-sql-database.xml">Does ActiveMQ support my SQL database</a></li><li><a shape="rect" href="how-does-journaling-work-with-multiple-brokers.xml">How does journaling work with multiple brokers</a></li><li><a shape="rect" href="how-does-the-journal-work.xml">How does the journal work</a></li><li><a shape="rect" href="how-do-i-back-up-kahadb.xml">How do I back-up KahaDB</a></li><li><a shape="rect" href="how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml">How do I change the message store directory for an embedded broker</a></li><li><a shape="rect" href="is-there-a-specified-size-of-the-journal.xml">Is there a specified size of the journal</a></li><li><a shape="rect" href="what-happens-when-the-journal-size-is-exceeded.xml">What happens when the journal size is excee
 ded</a></li><li><a shape="rect" href="what-is-the-difference-between-persistent-and-non-persistent-delivery.xml">What is the difference between persistent and non-persistent delivery</a></li></ul>
-
-<h3 id="FAQ-Errors"><a shape="rect" href="errors.xml">Errors</a></h3>
-
-
-
-<p>Questions on specific kinds of errors. If you have seen a specific exception then check the <a shape="rect" href="exceptions.xml">Exceptions</a></p>
-
-<ul class="childpages-macro"><li><a shape="rect" href="could-not-find-packetreader-for-packet-type-unknown-packet-type.xml">Could not find PacketReader for packet type - UNKNOWN PACKET TYPE</a></li><li><a shape="rect" href="exceptions.xml">Exceptions</a><ul class="childpages-macro"><li><a shape="rect" href="certificateunknown.xml">certificate_unknown</a></li><li><a shape="rect" href="ioexception-could-not-find-class-for-resource.xml">IOException - could not find class for resource</a></li><li><a shape="rect" href="javaiointerruptedioexception.xml">java.io.InterruptedIOException</a></li><li><a shape="rect" href="javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml">java.io.IOException Failed to create database 'derbydb', see the next exception for details</a></li><li><a shape="rect" href="javalangnosuchmethoderror.xml">java.lang.NoSuchMethodError</a></li><li><a shape="rect" href="javalangnosuchmethodexception-orgactivemqraactivemqresourceadapters
 etuseembeddedbroker.xml">java.lang.NoSuchMethodException org.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker</a></li><li><a shape="rect" href="javalangoutofmemory.xml">java.lang.OutOfMemory</a></li><li><a shape="rect" href="javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml">javax.jms.JMSException - Wire format negociation timeout - peer did not send his wire format.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI () needs 2.1 API.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (xxx) needs 2.1 API</a></li><li><a shape="rect" href="journal-is-already-opened-by-this-application.xml">Journal is already opened by this application</a></li><li><
 a shape="rect" href="noclassdeffounderror-orgspringframeworkcoreioresource.xml">NoClassDefFoundError - org.springframework.core.io.Resource</a></li><li><a shape="rect" href="no-suitable-driver.xml">No suitable driver</a></li></ul></li><li><a shape="rect" href="i-am-having-problems-with-the-spring-jmstemplate.xml">I am having problems with the Spring JmsTemplate</a></li><li><a shape="rect" href="i-am-not-receiving-any-messages-what-is-wrong.xml">I am not receiving any messages, what is wrong</a></li><li><a shape="rect" href="i-cannot-connect-to-activemq-from-jconsole.xml">I cannot connect to ActiveMQ from JConsole</a></li><li><a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.xml">I do not receive messages in my second consumer</a></li><li><a shape="rect" href="i-get-errors-building-the-code-whats-wrong.xml">I get errors building the code whats wrong</a></li><li><a shape="rect" href="log4j-warn-no-appenders-could-be-found-for-logger.xml">log4j-WARN No appenders cou
 ld be found for logger</a></li><li><a shape="rect" href="multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network.xml">Multicast - Watch out for IPV6 vs IPV4 support on your operating system or distribution or network</a></li><li><a shape="rect" href="my-producer-blocks.xml">My producer blocks</a></li><li><a shape="rect" href="onmessage-method-of-messagelistener-is-never-called.xml">onMessage method of MessageListener is never called</a></li><li><a shape="rect" href="resource-adapter-does-not-seem-to-pool-connections.xml">Resource Adapter does not seem to pool connections</a></li><li><a shape="rect" href="slow-networks-drop-large-messages.xml">Slow networks drop large messages</a></li><li><a shape="rect" href="the-broker-will-not-start.xml">The Broker will not start</a></li><li><a shape="rect" href="the-vm-transport-starts-a-broker-before-my-configured-broker-starts.xml">The vm transport starts a broker before my configured broker starts</a></
 li><li><a shape="rect" href="why-do-i-not-get-all-of-the-messages-i-sent.xml">Why do I not get all of the messages I sent</a></li><li><a shape="rect" href="why-do-i-not-receive-messages-on-my-durable-topic-subscription.xml">Why do I not receive messages on my durable topic subscription</a></li><li><a shape="rect" href="why-do-kahadb-log-files-remain-after-cleanup.xml">Why do KahaDB log files remain after cleanup</a></li></ul>
-
-<h3 id="FAQ-DevelopingActiveMQ"><a shape="rect" href="developing-activemq.xml">Developing ActiveMQ</a></h3>
-
-Questions for developers wishing to extend or enhance Apache ActiveMQ
-
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-add-a-new-type-of-transport.xml">How can I add a new type of transport</a></li><li><a shape="rect" href="how-can-i-contribute.xml">How can I contribute</a></li><li><a shape="rect" href="how-do-i-add-my-own-plugins.xml">How do I add my own plugins</a></li><li><a shape="rect" href="how-do-i-debug-activemq-from-my-ide.xml">How do I debug ActiveMQ from my IDE</a></li></ul>
-
-<h3 id="FAQ-Terminology"><a shape="rect" href="terminology.xml">Terminology</a></h3>
+<h3><link><page ri:content-title="Terminology"></page></link></h3>
 
 <p>A list of the various messaging related terms and acronyms.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="dr.xml">DR</a></li><li><a shape="rect" href="ha.xml">HA</a></li><li><a shape="rect" href="latency.xml">Latency</a></li><li><a shape="rect" href="mom.xml">MOM</a></li><li><a shape="rect" href="qos.xml">QoS</a></li><li><a shape="rect" href="seda.xml">SEDA</a></li><li><a shape="rect" href="throughput.xml">Throughput</a></li></ul>
+<structured-macro ac:macro-id="c1ff28d3-d9eb-47e9-a9c8-e7cd17617d0e" ac:name="children" ac:schema-version="1"><parameter ac:name="page"><link><page ri:content-title="Terminology"></page></link></parameter></structured-macro>
+
 
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/features-overview.xml
----------------------------------------------------------------------
diff --git a/features-overview.xml b/features-overview.xml
index b5b2fb1..1322df5 100644
--- a/features-overview.xml
+++ b/features-overview.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul><li>Supports a variety of <a shape="rect" href="cross-language-clients.xml">Cross Language Clients and Protocols</a> from Java, C, C++, C#, Ruby, Perl, Python, PHP<ul><li><a shape="rect" href="openwire.xml">OpenWire</a> for high performance clients in Java, C, C++, C#</li><li><a shape="rect" href="stomp.xml">Stomp</a> support so that clients can be written easily in C, Ruby, Perl, Python, PHP, ActionScript/Flash, Smalltalk to talk to ActiveMQ as well as any other popular Message Broker</li><li><a shape="rect" href="amqp.xml">AMQP</a> v1.0 support</li><li><a shape="rect" href="mqtt.xml">MQTT</a> v3.1 support allowing for connections in an IoT environment.</li></ul></li><li>full support for the <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> both in the JMS client and the Message Broker</li><li>Supports many <a shape="rect" href="features.xml">advanced features</a> such as <a shape="rect" href="me
 ssage-groups.xml">Message Groups</a>, <a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a>, <a shape="rect" href="wildcards.xml">Wildcards</a> and <a shape="rect" href="composite-destinations.xml">Composite Destinations</a></li><li>Fully supports JMS 1.1 and J2EE 1.4 with support for transient, persistent, transactional and XA messaging</li><li><a shape="rect" href="spring-support.xml">Spring Support</a> so that ActiveMQ can be easily embedded into Spring applications and configured using Spring's XML configuration mechanism</li><li>Tested inside popular J2EE servers such as <a shape="rect" class="external-link" href="http://tomee.apache.org/">TomEE</a>, <a shape="rect" class="external-link" href="http://geronimo.apache.org/">Geronimo</a>, JBoss, GlassFish and WebLogic<ul><li>Includes <a shape="rect" href="resource-adapter.xml">JCA 1.5 resource adaptors</a> for inbound &amp; outbound messaging so that ActiveMQ should auto-deploy in any J2EE 1.4 compliant server</
 li></ul></li><li>Supports pluggable <a shape="rect" href="uri-protocols.xml">transport protocols</a> such as <a shape="rect" href="how-do-i-use-activemq-using-in-jvm-messaging.xml">in-VM</a>, TCP, SSL, NIO, UDP, multicast, JGroups and JXTA transports</li><li>Supports very fast <a shape="rect" href="persistence.xml">persistence</a> using JDBC along with a high performance journal</li><li>Designed for high performance clustering, client-server, peer based communication</li><li><a shape="rect" href="rest.xml">REST</a> API to provide technology agnostic and language neutral web based API to messaging</li><li><a shape="rect" href="ajax.xml">Ajax</a> to support web streaming support to web browsers using pure DHTML, allowing web browsers to be part of the messaging fabric</li><li><a shape="rect" href="axis-and-cxf-support.xml">CXF and Axis Support</a> so that ActiveMQ can be easily dropped into either of these web service stacks to provide reliable messaging</li><li>Can be used as an in m
 emory JMS provider, ideal for <a shape="rect" href="how-to-unit-test-jms-code.xml">unit testing JMS</a></li></ul></div>
+<div class="wiki-content maincontent"><ul><li>Supports a variety of <link><page ri:content-title="Cross Language Clients"></page><plain-text-link-body>Cross Language Clients and Protocols</plain-text-link-body></link> from Java, C, C++, C#, Ruby, Perl, Python, PHP<ul><li><link><page ri:content-title="OpenWire"></page></link> for high performance clients in Java, C, C++, C#</li><li><link><page ri:content-title="Stomp"></page></link> support so that clients can be written easily in C, Ruby, Perl, Python, PHP, ActionScript/Flash, Smalltalk to talk to ActiveMQ as well as any other popular Message Broker</li><li><link><page ri:content-title="AMQP"></page></link> v1.0 support</li><li><link><page ri:content-title="MQTT"></page></link> v3.1 support allowing for connections in an IoT environment.</li></ul></li><li>full support for the <link><page ri:content-title="Enterprise Integration Patterns"></page></link> both in the JMS client and the Message Broker</li><li>Supports many <link><page r
 i:content-title="Features"></page><plain-text-link-body>advanced features</plain-text-link-body></link> such as <link><page ri:content-title="Message Groups"></page></link>, <link><page ri:content-title="Virtual Destinations"></page></link>, <link><page ri:content-title="Wildcards"></page></link> and <link><page ri:content-title="Composite Destinations"></page></link></li><li>Fully supports JMS 1.1 and J2EE 1.4 with support for transient, persistent, transactional and XA messaging</li><li><link><page ri:content-title="Spring Support"></page></link> so that ActiveMQ can be easily embedded into Spring applications and configured using Spring's XML configuration mechanism</li><li>Tested inside popular J2EE servers such as <a shape="rect" href="http://tomee.apache.org/">TomEE</a>, <a shape="rect" href="http://geronimo.apache.org/">Geronimo</a>, JBoss, GlassFish and WebLogic<ul><li>Includes <link><page ri:content-title="Resource Adapter"></page><plain-text-link-body>JCA 1.5 resource adap
 tors</plain-text-link-body></link> for inbound &amp; outbound messaging so that ActiveMQ should auto-deploy in any J2EE 1.4 compliant server</li></ul></li><li>Supports pluggable <link><page ri:content-title="URI Protocols"></page><plain-text-link-body>transport protocols</plain-text-link-body></link> such as <link><page ri:content-title="How do I use ActiveMQ using in JVM messaging"></page><plain-text-link-body>in-VM</plain-text-link-body></link>, TCP, SSL, NIO, UDP, multicast, JGroups and JXTA transports</li><li>Supports very fast <link><page ri:content-title="Persistence"></page><plain-text-link-body>persistence</plain-text-link-body></link> using JDBC along with a high performance journal</li><li>Designed for high performance clustering, client-server, peer based communication</li><li><link><page ri:content-title="REST"></page></link> API to provide technology agnostic and language neutral web based API to messaging</li><li><link><page ri:content-title="Ajax"></page></link> to su
 pport web streaming support to web browsers using pure DHTML, allowing web browsers to be part of the messaging fabric</li><li><link><page ri:content-title="Axis and CXF Support"></page><plain-text-link-body>CXF and Axis Support</plain-text-link-body></link> so that ActiveMQ can be easily dropped into either of these web service stacks to provide reliable messaging</li><li>Can be used as an in memory JMS provider, ideal for <link><page ri:content-title="How To Unit Test JMS Code"></page><plain-text-link-body>unit testing JMS</plain-text-link-body></link></li></ul></div>
 


[29/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-21-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-21-release.xml b/cms/activemq-cpp-21-release.xml
index bb8a7ed..d4bb728 100644
--- a/cms/activemq-cpp-21-release.xml
+++ b/cms/activemq-cpp-21-release.xml
@@ -1,33 +1,27 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version includes several bugfixes, as well as some new features.  Also a lot of work has been done on performance and memory leaks.  One new feature that has been highly anticipated is that we now build both shared and static libraries.</p>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p>
-</div></div>
+<structured-macro ac:macro-id="d875edd5-8b79-420c-97ab-e984d10ae133" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1-src.zip">activemq-cpp-2.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1-src.zip.asc">activemq-cpp-2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1-src.tar.gz">activemq-cpp-2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1-src.tar.gz.asc">activemq-cpp-2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1-src.zip">activemq-cpp-2.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1-src.zip.asc">activemq-cpp-2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1-src.tar.gz">activemq-cpp-2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq
 -cpp/source/activemq-cpp-2.1-src.tar.gz.asc">activemq-cpp-2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="ff353036-1c98-4290-a897-1834730bd2df" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11812">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11812">release notes</a><br clear="none">
+<structured-macro ac:macro-id="789f096d-f614-4636-9691-d62c1df83d8b" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11812&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-211-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-211-release.xml b/cms/activemq-cpp-211-release.xml
index 49957c4..91df88b 100644
--- a/cms/activemq-cpp-211-release.xml
+++ b/cms/activemq-cpp-211-release.xml
@@ -1,33 +1,27 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version includes several bugfixes, as well as some new examples.&#160; Also a lot of work has been done on performance and memory leaks and stability.</p>
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p>
-</div></div>
+<structured-macro ac:macro-id="56fc63cf-c71a-480d-be27-e05b09c922f8" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.1Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.1.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.zip">activemq-cpp-2.1.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.zip.asc">activemq-cpp-2.1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.tar.gz">activemq-cpp-2.1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.tar.gz.asc">activemq-cpp-2.1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.zip">activemq-cpp-2.1.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.zip.asc">activemq-cpp-2.1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.1-src.tar.gz">activemq-cpp-2.1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.1.1-src.tar.gz.asc">activemq-cpp-2.1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.1.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="74b7a94a-1ef3-4df8-9247-ff1bda9eba8b" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.1.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
 <p>For a more detailed view of new features and bug fixes, see the [release notes|http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11848]</p>
 
-<p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p><structured-macro ac:macro-id="7d9b80f2-bf4a-478c-a5a5-e44c6206bf7b" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11848&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-212-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-212-release.xml b/cms/activemq-cpp-212-release.xml
index fb60a19..5f1a3f8 100644
--- a/cms/activemq-cpp-212-release.xml
+++ b/cms/activemq-cpp-212-release.xml
@@ -1,34 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.1.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version adds support for building the client code on the Solaris platform using the Sun Studio 11 compiler.  Also makes some small improvements to the AutoConf scripts on various platforms.</p>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p>
-</div></div>
+<structured-macro ac:macro-id="71fceb0a-409a-4ff0-a07d-58e1f15b6b0f" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 family</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.2Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.1.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.zip">activemq-cpp-2.1.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.zip.asc">activemq-cpp-2.1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.tar.gz">activemq-cpp-2.1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.tar.gz.asc">activemq-cpp-2.1.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.zip">activemq-cpp-2.1.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.zip.asc">activemq-cpp-2.1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.2-src.tar.gz">activemq-cpp-2.1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.1.2-src.tar.gz.asc">activemq-cpp-2.1.2-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.1.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="3fba3156-6056-4338-ac0f-c18ec0efbc0e" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.1.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a></p>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a></p>
 
-<p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p><structured-macro ac:macro-id="5c520ab3-1179-4590-a085-0992535c877c" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11860&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-213-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-213-release.xml b/cms/activemq-cpp-213-release.xml
index eec87b6..29705fc 100644
--- a/cms/activemq-cpp-213-release.xml
+++ b/cms/activemq-cpp-213-release.xml
@@ -1,34 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.1.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version adds more support for building the client code on the Solaris platform using the Sun Studio 11 and 12 compilers as well as fixed a small OS/X configure script problem.  Also makes some small improvements to the AutoConf scripts on various platforms.</p>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 and 5.0 family</p>
-</div></div>
+<structured-macro ac:macro-id="d407f8cc-14b9-46fd-9a5e-1e0a277450d5" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 and 5.0 family</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.3Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.1.3Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.zip">activemq-cpp-2.1.3-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.zip.asc">activemq-cpp-2.1.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.tar.gz">activemq-cpp-2.1.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.tar.gz.asc">activemq-cpp-2.1.3-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.zip">activemq-cpp-2.1.3-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.zip.asc">activemq-cpp-2.1.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.1.3-src.tar.gz">activemq-cpp-2.1.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.1.3-src.tar.gz.asc">activemq-cpp-2.1.3-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.1.3Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="d8e792c0-65d4-4603-9637-84ed1810b2bd" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.1.3Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a></p>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a></p>
 
-<p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p><structured-macro ac:macro-id="f0d7adc2-fd9e-447b-ad55-ab72d40dd823" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11862&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-22-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-22-release.xml b/cms/activemq-cpp-22-release.xml
index 2d7a007..77a0e20 100644
--- a/cms/activemq-cpp-22-release.xml
+++ b/cms/activemq-cpp-22-release.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQCPP2.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This release has seen a large restructuring of the codebase to separate out to platform code into a new package called decaf.  We are now making use of the APR and APR-Util libraries for platform independence.  Also many new tests and bug fixes have made their way into this release.</p>
 
@@ -7,32 +7,26 @@
 
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 and 5.0 family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="a46f2273-1f6b-4847-87ed-ec1d40369d6e" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker versions in the 4.0 and 5.0 family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQCPP2.2Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.1.1">here</a></p>
 
-<h2 id="ActiveMQCPP2.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2-src.zip">activemq-cpp-2.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2-src.zip.asc">activemq-cpp-2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2-src.tar.gz">activemq-cpp-2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2-src.tar.gz.asc">activemq-cpp-2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2-src.zip">activemq-cpp-2.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2-src.zip.asc">activemq-cpp-2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2-src.tar.gz">activemq-cpp-2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq
 -cpp/source/activemq-cpp-2.2-src.tar.gz.asc">activemq-cpp-2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQCPP2.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="16fc7eba-15bb-4749-b4f6-a6f2afbfc155" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQCPP2.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11860">release notes</a><br clear="none">
+<structured-macro ac:macro-id="fbdea853-6541-4f3c-a67c-8dbea5f9e4a6" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11830&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-221-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-221-release.xml b/cms/activemq-cpp-221-release.xml
index d0c634a..ffcfa95 100644
--- a/cms/activemq-cpp-221-release.xml
+++ b/cms/activemq-cpp-221-release.xml
@@ -1,33 +1,27 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release incorporating several bug fixes that have been found since the 2.2 release.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="c4f7e07c-3052-4ef8-9193-ab0abb220d8f" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.1Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.zip">activemq-cpp-2.2.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.zip.asc">activemq-cpp-2.2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.tar.gz">activemq-cpp-2.2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.tar.gz.asc">activemq-cpp-2.2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.zip">activemq-cpp-2.2.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.zip.asc">activemq-cpp-2.2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.1-src.tar.gz">activemq-cpp-2.2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.1-src.tar.gz.asc">activemq-cpp-2.2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="dd421ae1-6cb0-4b76-98ec-a35cc5a2ee24" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11921">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11921">release notes</a><br clear="none">
+<structured-macro ac:macro-id="9892670c-a2d5-45e9-843c-2345863a8714" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11921&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-222-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-222-release.xml b/cms/activemq-cpp-222-release.xml
index f3b1258..7cf5cdb 100644
--- a/cms/activemq-cpp-222-release.xml
+++ b/cms/activemq-cpp-222-release.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release that contains bugfixes that were found since the<br clear="none">
 2.2.1 release.  Also in this release the there have been several meory leak<br clear="none">
@@ -7,32 +7,26 @@ changed to reflect improved asynchronous message send capabilities as well,<br c
 see the wiki for the new configuration option documentation.  This version<br clear="none">
 of the library now requires APR 1.3 or higher to compile.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="eba11f47-f45a-4d44-9a07-d1955bbad13a" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.2Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.zip">activemq-cpp-2.2.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.zip.asc">activemq-cpp-2.2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.tar.gz">activemq-cpp-2.2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.tar.gz.asc">activemq-cpp-2.2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.zip">activemq-cpp-2.2.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.zip.asc">activemq-cpp-2.2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.2-src.tar.gz">activemq-cpp-2.2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.2-src.tar.gz.asc">activemq-cpp-2.2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="a4d8011d-3dee-4f67-88bb-0b488490498c" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11931">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11931">release notes</a><br clear="none">
+<structured-macro ac:macro-id="a7c6ff47-2fb0-4e05-af70-2a693dc7c4ec" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11931&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-223-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-223-release.xml b/cms/activemq-cpp-223-release.xml
index b56719b..030d139 100644
--- a/cms/activemq-cpp-223-release.xml
+++ b/cms/activemq-cpp-223-release.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release that contains bugfixes that were found since the<br clear="none">
 2.2.2 release.  This version adds support for responding to KeepAlive <br clear="none">
@@ -6,32 +6,26 @@ requests from the broker, and it now properly sets JMSX properties on both<br cl
 stomp and openwire commands.  Users can now delete destinations using the <br clear="none">
 deleteDestination function in ActiveMQConnection.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="41459cf1-1a24-4616-9d7e-87665ae4922f" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.3Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.3Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.zip">activemq-cpp-2.2.3-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.zip.asc">activemq-cpp-2.2.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.tar.gz">activemq-cpp-2.2.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.tar.gz.asc">activemq-cpp-2.2.3-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.zip">activemq-cpp-2.2.3-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.zip.asc">activemq-cpp-2.2.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.3-src.tar.gz">activemq-cpp-2.2.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.3-src.tar.gz.asc">activemq-cpp-2.2.3-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.3Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="8296f1b9-8f50-4411-b1d7-a5e508b9d85f" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.3/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.3Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11999">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11999">release notes</a><br clear="none">
+<structured-macro ac:macro-id="7b15074d-ed4d-4379-b161-1cbc133ac0ec" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11999&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-224-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-224-release.xml b/cms/activemq-cpp-224-release.xml
index 723d9e8..cf94876 100644
--- a/cms/activemq-cpp-224-release.xml
+++ b/cms/activemq-cpp-224-release.xml
@@ -1,34 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.4Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release that contains bugfixes that were found since the<br clear="none">
 2.2.3 release.  </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="66b9a5db-92d7-4b1e-a431-4785615abbce" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.4Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.4Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.zip">activemq-cpp-2.2.4-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.zip.asc">activemq-cpp-2.2.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.tar.gz">activemq-cpp-2.2.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.tar.gz.asc">activemq-cpp-2.2.4-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.zip">activemq-cpp-2.2.4-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.zip.asc">activemq-cpp-2.2.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.4-src.tar.gz">activemq-cpp-2.2.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.4-src.tar.gz.asc">activemq-cpp-2.2.4-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.4Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="77d73e43-0037-42c8-bd42-cf07619cfbf6" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.4/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.4Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12000">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12000">release notes</a><br clear="none">
+<structured-macro ac:macro-id="cbd6a6bd-d72a-4b17-b27d-a9415c19b4d5" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=12000&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-225-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-225-release.xml b/cms/activemq-cpp-225-release.xml
index db8765f..6ac744b 100644
--- a/cms/activemq-cpp-225-release.xml
+++ b/cms/activemq-cpp-225-release.xml
@@ -1,34 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.5Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release that contains bugfixes that were found since the<br clear="none">
 2.2.4 release.  </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="c2470b9d-21a5-4610-9e4f-c8ca1595e932" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.5Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.5Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.zip">activemq-cpp-2.2.5-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.zip.asc">activemq-cpp-2.2.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.tar.gz">activemq-cpp-2.2.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.tar.gz.asc">activemq-cpp-2.2.5-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.zip">activemq-cpp-2.2.5-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.zip.asc">activemq-cpp-2.2.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.5-src.tar.gz">activemq-cpp-2.2.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.5-src.tar.gz.asc">activemq-cpp-2.2.5-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.5Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="d3e69697-5aa9-4192-9470-eaacde74c922" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.5/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.5Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12060">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12060">release notes</a><br clear="none">
+<structured-macro ac:macro-id="64125340-9ef9-4164-a118-84f135fd8a28" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=12060&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-226-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-226-release.xml b/cms/activemq-cpp-226-release.xml
index 0e84c27..080f111 100644
--- a/cms/activemq-cpp-226-release.xml
+++ b/cms/activemq-cpp-226-release.xml
@@ -1,36 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.2.6Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release that contains bugfixes that were found since the<br clear="none">
 2.2.5 release.  Most noteably the code now properly encodes the strings <br clear="none">
 sent in text message's and as properties in any message as proper modified <br clear="none">
 UTF-8 encoded string's.  </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="b2f97b90-0ab2-49ba-8c8b-ebc0b7fd6548" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP2.2.6Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.2.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.2.6Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.zip">activemq-cpp-2.2.6-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.zip.asc">activemq-cpp-2.2.6-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.tar.gz">activemq-cpp-2.2.6-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.tar.gz.asc">activemq-cpp-2.2.6-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.zip">activemq-cpp-2.2.6-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.zip.asc">activemq-cpp-2.2.6-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.2.6-src.tar.gz">activemq-cpp-2.2.6-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.2.6-src.tar.gz.asc">activemq-cpp-2.2.6-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.2.6Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="1912ddad-e337-4336-8d82-391a69897b90" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.2.6/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.2.6Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12109">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12109">release notes</a><br clear="none">
+<structured-macro ac:macro-id="a7fea867-a2d8-452c-abbb-925886276b15" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=12109&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-30-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-30-release.xml b/cms/activemq-cpp-30-release.xml
index 10c9b35..1bdc050 100644
--- a/cms/activemq-cpp-30-release.xml
+++ b/cms/activemq-cpp-30-release.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>The 3.0 release is a major update the to ActiveMQ-CPP client code, many areas have been rewritten to enhance performance and improve stability.  The following are some highlights of this release:</p>
 
@@ -6,34 +6,28 @@
 
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="a39979c7-1526-4e8e-9572-aa1327fd99ed" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 1.3 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.zip">activemq-cpp-library-3.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.zip.asc">activemq-cpp-library-3.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.tar.gz">activemq-cpp-library-3.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.tar.gz.asc">activemq-cpp-library-3.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.zip">activemq-cpp-library-3.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.zip.asc">activemq-cpp-library-3.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.tar.gz">activemq-cpp-library-3.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" hr
 ef="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0-src.tar.gz.asc">activemq-cpp-library-3.0-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="260761a2-8c07-4012-adc9-dae7adcd3bc8" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11998">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11998">release notes</a><br clear="none">
+<structured-macro ac:macro-id="ee979692-70a7-468b-9409-b1a2c39f2be8" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=11998&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-301-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-301-release.xml b/cms/activemq-cpp-301-release.xml
index c09383e..915a70a 100644
--- a/cms/activemq-cpp-301-release.xml
+++ b/cms/activemq-cpp-301-release.xml
@@ -1,35 +1,29 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.0.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a bugfix release that mainly addresses problems found in the Failover support added in the initial 3.0 release.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="006942ec-1cbc-4692-938b-649034557ba7" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.0.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 1.3 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.0.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.zip">activemq-cpp-library-3.0.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.zip.asc">activemq-cpp-library-3.0.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.tar.gz">activemq-cpp-library-3.0.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.tar.gz.asc">activemq-cpp-library-3.0.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.zip">activemq-cpp-library-3.0.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.zip.asc">activemq-cpp-library-3.0.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.tar.gz">activemq-cpp-library-3.0.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.0.1-src.tar.gz.asc">activemq-cpp-library-3.0.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.0.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="2cb51d55-619b-49cb-85cd-e49d82b00329" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.0.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.0.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12141">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12141">release notes</a><br clear="none">
+<structured-macro ac:macro-id="d5bac1ae-b8c3-496f-90ff-c0dc6d71e951" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;p2id=11000&amp;fixfor=12141&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-310-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-310-release.xml b/cms/activemq-cpp-310-release.xml
index 6c06bb6..26c82a5 100644
--- a/cms/activemq-cpp-310-release.xml
+++ b/cms/activemq-cpp-310-release.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.1.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new Major release of ActiveMQ-CPP.  Many new features have been added<br clear="none">
 and several bugs have been fixed.  The client now has an connection Inactivity<br clear="none">
@@ -7,30 +7,27 @@ broken.  The Threading code has been rewritten to improve performance and lower<
 memory usage, and there have been several other performance improvements added<br clear="none">
 throughout the code-base.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="c850d3bf-8b71-453e-a04e-b5a42523b359" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.1.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.1.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.zip">activemq-cpp-library-3.1.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.zip.asc">activemq-cpp-library-3.1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.tar.gz">activemq-cpp-library-3.1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.tar.gz.asc">activemq-cpp-library-3.1.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.zip">activemq-cpp-library-3.1.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.zip.asc">activemq-cpp-library-3.1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.tar.gz">activemq-cpp-library-3.1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.0-src.tar.gz.asc">activemq-cpp-library-3.1.0-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.1.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="ba2bcb1b-5f57-45b7-bac9-4dba1abce57b" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.1.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.1.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12070">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12070">release notes</a></p></div>
 


[16/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delay-and-schedule-message-delivery.xml
----------------------------------------------------------------------
diff --git a/delay-and-schedule-message-delivery.xml b/delay-and-schedule-message-delivery.xml
index d6885a6..5c8e1ad 100644
--- a/delay-and-schedule-message-delivery.xml
+++ b/delay-and-schedule-message-delivery.xml
@@ -1,13 +1,10 @@
-<div class="wiki-content maincontent"><p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. <br clear="none"> An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Check your Message Properties</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The message property <code>scheduledJobId&#160;</code>is reserved for use by the Job Scheduler. If this property is set before sending, the message will be sent immediately and not scheduled. Also, <span>after a scheduled message is received, the property </span><span><cod
 e>scheduledJobId</code>&#160;will be set on the received message so </span>keep this in mind if using something like a Camel Route which might automatically copy properties over when re-sending a message.</p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_DELAY</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The time in milliseconds that a message will wait before being scheduled to be delivered by the broker</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_PERIOD</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td><td colspan="1" rowspan="1" 
 class="confluenceTd"><p>The time in milliseconds to wait after the start time to wait before scheduling the message again</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_REPEAT</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>int</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of times to repeat scheduling a message for delivery</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>AMQ_SCHEDULED_CRON</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use a Cron entry to set the schedule</p></td></tr></tbody></table></div><p>For the connivence of Java JMS clients - there's an interface with the property names used for scheduling at <em><strong>org.apache.activemq.ScheduledMessage</strong></em>.</p><p>For example, to have a message scheduled for delivery in 60 seconds - you would need to set the <em>AMQ_SCHEDULED_DELAY</em> pro
 perty:</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
+<div class="wiki-content maincontent"><p>ActiveMQ from version <strong>5.4</strong> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <strong>schedulerSupport</strong> attribute to true in the <link><page ri:content-title="Xml Configuration"></page></link>. <br clear="none"> An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p><structured-macro ac:macro-id="9d386966-fbbb-49f5-afcd-e4fc705a19ed" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Check your Message Properties</parameter><rich-text-body><p>The message property <code>scheduledJobId&#160;</code>is reserved for use by the Job Scheduler. If this property is set before sending, the message will be sent immediately and not scheduled. Also, <span>after a scheduled message is received, the property </span><span><code>scheduledJobId</code>&#160;will be set on the received message so </span>keep this i
 n mind if using something like a Camel Route which might automatically copy properties over when re-sending a message.</p></rich-text-body></structured-macro><table><tbody><tr><th colspan="1" rowspan="1"><p>Property name</p></th><th colspan="1" rowspan="1"><p>type</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_DELAY</p></td><td colspan="1" rowspan="1"><p>long</p></td><td colspan="1" rowspan="1"><p>The time in milliseconds that a message will wait before being scheduled to be delivered by the broker</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_PERIOD</p></td><td colspan="1" rowspan="1"><p>long</p></td><td colspan="1" rowspan="1"><p>The time in milliseconds to wait after the start time to wait before scheduling the message again</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_REPEAT</p></td><td colspan="1" rowspan="1"><p>int</p></td><td colspan="1" rowspan="1"><p>The number of times to rep
 eat scheduling a message for delivery</p></td></tr><tr><td colspan="1" rowspan="1"><p>AMQ_SCHEDULED_CRON</p></td><td colspan="1" rowspan="1"><p>String</p></td><td colspan="1" rowspan="1"><p>Use a Cron entry to set the schedule</p></td></tr></tbody></table><p>For the connivence of Java JMS clients - there's an interface with the property names used for scheduling at <em><strong>org.apache.activemq.ScheduledMessage</strong></em>.</p><p>For example, to have a message scheduled for delivery in 60 seconds - you would need to set the <em>AMQ_SCHEDULED_DELAY</em> property:</p><structured-macro ac:macro-id="c68d7805-8bf6-4833-b600-9a20ee84ca98" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
         long time = 60 * 1000;
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, time);
         producer.send(message);
-]]></script>
-</div></div><p>You can set a message to wait with an initial delay, and the repeat delivery 10 times, waiting 10 seconds between each re-delivery:</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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
+</plain-text-body></structured-macro><p>You can set a message to wait with an initial delay, and the repeat delivery 10 times, waiting 10 seconds between each re-delivery:</p><structured-macro ac:macro-id="912377b9-7446-4d59-ab20-80cea8490783" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
         long delay = 30 * 1000;
         long period = 10 * 1000;
         int repeat = 9;
@@ -15,22 +12,17 @@
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_PERIOD, period);
         message.setIntProperty(ScheduledMessage.AMQ_SCHEDULED_REPEAT, repeat);
         producer.send(message);
-]]></script>
-</div></div><p>You can also use <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Cron" rel="nofollow">CRON</a> to schedule a message, for example, if you want a message scheduled to be delivered every hour, you would need to set the CRON entry to be - <em>0 * * * *</em> - 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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
-        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, &quot;0 * * * *&quot;);
+</plain-text-body></structured-macro><p>You can also use <a shape="rect" href="http://en.wikipedia.org/wiki/Cron">CRON</a> to schedule a message, for example, if you want a message scheduled to be delivered every hour, you would need to set the CRON entry to be - <em>0 * * * *</em> - e.g.</p><structured-macro ac:macro-id="a4d4b451-b5a5-4c05-b608-6034275960a5" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
+        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, "0 * * * *");
         producer.send(message);
-]]></script>
-</div></div><p>CRON scheduling takes priority over using message delay - however, if a repeat and period is set with a CRON entry, the ActiveMQ scheduler will schedule delivery of the message for every time the CRON entry fires. Easier to explain with an example. Supposing that you want a message to be delivered 10 times, with a one second delay between each message - and you wanted this to happen every hour - you'd do 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[        MessageProducer producer = session.createProducer(destination);
-        TextMessage message = session.createTextMessage(&quot;test msg&quot;);
-        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, &quot;0 * * * *&quot;);
+</plain-text-body></structured-macro><p>CRON scheduling takes priority over using message delay - however, if a repeat and period is set with a CRON entry, the ActiveMQ scheduler will schedule delivery of the message for every time the CRON entry fires. Easier to explain with an example. Supposing that you want a message to be delivered 10 times, with a one second delay between each message - and you wanted this to happen every hour - you'd do this:</p><structured-macro ac:macro-id="6a9d7e73-9d13-44b2-80e0-63ca1b8130b3" ac:name="code" ac:schema-version="1"><plain-text-body>        MessageProducer producer = session.createProducer(destination);
+        TextMessage message = session.createTextMessage("test msg");
+        message.setStringProperty(ScheduledMessage.AMQ_SCHEDULED_CRON, "0 * * * *");
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, 1000);
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_PERIOD, 1000);
         message.setIntProperty(ScheduledMessage.AMQ_SCHEDULED_REPEAT, 9);
         producer.send(message);
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delete-inactive-destinations.xml
----------------------------------------------------------------------
diff --git a/delete-inactive-destinations.xml b/delete-inactive-destinations.xml
index 6273c34..14bff40 100644
--- a/delete-inactive-destinations.xml
+++ b/delete-inactive-destinations.xml
@@ -1,16 +1,12 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Inactive Destination</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">An 'inactive' destination is one that has had no messages pending and no consumers connected for some configured period of time.</div></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">By default the broker does <em>not</em> check for inactive destinations. This as governed by the default values for the following options: <strong><code>schedulePeriodForDestinationPurge="0"</code></strong> and&#160;<strong><code>gcInactiveDestinations="false"</code></strong>.</div></div><p>However, the broker can be confi
 gured to purge inactive destinations. To do so requires using specially configured destination policy entries in combination with the broker attribute: <strong><code>schedulePeriodForDestinationPurge &gt; 0</code></strong>.</p><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; schedulePeriodForDestinationPurge=&quot;10000&quot;&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="fcf7d983-a1c8-45c4-97f5-e84d80c6cb5e" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Inactive Destination</parameter><rich-text-body>An 'inactive' destination is one that has had no messages pending and no consumers connected for some configured period of time.</rich-text-body></structured-macro><structured-macro ac:macro-id="44b9356b-6be3-4fbf-87d6-7c0840678f48" ac:name="info" ac:schema-version="1"><rich-text-body>By default the broker does <em>not</em> check for inactive destinations. This as governed by the default values for the following options: <strong><code>schedulePeriodForDestinationPurge="0"</code></strong> and&#160;<strong><code>gcInactiveDestinations="false"</code></strong>.</rich-text-body></structured-macro><p>However, the broker can be configured to purge inactive destinations. To do so requires using specially configured destination policy entries in combination with the broker att
 ribute: <strong><code>schedulePeriodForDestinationPurge &gt; 0</code></strong>.</p><p>Example:</p><structured-macro ac:macro-id="6500de46-5edd-41a6-8032-baf0dc981af5" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;broker xmlns="http://activemq.apache.org/schema/core" schedulePeriodForDestinationPurge="10000"&gt;
 
   &lt;destinationPolicy&gt;
      &lt;policyMap&gt;
         &lt;policyEntries&gt;
-           &lt;policyEntry queue=&quot;&gt;&quot; gcInactiveDestinations=&quot;true&quot; inactiveTimoutBeforeGC=&quot;30000&quot;/&gt;
+           &lt;policyEntry queue="&gt;" gcInactiveDestinations="true" inactiveTimoutBeforeGC="30000"/&gt;
         &lt;/policyEntries&gt;
      &lt;/policyMap&gt;
   &lt;/destinationPolicy&gt;
       
-&lt;/broker&gt;]]></script>
-</div></div><p>In this example the broker will check for inactive destinations every&#160;<strong><code>10</code></strong> seconds, as determined by <strong><code>schedulePeriodForDestinationPurge="10000"</code></strong>. When a destination purge is triggered the broker will delete any queue that has been empty for longer than <strong><code>inactiveTimoutBeforeGC="30000"</code></strong> milliseconds (default: <strong><code>60000</code></strong> milliseconds) and for which <strong><code>gcInactiveDestinations="true"</code></strong> is set on its corresponding destination policy entry.</p><p>When a destination is removed the broker will log a message like:</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[INFO  Queue                          - TEST.QUEUE Inactive for longer than 30000 ms - removing ...]]></script>
-</div></div><p>&#160;</p><p>&#160;</p></div>
+&lt;/broker&gt;</plain-text-body></structured-macro><p>In this example the broker will check for inactive destinations every&#160;<strong><code>10</code></strong> seconds, as determined by <strong><code>schedulePeriodForDestinationPurge="10000"</code></strong>. When a destination purge is triggered the broker will delete any queue that has been empty for longer than <strong><code>inactiveTimoutBeforeGC="30000"</code></strong> milliseconds (default: <strong><code>60000</code></strong> milliseconds) and for which <strong><code>gcInactiveDestinations="true"</code></strong> is set on its corresponding destination policy entry.</p><p>When a destination is removed the broker will log a message like:</p><structured-macro ac:macro-id="af51b539-e8e4-4614-88fb-8c56e9030c99" ac:name="code" ac:schema-version="1"><plain-text-body>INFO  Queue                          - TEST.QUEUE Inactive for longer than 30000 ms - removing ...</plain-text-body></structured-macro><p>&#160;</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/delphi-and-freepascal.xml
----------------------------------------------------------------------
diff --git a/delphi-and-freepascal.xml b/delphi-and-freepascal.xml
index 2741618..5b991fc 100644
--- a/delphi-and-freepascal.xml
+++ b/delphi-and-freepascal.xml
@@ -1,14 +1,14 @@
-<div class="wiki-content maincontent"><h1 id="DelphiandFreePascal-DelphiandFreePascalClient">Delphi and FreePascal Client</h1>
+<div class="wiki-content maincontent"><h1>Delphi and FreePascal Client</h1>
 <p>Habari ActiveMQ Client is a library for Delphi(tm) and Free Pascal. With Habari, applications can connect to Apache ActiveMQ servers, subscribe to queues and topics, send and receive messages and objects, and work with transactions.</p>
 
-<h3 id="DelphiandFreePascal-SupportedCommunicationLibraries">Supported Communication Libraries</h3>
+<h3>Supported Communication Libraries</h3>
 <ul><li>Internet Direct (Indy) 10.2</li><li>Synapse</li><li>OverByte ICS V6 (limited feature set)</li><li>TClientSocket (limited feature set)</li></ul>
 
 
-<h3 id="DelphiandFreePascal-ProjectStatus">Project Status</h3>
+<h3>Project Status</h3>
 <p>Habari ActiveMQ Client 1.0 has been released on March 5, 2008. Demo applications, API documentation and source code examples are available for download. <br clear="none">
-The API documentation is available at <a shape="rect" class="external-link" href="http://www.mikejustin.com/habari/docs/html/index.html" rel="nofollow">http://www.mikejustin.com/habari/docs/html/index.html</a></p>
+The API documentation is available at <a shape="rect" href="http://www.mikejustin.com/habari/docs/html/index.html">http://www.mikejustin.com/habari/docs/html/index.html</a></p>
 
-<h3 id="DelphiandFreePascal-ProjectHomePage">Project Home Page</h3>
-<p><a shape="rect" class="external-link" href="http://www.mikejustin.com/" rel="nofollow">http://www.mikejustin.com/</a></p></div>
+<h3>Project Home Page</h3>
+<p><a shape="rect" href="http://www.mikejustin.com/">http://www.mikejustin.com/</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/design-documents.xml
----------------------------------------------------------------------
diff --git a/design-documents.xml b/design-documents.xml
index 1b2e0c5..e15f1ca 100644
--- a/design-documents.xml
+++ b/design-documents.xml
@@ -1,2 +1,3 @@
-<div class="wiki-content maincontent"><ul><li><a shape="rect" href="slow-consumers.xml">Slow Consumers</a></li><li><a shape="rect" href="durable-queue-memory-management.xml">Durable Queue Memory Management</a></li><li><a shape="rect" href="supporting-io-streams.xml">Supporting IO Streams</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.xml">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.xml">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.xml">REST protocols</a></li></ul></div>
+<div class="wiki-content maincontent"><ul><li><link><page ri:content-title="Slow Consumers"></page></link></li><li><link><page ri:content-title="Durable Queue Memory Management"></page></link></li><li><link><page ri:content-title="Supporting IO Streams"></page></link></li><li><link><page ri:content-title="Message Redelivery and DLQ Handling"></page></link></li><li><link><page ri:content-title="Multicast Transport"></page></link></li><li><link><page ri:content-title="Proposed C Client Architecture"></page></link></li><li><link><page ri:content-title="REST protocols"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destination-features.xml
----------------------------------------------------------------------
diff --git a/destination-features.xml b/destination-features.xml
index d9996a7..d7e7e4f 100644
--- a/destination-features.xml
+++ b/destination-features.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="composite-destinations.xml">Composite Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.xml">Configure Startup Destinations</a></li><li><a shape="rect" href="delete-inactive-destinations.xml">Delete Inactive Destinations</a></li><li><a shape="rect" href="destination-options.xml">Destination Options</a></li><li><a shape="rect" href="mirrored-queues.xml">Mirrored Queues</a></li><li><a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a></li><li><a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a></li><li><a shape="rect" href="wildcards.xml">Wildcards</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="9c003b57-9b0d-42d5-b9a7-84b09f429720" ac:name="children" ac:schema-version="1"><parameter ac:name="">all</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destination-options.xml
----------------------------------------------------------------------
diff --git a/destination-options.xml b/destination-options.xml
index ec098d5..5eaba8a 100644
--- a/destination-options.xml
+++ b/destination-options.xml
@@ -1,6 +1,4 @@
-<div class="wiki-content maincontent"><h3 id="DestinationOptions-Background">Background</h3><p>Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JMS API. The options are encoded using URL query syntax in the destination name that the consumer is created on.</p><h3 id="DestinationOptions-ConsumerOptions">Consumer Options</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.dispatchAsync</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker <a shape="rect" href="consumer-dispatch-async.xml">dispatch messa
 ges asynchronously</a> to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.exclusive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Is this an <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.maximumPendingMessageLimit</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use to control if messages for non-durable topics are dropped if a <a shape="rect" href="slow-consumer-handling.xml">slow consumer</a> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.noLocal</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenc
 eTd"><p>Same as the&#160;<strong><code>noLocal</code></strong> flag on a Topic consumer. Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.prefetchSize</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>n/a</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of message the consumer will <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.priority</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Allows you to configure a <a shape="rect" href="consumer-priority.xml">Consumer Priority</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.retroactive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</
 code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Is this a <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>consumer.selector</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JMS Selector used with the consumer.</p></td></tr></tbody></table></div><h3 id="DestinationOptions-Example">Example</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[queue = new ActiveMQQueue(&quot;TEST.QUEUE?consumer.dispatchAsync=false&amp;consumer.prefetchSize=10&quot;);
+<div class="wiki-content maincontent"><h3>Background</h3><p>Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JMS API. The options are encoded using URL query syntax in the destination name that the consumer is created on.</p><h3>Consumer Options</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.dispatchAsync</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Should the broker <link><page ri:content-title="Consumer Dispatch Async"></page><plain-text-link-body>dispatch messages asynchronously</plain-text-link-body></link> to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.exclusive</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td 
 colspan="1" rowspan="1"><p>Is this an <link><page ri:content-title="Exclusive Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.maximumPendingMessageLimit</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Use to control if messages for non-durable topics are dropped if a <link><page ri:content-title="Slow Consumer Handling"></page><plain-text-link-body>slow consumer</plain-text-link-body></link> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.noLocal</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Same as the&#160;<strong><code>noLocal</code></strong> flag on a Topic consumer. Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.prefetchSize</code></p></td><td colspan="1" rowspan="1"><p><code>n/a</code></p></td><td colspan="1" rowspan="1"><p>The num
 ber of message the consumer will <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch</plain-text-link-body></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.priority</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Allows you to configure a <link><page ri:content-title="Consumer Priority"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.retroactive</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>Is this a <link><page ri:content-title="Retroactive Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>consumer.selector</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>JMS Selector used with the consumer.</p></td></tr></tbody></table><h3>Example</h3><structured-macro ac:macro-id="3ee1935a-0d33-41b2-b125-
 7b032eae301b" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>queue = new ActiveMQQueue("TEST.QUEUE?consumer.dispatchAsync=false&amp;consumer.prefetchSize=10");
 consumer = session.createConsumer(queue);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/destinations-plugin.xml
----------------------------------------------------------------------
diff --git a/destinations-plugin.xml b/destinations-plugin.xml
index 04d03eb..8018c9f 100644
--- a/destinations-plugin.xml
+++ b/destinations-plugin.xml
@@ -1,6 +1,4 @@
-<div class="wiki-content maincontent"><p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[        &lt;plugins&gt;
-            &lt;destinationsPlugin location=&quot;/workspace/destinations&quot;/&gt;
-        &lt;/plugins&gt;]]></script>
-</div></div><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p></div>
+<div class="wiki-content maincontent"><p>In some environments clients can't create destinations and only administrators are allowed to do that using management consoles or APIs. This plugin allows users to export destinations created during the runtime of the broker and replicate that state on another broker.</p><structured-macro ac:macro-id="3fd8e4f9-55b1-482d-a0d5-506278d29dee" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>        &lt;plugins&gt;
+            &lt;destinationsPlugin location="/workspace/destinations"/&gt;
+        &lt;/plugins&gt;</plain-text-body></structured-macro><p>&#160;</p><p>The plugin saves all destinations to the file defined by the location property when it stops. If the property is not specified, broker data directory will be used and the file will be named <code>destinations</code> (<code>${ACTIVEMQ_HOME}/data/localhost/destinations</code> by default). If this file is present on the broker start, destinations listed in the file will be pre-created. The future improvements can include periodic export&#160;or on demand via management API.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developer-forum.xml
----------------------------------------------------------------------
diff --git a/developer-forum.xml b/developer-forum.xml
index e1b0bd3..d2fa78b 100644
--- a/developer-forum.xml
+++ b/developer-forum.xml
@@ -1,5 +1,5 @@
-<div class="wiki-content maincontent"><p>
-<a shape="rect" id="nabblelink" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html">ActiveMQ - Dev</a>
-<script src="http://activemq.2283324.n4.nabble.com/embed/f2368404"></script>
-</p><p></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="979c14ec-231e-4310-b1c9-4f97fd543ff8" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;a id="nabblelink" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html"&gt;ActiveMQ - Dev&lt;/a&gt;
+&lt;script src="http://activemq.2283324.n4.nabble.com/embed/f2368404"&gt;&lt;/script&gt;
+</plain-text-body></structured-macro></p><p></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developer-guide.xml
----------------------------------------------------------------------
diff --git a/developer-guide.xml b/developer-guide.xml
index c194982..3008545 100644
--- a/developer-guide.xml
+++ b/developer-guide.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The following documents might be interesting</p><ul><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="release-plans.xml">Release Plans</a></li><li><a shape="rect" href="release-guide.xml">Release Guide</a></li><li><a shape="rect" href="design-documents.xml">Design Documents</a></li><li><a shape="rect" href="changes-in-40.xml">Changes in 4.0</a></li><li><a shape="rect" href="apache-activemq-board-reports.xml">Apache ActiveMQ Board Reports</a></li><li><a shape="rect" href="maven-snapshot-repository-in-your-pom.xml">Maven SNAPSHOT Repository in your POM</a></li></ul><h3 id="DeveloperGuide-Codewalkthrough">Code walkthrough</h3><ul class="alternate"><li><a shape="rect" href="code-overview.xml">Code Overview</a></li><li><a shape="rect" href="wire-protocol.xml">Wire Protocol</a></li><li><a shape="rect" href="developing-plugins.xml">Developing Plugins</a></li></ul></div>
+<div class="wiki-content maincontent"><p>The following documents might be interesting</p><ul><li><link><page ri:content-title="Building"></page></link></li><li><link><page ri:content-title="Release Plans"></page></link></li><li><link><page ri:content-title="Release Guide"></page></link></li><li><link><page ri:content-title="Design Documents"></page></link></li><li><link><page ri:content-title="Changes in 4.0"></page></link></li><li><link><page ri:content-title="Apache ActiveMQ Board Reports"></page></link></li><li><link><page ri:content-title="Maven SNAPSHOT Repository in your POM"></page></link></li></ul><h3>Code walkthrough</h3><ul class="alternate"><li><link><page ri:content-title="Code Overview"></page></link></li><li><link><page ri:content-title="Wire Protocol"></page></link></li><li><link><page ri:content-title="Developing Plugins"></page></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developers.xml
----------------------------------------------------------------------
diff --git a/developers.xml b/developers.xml
index afe7f55..6daa975 100644
--- a/developers.xml
+++ b/developers.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="becoming-a-committer.xml">Becoming a committer</a></li><li><a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a></li><li><a shape="rect" href="board-reports.xml">Board Reports</a><ul class="childpages-macro"><li><a shape="rect" href="2007-april.xml">2007 April</a></li></ul></li><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="code-overview.xml">Code Overview</a></li><li><a shape="rect" href="developer-guide.xml">Developer Guide</a><ul class="childpages-macro"><li><a shape="rect" href="design-documents.xml">Design Documents</a><ul class="childpages-macro"><li><a shape="rect" href="class-diagrams-for-activemq-40-m4-source-code.xml">Class Diagrams for activemq-4.0-M4 source code</a></li><li><a shape="rect" href="durable-queue-memory-management.xml">Durable Queue Memory Management</a></li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml
 ">Message Redelivery and DLQ Handling</a></li><li><a shape="rect" href="multicast-transport.xml">Multicast Transport</a></li><li><a shape="rect" href="proposed-c-client-architecture.xml">Proposed C Client Architecture</a></li><li><a shape="rect" href="rest-protocols.xml">REST protocols</a></li><li><a shape="rect" href="slow-consumers.xml">Slow Consumers</a></li><li><a shape="rect" href="supporting-io-streams.xml">Supporting IO Streams</a></li></ul></li><li><a shape="rect" href="developing-plugins.xml">Developing Plugins</a></li><li><a shape="rect" href="maven-snapshot-repository-in-your-pom.xml">Maven SNAPSHOT Repository in your POM</a></li><li><a shape="rect" href="release-plans.xml">Release Plans</a><ul class="childpages-macro"><li><a shape="rect" href="40-rc-1-guide.xml">4.0 RC 1 Guide</a></li><li><a shape="rect" href="how-you-can-help-release.xml">How you can help release</a></li><li><a shape="rect" href="release-info.xml">Release Info</a></li></ul></li></ul></li><li><a shape="r
 ect" href="ideas.xml">Ideas</a><ul class="childpages-macro"><li><a shape="rect" href="restful-queue.xml">RESTful Queue</a></li></ul></li><li><a shape="rect" href="integration-tests.xml">Integration Tests</a><ul class="childpages-macro"><li><a shape="rect" href="example-testing-scenario.xml">Example Testing Scenario</a></li></ul></li><li><a shape="rect" href="jmeter-performance-tests.xml">JMeter Performance Tests</a></li><li><a shape="rect" href="jmeter-system-tests.xml">JMeter System Tests</a></li><li><a shape="rect" href="junit-reports.xml">JUnit Reports</a></li><li><a shape="rect" href="release-guide.xml">Release Guide</a></li><li><a shape="rect" href="sandbox.xml">Sandbox</a></li><li><a shape="rect" href="source.xml">Source</a></li><li><a shape="rect" href="source-xref.xml">Source XRef</a></li><li><a shape="rect" href="svn.xml">SVN</a></li><li><a shape="rect" href="test-source-xref.xml">Test Source XRef</a></li><li><a shape="rect" href="wire-protocol.xml">Wire Protocol</a></li></
 ul> </div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="deb1db17-86c2-4189-adb5-f9ba39674adb" ac:name="children" ac:schema-version="1"><parameter ac:name="depth">4</parameter></structured-macro> </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/developing-activemq.xml
----------------------------------------------------------------------
diff --git a/developing-activemq.xml b/developing-activemq.xml
index f551956..505bc26 100644
--- a/developing-activemq.xml
+++ b/developing-activemq.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent"><p>Questions for developers wishing to extend or enhance Apache ActiveMQ</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-add-a-new-type-of-transport.xml">How can I add a new type of transport</a></li><li><a shape="rect" href="how-can-i-contribute.xml">How can I contribute</a></li><li><a shape="rect" href="how-do-i-add-my-own-plugins.xml">How do I add my own plugins</a></li><li><a shape="rect" href="how-do-i-debug-activemq-from-my-ide.xml">How do I debug ActiveMQ from my IDE</a></li></ul></div>
+<structured-macro ac:macro-id="f2073f3c-4db5-47be-ae49-cba901b84bce" 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/developing-plugins.xml
----------------------------------------------------------------------
diff --git a/developing-plugins.xml b/developing-plugins.xml
index b2e0216..125e78a 100644
--- a/developing-plugins.xml
+++ b/developing-plugins.xml
@@ -1,37 +1,31 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <a shape="rect" href="interceptors.xml">Interceptors</a> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection.</p><h3 id="DevelopingPlugins-DependencyInjection">Dependency Injection</h3><p>Some folks favour using constructor based injection as it removes the need to have a separate lifecycle <em>start()</em> method - others find using property based injection is a little more flexible and easier to map to XML configuration files. We'll leave that choice up to you. For complex to create objects you could consider writing a FactoryBean. For more details on writing POJOs with Spring see their <a shape="rect" class="external-link" href="http://www.springframework.org/documentation" rel="nofollow">documentation</a>.</p>
 <h3 id="DevelopingPlugins-CustomXML">Custom XML</h3><p>With ActiveMQ you can use regular Spring.xml syntax to configure things. However to produce neater XML that is easier to read and edit we use <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/">XBean</a> to autogenerate support for <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/custom-xml.html">Custom XML</a>.</p><p>If you wish your POJO to have its own custom XML you may wish to follow the following source examples for working nicely with XBean. Basically you add an XBean annotation in the javadoc comments to tell XBean how to map the POJO to custom XML. This should look something like</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[/**
- * @org.apache.xbean.XBean element=&quot;foo&quot;
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model of POJOs and <em>Dependency Injection</em>. If you are developing <link><page ri:content-title="Interceptors"></page></link> or additional components or plugins for ActiveMQ then the first thing you should do is develop the code as if you are writing any other Spring component, using dependency injection.</p><h3>Dependency Injection</h3><p>Some folks favour using constructor based injection as it removes the need to have a separate lifecycle <em>start()</em> method - others find using property based injection is a little more flexible and easier to map to XML configuration files. We'll leave that choice up to you. For complex to create objects you could consider writing a FactoryBean. For more details on writing POJOs with Spring see their <a shape="rect" href="http://www.springframework.org/documentation">documentation</a>.</p><h3>Custom XML</h3><p>With ActiveMQ you can use regular Spring.xml syntax to c
 onfigure things. However to produce neater XML that is easier to read and edit we use <a shape="rect" href="http://geronimo.apache.org/xbean/">XBean</a> to autogenerate support for <a shape="rect" href="http://geronimo.apache.org/xbean/custom-xml.html">Custom XML</a>.</p><p>If you wish your POJO to have its own custom XML you may wish to follow the following source examples for working nicely with XBean. Basically you add an XBean annotation in the javadoc comments to tell XBean how to map the POJO to custom XML. This should look something like</p><structured-macro ac:macro-id="18ed826e-ea03-4094-8041-ea885c64973f" ac:name="code" ac:schema-version="1"><plain-text-body>/**
+ * @org.apache.xbean.XBean element="foo"
  */
 public class MyExtension {
 ...
 }
-]]></script>
-</div></div><p>You can omit the element configuration. For more details on the available annotation options see <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/xbean-ant-task.html">here</a></p><p>If you are submitting your plugin to the ActiveMQ project then it will end up being included in the maven build step to create the XBean artifacts as part of the jar (in the META-INF/services area).</p><p>However if you are writing an external plugin to ActiveMQ then you will need to add the maven-xbean-plugin to your Maven 2 build. Refer to the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-spring/pom.xml">activemq-spring/pom.xml</a> as an example of using this plugin.</p><h3 id="DevelopingPlugins-ConfiguringpluginswithoutcustomXML">Configuring plugins without custom XML</h3><p>If you want to configure plugins that does not implement custom XML, you can define plugins as "regular" Spring beans and r
 eference them in broker's <code>plugins</code> attribute. For 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[&lt;broker useJmx=&quot;true&quot; xmlns=&quot;http://activemq.apache.org/schema/core&quot; plugins=&quot;#loggingPlugin&quot;&gt;
+</plain-text-body></structured-macro><p>You can omit the element configuration. For more details on the available annotation options see <a shape="rect" href="http://geronimo.apache.org/xbean/xbean-ant-task.html">here</a></p><p>If you are submitting your plugin to the ActiveMQ project then it will end up being included in the maven build step to create the XBean artifacts as part of the jar (in the META-INF/services area).</p><p>However if you are writing an external plugin to ActiveMQ then you will need to add the maven-xbean-plugin to your Maven 2 build. Refer to the <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-spring/pom.xml">activemq-spring/pom.xml</a> as an example of using this plugin.</p><h3>Configuring plugins without custom XML</h3><p>If you want to configure plugins that does not implement custom XML, you can define plugins as "regular" Spring beans and reference them in broker's <code>plugins</code> attribute. For example,</p><st
 ructured-macro ac:macro-id="1dd35da6-a1b9-41af-ab9b-43fe546563b6" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker useJmx="true" xmlns="http://activemq.apache.org/schema/core" plugins="#loggingPlugin"&gt;
  ...
 &lt;/broker&gt;
 
-&lt;bean id=&quot;loggingPlugin&quot; 
-      class=&quot;org.apache.activemq.broker.util.LoggingBrokerPlugin&quot;
+&lt;bean id="loggingPlugin" 
+      class="org.apache.activemq.broker.util.LoggingBrokerPlugin"
 /&gt;
 
-]]></script>
-</div></div><p>Not that this mechanism will not work in case that you have some XBean plugins configured inside the <code>&lt;plugins/&gt;</code> tag. In that case you must define the plugin inside that tag as well (with the appropriate schema definition). For 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[&lt;plugins&gt;
+</plain-text-body></structured-macro><p>Not that this mechanism will not work in case that you have some XBean plugins configured inside the <code>&lt;plugins/&gt;</code> tag. In that case you must define the plugin inside that tag as well (with the appropriate schema definition). For example,</p><structured-macro ac:macro-id="8a2615a4-df89-4e27-9b6b-523392c4aad0" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;plugins&gt;
     &lt;simpleAuthenticationPlugin&gt;
       &lt;users&gt;
-        &lt;authenticationUser username=&quot;system&quot; password=&quot;manager&quot;
-          groups=&quot;users,admins&quot;/&gt;
-        &lt;authenticationUser username=&quot;user&quot; password=&quot;password&quot;
-          groups=&quot;users&quot;/&gt;
-        &lt;authenticationUser username=&quot;guest&quot; password=&quot;password&quot; groups=&quot;guests&quot;/&gt;
+        &lt;authenticationUser username="system" password="manager"
+          groups="users,admins"/&gt;
+        &lt;authenticationUser username="user" password="password"
+          groups="users"/&gt;
+        &lt;authenticationUser username="guest" password="password" groups="guests"/&gt;
       &lt;/users&gt;
     &lt;/simpleAuthenticationPlugin&gt;  
-    &lt;bean xmlns=&quot;http://www.springframework.org/schema/beans&quot; 
-          id=&quot;loggingPlugin&quot; 
-          class=&quot;org.apache.activemq.broker.util.LoggingBrokerPlugin&quot;
+    &lt;bean xmlns="http://www.springframework.org/schema/beans" 
+          id="loggingPlugin" 
+          class="org.apache.activemq.broker.util.LoggingBrokerPlugin"
     /&gt;
 &lt;/plugins&gt;  
-]]></script>
-</div></div><h3 id="DevelopingPlugins-Examples">Examples</h3><p>The easiest way to get a feel for how to extend ActiveMQ is maybe to look at some concrete examples of features and how those are implemented and configured. Here are some examples</p><ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><a shape="rect" href="security.xml">Security</a> has an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">Author
 izationPlugin</a></li><li>The <a shape="rect" href="message-redelivery-and-dlq-handling.xml#MessageRedeliveryandDLQHandling-TheDiscardingDLQPlugin">Discarding DLQ Plugin</a> is used to discard messages from the DLQ.</li></ul></div>
+</plain-text-body></structured-macro><h3>Examples</h3><p>The easiest way to get a feel for how to extend ActiveMQ is maybe to look at some concrete examples of features and how those are implemented and configured. Here are some examples</p><ul><li><a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java">XBeanBrokerService</a> deals with most of the core configuration of the &lt;broker&gt; tag in the XML</li><li><link><page ri:content-title="Security"></page></link> has an <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/jaas-broker.xml">example</a> XML configuration file using the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java">AuthorizationPlugin</a></li><li>The <link ac:anchor="The Discarding DLQ P
 lugin"><page ri:content-title="Message Redelivery and DLQ Handling"></page><plain-text-link-body>Discarding DLQ Plugin</plain-text-link-body></link> is used to discard messages from the DLQ.</li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discovery-transport-reference.xml
----------------------------------------------------------------------
diff --git a/discovery-transport-reference.xml b/discovery-transport-reference.xml
index 04533fd..7a5ed9a 100644
--- a/discovery-transport-reference.xml
+++ b/discovery-transport-reference.xml
@@ -1,42 +1,39 @@
-<div class="wiki-content maincontent"><h3 id="DiscoveryTransportReference-TheDiscoveryTransport">The Discovery Transport</h3>
+<div class="wiki-content maincontent"><h3>The Discovery Transport</h3>
 
-<p>The Discovery transport works just like the <a shape="rect" href="failover-transport-reference.xml">Failover</a> transport, except that it uses a discovery agent to locate the list of uri to connect to.  The Discovery transport is also used by the <a shape="rect" href="fanout-transport-reference.xml">Fanout</a> transport for discovering brokers to send a fanout message to.</p>
+<p>The Discovery transport works just like the <link><page ri:content-title="Failover Transport Reference"></page><link-body>Failover</link-body></link> transport, except that it uses a discovery agent to locate the list of uri to connect to.  The Discovery transport is also used by the <link><page ri:content-title="Fanout Transport Reference"></page><link-body>Fanout</link-body></link> transport for discovering brokers to send a fanout message to.</p>
 
-<h4 id="DiscoveryTransportReference-ConfigurationSyntax">Configuration Syntax</h4>
+<h4>Configuration Syntax</h4>
 
 <p><strong>discovery:(discoveryAgentURI)?transportOptions</strong><br clear="none">
 or<br clear="none">
 <strong>discovery:discoveryAgentURI</strong></p>
 
-<p>Note that to be able to use <a shape="rect" href="discovery.xml">Discovery</a> to find brokers, the brokers need to have the multicast discovery agent enabled on the broker. </p>
+<p>Note that to be able to use <link><page ri:content-title="Discovery"></page></link> to find brokers, the brokers need to have the multicast discovery agent enabled on the broker. </p>
 
-<p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?view=co">example</a> of using discovery. Its basically something like the following (see the <strong>discoveryUri</strong>)</p>
+<p>To configure discovery in a Broker you should use the <link><page ri:content-title="Xml Configuration"></page></link>. Here is an <a shape="rect" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?view=co">example</a> of using discovery. Its basically something like the following (see the <strong>discoveryUri</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[
-&lt;broker name=&quot;foo&quot;&gt;
+<structured-macro ac:macro-id="aaf47c6c-4495-4851-b8a2-4d450e232d07" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;broker name="foo"&gt;
   &lt;transportConnectors&gt;
-    &lt;transportConnector uri=&quot;tcp://localhost:0&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
+    &lt;transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/&gt;
   &lt;/transportConnectors&gt;
 
   ...
 &lt;/broker&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<h5 id="DiscoveryTransportReference-TransportOptions">Transport Options</h5>
+<h5>Transport Options</h5>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>reconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How long to wait for discovery</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>How long to wait before the first reconnect attempt to a discovered url</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should an exponential backoff be used btween reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>2</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The exponent used in the exponential backoff attempts</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1" class="
 confluenceTd"><p>group</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> an identifier for the group to partition multi cast traffic among collaborating peers; the group forms part of the shared identity of a discovery datagram (since 5.2) </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>reconnectDelay</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>How long to wait for discovery</p></td></tr><tr><td colspan="1" rowspan="1"><p>initialReconnectDelay</p></td><td colspan="1" rowspan="1"><p>10</p></td><td colspan="1" rowspan="1"><p>How long to wait before the first reconnect attempt to a discovered url</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectDelay</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The maximum amount of time we ever wait between reconnect attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>useExponentialBackOff</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should an exponential backoff be used btween reconnect attempts<
 /p></td></tr><tr><td colspan="1" rowspan="1"><p>backOffMultiplier</p></td><td colspan="1" rowspan="1"><p>2</p></td><td colspan="1" rowspan="1"><p>The exponent used in the exponential backoff attempts</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxReconnectAttempts</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>If not 0, then this is the maximum number of reconnect attempts before an error is sent back to the client</p></td></tr><tr><td colspan="1" rowspan="1"><p>group</p></td><td colspan="1" rowspan="1"><p>default</p></td><td colspan="1" rowspan="1"><p> an identifier for the group to partition multi cast traffic among collaborating peers; the group forms part of the shared identity of a discovery datagram (since 5.2) </p></td></tr></tbody></table>
 
 
-<h5 id="DiscoveryTransportReference-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>discovery:(multicast://default)?initialReconnectDelay=100
-</pre>
-</div></div>
+<structured-macro ac:macro-id="9b5b8676-087a-4fb5-a1a5-b5fa176682fc" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+discovery:(multicast://default)?initialReconnectDelay=100
+</plain-text-body></structured-macro>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Applying parameters to discovered transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <a shape="rect" href="tcp-transport-reference.xml">TCP</a> transport, even though this parameter is not a Discovery transport option.</p></div></div></div>
+<structured-macro ac:macro-id="a04821a9-8498-4d06-a5e0-f047d1b800e3" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Applying parameters to discovered transports</parameter><rich-text-body>
+<p>From 5.4, transport parameters in the URI will also be applied to discovered transports if they are prefixed with <code>discovered.</code>; For example, adding the <code>discovered.connectionTimeout</code> parameter to the URI will apply the parameter to every discovered <link><page ri:content-title="TCP Transport Reference"></page><link-body>TCP</link-body></link> transport, even though this parameter is not a Discovery transport option.</p></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discovery.xml
----------------------------------------------------------------------
diff --git a/discovery.xml b/discovery.xml
index 042a018..e393f9f 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -1,18 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="Discovery-DiscoveryAgents">Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" class="external-link" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></p><p>There are currently two kinds of discovery agent.</p><h3 id="Discovery-Multicast">Multicast</h3><p>The Discovery transport uses our own Multicast based discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <a shape="rect" href="discovery-transport-reference.xml">Discovery Transport Reference</a>.</p><h3 id="Discovery-Zeroconf">Zeroconf</h3><p><a shape="rect" href="zeroconf.xml">ZeroConf</a> is a standard discovery 
 specification that uses UDP / multicast to discovery devices. Its used by Apple's Rendezvous services.<br clear="none"> We use the <a shape="rect" class="external-link" href="http://jmdns.sf.net/" rel="nofollow">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>. Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><div class="code panel pdl" st
 yle="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[zeroconf:_activemq_development.
-]]></script>
-</div></div><p>This will use Zeroconf to find an available broker and one will be randomly chosen &amp; things will auto-failover on disconnect if there are several brokers running.</p><h3 id="Discovery-LDAPDiscovery">LDAP Discovery</h3><p>ActiveMQ supports the use of LDAP for discovery of brokers.</p><p>Please see <a shape="rect" href="ldap-broker-discovery-mechanism.xml">LDAP Broker Discovery Mechanism</a> for more details.</p><h2 id="Discovery-Tryingoutdiscovery">Trying out discovery</h2><p>If you run the following commands in separate shells you'll have 2 brokers auto-discovering themselves and 2 clients using fixed-URLs</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[maven -o server -Dconfig=src/test/org/activemq/usecases/receiver-zeroconf.xml
+<div class="wiki-content maincontent"><h2>Discovery Agents</h2><p>ActiveMQ uses an abstraction called a <a shape="rect" href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html">Discovery Agent</a> to detect remote services such as remote brokers. We can use discovery for JMS clients to auto-detect a Message Broker to connect to, or to provide <link><page ri:content-title="Networks of Brokers"></page></link></p><p>There are currently two kinds of discovery agent.</p><h3>Multicast</h3><p>The Discovery transport uses our own Multicast based discovery agent to locate the list of URIs to connect to.</p><p>For more information see the <link><page ri:content-title="Discovery Transport Reference"></page></link>.</p><h3>Zeroconf</h3><p><link><page ri:content-title="ZeroConf"></page></link> is a standard discovery specification that uses UDP / multicast to discovery devices. Its used by Apple's Rendezvous services.<br clear="non
 e"> We use the <a shape="rect" href="http://jmdns.sf.net/">jmDNS</a> project to implement the Zeroconf specification to detect services. This means other Zeroconf<br clear="none"> based tools can be used in conjunction with this discovery agent.</p><p>To configure discovery in a Broker you should use the <link><page ri:content-title="Xml Configuration"></page></link>. Here is an <a shape="rect" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co">example</a> of using discovery to create <link><page ri:content-title="Networks of Brokers"></page></link>.</p><p>If you have one or more brokers running with Zeroconf discovery enabled you can connect to a broker using the brokerURL</p><structured-macro ac:macro-id="f1747328-7dfc-4d75-beaa-110c0513fbed" ac:name="code" ac:schema-version="1"><plain-text-body>zeroconf:_activemq_development.
+</plain-text-body></structured-macro><p>This will use Zeroconf to find an available broker and one will be randomly chosen &amp; things will auto-failover on disconnect if there are several brokers running.</p><h3>LDAP Discovery</h3><p>ActiveMQ supports the use of LDAP for discovery of brokers.</p><p>Please see <link><page ri:content-title="LDAP Broker Discovery Mechanism"></page></link> for more details.</p><h2>Trying out discovery</h2><p>If you run the following commands in separate shells you'll have 2 brokers auto-discovering themselves and 2 clients using fixed-URLs</p><structured-macro ac:macro-id="11d9cbdf-33c7-4f54-b9b6-ebb80e6fdcc8" ac:name="code" ac:schema-version="1"><plain-text-body>maven -o server -Dconfig=src/test/org/activemq/usecases/receiver-zeroconf.xml
 maven -o server -Dconfig=src/test/org/activemq/usecases/sender-zeroconf.xml
 maven -o consumer -Durl=tcp://localhost:62002
 maven -o producer -Durl=tcp://localhost:62001
-]]></script>
-</div></div><p>If you want the clients to use discovery to find brokers, run either of the two 'server' statements above (or both) then run the producer/consumer 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[maven -o consumer -Durl=zeroconf:_activemq.broker.development.
+</plain-text-body></structured-macro><p>If you want the clients to use discovery to find brokers, run either of the two 'server' statements above (or both) then run the producer/consumer as follows</p><structured-macro ac:macro-id="d61f046e-320e-45b1-8e46-119e1e612211" ac:name="code" ac:schema-version="1"><plain-text-body>maven -o consumer -Durl=zeroconf:_activemq.broker.development.
 maven -o producer  -Durl=zeroconf:_activemq.broker.development.
-]]></script>
-</div></div><p>The transport URL is of the format</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[    zeroconf:&lt;serviceName&gt;
-]]></script>
-</div></div><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2 id="Discovery-DiscoveryandSecurity">Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p></div>
+</plain-text-body></structured-macro><p>The transport URL is of the format</p><structured-macro ac:macro-id="fae97634-2d5e-41b9-9ae6-ed05d453676d" ac:name="code" ac:schema-version="1"><plain-text-body>    zeroconf:&lt;serviceName&gt;
+</plain-text-body></structured-macro><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service name; which seems to start with an underscore (_) and must end with a dot (.). So we can use this service name to distinguish development, UAT &amp; production brokers - or group them into domains etc.</p><h2>Discovery and Security</h2><p>When using auto discovery of brokers an attacker may be able to present itself as a legitimate broker and by this way catch and / or manipulate all messages that run over it.</p><p>Are there security settings in auto discovery to avoid this?</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/discussion-forums.xml
----------------------------------------------------------------------
diff --git a/discussion-forums.xml b/discussion-forums.xml
index 2c8ebdb..adb6a94 100644
--- a/discussion-forums.xml
+++ b/discussion-forums.xml
@@ -1,13 +1,13 @@
-<div class="wiki-content maincontent"><p>Before posting you might want to read the <a shape="rect" href="tips-for-getting-help.xml">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>Before posting you might want to read the <link><page ri:content-title="Tips for getting help"></page></link>.</p>
 
-<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">Nabble forums</a> which also work with our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
+<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" href="http://activemq.2283324.n4.nabble.com/">Nabble forums</a> which also work with our <link><page ri:content-title="Mailing Lists"></page></link> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
 
-<h3 id="DiscussionForums-ActiveMQForums"><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">ActiveMQ Forums</a></h3>
+<h3><a shape="rect" href="http://activemq.2283324.n4.nabble.com/">ActiveMQ Forums</a></h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html" rel="nofollow">ActiveMQ User Forum</a></li><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html" rel="nofollow">ActiveMQ Developer Forum</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html">ActiveMQ User Forum</a></li><li><a shape="rect" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html">ActiveMQ Developer Forum</a></li></ul>
 
 
-<h3 id="DiscussionForums-MailingLists">Mailing Lists</h3>
+<h3>Mailing Lists</h3>
 
-<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> are kept in sync so its your choice which you use.</p></div>
+<p>If you prefer to use a mailing list instead then check out our <link><page ri:content-title="Mailing Lists"></page></link>. Note that the Forums and <link><page ri:content-title="Mailing Lists"></page></link> are kept in sync so its your choice which you use.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/dispatch-policies.xml
----------------------------------------------------------------------
diff --git a/dispatch-policies.xml b/dispatch-policies.xml
index c2adcfd..9b425d2 100644
--- a/dispatch-policies.xml
+++ b/dispatch-policies.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="DispatchPolicies-DispatchPolicies">Dispatch Policies</h1><h2 id="DispatchPolicies-Dispatchpoliciesforqueues">Dispatch policies for queues</h2><p>Plug-able dispatch policies only apply to topics. For Queues, dispatch is more static, you can choose round robin (the default) or strict order. Before discussing dispatch policies its worth first understanding <a shape="rect" href="what-is-the-prefetch-limit-for.xml">the purpose of the prefetch value</a>.</p><p>The out of the box configuration of ActiveMQ is designed for high performance and high throughput messaging where there are lots of messages that need to be dispatched to consumers as quickly as possible. So the default prefetch values are fairly large and the default dispatch policy will try and fill the prefetch buffers as quickly as possible.</p><p>However with messaging there are many use cases and sometimes the default configuration is not ideal to your use case; when you send a sma
 ll number of messages, they tend to all go to one consumer unless you've lots of messages. If you have a large number of consumers and a relatively high <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch value</a> and you have a small number of messages that each message takes quite a while to process then the default dispatch policy might result in increasing the amount of time it takes to process all the messages (since the load balancing is not fair for small numbers of messages).</p><p>For queues, you can define whether the dispatch will occur in a round-robin fashion (default behaviour) or if one consumer's prefetch buffer will be exhausted before the dispatch process selects the next consumer along (strictOrderDispatch).<br clear="none"> The latter behaviour is enabled by setting the "strictOrderDispatch" attribute on the &lt;policyEntry /&gt; element. E.g.:</p><plain-text-body>&lt;policyEntry queue="&gt;" strictOrderDispatch="false" /&gt; </plain-text-body><p>
 Consumer priorities are observed, so if you have several consumers with different <a shape="rect" class="external-link" href="http://activemq.apache.org/consumer-priority.html">priorities</a>, the one with the highest priority will be flooded first until it can take no more, then the next one along, etc.</p><p>From version 5.14.0 - the&#160;strictOrderDispatch=true option will ensure strict order for redispatched messages when there is a single consumer.&#160;</p><h2 id="DispatchPolicies-DispatchpoliciesforTopics">Dispatch policies for Topics</h2><p>There are more options for topics because the dispatch policy is plug-able. Any implementation of org.apache.activemq.broker.region.policy.DispatchPolicy will work.<br clear="none"> The default org.apache.activemq.broker.region.policy.SimpleDispatchPolicy does what one would expect and delivers messages to all subscribers. An example of a more advanced implementation is the org.apache.activemq.broker.region.policy.PriorityNetworkDispatch
 Policy which will only dispatch to the highest priority network consumer. This is useful in a loop network topology where there is more than route to a consumer.</p><p>Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml">example of destination policy configuration</a>.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;destinationPolicy&gt;
+<div class="wiki-content maincontent"><h1>Dispatch Policies</h1><h2>Dispatch policies for queues</h2><p>Plug-able dispatch policies only apply to topics. For Queues, dispatch is more static, you can choose round robin (the default) or strict order. Before discussing dispatch policies its worth first understanding <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>the purpose of the prefetch value</plain-text-link-body></link>.</p><p>The out of the box configuration of ActiveMQ is designed for high performance and high throughput messaging where there are lots of messages that need to be dispatched to consumers as quickly as possible. So the default prefetch values are fairly large and the default dispatch policy will try and fill the prefetch buffers as quickly as possible.</p><p>However with messaging there are many use cases and sometimes the default configuration is not ideal to your use case; when you send a small number of messages, they
  tend to all go to one consumer unless you've lots of messages. If you have a large number of consumers and a relatively high <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch value</plain-text-link-body></link> and you have a small number of messages that each message takes quite a while to process then the default dispatch policy might result in increasing the amount of time it takes to process all the messages (since the load balancing is not fair for small numbers of messages).</p><p>For queues, you can define whether the dispatch will occur in a round-robin fashion (default behaviour) or if one consumer's prefetch buffer will be exhausted before the dispatch process selects the next consumer along (strictOrderDispatch).<br clear="none"> The latter behaviour is enabled by setting the "strictOrderDispatch" attribute on the &lt;policyEntry /&gt; element. E.g.:</p><plain-text-body>&lt;policyEntry queue="&gt;" strictOrderDispatch="f
 alse" /&gt; </plain-text-body><p>Consumer priorities are observed, so if you have several consumers with different <a shape="rect" href="http://activemq.apache.org/consumer-priority.html">priorities</a>, the one with the highest priority will be flooded first until it can take no more, then the next one along, etc.</p><p>From version 5.14.0 - the&#160;strictOrderDispatch=true option will ensure strict order for redispatched messages when there is a single consumer.&#160;</p><h2>Dispatch policies for Topics</h2><p>There are more options for topics because the dispatch policy is plug-able. Any implementation of org.apache.activemq.broker.region.policy.DispatchPolicy will work.<br clear="none"> The default org.apache.activemq.broker.region.policy.SimpleDispatchPolicy does what one would expect and delivers messages to all subscribers. An example of a more advanced implementation is the org.apache.activemq.broker.region.policy.PriorityNetworkDispatchPolicy which will only dispatch to th
 e highest priority network consumer. This is useful in a loop network topology where there is more than route to a consumer.</p><p>Here is an <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml">example of destination policy configuration</a>.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;destinationPolicy&gt;
   &lt;policyMap&gt;
 	&lt;policyEntries&gt;
 	  &lt;policyEntry topic="FOO.&gt;"&gt;

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/does-activemq-support-clustering.xml
----------------------------------------------------------------------
diff --git a/does-activemq-support-clustering.xml b/does-activemq-support-clustering.xml
index a2de10a..693fef9 100644
--- a/does-activemq-support-clustering.xml
+++ b/does-activemq-support-clustering.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>Yes, though there are various kinds of clustering. See <a shape="rect" href="clustering.xml">this page on details</a></p></div>
+<p>Yes, though there are various kinds of clustering. See <link><page ri:content-title="Clustering"></page><link-body>this page on details</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/does-activemq-support-my-sql-database.xml
----------------------------------------------------------------------
diff --git a/does-activemq-support-my-sql-database.xml b/does-activemq-support-my-sql-database.xml
index 4eae899..26312be 100644
--- a/does-activemq-support-my-sql-database.xml
+++ b/does-activemq-support-my-sql-database.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Quite possibly <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)">. See the <a shape="rect" href="jdbc-support.xml">JDBC Support</a> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <a shape="rect" href="persistence.xml">Persistence</a></p></div>
+<p>Quite possibly <emoticon ac:name="smile"></emoticon>. See the <link><page ri:content-title="JDBC Support"></page></link> page for details of how to configure for your database or how to let us know of a database which does not work. Also see <link><page ri:content-title="Persistence"></page></link></p></div>
 


[04/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jdbc-support.xml
----------------------------------------------------------------------
diff --git a/jdbc-support.xml b/jdbc-support.xml
index f071449..41ce333 100644
--- a/jdbc-support.xml
+++ b/jdbc-support.xml
@@ -1,32 +1,24 @@
-<div class="wiki-content maincontent"><p>We support a range of SQL databases for message persistence such as</p><ul><li>Apache Derby</li><li>Axion</li><li>DB2</li><li>HSQL</li><li>Informix</li><li>MaxDB</li><li>MySQL</li><li>Oracle</li><li>Postgresql</li><li><a shape="rect" href="sqlserver.xml">SQLServer</a></li><li><a shape="rect" href="sybase.xml">Sybase</a></li></ul><p>as well as a number of generic JDBC providers.</p><h3 id="JDBCSupport-Auto-discoveryofyourJDBCprovider">Auto-discovery of your JDBC provider</h3><p>We try to auto-detect from the JDBC driver which JDBCAdapter to use via these <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc">config files</a> and the return string from the JDBC driver.</p><p>If you have a JDBC database which we don't support then please let us know what JDBC driver string you're getting and <a shape="rect
 " href="discussion-forums.xml">drop us a note</a> or raise an issue in our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ">support database</a> and we'll fix it pretty quickly.</p><p>If your database is not in the above list it is normally a matter of tweaking the StatementProvider to ensure that the JDBCMessageStore uses the right flavour of SQL. So normally most databases support one of these providers...</p><ul><li>org.activemq.store.jdbc.adapter.BlobJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.BytesJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.DefaultJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.ImageJDBCAdapter</li></ul><p>You can explicitly specify the JDBC adaptor using its xbean identifier, inside the activemq.xml...</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;jdbcPersistenceAdapter adapter=&quot;postgresql-jdbc-adapter&quot;/&gt;
-]]></script>
-</div></div><h3 id="JDBCSupport-CustomizingtheSQLDDL">Customizing the SQL DDL</h3><p>You can confiugure the various SQL datatypes - such as column sizes and so forth - using the statements element</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[  &lt;broker useJmx=&quot;false&quot;&gt;
+<div class="wiki-content maincontent"><p>We support a range of SQL databases for message persistence such as</p><ul><li>Apache Derby</li><li>Axion</li><li>DB2</li><li>HSQL</li><li>Informix</li><li>MaxDB</li><li>MySQL</li><li>Oracle</li><li>Postgresql</li><li><link><page ri:content-title="SQLServer"></page></link></li><li><link><page ri:content-title="Sybase"></page></link></li></ul><p>as well as a number of generic JDBC providers.</p><h3>Auto-discovery of your JDBC provider</h3><p>We try to auto-detect from the JDBC driver which JDBCAdapter to use via these <a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-jdbc-store/src/main/resources/META-INF/services/org/apache/activemq/store/jdbc">config files</a> and the return string from the JDBC driver.</p><p>If you have a JDBC database which we don't support then please let us know what JDBC driver string you're getting and <link><page ri:content-title="Discussion Forums"></page><plain-text-link-
 body>drop us a note</plain-text-link-body></link> or raise an issue in our <a shape="rect" href="http://issues.apache.org/activemq/browse/AMQ">support database</a> and we'll fix it pretty quickly.</p><p>If your database is not in the above list it is normally a matter of tweaking the StatementProvider to ensure that the JDBCMessageStore uses the right flavour of SQL. So normally most databases support one of these providers...</p><ul><li>org.activemq.store.jdbc.adapter.BlobJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.BytesJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.DefaultJDBCAdapter</li><li>org.activemq.store.jdbc.adapter.ImageJDBCAdapter</li></ul><p>You can explicitly specify the JDBC adaptor using its xbean identifier, inside the activemq.xml...</p><structured-macro ac:macro-id="45d22476-142f-4b05-8879-76bd163c8efe" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;jdbcPersistenceAdapter adapter="postgresql-jdbc-adapter"
 /&gt;
+</plain-text-body></structured-macro><h3>Customizing the SQL DDL</h3><p>You can confiugure the various SQL datatypes - such as column sizes and so forth - using the statements element</p><structured-macro ac:macro-id="28fb77cc-b99c-46bb-a02a-5bb4f4df4f81" ac:name="code" ac:schema-version="1"><plain-text-body>  &lt;broker useJmx="false"&gt;
 
     &lt;persistenceAdapter&gt;
-      &lt;journaledJDBC useJournal=&quot;false&quot;&gt;
+      &lt;journaledJDBC useJournal="false"&gt;
         &lt;statements&gt;
-          &lt;statements stringIdDataType =&quot;VARCHAR(128)&quot;/&gt;
+          &lt;statements stringIdDataType ="VARCHAR(128)"/&gt;
         &lt;/statements&gt;
       &lt;/journaledJDBC&gt;
     &lt;/persistenceAdapter&gt;
 
   &lt;/broker&gt;
-]]></script>
-</div></div><p>For more info on what attributes can be set on the statements element, see the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/store/jdbc/Statements.html">Statements class</a>. All the settable bean properties can be used as attributes of the &lt;statements&gt; element.</p><h3 id="JDBCSupport-UsingMySQL">Using MySQL</h3><p>If you are using MySQL then you should set the <strong>relaxAutoCommit</strong> flag to be true. 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[  &lt;bean id=&quot;mysql-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-    &lt;property name=&quot;driverClassName&quot; value=&quot;com.mysql.jdbc.Driver&quot;/&gt;
-    &lt;property name=&quot;url&quot; value=&quot;jdbc:mysql://localhost/activemq?relaxAutoCommit=true&quot;/&gt;
-    &lt;property name=&quot;username&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;password&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;poolPreparedStatements&quot; value=&quot;true&quot;/&gt;
+</plain-text-body></structured-macro><p>For more info on what attributes can be set on the statements element, see the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/store/jdbc/Statements.html">Statements class</a>. All the settable bean properties can be used as attributes of the &lt;statements&gt; element.</p><h3>Using MySQL</h3><p>If you are using MySQL then you should set the <strong>relaxAutoCommit</strong> flag to be true. e.g.</p><structured-macro ac:macro-id="150457bb-9c29-40d2-b917-8bca8441f5d7" ac:name="code" ac:schema-version="1"><plain-text-body>  &lt;bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+    &lt;property name="driverClassName" value="com.mysql.jdbc.Driver"/&gt;
+    &lt;property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/&gt;
+    &lt;property name="username" value="activemq"/&gt;
+    &lt;property name="password" value="activemq"/&gt;
+    &lt;property name="poolPreparedStatements" value="true"/&gt;
   &lt;/bean&gt;
-]]></script>
-</div></div><p>To see this in action see the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">default configuration file</a></p><h3 id="JDBCSupport-ForAMQ3.x">For AMQ 3.x</h3><p>In 3.x you can specify the adapter 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[&lt;jdbcPersistence adapterClass=&quot;org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor&quot;&gt;
+</plain-text-body></structured-macro><p>To see this in action see the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">default configuration file</a></p><h3>For AMQ 3.x</h3><p>In 3.x you can specify the adapter as follows</p><structured-macro ac:macro-id="8a41d054-c2d5-4b21-84f7-c430ace0b29c" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;jdbcPersistence adapterClass="org.activemq.store.jdbc.adapter.ImageBasedJDBCAdaptor"&gt;
     ...
 &lt;/jdbcPersistence&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jmeter-performance-tests.xml
----------------------------------------------------------------------
diff --git a/jmeter-performance-tests.xml b/jmeter-performance-tests.xml
index c316dc8..aed4dcf 100644
--- a/jmeter-performance-tests.xml
+++ b/jmeter-performance-tests.xml
@@ -1,17 +1,17 @@
-<div class="wiki-content maincontent"><h3 id="JMeterPerformanceTests-JMeterperformancetest">JMeter performance test</h3>
+<div class="wiki-content maincontent"><h3>JMeter performance test</h3>
 
-<p>You can use JMeter to test the performance of your ActiveMQ Server. Please refer to the <a shape="rect" class="external-link" href="http://jakarta.apache.org/jmeter/">JMeter site</a> for detailed instructions on using this software.</p>
+<p>You can use JMeter to test the performance of your ActiveMQ Server. Please refer to the <a shape="rect" href="http://jakarta.apache.org/jmeter/">JMeter site</a> for detailed instructions on using this software.</p>
 
-<h3 id="JMeterPerformanceTests-DownloadingtheJMeterPerformanceTestBinary">Downloading the JMeter Performance Test Binary</h3>
+<h3>Downloading the JMeter Performance Test Binary</h3>
 
 <p>You can download the latest activemq-jmeter-*.zip distribution from the following</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/">Apache ActiveMQ versions</a></li><li><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/" rel="nofollow">3.x versions of ActiveMQ</a>.</li></ul>
+<ul><li><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/">Apache ActiveMQ versions</a></li><li><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/">3.x versions of ActiveMQ</a>.</li></ul>
 
 
-<h3 id="JMeterPerformanceTests-BuildingtheJMeterPerformanceTestfromsource">Building the JMeter Performance Test from source</h3>
+<h3>Building the JMeter Performance Test from source</h3>
 
-<p>1. Check out the latest head version of ActiveMQ from <a shape="rect" href="source.xml">Source</a>. Build from source.</p>
+<p>1. Check out the latest head version of ActiveMQ from <link><page ri:content-title="Source"></page></link>. Build from source.</p>
 
 <p>2. Run maven from the JMeter directory. This will build JMeter into the target directory.</p>
 
@@ -19,7 +19,7 @@
 
 <p>4. There are sample Test Plans located at \bin\testfiles directory that you could open to test ActiveMQ.</p>
 
-<h3 id="JMeterPerformanceTests-BuildingaTestPlan">Building a Test Plan</h3>
+<h3>Building a Test Plan</h3>
 
 <p>For a Producer Sampler<br clear="none">
 1. Add a Thread Group.<br clear="none">
@@ -33,7 +33,7 @@
 3. Highlight the Consumer Sampler then right click to add the consumer listener "View Consumer Results" from the Listener menu.<br clear="none">
 4. Go to the Thread Group element and set the Number of Threads, Ramp-Up Period and Loop Count to 1.</p>
 
-<h3 id="JMeterPerformanceTests-TheJMeterPerformanceTestModuleconsistsof:">The JMeter Performance Test Module consists of:</h3>
+<h3>The JMeter Performance Test Module consists of:</h3>
 
 <p>1. JMeter Producer Sampler</p>
 <ul class="alternate"><li>A JMeter Sampler tells JMeter to send requests to the server. Pluggable Samplers allow unlimited testing capabilities.</li></ul>
@@ -57,5 +57,6 @@
 
 
 <p>4. JMeter Consumer Listener</p>
-<ul class="alternate"><li>The Consumer Listener would provide statistics with the number of messages received and average messages per second.</li></ul></div>
+<ul class="alternate"><li>The Consumer Listener would provide statistics with the number of messages received and average messages per second.</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jmeter-system-tests.xml
----------------------------------------------------------------------
diff --git a/jmeter-system-tests.xml b/jmeter-system-tests.xml
index a3c62cc..275ac22 100644
--- a/jmeter-system-tests.xml
+++ b/jmeter-system-tests.xml
@@ -1,10 +1,10 @@
 <div class="wiki-content maincontent">
-<h3 id="JMeterSystemTests-JMeterSystemTests">JMeter System Tests</h3>
+<h3>JMeter System Tests</h3>
 <p>You can use JMeter to test your ActiveMQ Server. Please refer to the JMeter site for detailed instructions on using this software.<br clear="none">
 The Test would check for duplicate messages and the order of messages received.</p>
 
 
-<h3 id="JMeterSystemTests-BuildingaTestPlan">Building a Test Plan</h3>
+<h3>Building a Test Plan</h3>
 
 <p>For a Producer System Test Sampler<br clear="none">
 1. Add a Thread Group.<br clear="none">
@@ -16,7 +16,7 @@ The Test would check for duplicate messages and the order of messages received.<
 2. Highlight te Consumer Sampler then right click to add the consumer listener "View Producer System Test Results" from the Listener menu.</p>
 
 
-<h3 id="JMeterSystemTests-TheJMeterSystemTestModuleisconsistof:">The JMeter System Test Module is consist of:</h3>
+<h3>The JMeter System Test Module is consist of:</h3>
 <p>1. JMeter Producer System Test Sampler</p>
 
 <ul class="alternate"><li>A JMeter Sampler tells JMeter to send requests to the server. Pluggable Samplers allow unlimited testing capabilities.</li></ul>
@@ -46,5 +46,6 @@ The Test would check for duplicate messages and the order of messages received.<
 <ul class="alternate"><li>Consumer Identifier - Identifies the Consumer that received the message.</li><li>Producer Name - Producer name that send the message.</li><li>Message - The message body received.</li><li>Message Count - The number of messages received.</li></ul>
 
 
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-and-jdbc-operations-in-one-transaction.xml
----------------------------------------------------------------------
diff --git a/jms-and-jdbc-operations-in-one-transaction.xml b/jms-and-jdbc-operations-in-one-transaction.xml
index e2a3b3f..80fcaa0 100644
--- a/jms-and-jdbc-operations-in-one-transaction.xml
+++ b/jms-and-jdbc-operations-in-one-transaction.xml
@@ -1,13 +1,12 @@
-<div class="wiki-content maincontent"><h3 id="JMSandJDBCoperationsinonetransaction-JMSandJDBCoperationsinonetransactionwithSpring/Jencks/ActiveMQ">JMS and JDBC operations in one transaction with Spring/Jencks/ActiveMQ</h3>
+<div class="wiki-content maincontent"><h3>JMS and JDBC operations in one transaction with Spring/Jencks/ActiveMQ</h3>
 
 <p>Spring beans:</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="131960d2-7879-4564-9ec8-932ad251d58d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&gt;
     &lt;!-- ActiveMQ Broker --&gt;
-    &lt;bean id=&quot;broker&quot; class=&quot;org.apache.activemq.broker.BrokerService&quot; init-method=&quot;start&quot; destroy-method=&quot;stop&quot;&gt;
-        &lt;property name=&quot;persistent&quot; value=&quot;false&quot;/&gt;
-        &lt;property name=&quot;transportConnectorURIs&quot;&gt;
+    &lt;bean id="broker" class="org.apache.activemq.broker.BrokerService" init-method="start" destroy-method="stop"&gt;
+        &lt;property name="persistent" value="false"/&gt;
+        &lt;property name="transportConnectorURIs"&gt;
             &lt;list&gt;
                 &lt;value&gt;tcp://localhost:5000&lt;/value&gt;
             &lt;/list&gt;
@@ -15,111 +14,109 @@
     &lt;/bean&gt;
 
     &lt;!-- Geronimo Transaction Manager --&gt;
-    &lt;bean id=&quot;transactionContextManager&quot; class=&quot;org.jencks.factory.TransactionContextManagerFactoryBean&quot;/&gt;
-    &lt;bean id=&quot;geronimo&quot; class=&quot;org.jencks.factory.GeronimoTransactionManagerFactoryBean&quot;/&gt;
-    &lt;bean id=&quot;geronimoTransactionManager&quot; class=&quot;org.springframework.transaction.jta.JtaTransactionManager&quot;&gt;
-        &lt;property name=&quot;userTransaction&quot; ref=&quot;geronimo&quot; /&gt;
+    &lt;bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean"/&gt;
+    &lt;bean id="geronimo" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean"/&gt;
+    &lt;bean id="geronimoTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"&gt;
+        &lt;property name="userTransaction" ref="geronimo" /&gt;
     &lt;/bean&gt;
 
     &lt;!-- Jencks Connection Manager --&gt;
-    &lt;bean id=&quot;connectionManager&quot; class=&quot;org.jencks.factory.ConnectionManagerFactoryBean&quot;&gt;
-        &lt;property name=&quot;transactionSupport&quot;&gt;
-            &lt;bean class=&quot;org.jencks.factory.XATransactionFactoryBean&quot;&gt;
-                &lt;property name=&quot;useTransactionCaching&quot; value=&quot;true&quot;/&gt;
-                &lt;property name=&quot;useThreadCaching&quot; value=&quot;false&quot;/&gt;
+    &lt;bean id="connectionManager" class="org.jencks.factory.ConnectionManagerFactoryBean"&gt;
+        &lt;property name="transactionSupport"&gt;
+            &lt;bean class="org.jencks.factory.XATransactionFactoryBean"&gt;
+                &lt;property name="useTransactionCaching" value="true"/&gt;
+                &lt;property name="useThreadCaching" value="false"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;poolingSupport&quot;&gt;
-            &lt;bean class=&quot;org.jencks.factory.SinglePoolFactoryBean&quot;&gt;
-                &lt;property name=&quot;maxSize&quot; value=&quot;2&quot;/&gt;
-                &lt;property name=&quot;minSize&quot; value=&quot;1&quot;/&gt;
-                &lt;property name=&quot;blockingTimeoutMilliseconds&quot; value=&quot;60&quot;/&gt;
-                &lt;property name=&quot;idleTimeoutMinutes&quot; value=&quot;60&quot;/&gt;
-                &lt;property name=&quot;matchOne&quot; value=&quot;true&quot;/&gt;
-                &lt;property name=&quot;matchAll&quot; value=&quot;true&quot;/&gt;
-                &lt;property name=&quot;selectOneAssumeMatch&quot; value=&quot;true&quot;/&gt;
+        &lt;property name="poolingSupport"&gt;
+            &lt;bean class="org.jencks.factory.SinglePoolFactoryBean"&gt;
+                &lt;property name="maxSize" value="2"/&gt;
+                &lt;property name="minSize" value="1"/&gt;
+                &lt;property name="blockingTimeoutMilliseconds" value="60"/&gt;
+                &lt;property name="idleTimeoutMinutes" value="60"/&gt;
+                &lt;property name="matchOne" value="true"/&gt;
+                &lt;property name="matchAll" value="true"/&gt;
+                &lt;property name="selectOneAssumeMatch" value="true"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
 
     &lt;!-- ActiveMQ Connection --&gt;
-    &lt;bean id=&quot;jmsResourceAdapter&quot; class=&quot;org.apache.activemq.ra.ActiveMQResourceAdapter&quot; depends-on=&quot;broker&quot;&gt;
-        &lt;property name=&quot;serverUrl&quot;&gt;
+    &lt;bean id="jmsResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter" depends-on="broker"&gt;
+        &lt;property name="serverUrl"&gt;
             &lt;value&gt;tcp://localhost:5000&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
-    &lt;bean id=&quot;jmsManagedConnectionFactory&quot; class=&quot;org.apache.activemq.ra.ActiveMQManagedConnectionFactory&quot;&gt;
-        &lt;property name=&quot;resourceAdapter&quot; ref=&quot;jmsResourceAdapter&quot;/&gt;
+    &lt;bean id="jmsManagedConnectionFactory" class="org.apache.activemq.ra.ActiveMQManagedConnectionFactory"&gt;
+        &lt;property name="resourceAdapter" ref="jmsResourceAdapter"/&gt;
     &lt;/bean&gt;
-    &lt;bean id=&quot;jmsConnectionFactory&quot; class=&quot;org.springframework.jca.support.LocalConnectionFactoryBean&quot;&gt;
-        &lt;property name=&quot;managedConnectionFactory&quot; ref=&quot;jmsManagedConnectionFactory&quot;/&gt;
-        &lt;property name=&quot;connectionManager&quot; ref=&quot;connectionManager&quot;/&gt;
+    &lt;bean id="jmsConnectionFactory" class="org.springframework.jca.support.LocalConnectionFactoryBean"&gt;
+        &lt;property name="managedConnectionFactory" ref="jmsManagedConnectionFactory"/&gt;
+        &lt;property name="connectionManager" ref="connectionManager"/&gt;
     &lt;/bean&gt;
 
     &lt;!-- Tranql JDBC Connection --&gt;
     &lt;!--
-    &lt;bean id=&quot;tranqlManagedConnectionFactory&quot; class=&quot;org.jencks.tranql.XAPoolDataSourceMCF&quot;&gt;
-        &lt;property name=&quot;driverName&quot; value=&quot;org.postgresql.Driver&quot;/&gt;
-        &lt;property name=&quot;url&quot; value=&quot;jdbc:postgresql://ats-manager/activemq&quot;/&gt;
-        &lt;property name=&quot;user&quot; value=&quot;activemq&quot;/&gt;
+    &lt;bean id="tranqlManagedConnectionFactory" class="org.jencks.tranql.XAPoolDataSourceMCF"&gt;
+        &lt;property name="driverName" value="org.postgresql.Driver"/&gt;
+        &lt;property name="url" value="jdbc:postgresql://ats-manager/activemq"/&gt;
+        &lt;property name="user" value="activemq"/&gt;
     &lt;/bean&gt;
-    &lt;bean id=&quot;tranqlDataSource&quot; class=&quot;org.springframework.jca.support.LocalConnectionFactoryBean&quot;&gt;
-        &lt;property name=&quot;managedConnectionFactory&quot; ref=&quot;tranqlManagedConnectionFactory&quot;/&gt;
-        &lt;property name=&quot;connectionManager&quot; ref=&quot;connectionManager&quot;/&gt;
+    &lt;bean id="tranqlDataSource" class="org.springframework.jca.support.LocalConnectionFactoryBean"&gt;
+        &lt;property name="managedConnectionFactory" ref="tranqlManagedConnectionFactory"/&gt;
+        &lt;property name="connectionManager" ref="connectionManager"/&gt;
     &lt;/bean&gt;
     --&gt;
 
     &lt;!-- Enhydra JDBC Connection --&gt;
-    &lt;bean id=&quot;enhydraDataSource&quot; class=&quot;org.enhydra.jdbc.pool.StandardXAPoolDataSource&quot; destroy-method=&quot;shutdown&quot;&gt;
-        &lt;property name=&quot;dataSource&quot;&gt;
-            &lt;bean class=&quot;org.enhydra.jdbc.standard.StandardXADataSource&quot; destroy-method=&quot;shutdown&quot;&gt;
-                &lt;property name=&quot;transactionManager&quot; ref=&quot;geronimo&quot; /&gt;
-                &lt;property name=&quot;driverName&quot; value=&quot;org.postgresql.Driver&quot; /&gt;
-                &lt;property name=&quot;url&quot; value=&quot;jdbc:postgresql://ats-manager/activemq&quot; /&gt;
+    &lt;bean id="enhydraDataSource" class="org.enhydra.jdbc.pool.StandardXAPoolDataSource" destroy-method="shutdown"&gt;
+        &lt;property name="dataSource"&gt;
+            &lt;bean class="org.enhydra.jdbc.standard.StandardXADataSource" destroy-method="shutdown"&gt;
+                &lt;property name="transactionManager" ref="geronimo" /&gt;
+                &lt;property name="driverName" value="org.postgresql.Driver" /&gt;
+                &lt;property name="url" value="jdbc:postgresql://ats-manager/activemq" /&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;user&quot; value=&quot;activemq&quot;/&gt;
+        &lt;property name="user" value="activemq"/&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;jencksJCAContainer&quot; class=&quot;org.jencks.JCAContainer&quot;&gt;
-        &lt;property name=&quot;bootstrapContext&quot;&gt;
-            &lt;bean class=&quot;org.jencks.factory.BootstrapContextFactoryBean&quot;&gt;
-                &lt;property name=&quot;threadPoolSize&quot; value=&quot;25&quot;/&gt;
+    &lt;bean id="jencksJCAContainer" class="org.jencks.JCAContainer"&gt;
+        &lt;property name="bootstrapContext"&gt;
+            &lt;bean class="org.jencks.factory.BootstrapContextFactoryBean"&gt;
+                &lt;property name="threadPoolSize" value="25"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;resourceAdapter&quot; ref=&quot;jmsResourceAdapter&quot;/&gt;
+        &lt;property name="resourceAdapter" ref="jmsResourceAdapter"/&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;inboundConnector&quot; class=&quot;org.jencks.JCAConnector&quot;&gt;
-        &lt;property name=&quot;jcaContainer&quot; ref=&quot;jencksJCAContainer&quot; /&gt;
-        &lt;property name=&quot;activationSpec&quot;&gt;
-            &lt;bean class=&quot;org.apache.activemq.ra.ActiveMQActivationSpec&quot;&gt;
-                &lt;property name=&quot;destination&quot; value=&quot;messages.input&quot;/&gt;
-                &lt;property name=&quot;destinationType&quot; value=&quot;javax.jms.Queue&quot;/&gt;
+    &lt;bean id="inboundConnector" class="org.jencks.JCAConnector"&gt;
+        &lt;property name="jcaContainer" ref="jencksJCAContainer" /&gt;
+        &lt;property name="activationSpec"&gt;
+            &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+                &lt;property name="destination" value="messages.input"/&gt;
+                &lt;property name="destinationType" value="javax.jms.Queue"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;transactionManager&quot; ref=&quot;geronimo&quot;/&gt;
-        &lt;property name=&quot;ref&quot; value=&quot;echoBean&quot;/&gt;
+        &lt;property name="transactionManager" ref="geronimo"/&gt;
+        &lt;property name="ref" value="echoBean"/&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;echoBean&quot; class=&quot;transactions.EchoBean&quot;&gt;
-        &lt;property name=&quot;jdbcTemplate&quot;&gt;
-            &lt;bean class=&quot;org.springframework.jdbc.core.JdbcTemplate&quot;&gt;
-                &lt;property name=&quot;dataSource&quot; ref=&quot;enhydraDataSource&quot;/&gt;
+    &lt;bean id="echoBean" class="transactions.EchoBean"&gt;
+        &lt;property name="jdbcTemplate"&gt;
+            &lt;bean class="org.springframework.jdbc.core.JdbcTemplate"&gt;
+                &lt;property name="dataSource" ref="enhydraDataSource"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;jmsTemplate&quot;&gt;
-            &lt;bean class=&quot;org.springframework.jms.core.JmsTemplate&quot;&gt;
-                &lt;property name=&quot;connectionFactory&quot; ref=&quot;jmsConnectionFactory&quot;/&gt;
+        &lt;property name="jmsTemplate"&gt;
+            &lt;bean class="org.springframework.jms.core.JmsTemplate"&gt;
+                &lt;property name="connectionFactory" ref="jmsConnectionFactory"/&gt;
             &lt;/bean&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>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[
+<structured-macro ac:macro-id="cfe63126-2a2e-4b7b-8771-2ba6ff05ea6a" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>
 public class EchoBean implements MessageListener {
 
     private Log log = LogFactory.getLog(getClass());
@@ -140,16 +137,15 @@ public class EchoBean implements MessageListener {
         if (message instanceof TextMessage) {
             try {
                 String messageText = ((TextMessage)message).getText();
-                log.debug(&quot;execute JMS operation&quot;);
-                jmsTemplate.convertAndSend(&quot;messages.ouptut&quot;, messageText);
-                log.debug(&quot;execute JDBC operation&quot;);
-                jdbcTemplate.execute(&quot;insert into t1 values(&#39;&quot;+messageText+&quot;&#39;)&quot;);
+                log.debug("execute JMS operation");
+                jmsTemplate.convertAndSend("messages.ouptut", messageText);
+                log.debug("execute JDBC operation");
+                jdbcTemplate.execute("insert into t1 values('"+messageText+"')");
             } catch (JMSException e) {
                 e.printStackTrace();
             }
         }
     }
 }
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-bridge-with-local-broker.xml
----------------------------------------------------------------------
diff --git a/jms-bridge-with-local-broker.xml b/jms-bridge-with-local-broker.xml
index 425e740..a3a6b3e 100644
--- a/jms-bridge-with-local-broker.xml
+++ b/jms-bridge-with-local-broker.xml
@@ -1,36 +1,34 @@
-<div class="wiki-content maincontent"><h3 id="JMSBridgeWithLocalBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontothelocalActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3>Example of a configuration that shows how to use a BridgeConnector to make a connection to the local ActiveMQ broker.</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="4e5f3026-cbef-453b-ba5f-9746421eaa2d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&gt;
     &lt;!-- Allows us to use 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 useJmx=&quot;true&quot; persistent=&quot;false&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;
-            brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot;&gt;
+    &lt;broker useJmx="true" persistent="false" xmlns="http://activemq.org/config/1.0"
+            brokerName="localhost" dataDirectory="${activemq.base}/data"&gt;
         &lt;jmsBridgeConnectors&gt;
-            &lt;jmsQueueConnector outboundQueueConnectionFactory=&quot;#localBroker&quot;&gt;
+            &lt;jmsQueueConnector outboundQueueConnectionFactory="#localBroker"&gt;
                 &lt;inboundQueueBridges&gt;
                     &lt;inboundQueueBridge
-                            inboundQueueName = &quot;queue.ping&quot;
-                            localQueueName   = &quot;queue.incomingMsgs.ping&quot;
-                            selector         = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            inboundQueueName = "queue.ping"
+                            localQueueName   = "queue.incomingMsgs.ping"
+                            selector         = "JMSType LIKE 'foo%'"/&gt;
                 &lt;/inboundQueueBridges&gt;
                 &lt;outboundQueueBridges&gt;
                     &lt;outboundQueueBridge
-                            localQueueName    = &quot;queue.incomingMsgs.ping&quot;
-                            outboundQueueName = &quot;queue.pong&quot;
-                            selector          = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            localQueueName    = "queue.incomingMsgs.ping"
+                            outboundQueueName = "queue.pong"
+                            selector          = "JMSType LIKE 'foo%'"/&gt;
                 &lt;/outboundQueueBridges&gt;
             &lt;/jmsQueueConnector&gt;
         &lt;/jmsBridgeConnectors&gt;
     &lt;/broker&gt;
 
     &lt;!-- JMS ConnectionFactory to use for local bridging --&gt;
-    &lt;bean id=&quot;localBroker&quot; class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-        &lt;property name=&quot;brokerURL&quot; value=&quot;vm://localhost:61616&quot; /&gt;
+    &lt;bean id="localBroker" class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+        &lt;property name="brokerURL" value="vm://localhost:61616" /&gt;
     &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-bridge-with-oracle-aq.xml
----------------------------------------------------------------------
diff --git a/jms-bridge-with-oracle-aq.xml b/jms-bridge-with-oracle-aq.xml
index ff89c94..5aab871 100644
--- a/jms-bridge-with-oracle-aq.xml
+++ b/jms-bridge-with-oracle-aq.xml
@@ -1,117 +1,113 @@
-<div class="wiki-content maincontent"><h3 id="JMSBridgeWithOracleAQ-ExampleofaconfigurationthatshowshowtoconnecttoOracleAQqueuesandtopics.">Example of a configuration that shows how to connect to Oracle AQ queues and topics.</h3>
+<div class="wiki-content maincontent"><h3>Example of a configuration that shows how to connect to Oracle AQ queues and topics.</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="4cf21870-0ab2-4f52-a906-fabf122f573a" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&gt;
     &lt;!-- Allows us to use 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 useJmx=&quot;true&quot; persistent=&quot;false&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;
-            brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot; &gt;
+    &lt;broker useJmx="true" persistent="false" xmlns="http://activemq.org/config/1.0"
+            brokerName="localhost" dataDirectory="${activemq.base}/data" &gt;
     &lt;/broker&gt;
 
-    &lt;camelContext id=&quot;camel&quot; xmlns=&quot;http://activemq.apache.org/camel/schema/spring&quot;&gt;
+    &lt;camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring"&gt;
         &lt;!-- Dependencies: ojdbc.jar and aqjms.jar must be in the activemq lib directory --&gt;
 
         &lt;!-- this camel route will read incoming messages from Oracle --&gt;
         &lt;route&gt;
-            &lt;from uri=&quot;oracleQueue:queue:ORACLE_QUEUE&quot;&gt;
-            &lt;to   uri=&quot;activemq:queue:queue.inboundOracleAQqueue&quot; &gt;
+            &lt;from uri="oracleQueue:queue:ORACLE_QUEUE"&gt;
+            &lt;to   uri="activemq:queue:queue.inboundOracleAQqueue" &gt;
         &lt;/route&gt;
         &lt;route&gt;
             &lt;!-- NOTE: I have had success with a topic using ActiveMQ 5.3, but not 5.1 --&gt;
-            &lt;from uri=&quot;oracleTopic:topic:ORACLE_TOPIC&quot;&gt;
-            &lt;to   uri=&quot;activemq:queue:queue.inboundOracleAQtopic&quot; &gt;
+            &lt;from uri="oracleTopic:topic:ORACLE_TOPIC"&gt;
+            &lt;to   uri="activemq:queue:queue.inboundOracleAQtopic" &gt;
         &lt;/route&gt;
 
         &lt;!-- these camel routes will log the messages to the console .... replace them with something more useful!!  --&gt;
         &lt;route&gt;
-            &lt;from uri=&quot;activemq:queue:queue.inboundOracleAQqueue&quot; &gt;
-            &lt;to uri=&quot;log:oracleAQ.inbound.got_a_queue_message?level=ERROR&quot;&gt;
+            &lt;from uri="activemq:queue:queue.inboundOracleAQqueue" &gt;
+            &lt;to uri="log:oracleAQ.inbound.got_a_queue_message?level=ERROR"&gt;
         &lt;/route&gt;
         &lt;route&gt;
-            &lt;from uri=&quot;activemq:queue:queue.inboundOracleAQtopic&quot; &gt;
-            &lt;to uri=&quot;log:oracleAQ.inbound.got_a_topic_message?level=ERROR&quot;&gt;
+            &lt;from uri="activemq:queue:queue.inboundOracleAQtopic" &gt;
+            &lt;to uri="log:oracleAQ.inbound.got_a_topic_message?level=ERROR"&gt;
         &lt;/route&gt;
     &lt;/camelContext&gt;
 
     &lt;!-- without the following bean instantiation, we will get an oracle.jms.AQjmsException with each and every received message --&gt;
-    &lt;bean id=&quot;requiredBeanForOracleAq&quot; class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot; /&gt;
+    &lt;bean id="requiredBeanForOracleAq" class="org.apache.activemq.ActiveMQConnectionFactory" /&gt;
 
-    &lt;bean id=&quot;connectionFactoryOracleAQQueue&quot; class=&quot;oracle.jms.AQjmsFactory&quot; factory-method=&quot;getQueueConnectionFactory&quot;&gt;
-        &lt;constructor-arg index=&quot;0&quot;&gt;
+    &lt;bean id="connectionFactoryOracleAQQueue" class="oracle.jms.AQjmsFactory" factory-method="getQueueConnectionFactory"&gt;
+        &lt;constructor-arg index="0"&gt;
             &lt;value&gt;jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST ....... (SERVICE_NAME = myDbService)))&lt;/value&gt;
         &lt;/constructor-arg&gt;
-        &lt;constructor-arg index=&quot;1&quot; type=&quot;java.util.Properties&quot;&gt;
+        &lt;constructor-arg index="1" type="java.util.Properties"&gt;
             &lt;value&gt;&lt;/value&gt;
         &lt;/constructor-arg&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;connectionFactoryOracleAQTopic&quot; class=&quot;oracle.jms.AQjmsFactory&quot;
-                factory-method=&quot;getQueueConnectionFactory&quot;&gt;
-        &lt;constructor-arg index=&quot;0&quot;&gt;
+    &lt;bean id="connectionFactoryOracleAQTopic" class="oracle.jms.AQjmsFactory"
+                factory-method="getQueueConnectionFactory"&gt;
+        &lt;constructor-arg index="0"&gt;
             &lt;value&gt;jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST ....... (SERVICE_NAME = myDbService)))&lt;/value&gt;
         &lt;/constructor-arg&gt;
-        &lt;constructor-arg index=&quot;1&quot; type=&quot;java.util.Properties&quot;&gt;
+        &lt;constructor-arg index="1" type="java.util.Properties"&gt;
             &lt;value&gt;&lt;/value&gt;
         &lt;/constructor-arg&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;oracleQueueCredentials&quot; class=&quot;org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter&quot;&gt;
-        &lt;property name=&quot;targetConnectionFactory&quot;&gt;
-            &lt;ref bean=&quot;connectionFactoryOracleAQQueue&quot;&gt;
+    &lt;bean id="oracleQueueCredentials" class="org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter"&gt;
+        &lt;property name="targetConnectionFactory"&gt;
+            &lt;ref bean="connectionFactoryOracleAQQueue"&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;username&quot;&gt;
+        &lt;property name="username"&gt;
             &lt;value&gt;foo&lt;/value&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;password&quot;&gt;
+        &lt;property name="password"&gt;
             &lt;value&gt;bar&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
 
-    &lt;bean id=&quot;oracleTopicCredentials&quot; class=&quot;org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter&quot;&gt;
-        &lt;property name=&quot;targetConnectionFactory&quot;&gt;
-            &lt;ref bean=&quot;connectionFactoryOracleAQTopic&quot;&gt;
+    &lt;bean id="oracleTopicCredentials" class="org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter"&gt;
+        &lt;property name="targetConnectionFactory"&gt;
+            &lt;ref bean="connectionFactoryOracleAQTopic"&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;username&quot;&gt;
+        &lt;property name="username"&gt;
             &lt;value&gt;foo&lt;/value&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;password&quot;&gt;
+        &lt;property name="password"&gt;
             &lt;value&gt;bar&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
 
-   &lt;bean id=&quot;oracleQueue&quot; class=&quot;org.apache.camel.component.jms.JmsComponent&quot;&gt;
-        &lt;property name=&quot;connectionFactory&quot; ref=&quot;oracleQueueCredentials&quot;&gt;
+   &lt;bean id="oracleQueue" class="org.apache.camel.component.jms.JmsComponent"&gt;
+        &lt;property name="connectionFactory" ref="oracleQueueCredentials"&gt;
    &lt;/bean&gt;
 
-   &lt;bean id=&quot;oracleTopic&quot; class=&quot;org.apache.camel.component.jms.JmsComponent&quot;&gt;
-        &lt;property name=&quot;connectionFactory&quot; ref=&quot;oracleTopicCredentials&quot;&gt;
+   &lt;bean id="oracleTopic" class="org.apache.camel.component.jms.JmsComponent"&gt;
+        &lt;property name="connectionFactory" ref="oracleTopicCredentials"&gt;
    &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<p>If you run in an OSGi environment such as <a shape="rect" class="external-link" href="http://servicemix.apache.org">ServiceMix 4</a> then take a look at <a shape="rect" class="external-link" href="http://servicemix.396122.n5.nabble.com/ServiceMix-4-2-Camel-OracleAQ-td421214.html#a421214" rel="nofollow">this discussion</a> how to install the OracleAQ Client in the OSGi container.</p>
+<p>If you run in an OSGi environment such as <a shape="rect" href="http://servicemix.apache.org">ServiceMix 4</a> then take a look at <a shape="rect" href="http://servicemix.396122.n5.nabble.com/ServiceMix-4-2-Camel-OracleAQ-td421214.html#a421214">this discussion</a> how to install the OracleAQ Client in the OSGi container.</p>
 
-<h4 id="JMSBridgeWithOracleAQ-OracleSQLcode">Oracle SQL code</h4>
+<h4>Oracle SQL code</h4>
 <p>You may need to setup OracleAQ, and here is a sample 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[
+<structured-macro ac:macro-id="efdb1a06-1164-41a6-86ee-ce8b6fc792b7" ac:name="code" ac:schema-version="1"><plain-text-body>
 BEGIN
- DBMS_AQADM.CREATE_QUEUE_TABLE( queue_table =&gt; &#39;queue_message_table&#39;, queue_payload_type =&gt; &#39;SYS.AQ$_JMS_TEXT_MESSAGE&#39;);
+ DBMS_AQADM.CREATE_QUEUE_TABLE( queue_table =&gt; 'queue_message_table', queue_payload_type =&gt; 'SYS.AQ$_JMS_TEXT_MESSAGE');
 END;        
 
 BEGIN
-  DBMS_AQADM.CREATE_QUEUE( queue_name =&gt; &#39;ORACLE_QUEUE&#39;, queue_table =&gt; &#39;queue_message_table&#39;);
+  DBMS_AQADM.CREATE_QUEUE( queue_name =&gt; 'ORACLE_QUEUE', queue_table =&gt; 'queue_message_table');
 END;
 
 BEGIN
-  DBMS_AQADM.START_QUEUE(queue_name =&gt; &#39;ORACLE_QUEUE&#39;);
+  DBMS_AQADM.START_QUEUE(queue_name =&gt; 'ORACLE_QUEUE');
 END;  
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" class="external-link" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm" rel="nofollow">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p></div>
+<p>You can also find more information about OracleAQ and using JMS at: <a shape="rect" href="http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm">http://docs.oracle.com/cd/B13789_01/server.101/b10785/jm_exmpl.htm</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-bridge-with-remote-broker.xml
----------------------------------------------------------------------
diff --git a/jms-bridge-with-remote-broker.xml b/jms-bridge-with-remote-broker.xml
index 8294efd..7551833 100644
--- a/jms-bridge-with-remote-broker.xml
+++ b/jms-bridge-with-remote-broker.xml
@@ -1,36 +1,34 @@
-<div class="wiki-content maincontent"><h3 id="JMSBridgeWithRemoteBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteActiveMQbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</h3>
+<div class="wiki-content maincontent"><h3>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote ActiveMQ broker.</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="841c501d-dd07-4c45-9354-bdbcb93ff0cc" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&gt;
     &lt;!-- Allows us to use 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 useJmx=&quot;true&quot; persistent=&quot;false&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;
-            brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot;&gt;
+    &lt;broker useJmx="true" persistent="false" xmlns="http://activemq.org/config/1.0"
+            brokerName="localhost" dataDirectory="${activemq.base}/data"&gt;
         &lt;jmsBridgeConnectors&gt;
-            &lt;jmsQueueConnector outboundQueueConnectionFactory=&quot;#remoteBroker&quot;&gt;
+            &lt;jmsQueueConnector outboundQueueConnectionFactory="#remoteBroker"&gt;
                 &lt;inboundQueueBridges&gt;
                     &lt;inboundQueueBridge
-                            inboundQueueName = &quot;queue.ping&quot;
-                            localQueueName   = &quot;queue.incomingMsgs.ping&quot;
-                            selector         = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            inboundQueueName = "queue.ping"
+                            localQueueName   = "queue.incomingMsgs.ping"
+                            selector         = "JMSType LIKE 'foo%'"/&gt;
                 &lt;/inboundQueueBridges&gt;
                 &lt;outboundQueueBridges&gt;
                     &lt;outboundQueueBridge
-                            outboundQueueName = &quot;queue.pong&quot;
-                            localQueueName    = &quot;queue.incomingMsgs.ping&quot;
-                            selector          = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            outboundQueueName = "queue.pong"
+                            localQueueName    = "queue.incomingMsgs.ping"
+                            selector          = "JMSType LIKE 'foo%'"/&gt;
                 &lt;/outboundQueueBridges&gt;
             &lt;/jmsQueueConnector&gt;
         &lt;/jmsBridgeConnectors&gt;
     &lt;/broker&gt;
 
     &lt;!-- JMS ConnectionFactory to use for remote bridging --&gt;
-    &lt;bean id=&quot;remoteBroker&quot; class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-        &lt;property name=&quot;brokerURL&quot; value=&quot;failover:(tcp://remote_activemq:61616)&quot; /&gt;
+    &lt;bean id="remoteBroker" class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+        &lt;property name="brokerURL" value="failover:(tcp://remote_activemq:61616)" /&gt;
     &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-bridge-with-remote-tibco-broker.xml
----------------------------------------------------------------------
diff --git a/jms-bridge-with-remote-tibco-broker.xml b/jms-bridge-with-remote-tibco-broker.xml
index 726a494..0cd5a71 100644
--- a/jms-bridge-with-remote-tibco-broker.xml
+++ b/jms-bridge-with-remote-tibco-broker.xml
@@ -1,40 +1,38 @@
-<div class="wiki-content maincontent"><h3 id="JMSBridgeWithRemoteTIBCOBroker-ExampleofaconfigurationthatshowshowtouseaBridgeConnectortomakeaconnectiontoaremoteTIBCOEMSbroker.">Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</h3>
+<div class="wiki-content maincontent"><h3>Example of a configuration that shows how to use a BridgeConnector to make a connection to a remote TIBCO EMS broker.</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="77975890-00a2-41e6-9b62-df2e59352b0e" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&gt;
     &lt;!-- Allows us to use 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 useJmx=&quot;true&quot; persistent=&quot;false&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;
-            brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.base}/data&quot;&gt;
+    &lt;broker useJmx="true" persistent="false" xmlns="http://activemq.org/config/1.0"
+            brokerName="localhost" dataDirectory="${activemq.base}/data"&gt;
 
         &lt;!-- Dependencies: tibjms.jar must be in the activemq lib directory --&gt;
 
         &lt;!-- bridging definitions for traffic to/from remote activemq instance --&gt;
         &lt;jmsBridgeConnectors&gt;
-            &lt;jmsQueueConnector outboundQueueConnectionFactory=&quot;#tibco&quot;&gt;
+            &lt;jmsQueueConnector outboundQueueConnectionFactory="#tibco"&gt;
                 &lt;inboundQueueBridges&gt;
                     &lt;inboundQueueBridge
-                            inboundQueueName = &quot;queue.ping&quot;
-                            localQueueName   = &quot;queue.incomingMsgs.ping&quot;
-                            selector         = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            inboundQueueName = "queue.ping"
+                            localQueueName   = "queue.incomingMsgs.ping"
+                            selector         = "JMSType LIKE 'foo%'"/&gt;
                 &lt;/inboundQueueBridges&gt;
                 &lt;outboundQueueBridges&gt;
                     &lt;outboundQueueBridge
-                            outboundQueueName = &quot;queue.pong&quot;
-                            localQueueName    = &quot;queue.incomingMsgs.ping&quot;
-                            selector          = &quot;JMSType LIKE &#39;foo%&#39;&quot;/&gt;
+                            outboundQueueName = "queue.pong"
+                            localQueueName    = "queue.incomingMsgs.ping"
+                            selector          = "JMSType LIKE 'foo%'"/&gt;
                  &lt;/outboundQueueBridges&gt;
             &lt;/jmsQueueConnector&gt;
         &lt;/jmsBridgeConnectors&gt;
     &lt;/broker&gt;
 
     &lt;!-- JMS ConnectionFactory to use for local bridging --&gt;
-    &lt;bean id=&quot;tibco&quot; class=&quot;com.tibco.tibjms.TibjmsQueueConnectionFactory&quot;&gt;
-        &lt;property name=&quot;serverUrl&quot; value=&quot;tcp://remote_tibco:7222&quot; /&gt;
+    &lt;bean id="tibco" class="com.tibco.tibjms.TibjmsQueueConnectionFactory"&gt;
+        &lt;property name="serverUrl" value="tcp://remote_tibco:7222" /&gt;
     &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-streams.xml
----------------------------------------------------------------------
diff --git a/jms-streams.xml b/jms-streams.xml
index e75c722..47dd537 100644
--- a/jms-streams.xml
+++ b/jms-streams.xml
@@ -1,60 +1,57 @@
 <div class="wiki-content maincontent"><p><strong>deprecated</strong></p>
 
-<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>This feature is deprecated, and end users is encouraged to <strong>not</strong> use it. This feature will be removed in a later ActiveMQ release.</p></div></div>
+<structured-macro ac:macro-id="88cf66c6-a3ba-4c16-afbf-0ef5c8fed79a" ac:name="warning" ac:schema-version="1"><rich-text-body>
+<p>This feature is deprecated, and end users is encouraged to <strong>not</strong> use it. This feature will be removed in a later ActiveMQ release.</p></rich-text-body></structured-macro>
 
 <p>Sometimes you need to send truly massive files (many Gb) around the network in a reliable manner. The JMS API expects JMS clients to be able to keep a message in memory at one time, so sending &gt; 1Gb messages around ends up using way too much RAM on the client side.</p>
 
-<p>To solve this problem ActiveMQ supports regular <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/io/InputStream.html" rel="nofollow">InputStream</a> and <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/io/OutputStream.html" rel="nofollow">OutputStream</a> abstractions which work with regular JMS producers and consumers.</p>
+<p>To solve this problem ActiveMQ supports regular <a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/api/java/io/InputStream.html">InputStream</a> and <a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/api/java/io/OutputStream.html">OutputStream</a> abstractions which work with regular JMS producers and consumers.</p>
 
-<p>This allows you to use the familar streams from Java to send or receive messages of any size at all (providing your file system can handle them <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)"> while keeping a low memory overhead.</p>
+<p>This allows you to use the familar streams from Java to send or receive messages of any size at all (providing your file system can handle them <emoticon ac:name="smile"></emoticon> while keeping a low memory overhead.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">For Users of 4.2</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you are using 4.2 onwards of ActiveMQ we highly recommend you try out <a shape="rect" href="blob-messages.xml">Blob Messages</a> which offers a more flexible mechanism for dealing wtih massive files and fully supports out-of-band transfer using HTTP/FTP as well as allowing external resources to be sent around the JMS network.</p></div></div>
+<structured-macro ac:macro-id="3849c84e-3152-47d0-8075-de533a4015af" ac:name="info" ac:schema-version="1"><parameter ac:name="title">For Users of 4.2</parameter><rich-text-body>
+<p>If you are using 4.2 onwards of ActiveMQ we highly recommend you try out <link><page ri:content-title="Blob Messages"></page></link> which offers a more flexible mechanism for dealing wtih massive files and fully supports out-of-band transfer using HTTP/FTP as well as allowing external resources to be sent around the JMS network.</p></rich-text-body></structured-macro>
 
-<h3 id="JMSStreams-UsingJMSStreams">Using JMS Streams</h3>
+<h3>Using JMS Streams</h3>
 
-<p>To use the streams just create an input or output stream depending on if you are reading or writing using the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html#createInputStream(javax.jms.Destination)">connection.createInputStream()</a> or<br clear="none">
-<a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html#createOutputStream(javax.jms.Destination)">connection.createOutputStream()</a> methods.</p>
+<p>To use the streams just create an input or output stream depending on if you are reading or writing using the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html#createInputStream(javax.jms.Destination)">connection.createInputStream()</a> or<br clear="none">
+<a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html#createOutputStream(javax.jms.Destination)">connection.createOutputStream()</a> methods.</p>
 
 <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[
+<structured-macro ac:macro-id="0a3d4912-0a8c-4072-8031-2972c28d04ab" ac:name="code" ac:schema-version="1"><plain-text-body>
 ActiveMQConnection connection = ...;
-Destination destination = new ActiveMQQueue(&quot;FOO.BAR&quot;);
+Destination destination = new ActiveMQQueue("FOO.BAR");
 
 OutputStream out = connection.createOutputStream(destination);
 
 // write the file to out
 out.close();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Or to consume a large message</p>
 
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="e351d85f-34c6-4d59-b017-d9489e64f04f" ac:name="code" ac:schema-version="1"><plain-text-body>
 ActiveMQConnection connection = ...;
-Destination destination = new ActiveMQQueue(&quot;FOO.BAR&quot;);
+Destination destination = new ActiveMQQueue("FOO.BAR");
 
 InputStream in = connection.createInputStream(destination)
 
 // read the stream...
 in.close();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>There are overloaded createInputStream/createOutputStream methods which support additional paramateres to be passed.</p>
 
 <p>For further reference see the javadoc.</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQInputStream.html">ActiveMQInputStream </a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQOutputStream.html">ActiveMQOutputStream </a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQInputStream.html">ActiveMQInputStream </a></li><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQOutputStream.html">ActiveMQOutputStream </a></li></ul>
 
 
 
 <p><em>Note:</em><br clear="none">
 The  counterpart classes in AMQ 3.x  are :</p>
-<ul><li>JMSInputStream</li><li>JMSOutputStream</li></ul></div>
+<ul><li>JMSInputStream</li><li>JMSOutputStream</li></ul>
+</div>
 


[31/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/building-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/building-activemq-cpp.xml b/building-activemq-cpp.xml
index 9f664a1..49725ca 100644
--- a/building-activemq-cpp.xml
+++ b/building-activemq-cpp.xml
@@ -1,40 +1,36 @@
-<div class="wiki-content maincontent"><h2 id="BuildingActiveMQCPP-Dependencies">Dependencies</h2>
+<div class="wiki-content maincontent"><h2>Dependencies</h2>
 
 
-<h3 id="BuildingActiveMQCPP-libuuid">libuuid</h3>
+<h3>libuuid</h3>
 
-<p>The build requires the <strong>libuuid</strong> library that is part of the e2fsprogs package and is available from <a shape="rect" class="external-link" href="http://e2fsprogs.sourceforge.net/" rel="nofollow">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p>
+<p>The build requires the <strong>libuuid</strong> library that is part of the e2fsprogs package and is available from <a shape="rect" href="http://e2fsprogs.sourceforge.net/">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p>
 
-<h3 id="BuildingActiveMQCPP-cppunit">cppunit</h3>
+<h3>cppunit</h3>
 
-<p>The package contains a complete set of cppunit tests.  In order for you to build an run the tests, you will need to download and install the cppunit suite.  See <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki" rel="nofollow">http://cppunit.sourceforge.net/cppunit-wiki</a></p>
+<p>The package contains a complete set of cppunit tests.  In order for you to build an run the tests, you will need to download and install the cppunit suite.  See <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki">http://cppunit.sourceforge.net/cppunit-wiki</a></p>
 
 <p>or on Fedora type 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="e1010969-446e-40b3-8b0e-6d6fec1fe8ba" ac:name="code" ac:schema-version="1"><plain-text-body>
 sudo yum install cppunit
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Make sure that the paths to the installed cppunit library and includes are visible in your current shell before you try building the tests.</p>
 
-<p>Windows users will need to build the cppunit library using the CPPUnit MSVC project files.&#160; A discussion of the build process can be found on the CPPUnit wiki under <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1" rel="nofollow">CPPUnit Platform build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p>
+<p>Windows users will need to build the cppunit library using the CPPUnit MSVC project files.&#160; A discussion of the build process can be found on the CPPUnit wiki under <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1">CPPUnit Platform build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p>
 
 
-<h3 id="BuildingActiveMQCPP-GNUBuildSystem(forbuildingon*nix)">GNU Build System (for building on *nix)</h3>
+<h3>GNU Build System (for building on *nix)</h3>
 
 <p>To Generate the ./configure script use to create the Makefiles, you need the following software installed:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Tool </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Recommended Version </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> autoconf </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> &gt;= 2.59 <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> automake </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> &gt;= 1.9.6 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> libtool </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> &gt;= 1.5.22 <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Tool </p></th><th colspan="1" rowspan="1"><p> Recommended Version </p></th></tr><tr><td colspan="1" rowspan="1"><p> autoconf </p></td><td colspan="1" rowspan="1"><p> &gt;= 2.59 <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> automake </p></td><td colspan="1" rowspan="1"><p> &gt;= 1.9.6 </p></td></tr><tr><td colspan="1" rowspan="1"><p> libtool </p></td><td colspan="1" rowspan="1"><p> &gt;= 1.5.22 <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table>
 
 
-<h2 id="BuildingActiveMQCPP-Buildingon*nix(Unix/Linux/OSX/Cygwin)">Building on *nix (Unix/Linux/OS X/Cygwin)</h2>
+<h2>Building on *nix (Unix/Linux/OS X/Cygwin)</h2>
 
 <p>This assumes you have all of the project dependencies installed.  We're now ready to create the configure script.  To do this, run:</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="73cdd5b7-0cf4-4d99-9c40-50618a8b1dfd" ac:name="code" ac:schema-version="1"><plain-text-body>
 ./autogen.sh
-]]></script>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+</plain-text-body></structured-macro>
+<structured-macro ac:macro-id="69a5c84d-28fe-446a-8fbe-284d846c1db6" ac:name="info" ac:schema-version="1"><rich-text-body>
 <p>You may see the following warnings when running this command:</p>
 
 <p>src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable, you should not override it;<br clear="none">
@@ -42,96 +38,77 @@ src/test-integration/Makefile.am:44: use `AM_CXXFLAGS' instead.<br clear="none">
 src/test/Makefile.am:104: `CXXFLAGS' is a user variable, you should not override it;<br clear="none">
 src/test/Makefile.am:104: use `AM_CXXFLAGS' instead.</p>
 
-<p>These can be ignored.  We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></div></div>
+<p>These can be ignored.  We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></rich-text-body></structured-macro>
 <p>This should be run the first time and anytime you change configure.ac or any of the Makefile.am files.</p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Solaris 10 Note</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="80a1c3af-3159-43ce-8138-6ecb3d37b68c" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Solaris 10 Note</parameter><rich-text-body>
 <p>CPP_UNIT might not build until you correct the file libstdc++.la to contain the correct data, see this discussion.</p>
 
-<p><a shape="rect" class="external-link" href="http://forum.sun.com/jive/thread.jspa?threadID=73150" rel="nofollow">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></div></div>
+<p><a shape="rect" href="http://forum.sun.com/jive/thread.jspa?threadID=73150">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></rich-text-body></structured-macro>
 <p>The configure script will customize the way the software is built and installed into your system along with detecting the available libraries that have been installed.  To use the default configuration just run:</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="205c26b2-1371-4bf8-abbc-41d2eea6f006" ac:name="code" ac:schema-version="1"><plain-text-body>
 ./configure
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>For more help on how to customize the build configuration, run:</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="9b6a11a7-08f6-4ac1-99fc-d076a7458244" ac:name="code" ac:schema-version="1"><plain-text-body>
 ./configure --help
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Once the configure script has run successfully, you are ready to build.  Run:</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="f50bfe43-4a94-495e-99b0-1ab21f6212dd" ac:name="code" ac:schema-version="1"><plain-text-body>
 make
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This will build all of the core ActiveMQ CPP source code.  To build and install the code into the system directories, run:</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="cf308ba3-9be2-47a4-8d29-ab6abe737c53" ac:name="code" ac:schema-version="1"><plain-text-body>
 make install
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>You will have to become the superuser in order to be able to install the files.</p>
 
-<h2 id="BuildingActiveMQCPP-Doxygen">Doxygen</h2>
+<h2>Doxygen</h2>
 
 <p>To generate the doxygen documentation for the project, just run:</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="7a959d3b-8ad9-46bd-99e0-c2136169c31d" ac:name="code" ac:schema-version="1"><plain-text-body>
 make doxygen-run
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="BuildingActiveMQCPP-RunningTests">Running Tests</h2>
+<h2>Running Tests</h2>
 
 
-<h3 id="BuildingActiveMQCPP-UnitTests">Unit Tests</h3>
+<h3>Unit Tests</h3>
 
 <p>In order to build and run the suite of unit tests, run:</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="355a0924-32b9-43e1-af0e-35b2c78acc6f" ac:name="code" ac:schema-version="1"><plain-text-body>
 make check
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This will verify that the library is functioning correctly on the target platform. In addition, it will generate the integration tests binary.</p>
 
-<h3 id="BuildingActiveMQCPP-IntegrationTests">Integration Tests</h3>
+<h3>Integration Tests</h3>
 
 <p>The library also contains a set of tests that are run against a real AMQ broker.  These allow you to validate this distribution of ActiveMQ CPP against your broker.  Running these without a broker will result in failed tests.  The tests currently hard-code the broker url to be tcp://localhost:61613 for stomp and tcp://localhost:61616 for openwire.</p>
 
 <p>The integration tests are built via "make check".  To run them, first start a broker and then</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="84f4a992-211a-4466-b719-5932731f018a" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd src/test-integration
 ./activemq-test-integration
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>This will take quite some time to complete, so be patient.</p>
 
-<h2 id="BuildingActiveMQCPP-Example">Example</h2>
+<h2>Example</h2>
 
 <p>There is an example application that ships with the distribution in src/examples.   The example is compiled by default with the "make" command, but can easily be compiled manually using the command:</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="b0fc5b8c-b49c-4a70-9cea-6b7bc430239d" ac:name="code" ac:schema-version="1"><plain-text-body>
 g++ -o main -pthread -I ../main main.cpp ../../out/libactivemq-cpp-0_0_2.a -luuid
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="BuildingActiveMQCPP-NotesforWindowsusers">Notes for Windows users</h2>
+<h2>Notes for Windows users</h2>
 
 <p>We support using the GNU compiler on Windows, using the Cygwin package.  However we also support using the MSVC compiler on Windows.</p>
 
 <p>There are a couple or things that you will need to setup to ensure that the MSVC compile succeeds.</p>
 <ul><li>You need to download and install the Platform SDK if you don't have it installed already.</li><li>Ensure that the path to you MSVC install is set in the PATH env variable.   You can test this by typing cl.exe at the command line, if you get an error complaining that its not found, then you'll need to fix your PATH.</li><li>Set the INCLUDE env variable to include the path to your MSVC includes, and the platform SDK includes. For example:
-<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="1bcf5725-bbc2-4cfe-b378-7abd123ce11a" ac:name="code" ac:schema-version="1"><plain-text-body>
 INCLUDE = D:\Program Files\Microsoft Visual Studio 8\VC\include;D:\Program Files\Microsoft Platform SDK\Include\*
-]]></script>
-</div></div></li><li>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For example:
-<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[
+</plain-text-body></structured-macro></li><li>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For example:
+<structured-macro ac:macro-id="9d551a9f-b5d7-4ff7-a8f7-236917531e81" ac:name="code" ac:schema-version="1"><plain-text-body>
 LIB = D:\Program Files\Microsoft Visual Studio 8\VC\lib;D:\Program Files\Microsoft Platform SDK\Lib
-]]></script>
-</div></div></li><li>The Project files reference the CPPUnit libraries for the Integration and Unit tests builds.&#160; In order for these to build correctly you must either place the CPPUnit libraries in a directory listed in the project settings, or add a new location for your install of CPPUnit.&#160;</li></ul></div>
+</plain-text-body></structured-macro></li><li>The Project files reference the CPPUnit libraries for the Integration and Unit tests builds.&#160; In order for these to build correctly you must either place the CPPUnit libraries in a directory listed in the project settings, or add a new location for your install of CPPUnit.&#160;</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/building.xml
----------------------------------------------------------------------
diff --git a/building.xml b/building.xml
index bc5a02a..5f7c835 100644
--- a/building.xml
+++ b/building.xml
@@ -1,20 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="Building-BuildingActiveMQfromSource">Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <a shape="rect" href="download.xml">Download</a> a distribution or JAR.</p><h3 id="Building-Prequisites">Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <a shape="rect" href="source.xml">Source</a></li><li>JDK (1.6 for version &lt;= 5.10, 1.7 for version &gt; 5.10)</li></ul><h2 id="Building-UsingMaven2(ActiveMQ4.1.xandUp)">Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">Mav
 en 2.0.4</a>.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You should set the MAVEN_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></div></div><h3 id="Building-DoingaQuickBuild">Doing a Quick Build</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[mvn -Dtest=false -DfailIfNoTests=false clean install 
-]]></script>
-</div></div><h3 id="Building-UsinganIDE">Using an IDE</h3><p>If you prefer to use an IDE then you can auto-generate the IDE's project files using maven plugins. 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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>or</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[mvn idea:idea
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Importing into Eclipse</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you have not already done so, you will need to make Eclipse aware of the Maven repository so that it can build everything. In the preferences, go to Java-&gt;Build Path-&gt;Classpath and define a new Classpath Variable named M2_REPO that points to your local Maven repository (i.e., <code>~/.m2/repository</code> on Unix and <code>c:\Documents and Settings\&lt;user&gt;\.m2\repository</code> on Windows).</p></div></div><h3 id="Building-OtherMaven2Goals">Other Maven 2 Goals</h3><p>For more details try the <a shape="rect" href="examples.xml">Examples</a> or <a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http:/
 /maven.apache.org/plugins/index.html">plugin reference</a> for more details on using them.</p><h2 id="Building-UsingMaven1(ActiveMQ4.0.xandDown)">Using Maven 1 (ActiveMQ 4.0.x and Down)</h2><p>ActiveMQ 4.0.x and down use Maven 1 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/start/download.html">Maven 1.0.2</a>.</p><h3 id="Building-DoingaQuickBuild.1">Doing a Quick Build</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[maven -Dmaven.test.skip.exec=true
-]]></script>
-</div></div><h3 id="Building-UsinganIDE.1">Using an IDE</h3><p>If you prefer to use an IDE then you can autogenerate the IDE's project files using maven plugins. 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[maven eclipse
-]]></script>
-</div></div><p>or</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[maven idea
-]]></script>
-</div></div><p>etc.</p><h3 id="Building-OtherMaven1Goals">Other Maven 1 Goals</h3><p>For more details try the <a shape="rect" href="examples.xml">Examples</a> or <a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p></div>
+<div class="wiki-content maincontent"><h2>Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <link><page ri:content-title="Download"></page></link> a distribution or JAR.</p><h3>Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <link><page ri:content-title="Source"></page></link></li><li>JDK (1.6 for version &lt;= 5.10, 1.7 for version &gt; 5.10)</li></ul><h2>Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" href="http://maven.apache.org/download.html">Maven 2.0.4</a>.</p><structured-macro ac:macro-id="fe89bdbf-e735-4288-8e2a-70788b5be12e" ac:name="note" ac:schema-version="1"><rich-text-body><p>You should set the MAVE
 N_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></rich-text-body></structured-macro><h3>Doing a Quick Build</h3><structured-macro ac:macro-id="97386c09-3915-4735-b982-67ff64289026" ac:name="code" ac:schema-version="1"><plain-text-body>mvn -Dtest=false -DfailIfNoTests=false clean install 
+</plain-text-body></structured-macro><h3>Using an IDE</h3><p>If you prefer to use an IDE then you can auto-generate the IDE's project files using maven plugins. e.g.</p><structured-macro ac:macro-id="6a740a84-8959-4edd-b7d3-62fcc971a9e3" ac:name="code" ac:schema-version="1"><plain-text-body>mvn eclipse:eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="379bb966-063b-42b0-9cc6-adbaa22ea3a3" ac:name="code" ac:schema-version="1"><plain-text-body>mvn idea:idea
+</plain-text-body></structured-macro><structured-macro ac:macro-id="bec970c7-9d56-430f-a4d3-6071f7806eff" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Importing into Eclipse</parameter><rich-text-body><p>If you have not already done so, you will need to make Eclipse aware of the Maven repository so that it can build everything. In the preferences, go to Java-&gt;Build Path-&gt;Classpath and define a new Classpath Variable named M2_REPO that points to your local Maven repository (i.e., <code>~/.m2/repository</code> on Unix and <code>c:\Documents and Settings\&lt;user&gt;\.m2\repository</code> on Windows).</p></rich-text-body></structured-macro><h3>Other Maven 2 Goals</h3><p>For more details try the <link><page ri:content-title="Examples"></page></link> or <link><page ri:content-title="Benchmark Tests"></page></link><br clear="none"> Please refer to the <a shape="rect" href="http://maven.apache.org/plugins/index.html">plugin reference</a> for more details on using t
 hem.</p><h2>Using Maven 1 (ActiveMQ 4.0.x and Down)</h2><p>ActiveMQ 4.0.x and down use Maven 1 to Build. We recommend you download and install <a shape="rect" href="http://maven.apache.org/maven-1.x/start/download.html">Maven 1.0.2</a>.</p><h3>Doing a Quick Build</h3><structured-macro ac:macro-id="4d8fe143-c9c1-416f-b21f-3c0a2129f4b7" ac:name="code" ac:schema-version="1"><plain-text-body>maven -Dmaven.test.skip.exec=true
+</plain-text-body></structured-macro><h3>Using an IDE</h3><p>If you prefer to use an IDE then you can autogenerate the IDE's project files using maven plugins. e.g.</p><structured-macro ac:macro-id="7949995d-1204-4b55-b057-187381772c30" ac:name="code" ac:schema-version="1"><plain-text-body>maven eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="33270868-4ce7-4dba-ab5c-2fa84338c4f5" ac:name="code" ac:schema-version="1"><plain-text-body>maven idea
+</plain-text-body></structured-macro><p>etc.</p><h3>Other Maven 1 Goals</h3><p>For more details try the <link><page ri:content-title="Examples"></page></link> or <link><page ri:content-title="Benchmark Tests"></page></link><br clear="none"> Please refer to the <a shape="rect" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/c-integration-scenarios.xml
----------------------------------------------------------------------
diff --git a/c-integration-scenarios.xml b/c-integration-scenarios.xml
index f73d187..898574d 100644
--- a/c-integration-scenarios.xml
+++ b/c-integration-scenarios.xml
@@ -1,11 +1,11 @@
 <div class="wiki-content maincontent">
-<h2 id="Cintegrationscenarios-OnewayandRPCwithCservices">One way and RPC with C services</h2>
+<h2>One way and RPC with C services</h2>
 <p>Its common for the C services to be the back end services. The 2 common use cases are</p>
 
 <ul><li>we send a message one-way to a C service</li><li>we send a message to a C-service and wait for the result, then reply back to the originator the result</li></ul>
 
 
-<h3 id="Cintegrationscenarios-Makingone-waysreliable">Making one-ways reliable</h3>
+<h3>Making one-ways reliable</h3>
 
 <p>If we assume that the C-service is fairly atomic, it works or it doesn't and does not partially work, then for one-way handling we just need some code to...</p>
 
@@ -23,7 +23,7 @@
 
 <p>Another approach could be for the C service to say whether or not it has successfully processed the message before. This just pushes the problem inside the C code requiring that it persists when things are invoked and when things complete so that it can know when duplicate messages are delivered.</p>
 
-<h3 id="Cintegrationscenarios-makingRPCreliable">making RPC reliable</h3>
+<h3>making RPC reliable</h3>
 
 <p>This scenario is as above but rather than just acknowledge the inbound message we wish to send a reply and acknowledge the inbound message. So this could be regarded as a small JMS transaction.</p>
 
@@ -32,7 +32,7 @@
 
 <p>Again if the C service is capable of knowing if it has seen the message before then we can avoiid step 3.</p>
 
-<h3 id="Cintegrationscenarios-connectivitytoC">connectivity to C</h3>
+<h3>connectivity to C</h3>
 
 <p>We can link C into a Java process and invoke it directly via JNI. Another option is to wrap the C code as an Apache module and perform a HTTP POST to invoke a C service and extract the results of the service.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/c-integration.xml
----------------------------------------------------------------------
diff --git a/c-integration.xml b/c-integration.xml
index 372a018..1d83404 100644
--- a/c-integration.xml
+++ b/c-integration.xml
@@ -1,10 +1,11 @@
 <div class="wiki-content maincontent"><p>It is very common for an organisation to have lots of legacy C code which needs integration into the message bus. The current available solutions are</p>
-<ul><li><a shape="rect" class="unresolved" href="#">CMS</a> is an easy-to-use JMS 1.1-like API for C++. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</li><li>use the <a shape="rect" href="openwire-c-client.xml">OpenWire C Client</a> which is only available in ActiveMQ 4.x or later.</li><li>we are working on the <a shape="rect" href="openwire-cpp-client.xml">OpenWire CPP Client</a></li></ul>
+<ul><li><link><page ri:content-title="CMS"></page></link> is an easy-to-use JMS 1.1-like API for C++. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</li><li>use the <link><page ri:content-title="OpenWire C Client"></page></link> which is only available in ActiveMQ 4.x or later.</li><li>we are working on the <link><page ri:content-title="OpenWire CPP Client"></page></link></li></ul>
 
 
-<ul><li>use the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/C" rel="nofollow">Stomp C Client</a> for any version of ActiveMQ from 3.1 onwards. You can also use <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> from many other languages like .Net, Python, Ruby, Perl etc.</li></ul>
+<ul><li>use the <a shape="rect" href="http://stomp.codehaus.org/C">Stomp C Client</a> for any version of ActiveMQ from 3.1 onwards. You can also use <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> from many other languages like .Net, Python, Ruby, Perl etc.</li></ul>
 
 
 <p>Other alternative mechanisms to communicate using.</p>
-<ul><li>use the <a shape="rect" href="rest.xml">REST</a> API</li><li>use <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <a shape="rect" href="how-do-i-access-activemq-from-csharp-or-dotnet.xml">.Net or Mono</a> to use ActiveMQ insided .Net</li><li><a shape="rect" href="compile-activemq-with-gcj.xml">Compile ActiveMQ with GCJ</a> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <a shape="rect" href="xmpp.xml">XMPP</a> protocol</li></ul></div>
+<ul><li>use the <link><page ri:content-title="REST"></page></link> API</li><li>use <a shape="rect" href="http://servicemix.org/WS+Notification">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <link><page ri:content-title="How do I access ActiveMQ from CSharp or dotNet"></page><link-body>.Net or Mono</link-body></link> to use ActiveMQ insided .Net</li><li><link><page ri:content-title="Compile ActiveMQ with GCJ"></page></link> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <link><page ri:content-title="xmpp"></page><link-body>XMPP</link-body></link> protocol</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cache/main.pageCache
----------------------------------------------------------------------
diff --git a/cache/main.pageCache b/cache/main.pageCache
index 300292a..826056c 100644
Binary files a/cache/main.pageCache and b/cache/main.pageCache differ

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cache/nms.pageCache
----------------------------------------------------------------------
diff --git a/cache/nms.pageCache b/cache/nms.pageCache
index 477bacd..41cc4c1 100644
Binary files a/cache/nms.pageCache and b/cache/nms.pageCache differ

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cached-ldap-authorization-module.xml
----------------------------------------------------------------------
diff --git a/cached-ldap-authorization-module.xml b/cached-ldap-authorization-module.xml
index 5c60b0a..b7c5e3e 100644
--- a/cached-ldap-authorization-module.xml
+++ b/cached-ldap-authorization-module.xml
@@ -1,33 +1,25 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2 id="CachedLDAPAuthorizationModule-Initializing">Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we
  use in embedded mode for testing. For an example on how to initialize the embedded ApacheDS with this ldif file take a look at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" class="external-link" href="http://www.openldap.org/" rel="nofollow">OpenLDAP</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</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"><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for ent
 ries, so the configuration similar to the one shown in the following snippet</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[suffix          &quot;dc=activemq,dc=apache,dc=org&quot;
-rootdn          &quot;cn=admin,dc=activemq,dc=apache,dc=org&quot;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="428fbf5e-bb76-474f-9ebf-7d962d8b39f9" ac:name="info" ac:schema-version="1"><parameter ac:name="">Availability</parameter><rich-text-body><p>Available since 5.6</p></rich-text-body></structured-macro><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2>Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we use in embedded mode for testing. For an example on how to initialize the embedded ApacheDS with this ldif file take a look at
  <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" href="http://www.openldap.org/">OpenLDAP</a> (<a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</p><structured-macro ac:macro-id="1bb9490d-a48f-437d-a0b4-864149b309f8" ac:name="info" ac:schema-version="1"><parameter ac:name=""> Configuring OpenLDAP</parameter><rich-text-body><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for entries, so the configuration similar to the one shown in the following snippet</p><structured-macro ac:macro-id="3c8fa317-f914-445c-ae79-cf54e77d755e" ac:name="code" ac:schema-version="1"><plain-text-body>suffix          "dc=activemq,dc=apache,dc=org"
+rootdn          "cn=admin,dc=activemq,dc=apache,dc=org"
 # Cleartext passwords, especially for the rootdn, should
 # be avoid.  See slappasswd(8) and slapd.conf(5) for details.
 # Use of strong authentication encouraged.
 rootpw          {SSHA}lfAYn54xCFghgQv5B2Kqn3d3eLojqxtS
-]]></script>
-</div></div><p>should be put into your <code>slapd.conf</code></p></div></div><p>To initialize your (properly configured) OpenLDAP do something like</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[ldapadd -x -D &quot;cn=admin,dc=activemq,dc=apache,dc=org&quot; -w sunflower -f activemq-openldap.ldif]]></script>
-</div></div><h2 id="CachedLDAPAuthorizationModule-Configuring">Configuring</h2><p>Once entries are in LDAP, you can configure the module to load entries from there. A default values are adapted for embedded Apache DS server, so all you have to do in that case is add your plugin to the broker xml conf</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;authorizationPlugin&gt;
+</plain-text-body></structured-macro><p>should be put into your <code>slapd.conf</code></p></rich-text-body></structured-macro><p>To initialize your (properly configured) OpenLDAP do something like</p><structured-macro ac:macro-id="c4fef04d-25ba-4e17-82a3-03b478d81086" ac:name="code" ac:schema-version="1"><plain-text-body>ldapadd -x -D "cn=admin,dc=activemq,dc=apache,dc=org" -w sunflower -f activemq-openldap.ldif</plain-text-body></structured-macro><h2>Configuring</h2><p>Once entries are in LDAP, you can configure the module to load entries from there. A default values are adapted for embedded Apache DS server, so all you have to do in that case is add your plugin to the broker xml conf</p><structured-macro ac:macro-id="13b9c7ce-4de5-4687-8bc0-4f99739c7add" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;authorizationPlugin&gt;
     &lt;map&gt;
         &lt;cachedLDAPAuthorizationMap/&gt;
     &lt;/map&gt;
-&lt;/authorizationPlugin&gt;]]></script>
-</div></div><p>For the OpenLDAP case, you should define more parameters</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;authorizationPlugin&gt;
+&lt;/authorizationPlugin&gt;</plain-text-body></structured-macro><p>For the OpenLDAP case, you should define more parameters</p><structured-macro ac:macro-id="569c3055-be0d-40f9-bcbd-fc7d0e0cf39e" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;authorizationPlugin&gt;
     &lt;map&gt;
         &lt;cachedLDAPAuthorizationMap
-            connectionURL=&quot;ldap://localhost:389&quot;
-            connectionUsername=&quot;cn=admin,dc=activemq,dc=apache,dc=org&quot;
-            connectionPassword=&quot;sunflower&quot;
-            queueSearchBase=&quot;ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org&quot;
-            topicSearchBase=&quot;ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org&quot;
-            tempSearchBase=&quot;ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org&quot;
-            refreshInterval=&quot;300000&quot;
-            legacyGroupMapping=&quot;false&quot;
+            connectionURL="ldap://localhost:389"
+            connectionUsername="cn=admin,dc=activemq,dc=apache,dc=org"
+            connectionPassword="sunflower"
+            queueSearchBase="ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+            topicSearchBase="ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+            tempSearchBase="ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+            refreshInterval="300000"
+            legacyGroupMapping="false"
         /&gt;
     &lt;/map&gt;
-&lt;/authorizationPlugin&gt;]]></script>
-</div></div><p>Full examples of configurations for <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>version</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionURL</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>secret</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionProtocol</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>s</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>authentication</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>simple</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>queueSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>topicSearchBase</p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tempSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>refreshInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Interval (in milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr></tbody></table></div><h2 id="CachedLDAPAuthorizationModule-Updates">Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately app
 lied)</p></div>
+&lt;/authorizationPlugin&gt;</plain-text-body></structured-macro><p>Full examples of configurations for <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th><td colspan="1" rowspan="1"><p>version</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionURL</p></td><td colspan="1" rowspan="1"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr
 ><tr><td colspan="1" rowspan="1"><p>connectionUsername</p></td><td colspan="1" rowspan="1"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionPassword</p></td><td colspan="1" rowspan="1"><p>secret</p></td><td colspan="1" rowspan="1"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionProtocol</p></td><td colspan="1" rowspan="1"><p>s</p></td><td colspan="1" rowspan="1"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>authentication</p></td><td colspan="1" rowspan="1"><p>simple</p></td><td colspan="1" rowspan="1"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1"><p>&#160
 ;</p></td></tr><tr><td colspan="1" rowspan="1"><p>queueSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>topicSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>tempSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>refreshInterval</p></td><td colspan="1" rowspan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Interval (in 
 milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr></tbody></table><h2>Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately applied)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-get-commercial-support.xml
----------------------------------------------------------------------
diff --git a/can-i-get-commercial-support.xml b/can-i-get-commercial-support.xml
index 6faeb61..2eda5e6 100644
--- a/can-i-get-commercial-support.xml
+++ b/can-i-get-commercial-support.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="CanIgetcommercialsupport-CanIgetcommercialsupport?">Can I get commercial support? </h2>
+<div class="wiki-content maincontent"><h2>Can I get commercial support? </h2>
 
-<p>Absolutely, see our <a shape="rect" href="support.xml">Support</a> page for more details</p></div>
+<p>Absolutely, see our <link><page ri:content-title="Support"></page></link> page for more details</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-modify-messages-on-a-queue.xml
----------------------------------------------------------------------
diff --git a/can-i-modify-messages-on-a-queue.xml b/can-i-modify-messages-on-a-queue.xml
index 186d6ea..d956225 100644
--- a/can-i-modify-messages-on-a-queue.xml
+++ b/can-i-modify-messages-on-a-queue.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="CanImodifymessagesonaqueue-CanImodifymessagesonaqueue?">Can I modify messages on a queue?</h2>
+<div class="wiki-content maincontent"><h2>Can I modify messages on a queue?</h2>
 
 <p>The short answer is no. In JMS messages are immutable once they have been sent. If you find you need to modify messages its recommended that you create a consumer with some selector which matches the messages you wish to update, consume them and send new modified messages, either to another queue or if you are careful, back to the original queue. (If you are using the same queue, be careful not to get into a loop where your selector matches messages you are sending yourself - you may wish to use some JMS header to avoid this loop).</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
----------------------------------------------------------------------
diff --git a/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml b/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
index efd4cb9..5e4a60f 100644
--- a/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
+++ b/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
@@ -4,5 +4,5 @@
 
 <p>For concurrent consumption create a session per consumer - as all messages are dispatched to a session in a single thread - but you can have as many sessions as you like per connection.</p>
 
-<p>To further help with concurrent consuming of JMS you can use <a shape="rect" class="external-link" href="http://jencks.codehaus.org/Message+Driven+POJOs" rel="nofollow">Message Driven POJOs</a></p></div>
+<p>To further help with concurrent consuming of JMS you can use <a shape="rect" href="http://jencks.codehaus.org/Message+Driven+POJOs">Message Driven POJOs</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-send-really-large-files-over-activemq.xml
----------------------------------------------------------------------
diff --git a/can-i-send-really-large-files-over-activemq.xml b/can-i-send-really-large-files-over-activemq.xml
index d0f397d..9c4df4d 100644
--- a/can-i-send-really-large-files-over-activemq.xml
+++ b/can-i-send-really-large-files-over-activemq.xml
@@ -1,10 +1,11 @@
-<div class="wiki-content maincontent"><h2 id="CanIsendreallylargefilesoverActiveMQ-CanIsendreallylargefilesoverActiveMQ">Can I send really large files over ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2>Can I send really large files over ActiveMQ</h2>
 
 <p>The answer is yes. </p>
 
-<p>If you are using ActiveMQ 4.2 or later we highly recommend you use <a shape="rect" href="blob-messages.xml">Blob Messages</a> which implements an out of band transport of the messages; it allows the files to be hosted on external http/ftp sites if required and can support either direct publisher &lt;-&gt; subscriber communication or publisher -&gt; broker/file server -&gt; consumer messaging.</p>
+<p>If you are using ActiveMQ 4.2 or later we highly recommend you use <link><page ri:content-title="Blob Messages"></page></link> which implements an out of band transport of the messages; it allows the files to be hosted on external http/ftp sites if required and can support either direct publisher &lt;-&gt; subscriber communication or publisher -&gt; broker/file server -&gt; consumer messaging.</p>
 
-<p>For 4.1 or ealier large file transfer is achieved using <a shape="rect" href="jms-streams.xml">JMS Streams</a>. </p>
+<p>For 4.1 or ealier large file transfer is achieved using <link><page ri:content-title="JMS Streams"></page></link>. </p>
 
-<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <a shape="rect" href="blob-messages.xml">Blob Messages</a> or <a shape="rect" href="jms-streams.xml">JMS Streams</a> allows you to send and receive arbitrarily large files with very low RAM overhead.</p></div>
+<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <link><page ri:content-title="Blob Messages"></page></link> or <link><page ri:content-title="JMS Streams"></page></link> allows you to send and receive arbitrarily large files with very low RAM overhead.</p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-use-activemq-5x-or-later-on-java-14.xml
----------------------------------------------------------------------
diff --git a/can-i-use-activemq-5x-or-later-on-java-14.xml b/can-i-use-activemq-5x-or-later-on-java-14.xml
index 2bc086c..e991763 100644
--- a/can-i-use-activemq-5x-or-later-on-java-14.xml
+++ b/can-i-use-activemq-5x-or-later-on-java-14.xml
@@ -1,12 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="CanIuseActiveMQ5.xorlateronJava1.4-CanIuseActiveMQ5.0orlateronJava1.4?">Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
+<div class="wiki-content maincontent"><h2>Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
 
 <p>Apache ActiveMQ 5.x or later is developed to run on Java 5 or later  to take advantage of the new language features together with the major fact that on Java 5 the new concurrency code is faster &amp; less buggy and requires less dependencies.</p>
 
-<p>We may get around to creating a sepate distro of retrotranslated jars for 1.4 <a shape="rect" href="contributing.xml">particularly if someone helps</a>.</p>
+<p>We may get around to creating a sepate distro of retrotranslated jars for 1.4 <link><page ri:content-title="Contributing"></page><link-body>particularly if someone helps</link-body></link>.</p>
 
-<p>Until then you can just <a shape="rect" class="external-link" href="http://retrotranslator.sourceforge.net/#jit" rel="nofollow">install the retrotranslator JIT in your JVM</a> which will auto-swizzle all Java 5 bytecode to be complaint Java 1.4 bytecode using backport-util-concurrent instead of Java 5 concurrency code.</p>
+<p>Until then you can just <a shape="rect" href="http://retrotranslator.sourceforge.net/#jit">install the retrotranslator JIT in your JVM</a> which will auto-swizzle all Java 5 bytecode to be complaint Java 1.4 bytecode using backport-util-concurrent instead of Java 5 concurrency code.</p>
 
-<h2 id="CanIuseActiveMQ5.xorlateronJava1.4-SeeAlso">See Also</h2>
+<h2>See Also</h2>
 
-<ul><li><a shape="rect" href="what-platforms-does-activemq-support.xml">What platforms does ActiveMQ support</a></li></ul></div>
+<ul><li><link><page ri:content-title="What platforms does ActiveMQ support"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-two-brokers-share-the-same-database.xml
----------------------------------------------------------------------
diff --git a/can-two-brokers-share-the-same-database.xml b/can-two-brokers-share-the-same-database.xml
index 7b0c5ce..2f1da10 100644
--- a/can-two-brokers-share-the-same-database.xml
+++ b/can-two-brokers-share-the-same-database.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="Cantwobrokerssharethesamedatabase-Cantwobrokerssharethesamedatabase">Can two brokers share the same database</h2>
+<div class="wiki-content maincontent"><h2>Can two brokers share the same database</h2>
 
 <p>The short answer is no; 2 brokers cannot operate on the same sets of database tables concurrently. ActiveMQ is designed for high performance so we want to minimise the amount of pessimistic locking; each broker is designed to work with its own persistent database.</p>
 
 <p>If you want to share the same physical database server across two brokers to simplify your installation &amp; backup procedures then just create 2 different logins for each broker so that they get their own sets of database tables within the same physical database. (i.e. each broker gets its own logical database within the same physical database server).</p>
 
-<p>Also if you want to only have one database but many possible brokers (for HA) then just use <a shape="rect" href="jdbc-master-slave.xml">JDBC Master Slave</a></p></div>
+<p>Also if you want to only have one database but many possible brokers (for HA) then just use <link><page ri:content-title="JDBC Master Slave"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-you-browse-a-topic.xml
----------------------------------------------------------------------
diff --git a/can-you-browse-a-topic.xml b/can-you-browse-a-topic.xml
index 20fcf62..cbae1c0 100644
--- a/can-you-browse-a-topic.xml
+++ b/can-you-browse-a-topic.xml
@@ -4,5 +4,5 @@
 
 <p>i.e. browsing is necessary on queues as you wanna see what messages there are without removing them. For topics, everyone who's interested gets a copy of the message so just do a regular subscribe.</p>
 
-<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p></div>
+<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/certificateunknown.xml
----------------------------------------------------------------------
diff --git a/certificateunknown.xml b/certificateunknown.xml
index f05f240..b3184a3 100644
--- a/certificateunknown.xml
+++ b/certificateunknown.xml
@@ -1,7 +1,6 @@
 <div class="wiki-content maincontent"><p>If you get an error something 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[
+<structured-macro ac:macro-id="0708482b-8175-421f-9fe9-85a126b5b52c" ac:name="code" ac:schema-version="1"><plain-text-body>
 javax.jms.JMSException: start failed: Received fatal alert: certificate_unknown
        at org.activemq.transport.tcp.TcpTransportChannel.start(TcpTransportChannel.java:200)
        at org.activemq.broker.impl.BrokerConnectorImpl.addClient(BrokerConnectorImpl.java:308)
@@ -17,12 +16,11 @@ Caused by: javax.net.ssl.SSLHandshakeException: Received fatal alert: certificat
        at com.sun.net.ssl.internal.ssl.SSLSocketImpl.readDataRecord(Unknown Source)
        at com.sun.net.ssl.internal.ssl.AppInputStream.read(Unknown Source)
        at java.io.BufferedInputStream.fill(Unknown Source) 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>when you are trying to use SSL to connect to ActiveMQ then the "certificate_unknown" error shows on the broker when the client doesn't trust the broker's certificate.  On the client, I would see an error as well: "No trusted certificate found".  </p>
 
-<h3 id="certificate_unknown-Fix">Fix</h3>
+<h3>Fix</h3>
 
-<p>Make sure that you exported the broker's certificate (step 2 in <a shape="rect" href="how-do-i-use-ssl.xml">How do I use SSL</a>) and imported it on the client into a truststore (step 4).  If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p></div>
+<p>Make sure that you exported the broker's certificate (step 2 in <link><page ri:content-title="How do I use SSL"></page></link>) and imported it on the client into a truststore (step 4).  If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/changes-in-40.xml
----------------------------------------------------------------------
diff --git a/changes-in-40.xml b/changes-in-40.xml
index f71100c..25afee2 100644
--- a/changes-in-40.xml
+++ b/changes-in-40.xml
@@ -1,24 +1,23 @@
-<div class="wiki-content maincontent"><h3 id="Changesin4.0-NewFeaturesin4.0">New Features in 4.0</h3>
+<div class="wiki-content maincontent"><h3>New Features in 4.0</h3>
 
-<ul><li><a shape="rect" href="masterslave.xml">MasterSlave</a> provides support for continuous availability and fault tolerance of brokers to be able to handle catastrophic hardware failure and not loose a message (or get duplicates).</li><li>A new <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a> feature allows you to pin message processing to a single consumer in a cluser of consumers.</li><li>A new <a shape="rect" href="message-groups.xml">Message Groups</a> feaure allows you load balance messages accross a set of consumers but also garantee the message order for messages within a message group.</li><li>A new <a shape="rect" href="total-ordering.xml">Total Ordering</a> feature to allow all consumers on a topic to see messages in the same order.</li><li>New <a shape="rect" href="how-can-i-monitor-activemq.xml">JMX Management</a> and monitoring capabilities. You can now see statistics for each broker, destination, connector and connection!</li><li>Improved <a sha
 pe="rect" href="security.xml">Security</a> plugin which provides JAAS support for authentication along with a pluggable strategy for authorization together with a default XML based implementation.</li><li>A new <a shape="rect" href="openwire-c-client.xml">OpenWire C Client</a> is now available. This client talks the same wire protocol that the standard java client uses so every messaging broker feature available to the java client is available to the c client.</li><li>An experimental <a shape="rect" href="nms/index.html">OpenWire dotNet</a> is available, written in pure C# along with a JMS-like API for working on the .Net platform with ActiveMQ</li><li>Queues can now be loaded up with persistent messages without locking up the broker. Persistent messages are now swapped out of memory when no consumer needs it soon.</li><li>A new <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> feature allows you to build location affinity by assignin a priority to consumers. The br
 oker can then dispatch messages to higher priority consumers before dispatching to lower priority consumers.</li><li>A configurable per <a shape="rect" href="consumer-dispatch-async.xml">Consumer Dispatch Async</a> flag which allows you to configure how messages are sent by the broker to a consumer.  This controls if the broker uses <a shape="rect" href="seda.xml">SEDA</a> or <a shape="rect" class="unresolved" href="#">STP</a> style dispaching.</li><li>A new plug-able topic <a shape="rect" href="subscription-recovery-policy.xml">Subscription Recovery Policy</a> which allows you to configure how many transient messages are replayed when a <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a> is created.</li><li>A new <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a> feature allows topic consumers to "go back in time" so that it receives old messages when the subscription is activated. If the consumer is a durable consumer, he recover all the 
 messages that are still in the persistent store.</li><li><a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a> allow you configure the behavior of destinations.</li><li>The broker now supports per destination plugable <a shape="rect" href="dispatch-policies.xml">Dispatch Policies</a> so that you can choose the distribution algorithm used to send messages to a consumer.</li><li>The broker now supports two new types of connectors:
-	<ul><li><a shape="rect" href="the-jms-connector.xml">The JMS Connector</a> is used to establish connection to external JMS providers so that messages can be bridged between the system.</li><li><a shape="rect" href="the-proxy-connector.xml">The Proxy Connector</a>. Is used to proxy connections to another broker.</li></ul>
-	</li><li><a shape="rect" href="slow-consumer-handling.xml">Slow Consumer Handling</a> allows you to discard old messages for slow consumers on non-durable topics to avoid slowing down fast consumers</li><li>You can now specify <a shape="rect" href="destination-options.xml">Destination Options</a> that allow you to do extend configuration of consumers.</li><li>Conumsers now use <a shape="rect" href="optimized-acknowledgement.xml">Optimized Acknowledgement</a> by default to which results in increased performance.</li></ul>
+<ul><li><link><page ri:content-title="MasterSlave"></page></link> provides support for continuous availability and fault tolerance of brokers to be able to handle catastrophic hardware failure and not loose a message (or get duplicates).</li><li>A new <link><page ri:content-title="Exclusive Consumer"></page></link> feature allows you to pin message processing to a single consumer in a cluser of consumers.</li><li>A new <link><page ri:content-title="Message Groups"></page></link> feaure allows you load balance messages accross a set of consumers but also garantee the message order for messages within a message group.</li><li>A new <link><page ri:content-title="Total Ordering"></page></link> feature to allow all consumers on a topic to see messages in the same order.</li><li>New <link><page ri:content-title="How can I monitor ActiveMQ"></page><link-body>JMX Management</link-body></link> and monitoring capabilities. You can now see statistics for each broker, destination, connector and
  connection!</li><li>Improved <link><page ri:content-title="Security"></page></link> plugin which provides JAAS support for authentication along with a pluggable strategy for authorization together with a default XML based implementation.</li><li>A new <link><page ri:content-title="OpenWire C Client"></page></link> is now available. This client talks the same wire protocol that the standard java client uses so every messaging broker feature available to the java client is available to the c client.</li><li>An experimental <link><space ri:space-key="NMS"></space><link-body>OpenWire dotNet</link-body></link> is available, written in pure C# along with a JMS-like API for working on the .Net platform with ActiveMQ</li><li>Queues can now be loaded up with persistent messages without locking up the broker. Persistent messages are now swapped out of memory when no consumer needs it soon.</li><li>A new <link><page ri:content-title="Consumer Priority"></page></link> feature allows you to bui
 ld location affinity by assignin a priority to consumers. The broker can then dispatch messages to higher priority consumers before dispatching to lower priority consumers.</li><li>A configurable per <link><page ri:content-title="Consumer Dispatch Async"></page></link> flag which allows you to configure how messages are sent by the broker to a consumer.  This controls if the broker uses <link><page ri:content-title="SEDA"></page></link> or <link><page ri:content-title="STP"></page></link> style dispaching.</li><li>A new plug-able topic <link><page ri:content-title="Subscription Recovery Policy"></page></link> which allows you to configure how many transient messages are replayed when a <link><page ri:content-title="Retroactive Consumer"></page></link> is created.</li><li>A new <link><page ri:content-title="Retroactive Consumer"></page></link> feature allows topic consumers to "go back in time" so that it receives old messages when the subscription is activated. If the consumer is a 
 durable consumer, he recover all the messages that are still in the persistent store.</li><li><link><page ri:content-title="Per Destination Policies"></page></link> allow you configure the behavior of destinations.</li><li>The broker now supports per destination plugable <link><page ri:content-title="Dispatch Policies"></page></link> so that you can choose the distribution algorithm used to send messages to a consumer.</li><li>The broker now supports two new types of connectors:
+	<ul><li><link><page ri:content-title="The JMS Connector"></page></link> is used to establish connection to external JMS providers so that messages can be bridged between the system.</li><li><link><page ri:content-title="The Proxy Connector"></page></link>. Is used to proxy connections to another broker.</li></ul>
+	</li><li><link><page ri:content-title="Slow Consumer Handling"></page></link> allows you to discard old messages for slow consumers on non-durable topics to avoid slowing down fast consumers</li><li>You can now specify <link><page ri:content-title="Destination Options"></page></link> that allow you to do extend configuration of consumers.</li><li>Conumsers now use <link><page ri:content-title="Optimized Acknowledgement"></page></link> by default to which results in increased performance.</li></ul>
 
 
 
-<h3 id="Changesin4.0-API/Configurationchanages">API/Configuration chanages</h3>
+<h3>API/Configuration chanages</h3>
 
-<ul><li>as part of the move to Apache, the package name is now <strong>org.apache.activemq</strong> and not <strong>org.activemq</strong>.</li><li>the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> has changed a little; mostly its now in the ActiveMQ namespace and has a generated XSD and documentation.</li><li>the <em>reliable</em> transport has been renamed to <em>failover</em> to make it more clear what it does; we're working on a separate DR mechanism to provide data centre resilliance. So if you wish to connect to one of a number of URIs try
-<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[
+<ul><li>as part of the move to Apache, the package name is now <strong>org.apache.activemq</strong> and not <strong>org.activemq</strong>.</li><li>the <link><page ri:content-title="Xml Configuration"></page></link> has changed a little; mostly its now in the ActiveMQ namespace and has a generated XSD and documentation.</li><li>the <em>reliable</em> transport has been renamed to <em>failover</em> to make it more clear what it does; we're working on a separate DR mechanism to provide data centre resilliance. So if you wish to connect to one of a number of URIs try
+<structured-macro ac:macro-id="67446eff-165c-41df-a0ae-fbb115d9644a" ac:name="code" ac:schema-version="1"><plain-text-body>
 failover:tcp://host1:port1,tcp://host2:port2
-]]></script>
-</div></div></li><li>The configuration options of transports have changed. See <a shape="rect" href="activemq-connection-uris.xml">ActiveMQ Connection URIs</a> for a detailed guide of of all the options.</li><li>The spring package has gone; we now use <a shape="rect" class="external-link" href="http://xbean.org" rel="nofollow">XBean</a> to configure ActiveMQ. See the org.activemq.xbean.BrokerFactoryBean if you want a factory bean to use in regular spring instead of the org.activemq.spring.BrokerFactoryBean. See <a shape="rect" href="configuring-brokers.xml">Configuring Brokers</a> for more information on the new XML syntax.</li><li>ActiveMQTopic and ActiveMQQueue are now in the org.activemq.command package.</li><li>If you were creating a broker in Java code, the BrokerContainer has been replaced with BrokerService which is easier to use now.</li><li>The connection URL options have changed slightly to provided more persise configuration options of the transport and wireformat and to 
 allow validation of the options.</li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml">Message Redelivery and DLQ Handling</a> has been re-implemnted. Currently all messages sent poison messages are sent to a single DQL.</li><li>The <a shape="rect" href="jms-streams.xml">JMS Streams</a> API has changed.</li></ul>
+</plain-text-body></structured-macro></li><li>The configuration options of transports have changed. See <link><page ri:content-title="ActiveMQ Connection URIs"></page></link> for a detailed guide of of all the options.</li><li>The spring package has gone; we now use <a shape="rect" href="http://xbean.org">XBean</a> to configure ActiveMQ. See the org.activemq.xbean.BrokerFactoryBean if you want a factory bean to use in regular spring instead of the org.activemq.spring.BrokerFactoryBean. See <link><page ri:content-title="Configuring Brokers"></page></link> for more information on the new XML syntax.</li><li>ActiveMQTopic and ActiveMQQueue are now in the org.activemq.command package.</li><li>If you were creating a broker in Java code, the BrokerContainer has been replaced with BrokerService which is easier to use now.</li><li>The connection URL options have changed slightly to provided more persise configuration options of the transport and wireformat and to allow validation of the opt
 ions.</li><li><link><page ri:content-title="Message Redelivery and DLQ Handling"></page></link> has been re-implemnted. Currently all messages sent poison messages are sent to a single DQL.</li><li>The <link><page ri:content-title="JMS Streams"></page></link> API has changed.</li></ul>
 
 
-<h3 id="Changesin4.0-GeneralChanges">General Changes</h3>
+<h3>General Changes</h3>
 
-<ul><li>The JDBC persistence adapter now uses JDBC statement batching to increase it's performance with the database. This should reduce the amount of time a checkpoint takes.</li><li>QueueBrowsers now play nicely with a queue that is currently being consumed from. It gives you a true snapshot of what the queue looked like when you created the browser and it does not affect the dispatching of messages to active consumers.</li><li>we no longer have hand-crafted marshalling code any more; its all based on <a shape="rect" href="openwire.xml">OpenWire</a> and autogenerated from the open wire commands in the org.activemq.command package</li><li>The network bridges used for broker to broker messaging now use a lower level ActiveMQ command and transport API instead of the JMS API, this allows them to use more optimizations and have a lower per bridge resource consumption while letting the JMS client API implementation reduce it's complexity.</li><li>Two types of network bridges are now sup
 ported:
+<ul><li>The JDBC persistence adapter now uses JDBC statement batching to increase it's performance with the database. This should reduce the amount of time a checkpoint takes.</li><li>QueueBrowsers now play nicely with a queue that is currently being consumed from. It gives you a true snapshot of what the queue looked like when you created the browser and it does not affect the dispatching of messages to active consumers.</li><li>we no longer have hand-crafted marshalling code any more; its all based on <link><page ri:content-title="OpenWire"></page></link> and autogenerated from the open wire commands in the org.activemq.command package</li><li>The network bridges used for broker to broker messaging now use a lower level ActiveMQ command and transport API instead of the JMS API, this allows them to use more optimizations and have a lower per bridge resource consumption while letting the JMS client API implementation reduce it's complexity.</li><li>Two types of network bridges are n
 ow supported:
 	<ul><li>A simple forwardng bridge - sends all messages as soon as possible to the remote broker. Great you know the usage patterns up front and allways want to do store and forward to a central broker.</li><li>A demand based forwarding bridge (same type of bridge that was using in ActiveMQ 3.x) which detects consumer demand on the remote broker and only forwards messages as needed.</li></ul>
-	</li><li>The demand based forwarding bridge now take advantage of the <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <a shape="rect" href="jms-streams.xml">JMS Streams</a>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul></div>
+	</li><li>The demand based forwarding bridge now take advantage of the <link><page ri:content-title="Consumer Priority"></page></link> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <link><page ri:content-title="JMS Streams"></page></link>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/class-diagrams-for-activemq-40-m4-source-code.xml
----------------------------------------------------------------------
diff --git a/class-diagrams-for-activemq-40-m4-source-code.xml b/class-diagrams-for-activemq-40-m4-source-code.xml
index 92cfcc1..2ec20f9 100644
--- a/class-diagrams-for-activemq-40-m4-source-code.xml
+++ b/class-diagrams-for-activemq-40-m4-source-code.xml
@@ -3,11 +3,11 @@
 
 <p>These diagrams cover the bulk of the source code and are in EMF format.&#160;</p>
 
-<p><a shape="rect" class="external-link" href="http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip" rel="nofollow">http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip</a></p>
+<p><a shape="rect" href="http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip">http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip</a></p>
 
-<p>Note about conversion to other formats:&#160; Some files when converted to something like JPG or PNG will be quite large.&#160; If your system doesn't have enough RAM you will get an error or in some cases the converting program will just scale to fit which usually will mangle the image.&#160; For the larger file conversions you will need&#160; 1GB of RAM.&#160; A free program I came across for converting is IrfanView (<a shape="rect" class="external-link" href="http://www.irfanview.com/" rel="nofollow">http://www.irfanview.com/</a>).&#160; I found it much better than Windows Image Viewer, but you still need an appropriate amount of memory.&#160;</p>
+<p>Note about conversion to other formats:&#160; Some files when converted to something like JPG or PNG will be quite large.&#160; If your system doesn't have enough RAM you will get an error or in some cases the converting program will just scale to fit which usually will mangle the image.&#160; For the larger file conversions you will need&#160; 1GB of RAM.&#160; A free program I came across for converting is IrfanView (<a shape="rect" href="http://www.irfanview.com/">http://www.irfanview.com/</a>).&#160; I found it much better than Windows Image Viewer, but you still need an appropriate amount of memory.&#160;</p>
 
-<p>Note about printing: Adobe In Design works well for printing if you want a large print but don't have access to an oversized/wide format ink jet (<a shape="rect" class="external-link" href="http://www.adobe.com/products/tryadobe/main.jsp#product=31" rel="nofollow">http://www.adobe.com/products/tryadobe/main.jsp#product=31</a>).&#160; Set up the page dimensions first, for example,&#160; normal letter size page is measured in pts, 51p0 width, 66p0 height.&#160; So for a wider than long oversized diagram you might go to File-&gt;Document Setup... and set Page Size to "Custom" and width to 255p0 (5 8 1/2" letter pages in width), and height to 112p0 (2 11" letter pages in height).&#160; Next go to File-&gt;Place... to import the EMF. Using the Scale tool (smaller box with an arrow pointing into larger box) size the image to fit inside the page (hold down shift key while sizing to keep proportions), and position it using the Selection tool (arrow).</p>
+<p>Note about printing: Adobe In Design works well for printing if you want a large print but don't have access to an oversized/wide format ink jet (<a shape="rect" href="http://www.adobe.com/products/tryadobe/main.jsp#product=31">http://www.adobe.com/products/tryadobe/main.jsp#product=31</a>).&#160; Set up the page dimensions first, for example,&#160; normal letter size page is measured in pts, 51p0 width, 66p0 height.&#160; So for a wider than long oversized diagram you might go to File-&gt;Document Setup... and set Page Size to "Custom" and width to 255p0 (5 8 1/2" letter pages in width), and height to 112p0 (2 11" letter pages in height).&#160; Next go to File-&gt;Place... to import the EMF. Using the Scale tool (smaller box with an arrow pointing into larger box) size the image to fit inside the page (hold down shift key while sizing to keep proportions), and position it using the Selection tool (arrow).</p>
 
 <p>Then go to File-&gt;Print..., select "Setup" and check the "Tile" option.&#160; The "Tile" dropdown setting should be "Auto" and Overlap 4p0.&#160; Then set the Scale option to a percentage that maximizes the image coverage (there is a visual thumbnail that will indicate the coverage).&#160; Then Print.&#160; This should yield a nice large image printed out in tiled format on letter size pages.&#160; Each page will be properly numbered so you know their positions, and there will be marks for trimming and taping the pages together.&#160; A page cutter is neccessary.&#160; Just trim the right and bottom overlap on each page, then align and tape.</p></div>
 


[32/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/auto.xml
----------------------------------------------------------------------
diff --git a/auto.xml b/auto.xml
index 4845e6c..cfb1ec2 100644
--- a/auto.xml
+++ b/auto.xml
@@ -1,19 +1,3 @@
-<div class="wiki-content maincontent"><p>Starting with version 5.13.0, ActiveMQ supports wire format protocol detection. &#160; OpenWire, STOMP, AMQP, and MQTT can be automatically detected. &#160;This allows one transport to be shared for all 4 types of clients.</p><h3 id="AUTO-EnablingAUTOoverTCP">Enabling AUTO over TCP</h3><p>To configure ActiveMQ auto wire format detection over a TCP connection use the&#160;<code>auto</code>&#160;transport prefix. For example, add the following transport configuration in your XML file:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto&quot; uri=&quot;auto://localhost:5671&quot;/&gt;]]></script>
-</div></div><h3 id="AUTO-EnablingAUTOoverSSL">Enabling AUTO over SSL</h3><p>To configure ActiveMQ auto wire format detection over an SSL connection use the&#160;<code>auto+ssl</code>&#160;transport prefix. For example, add the following transport configuration in your XML file:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto+ssl&quot; uri=&quot;auto+ssl://localhost:5671&quot;/&gt;
-]]></script>
-</div></div><ul><li>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" class="external-link" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</li></ul><h3 id="AUTO-EnablingAUTOoverNIO">Enabling AUTO over NIO</h3><p>To configure ActiveMQ auto wire format detection over an NIO TCP connection use the&#160;<code>auto+nio</code>transport prefix. For example, add the following transport configuration in your XML file:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto+nio&quot; uri=&quot;auto+nio://localhost:5671&quot;/&gt;]]></script>
-</div></div><h3 id="AUTO-EnablingAUTOoverNIOSSL">Enabling AUTO over NIO SSL</h3><p>To configure ActiveMQ auto wire format detection over an NIO SSL connection use the&#160;<code>auto+nio+ssl</code>&#160;transport prefix. For example, add the following transport configuration in your XML file:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto+nio+ssl&quot; uri=&quot;auto+nio+ssl://localhost:5671&quot;/&gt;]]></script>
-</div></div><h3 id="AUTO-ConfiguringAUTOTransportOptions">Configuring AUTO Transport Options</h3><p>There are some configuration options that can be set.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Parameter Name</p></th><th colspan="1" rowspan="1" class="confluenceTh">Default Value</th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>protocolDetectionTimeOut</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The time before a connection times out in milliseconds. This is similar to maxInactivityDuration. If a client makes a connection to but doesn't send data or enough data for the protocol to be detected then the thread will sit and wait for more data to come in over the socket. This will let the broker kill the connections if they do not complete t
 he protocol initialization after a certain period of time. The default is 30 seconds. Set a default to &lt;= 0 to disable this.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxConnectionThreadPoolSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>MAX_INT</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This option allows the configuration of the maximum size of the thread pool that handles connection attempts. Lowering this number can help prevent the broker from running out of threads if there are many different clients attempting to connect at the same time. By default it is turned off by setting to MAX_INT</p></td></tr></tbody></table></div><p><br clear="none">An example that configures the transport with a maximum protocol detection time of 5 seconds:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto&quot; uri=&quot;auto://localhost:5671?protocolDetectionTimeOut=5000&quot;/&gt;]]></script>
-</div></div><h3 id="AUTO-ConfiguringWireFormats">Configuring Wire Formats</h3><p>OpenWire is the default Wire Format that ActiveMQ uses.&#160; It provides a highly efficent binary format for high speed messaging.&#160; OpenWire options can be configured on a JMS client's connection URI string or on a Brokers transport bind URI.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Parameter Prefix</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Applies the option to all wire formats.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.default.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Applies the option to the default format which is OpenWire</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p
 >wireFormat.stomp.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the STOMP wire format</span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span>wireFormat.amqp.</span></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the AMQP<span> wire format</span></span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.mqtt.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span>Applies the option to the MQTT<span> wire format</span></span></p></td></tr></tbody></table></div><p>&#160;</p><p>An example of a property that applies to all formats:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto&quot; uri=&quot;auto://localhost:5671?wireFormat.maxFrameSize=1000&quot;/&gt;]]></script>
-</div></div><p>&#160;</p><p>An example of a property only applied to OpenWire would be:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto&quot; uri=&quot;auto://localhost:5671?wireFormat.default.maxFrameSize=1000&quot;/&gt;]]></script>
-</div></div><h3 id="AUTO-ConfiguringEnabledWireProtocols">Configuring Enabled Wire Protocols</h3><p>By default all wire protocols are available. &#160;This can be configured to only enable certain formats by setting the property &#160;auto<code>.protocols.</code>&#160;</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>default</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables OpenWire</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>amqp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables AMQP format</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>stomp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables STOMP format</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p>mqtt</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables MQTT format</p></td></tr></tbody></table></div><p>&#160;</p><p>An example showing only OpenWire and STOMP enabled:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[     &lt;transportConnector name=&quot;auto&quot; uri=&quot;auto://localhost:5671?auto.protocols=default,stomp&quot;/&gt;]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><p>Starting with version 5.13.0, ActiveMQ supports wire format protocol detection. &#160; OpenWire, STOMP, AMQP, and MQTT can be automatically detected. &#160;This allows one transport to be shared for all 4 types of clients.</p><h3>Enabling AUTO over TCP</h3><p>To configure ActiveMQ auto wire format detection over a TCP connection use the&#160;<code>auto</code>&#160;transport prefix. For example, add the following transport configuration in your XML file:</p><structured-macro ac:macro-id="1b2eaa95-2237-4062-85d0-8f9e9566e4ce" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto" uri="auto://localhost:5671"/&gt;</plain-text-body></structured-macro><h3>Enabling AUTO over SSL</h3><p>To configure ActiveMQ auto wire format detection over an SSL connection use the&#160;<code>auto+ssl</code>&#160;transport prefix. For example, add the following transport configuration in your
  XML file:</p><structured-macro ac:macro-id="8fb394d9-660b-4afa-8246-ffef07fecf32" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto+ssl" uri="auto+ssl://localhost:5671"/&gt;
+</plain-text-body></structured-macro><ul><li>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</li></ul><h3>Enabling AUTO over NIO</h3><p>To configure ActiveMQ auto wire format detection over an NIO TCP connection use the&#160;<code>auto+nio</code>transport prefix. For example, add the following transport configuration in your XML file:</p><structured-macro ac:macro-id="d64978dd-16ac-4473-8c2d-e077b8e0e8da" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto+nio" uri="auto+nio://localhost:5671"/&gt;</plain-text-body></structured-macro><h3>Enabling AUTO over NIO SSL</h3><p>To configure ActiveMQ auto wire format detection over an NIO SSL connection use the&#160;<code>auto+nio+ssl</code>&#160;transport prefix. For example, add the following transport configuration in your XML file:</p><structur
 ed-macro ac:macro-id="45956eda-207b-439f-85f8-45fb5cd8b09d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto+nio+ssl" uri="auto+nio+ssl://localhost:5671"/&gt;</plain-text-body></structured-macro><h3>Configuring AUTO Transport Options</h3><p>There are some configuration options that can be set.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Parameter Name</p></th><th colspan="1" rowspan="1">Default Value</th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>protocolDetectionTimeOut</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The time before a connection times out in milliseconds. This is similar to maxInactivityDuration. If a client makes a connection to but doesn't send data or enough data for the protocol to be detected then the thread will sit and wait for more data to come in over the socket. This will let the broke
 r kill the connections if they do not complete the protocol initialization after a certain period of time. The default is 30 seconds. Set a default to &lt;= 0 to disable this.</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxConnectionThreadPoolSize</p></td><td colspan="1" rowspan="1"><p>MAX_INT</p></td><td colspan="1" rowspan="1"><p>This option allows the configuration of the maximum size of the thread pool that handles connection attempts. Lowering this number can help prevent the broker from running out of threads if there are many different clients attempting to connect at the same time. By default it is turned off by setting to MAX_INT</p></td></tr></tbody></table><p><br clear="none">An example that configures the transport with a maximum protocol detection time of 5 seconds:</p><structured-macro ac:macro-id="2f645d3e-dbec-42b6-b5ad-c6043c0d1d72" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto" 
 uri="auto://localhost:5671?protocolDetectionTimeOut=5000"/&gt;</plain-text-body></structured-macro><h3>Configuring Wire Formats</h3><p>OpenWire is the default Wire Format that ActiveMQ uses.&#160; It provides a highly efficent binary format for high speed messaging.&#160; OpenWire options can be configured on a JMS client's connection URI string or on a Brokers transport bind URI.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Parameter Prefix</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.</p></td><td colspan="1" rowspan="1"><p>Applies the option to all wire formats.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.default.</p></td><td colspan="1" rowspan="1"><p>Applies the option to the default format which is OpenWire</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.stomp.</p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the STOMP wire format</span></p></td></tr><tr><td colsp
 an="1" rowspan="1"><p><span>wireFormat.amqp.</span></p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the AMQP<span> wire format</span></span></p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.mqtt.</p></td><td colspan="1" rowspan="1"><p><span>Applies the option to the MQTT<span> wire format</span></span></p></td></tr></tbody></table><p>&#160;</p><p>An example of a property that applies to all formats:</p><structured-macro ac:macro-id="74a2a3a1-104d-440d-8639-b25f6efe924f" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto" uri="auto://localhost:5671?wireFormat.maxFrameSize=1000"/&gt;</plain-text-body></structured-macro><p>&#160;</p><p>An example of a property only applied to OpenWire would be:</p><structured-macro ac:macro-id="1098c525-7508-4399-954f-3b02ab7b1994" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnect
 or name="auto" uri="auto://localhost:5671?wireFormat.default.maxFrameSize=1000"/&gt;</plain-text-body></structured-macro><h3>Configuring Enabled Wire Protocols</h3><p>By default all wire protocols are available. &#160;This can be configured to only enable certain formats by setting the property &#160;auto<code>.protocols.</code>&#160;</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>default</p></td><td colspan="1" rowspan="1"><p>Enables OpenWire</p></td></tr><tr><td colspan="1" rowspan="1"><p>amqp</p></td><td colspan="1" rowspan="1"><p>Enables AMQP format</p></td></tr><tr><td colspan="1" rowspan="1"><p>stomp</p></td><td colspan="1" rowspan="1"><p>Enables STOMP format</p></td></tr><tr><td colspan="1" rowspan="1"><p>mqtt</p></td><td colspan="1" rowspan="1"><p>Enables MQTT format</p></td></tr></tbody></table><p>&#160;</p><p>An example showing only OpenWire and STOMP enabled:</p><
 structured-macro ac:macro-id="2cc70f63-d57a-470e-848d-b8a7d05d4d06" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>     &lt;transportConnector name="auto" uri="auto://localhost:5671?auto.protocols=default,stomp"/&gt;</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/axis-and-cxf-support.xml
----------------------------------------------------------------------
diff --git a/axis-and-cxf-support.xml b/axis-and-cxf-support.xml
index a7e3f56..eea2e9a 100644
--- a/axis-and-cxf-support.xml
+++ b/axis-and-cxf-support.xml
@@ -1,11 +1,11 @@
-<div class="wiki-content maincontent"><p>ActiveMQ supports both <a shape="rect" class="external-link" href="http://ws.apache.org/axis/">Apache Axis</a> and <a shape="rect" class="external-link" href="http://incubator.apache.org/cxf">Apache CXF</a> out of the box. </p>
+<div class="wiki-content maincontent"><p>ActiveMQ supports both <a shape="rect" href="http://ws.apache.org/axis/">Apache Axis</a> and <a shape="rect" href="http://incubator.apache.org/cxf">Apache CXF</a> out of the box. </p>
 
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Axis support is @deprecated</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Support for Axis is deprecated, and will be removed from ActiveMQ 5.8 onwards.</p></div></div>
+<structured-macro ac:macro-id="a9d73ce4-60e3-4b4f-8fb9-0ff12c48a100" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Axis support is @deprecated</parameter><rich-text-body>
+<p>Support for Axis is deprecated, and will be removed from ActiveMQ 5.8 onwards.</p></rich-text-body></structured-macro>
 
-<p>Just add the <a shape="rect" href="initial-configuration.xml">required jars</a> to your classpath and you should be able to use JMS transport support inside either web service framework to send and receive messages using ActiveMQ queues or topics for reliable messaging.</p>
+<p>Just add the <link><page ri:content-title="Initial Configuration"></page><link-body>required jars</link-body></link> to your classpath and you should be able to use JMS transport support inside either web service framework to send and receive messages using ActiveMQ queues or topics for reliable messaging.</p>
 
-<p>For an example of using the JMS transport with Axis, consult <a shape="rect" class="external-link" href="http://ws.apache.org/axis2/1_2/jms-transport.html">JMS Transport reference</a> or try looking at the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/samples/jms/">JMS example</a> that comes with bundled with Axis' binary and source downloads.</p>
+<p>For an example of using the JMS transport with Axis, consult <a shape="rect" href="http://ws.apache.org/axis2/1_2/jms-transport.html">JMS Transport reference</a> or try looking at the <a shape="rect" href="http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/samples/jms/">JMS example</a> that comes with bundled with Axis' binary and source downloads.</p>
 
-<p>For examples of using JMS transport with CXF, please see its <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/">JMS publish/subscriber sample</a> and the <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_queue/">JMS queue sample</a> available in the CXF source and binary downloads.</p></div>
+<p>For examples of using JMS transport with CXF, please see its <a shape="rect" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/">JMS publish/subscriber sample</a> and the <a shape="rect" href="http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_queue/">JMS queue sample</a> available in the CXF source and binary downloads.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/banner.xml
----------------------------------------------------------------------
diff --git a/banner.xml b/banner.xml
index 0ba55b7..224ccbc 100644
--- a/banner.xml
+++ b/banner.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><div id="asf_logo">
-	<div id="activemq_logo">
-     <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
-	</div>
-</div>
-</div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="b53c059e-781d-4916-b99a-5bccad111511" ac:name="html" ac:schema-version="1"><parameter ac:name="output">html</parameter><parameter ac:name="atlassian-macro-output-type">INLINE</parameter><parameter ac:name="noPanel">true</parameter><plain-text-body>&lt;div id="asf_logo"&gt;
+	&lt;div id="activemq_logo"&gt;
+     &lt;a style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker"&gt;ActiveMQ&lt;/a&gt;
+            &lt;a style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation"&gt;ASF&lt;/a&gt;
+	&lt;/div&gt;
+&lt;/div&gt;
+</plain-text-body></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/becoming-a-committer.xml
----------------------------------------------------------------------
diff --git a/becoming-a-committer.xml b/becoming-a-committer.xml
index 84ee20d..f4328d7 100644
--- a/becoming-a-committer.xml
+++ b/becoming-a-committer.xml
@@ -1,4 +1,2 @@
-<div class="wiki-content maincontent"><p>This page details how to become a committer.</p><h3 id="Becomingacommitter-Howtobecomeacommitter">How to become a committer</h3><p>First of all you need to get involved and <a shape="rect" href="contributing.xml">Contribute</a> via the mail list, forums, edit the documention, work on the issue tracker and submit patches.</p><p>Once you're contributing and your work is good, one of our <a shape="rect" href="team.xml">Team</a> may invite you to be a committer (after we've called a vote). When that happens, if you accept, the following process kicks into place...</p><p>Note that becoming a committer is not just about submitting some patches; its also about helping out on the development and user <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>, helping with documentation and the issue tracker.</p><h3 id="Becomingacommitter-Becomingacommittersteps">Becoming a committer steps</h3><ul><li>Download and print the Apache Contributor 
 License Agreement from <a shape="rect" class="external-link" href="http://www.apache.org/dev/new-committers-guide.html">here</a>. You need to sign it and fax it to Apache. In the past I've found its often faster to also post it via snail mail <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li><li>wait for your name to appear on the list of <a shape="rect" class="external-link" href="http://people.apache.org/~jim/committers.html#unlistedclas">received CLAs</a></li><li>once thats done let us know and we can apply to Apache Infrastructure to have your account created; we'll also need to know<ul><li>your full name</li><li>your preferred email address</li><li>your preferred unix account name</li></ul></li></ul><h3 id="Becomingacommitter-GettingstartedatApache">Getting started at Apache</h3><p>Firstly add yourself to the <a sh
 ape="rect" href="team.xml">Team</a> page</p><p>Now go read the instructions on the <a shape="rect" class="external-link" href="http://www.apache.org/dev/new-committers-guide.html">new committers guide</a>. Its also worth viewing <a shape="rect" class="external-link" href="http://www.apache.org/dev">http://www.apache.org/dev</a>.</p><h3 id="Becomingacommitter-EnablingyourGITaccount">Enabling your GIT account</h3><p>Once you've got your Apache account working you need to enable GIT access<strong>. </strong>Add your SSH Key at <a shape="rect" class="external-link" href="https://id.apache.org/">https://id.apache.org/</a><strong><br clear="none"></strong></p><h3 id="Becomingacommitter-ConfiguringGIT">Configuring GIT</h3><p>Configure GIT to use unix line endings.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[git config --add core.autocrlf input]]></script>
-</div></div><h3 id="Becomingacommitter-GettingKarmainJIRAandConfluence">Getting Karma in JIRA and Confluence</h3><p>Mail the dev list and ask for karma for JIRA / Confluence giving them details of your username you used to register with them both. We can then grant the necessary karma so you can start grabbing JIRA issues or editing the wiki</p></div>
+<div class="wiki-content maincontent"><p>This page details how to become a committer.</p><h3>How to become a committer</h3><p>First of all you need to get involved and <link><page ri:content-title="Contributing"></page><plain-text-link-body>Contribute</plain-text-link-body></link> via the mail list, forums, edit the documention, work on the issue tracker and submit patches.</p><p>Once you're contributing and your work is good, one of our <link><page ri:content-title="Team"></page></link> may invite you to be a committer (after we've called a vote). When that happens, if you accept, the following process kicks into place...</p><p>Note that becoming a committer is not just about submitting some patches; its also about helping out on the development and user <link><page ri:content-title="Discussion Forums"></page></link>, helping with documentation and the issue tracker.</p><h3>Becoming a committer steps</h3><ul><li>Download and print the Apache Contributor License Agreement from <a sh
 ape="rect" href="http://www.apache.org/dev/new-committers-guide.html">here</a>. You need to sign it and fax it to Apache. In the past I've found its often faster to also post it via snail mail <emoticon ac:name="smile"></emoticon></li><li>wait for your name to appear on the list of <a shape="rect" href="http://people.apache.org/~jim/committers.html#unlistedclas">received CLAs</a></li><li>once thats done let us know and we can apply to Apache Infrastructure to have your account created; we'll also need to know<ul><li>your full name</li><li>your preferred email address</li><li>your preferred unix account name</li></ul></li></ul><h3>Getting started at Apache</h3><p>Firstly add yourself to the <link><page ri:content-title="Team"></page></link> page</p><p>Now go read the instructions on the <a shape="rect" href="http://www.apache.org/dev/new-committers-guide.html">new committers guide</a>. Its also worth viewing <a shape="rect" class="external-link" href="http://www.apache.org/dev">http:
 //www.apache.org/dev</a>.</p><h3>Enabling your GIT account</h3><p>Once you've got your Apache account working you need to enable GIT access<strong>. </strong>Add your SSH Key at <a shape="rect" href="https://id.apache.org/">https://id.apache.org/</a><strong><br clear="none"></strong></p><h3>Configuring GIT</h3><p>Configure GIT to use unix line endings.</p><structured-macro ac:macro-id="c4df4af7-2b1f-45e3-b20f-ca1ed40f7d24" ac:name="code" ac:schema-version="1"><plain-text-body>git config --add core.autocrlf input</plain-text-body></structured-macro><h3>Getting Karma in JIRA and Confluence</h3><p>Mail the dev list and ask for karma for JIRA / Confluence giving them details of your username you used to register with them both. We can then grant the necessary karma so you can start grabbing JIRA issues or editing the wiki</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/benchmark-tests.xml
----------------------------------------------------------------------
diff --git a/benchmark-tests.xml b/benchmark-tests.xml
index 872a089..718448d 100644
--- a/benchmark-tests.xml
+++ b/benchmark-tests.xml
@@ -1,9 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="BenchmarkTests-ActiveMQMavenPerformancetestplugin.">ActiveMQ Maven Performance test plugin.</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ Maven Performance test plugin.</h2>
 
-<p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself.  To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin.  The plugin is further documented <a shape="rect" href="activemq-performance-module-users-manual.xml">here</a>.</p>
+<p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself.  To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin.  The plugin is further documented <link><page ri:content-title="ActiveMQ Performance Module Users Manual"></page><link-body>here</link-body></link>.</p>
 
-<h2 id="BenchmarkTests-Third-PartyJMSperformancetests">Third-Party JMS performance tests</h2>
+<h2>Third-Party JMS performance tests</h2>
 
 <p>There are a number of third-party JMS performance test tools that can be used to measure the performance of various features of brokers and compare them.</p>
-<ul><li><a shape="rect" class="external-link" href="http://jmeter.apache.org/">Apache JMeter</a></li><li><a shape="rect" class="external-link" href="https://github.com/chirino/jms-benchmark" rel="nofollow">jms-benchmark</a></li></ul></div>
+<ul><li><a shape="rect" href="http://jmeter.apache.org/">Apache JMeter</a></li><li><a shape="rect" href="https://github.com/chirino/jms-benchmark">jms-benchmark</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/blazeds.xml
----------------------------------------------------------------------
diff --git a/blazeds.xml b/blazeds.xml
index e619dfe..7d1ea27 100644
--- a/blazeds.xml
+++ b/blazeds.xml
@@ -1,25 +1,24 @@
-<div class="wiki-content maincontent"><h2 id="BlazeDS-BlazeDS">BlazeDS</h2>
+<div class="wiki-content maincontent"><h2>BlazeDS</h2>
 
-<p>You may also want to check out the <a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html" rel="nofollow">Simplified BlazeDS and JMS article</a> by <a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/" rel="nofollow">Michael Martin</a>.</p>
+<p>You may also want to check out the <a shape="rect" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html">Simplified BlazeDS and JMS article</a> by <a shape="rect" href="http://mmartinsoftware.blogspot.com/">Michael Martin</a>.</p>
 
-<p>Using the dynamicQueues feature of the <a shape="rect" href="jndi-support.xml">JNDI Support</a> Ryan Gardner created thisworking BlazeDS messaging-config.xml file:</p>
+<p>Using the dynamicQueues feature of the <link><page ri:content-title="JNDI Support"></page></link> Ryan Gardner created thisworking BlazeDS messaging-config.xml file:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;service id=&quot;message-service&quot; class=&quot;flex.messaging.services.MessageService&quot;&gt;
+<structured-macro ac:macro-id="b238623f-c9bb-49a6-a5c5-a5549d2610b9" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;service id="message-service" class="flex.messaging.services.MessageService"&gt;
 
    &lt;adapters&gt;
-       &lt;adapter-definition id=&quot;actionscript&quot; class=&quot;flex.messaging.services.messaging.adapters.ActionScriptAdapter&quot; default=&quot;true&quot; /&gt;
-       &lt;adapter-definition id=&quot;jms&quot; class=&quot;flex.messaging.services.messaging.adapters.JMSAdapter&quot;/&gt;
+       &lt;adapter-definition id="actionscript" class="flex.messaging.services.messaging.adapters.ActionScriptAdapter" default="true" /&gt;
+       &lt;adapter-definition id="jms" class="flex.messaging.services.messaging.adapters.JMSAdapter"/&gt;
    &lt;/adapters&gt;
 
    &lt;default-channels&gt;
-               &lt;channel ref=&quot;my-streaming-amf&quot;/&gt;
-               &lt;channel ref=&quot;my-polling-amf&quot;/&gt;
+               &lt;channel ref="my-streaming-amf"/&gt;
+               &lt;channel ref="my-polling-amf"/&gt;
    &lt;/default-channels&gt;
 
-  &lt;destination id=&quot;inbound-sms-destination&quot;&gt;
+  &lt;destination id="inbound-sms-destination"&gt;
 
    &lt;properties&gt;
    &lt;jms&gt;
@@ -44,9 +43,8 @@
      &lt;/initial-context-environment&gt;
    &lt;/jms&gt;
    &lt;/properties&gt;
-   &lt;adapter ref=&quot;jms&quot;/&gt;
+   &lt;adapter ref="jms"/&gt;
    &lt;/destination&gt;
 &lt;/service&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/blob-messages.xml
----------------------------------------------------------------------
diff --git a/blob-messages.xml b/blob-messages.xml
index 8530554..7075369 100644
--- a/blob-messages.xml
+++ b/blob-messages.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="BlobMessages-BlobMessages">Blob Messages</h2>
+<div class="wiki-content maincontent"><h2>Blob Messages</h2>
 
 <p>A common requirement these days is to send around massive files for processing by consumers. Folks want to take advantage of the message broker's features such as reliable, transactional load balancing of queues with smart routing but still manage to deal with huge logical files.</p>
 
@@ -6,42 +6,35 @@
 
 <p>There are now new createBlobMessage() methods on the ActiveMQSession that you can use for sending BLOBs. </p>
 
-<h3 id="BlobMessages-SendingBlobMessages">Sending BlobMessages</h3>
+<h3>Sending BlobMessages</h3>
 
 <p>You can send a URL around the JMS network, such as a file or URL which exists on some shared file system or web server using the following code</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-BlobMessage message = session.createBlobMessage(new URL(&quot;http://some.shared.site.com&quot;);
+<structured-macro ac:macro-id="6be5c968-e508-407f-83e5-5e256a77d939" ac:name="code" ac:schema-version="1"><plain-text-body>
+BlobMessage message = session.createBlobMessage(new URL("http://some.shared.site.com");
 producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Or if you are creating files or streams dynamically on the client you may want to upload the file to the broker or some server (Jetty, FTP, WebDav or whatever). In which case you'd use one of the following methods</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f990ea28-b4c0-4468-b9ba-5648214461d4" ac:name="code" ac:schema-version="1"><plain-text-body>
 // lets use a local file
-BlobMessage message = session.createBlobMessage(new File(&quot;/foo/bar&quot;);
+BlobMessage message = session.createBlobMessage(new File("/foo/bar");
 producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="a43a4699-551e-41b2-a013-f580e8ba0894" ac:name="code" ac:schema-version="1"><plain-text-body>
 // lets use a stream
 InputStream in = ...;
 BlobMessage message = session.createBlobMessage(in);
 producer.send(message);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="BlobMessages-ReceivingBlobMessages">Receiving BlobMessages</h3>
+<h3>Receiving BlobMessages</h3>
 
-<p>A <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/BlobMessage.html">BlobMessage</a> is a regular JMS message so it can be received just like any other message...</p>
+<p>A <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/BlobMessage.html">BlobMessage</a> is a regular JMS message so it can be received just like any other message...</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="19b81f57-789a-4d1a-882a-d0f3ebe734be" ac:name="code" ac:schema-version="1"><plain-text-body>
 public class MyListener implements MessageListener {
   public void onMessage(Message message) {
     if (message instanceof BlobMessage) {
@@ -52,22 +45,20 @@ public class MyListener implements MessageListener {
     }
   }
 }
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<h3 id="BlobMessages-ConfiguringtheBLOBTransferPolicy">Configuring the BLOB Transfer Policy</h3>
+<h3>Configuring the BLOB Transfer Policy</h3>
 
 <p>You can explicitly configure the BlobTransferPolicy on an ActiveMQConnectionFactory, ActiveMQConnection or ActiveMQSession. Typically its done on the factory either via Java code or Spring.</p>
 
-<p>You can use the <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a> to configure these things via a URI.</p>
+<p>You can use the <link><page ri:content-title="Connection Configuration URI"></page></link> to configure these things via a URI.</p>
 
 <p>For example you can connect to a broker also specifying the uploadUrl to use via</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="c3816021-f3f7-419b-b3d9-65a52c18ef59" ac:name="code" ac:schema-version="1"><plain-text-body>
 tcp://localhost:61616?jms.blobTransferPolicy.uploadUrl=http://foo.com
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/board-reports.xml
----------------------------------------------------------------------
diff --git a/board-reports.xml b/board-reports.xml
index 93656c6..591ed09 100644
--- a/board-reports.xml
+++ b/board-reports.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="BoardReports-BoardReports">Board Reports</h2>
+<div class="wiki-content maincontent"><h2>Board Reports</h2>
 
 <p>The following are the Apache Software Foundation Board Reports.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="2007-april.xml">2007 April</a></li></ul></div>
+<structured-macro ac:macro-id="7dc06fda-5630-4ef7-ba59-7c2e26f9b241" ac:name="children" ac:schema-version="1"><parameter ac:name="">all</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/books.xml
----------------------------------------------------------------------
diff --git a/books.xml b/books.xml
index 2594158..584bc3e 100644
--- a/books.xml
+++ b/books.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="Books-Books">Books</h1><p>This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>.</p><ul><li><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ in Action</a></li><li><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow">Instant Apache ActiveMQ Messaging Application Development</a></li><li><a shape="rect" class="external-link" href="http://shop.oreilly.com/product/0636920032366.do" rel="nofollow">Mobile and Web Messaging</a></li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">Apache ActiveMQ Reference Guide</a></li></ul><h3 id="Books-ActiveMQinAction">ActiveMQ in Action</h3><p><a shape="rect" class="external-link" href="http://bit.ly/2j
 e6cQ" rel="nofollow">ActiveMQ in Action</a> by <a shape="rect" class="external-link" href="http://bruceblog.org/" rel="nofollow">Bruce Snyder</a>, <a shape="rect" class="external-link" href="http://www.nighttale.net/" rel="nofollow">Dejan Bosanac</a> and <a shape="rect" class="external-link" href="http://rajdavies.blogspot.com/" rel="nofollow">Rob Davies</a>. Published by <a shape="rect" class="external-link" href="http://www.manning.com" rel="nofollow">Manning</a>.</p><p><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span></a></p><p>Apache ActiveMQ in Action is a thorough, practical guide to implementing message-oriented systems in Java using ActiveMQ. The book lays out the core of ActiveMQ in clear language, sta
 rting with the anatomy of a JMS message and moving quickly through connectors, message persistence, authentication and authorization. With the basics well in hand, you move into interesting examples of ActiveMQ at work, following a running Stock Portfolio application. You'll integrate ActiveMQ with containers like Geronimo and JBoss and learn to tie into popular Java-based technologies like Spring Framework.</p><p>Along the way, you'll pick up best practices forged out of the deep experience the authors bring to the book. You'll learn to integrate with non-Java technologies and explore advanced topics like broker topologies and configuration and performance tuning.</p><h3 id="Books-InstantApacheActiveMQMessagingApplicationDevelopment">Instant Apache ActiveMQ Messaging Application Development</h3><p><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow">Instant Apache ActiveMQ Messaging Application Development</a> by <a shape="rect" class="external-link" href
 ="http://timbish.blogspot.com/" rel="nofollow">Timothy Bish</a>. Published by <a shape="rect" class="external-link" href="http://www.packtpub.com/" rel="nofollow">Packt Publishing</a>.</p><p><a shape="rect" class="external-link" href="http://goo.gl/RFltj" rel="nofollow"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg" data-image-src="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg"></span></a></p><p>Instant ActiveMQ Application Development How-to is for the developers who are new to Java Message Service application development or new to JMS development using ActiveMQ. Readers will come away ready to solve complicated messaging related problems using the JMS API and ActiveMQ.</p><p>Filled with practical, step-by-step instructions and clear explanations for the most impo
 rtant and useful tasks.This is a Packt Instant How-to guide, which provides concise and practical recipes to help you get started writing applications with ActiveMQ using practical examples.</p><h3 id="Books-MobileandWebMessaging">Mobile and Web Messaging</h3><p><a shape="rect" class="external-link" href="http://shop.oreilly.com/product/0636920032366.do" rel="nofollow">Messaging Protocols for Web and Mobile Devices by Jeff Mesnil. Published by OReilly.</a></p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif" data-image-src="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif"></span></p><p>Learn how to use messaging technologies to build responsive and resilient applications for mobile devices and web browsers. With this hands-on guide, you&#8217;ll use the STOMP and MQTT messaging protocols to write iOS and web applications capable of sendi
 ng and receiving GPS and device sensor data, text messages, and alerts.</p><h3 id="Books-ApacheActiveMQReferenceGuideKit">Apache ActiveMQ Reference Guide Kit</h3><p>The TTM's "<a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">Apache ActiveMQ Reference Guide</a>" (PDF book) provides information to learn how to implement, deploy, administer, and tune Apache ActiveMQ. The Reference Guide includes details on how to work with ActiveMQ components, connectors, client/broker configuration, master/slave configuration, administration, logging, performance tuning and advanced features.</p></div>
+<div class="wiki-content maincontent"><h1>Books</h1><p>This page lists the known books about Apache ActiveMQ. If you happen to know a book which is not listed then please contact us, for example using the <link><page ri:content-title="Mailing Lists"></page></link>.</p><ul><li><a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ in Action</a></li><li><a shape="rect" href="http://goo.gl/RFltj">Instant Apache ActiveMQ Messaging Application Development</a></li><li><a shape="rect" href="http://shop.oreilly.com/product/0636920032366.do">Mobile and Web Messaging</a></li><li><a shape="rect" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php">Apache ActiveMQ Reference Guide</a></li></ul><h3>ActiveMQ in Action</h3><p><a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ in Action</a> by <a shape="rect" href="http://bruceblog.org/">Bruce Snyder</a>, <a shape="rect" href="http://www.nighttale.net/">Dejan Bosanac</a> and <a shape="rect" href="http://rajdavies.blogspot.
 com/">Rob Davies</a>. Published by <a shape="rect" href="http://www.manning.com">Manning</a>.</p><p><a shape="rect" href="http://bit.ly/2je6cQ"><image><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image></a></p><p>Apache ActiveMQ in Action is a thorough, practical guide to implementing message-oriented systems in Java using ActiveMQ. The book lays out the core of ActiveMQ in clear language, starting with the anatomy of a JMS message and moving quickly through connectors, message persistence, authentication and authorization. With the basics well in hand, you move into interesting examples of ActiveMQ at work, following a running Stock Portfolio application. You'll integrate ActiveMQ with containers like Geronimo and JBoss and learn to tie into popular Java-based technologies like Spring Framework.</p><p>Along the way, you'll pick up best practices forged out of the deep experience the authors bring to the book. You'll learn to integrate with non-Java tech
 nologies and explore advanced topics like broker topologies and configuration and performance tuning.</p><h3>Instant Apache ActiveMQ Messaging Application Development</h3><p><a shape="rect" href="http://goo.gl/RFltj">Instant Apache ActiveMQ Messaging Application Development</a> by <a shape="rect" href="http://timbish.blogspot.com/">Timothy Bish</a>. Published by <a shape="rect" href="http://www.packtpub.com/">Packt Publishing</a>.</p><p><a shape="rect" href="http://goo.gl/RFltj"><image><url ri:value="http://dgdsbygo8mp3h.cloudfront.net/sites/default/files/imagecache/productview_larger/9413OS.jpg"></url></image></a></p><p>Instant ActiveMQ Application Development How-to is for the developers who are new to Java Message Service application development or new to JMS development using ActiveMQ. Readers will come away ready to solve complicated messaging related problems using the JMS API and ActiveMQ.</p><p>Filled with practical, step-by-step instructions and clear explanations for the m
 ost important and useful tasks.This is a Packt Instant How-to guide, which provides concise and practical recipes to help you get started writing applications with ActiveMQ using practical examples.</p><h3>Mobile and Web Messaging</h3><p><a shape="rect" href="http://shop.oreilly.com/product/0636920032366.do">Messaging Protocols for Web and Mobile Devices by Jeff Mesnil. Published by OReilly.</a></p><p><image><url ri:value="http://akamaicovers.oreilly.com/images/0636920032366/cat.gif"></url></image></p><p>Learn how to use messaging technologies to build responsive and resilient applications for mobile devices and web browsers. With this hands-on guide, you&#8217;ll use the STOMP and MQTT messaging protocols to write iOS and web applications capable of sending and receiving GPS and device sensor data, text messages, and alerts.</p><h3>Apache ActiveMQ Reference Guide Kit</h3><p>The TTM's "<a shape="rect" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php">Ap
 ache ActiveMQ Reference Guide</a>" (PDF book) provides information to learn how to implement, deploy, administer, and tune Apache ActiveMQ. The Reference Guide includes details on how to work with ActiveMQ components, connectors, client/broker configuration, master/slave configuration, administration, logging, performance tuning and advanced features.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broadcasting.xml
----------------------------------------------------------------------
diff --git a/broadcasting.xml b/broadcasting.xml
index 3dcfb57..7d9c98b 100644
--- a/broadcasting.xml
+++ b/broadcasting.xml
@@ -5,8 +5,7 @@ Using the basic building block of a Channel, there exists a functional hierarchy
 
 <p>To use a BlazeChannel create one from the a factory:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f30411e7-098a-436f-aee0-aef2d1b9764d" ac:name="code" ac:schema-version="1"><plain-text-body>
 import org.apache.activeblaze.*;
 ...
 BlazeChannelFactory factory = new BlazeChannelFactory();
@@ -14,18 +13,16 @@ BlazeChannel sender = factory.createChannel();
 //start the channel and send a message
 sender.start();
 
-String destination = &quot;foo.bar&quot;;
-BlazeMessage msg = new BlazeMessage(&quot;test payload&quot;);
+String destination = "foo.bar";
+BlazeMessage msg = new BlazeMessage("test payload");
 sender.broadcast(destination,msg);
 //shutdown the sender
 sender.shutDown();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>You can similarly subscribe to Topic messages by using a listener</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f52abf76-f5a1-49db-b7a5-88dcf8f9b651" ac:name="code" ac:schema-version="1"><plain-text-body>
 BlazeChannel receiver = factory.createChannel();
 receiver.start();
 
@@ -33,11 +30,10 @@ receiver.start();
 
 receiver.addBlazeTopicMessageListener(destination, new BlazeMessageListener() {
             public void onMessage(BlazeMessage msg) {
-                System.out.println(&quot;Got a msg: &quot; + msg);
+                System.out.println("Got a msg: " + msg);
             }
         });
 
 receiver.shutDown();
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-camel-component.xml
----------------------------------------------------------------------
diff --git a/broker-camel-component.xml b/broker-camel-component.xml
index aafa00c..42e61d5 100644
--- a/broker-camel-component.xml
+++ b/broker-camel-component.xml
@@ -1,35 +1,31 @@
-<div class="wiki-content maincontent"><h2 id="BrokerCamelComponent-BrokerCamelComponent">Broker Camel Component</h2><p><strong>Available as of ActiveMQ 5.9</strong></p><p>Embedding Apache Camel inside the ActiveMQ broker provides great flexibility for extending the message broker with the integration power of Camel. Apache Camel routes also benefit in that you can avoid the serialization and network costs of connecting to ActiveMQ remotely - if you use the <a shape="rect" class="external-link" href="http://camel.apache.org/activemq.html">activemq component</a>.</p><p>If however, you want to change the behavior of messages flowing through the ActiveMQ message broker itself you will be limited to the shipped set of ActiveMQ broker <a shape="rect" class="external-link" href="http://activemq.apache.org/interceptors.html">Interceptors</a> - or develop your own <a shape="rect" class="external-link" href="http://activemq.apache.org/developing-plugins.html">Broker plugin</a> and then introd
 uce that as a jar on to the class path for the ActiveMQ broker. The&#160;<strong><code>broker</code></strong> Camel component makes this even easier. It intercepts messages as they move through the broker itself, allowing them to be modified and manipulated before they are persisted to the message store or delivered to end consumers.</p><p>For example <a shape="rect" class="external-link" href="http://activemq.apache.org/how-should-i-package-applications-using-camel-and-activemq.html">by defining a CamelContext to run inside the broker's JVM </a>the&#160;<strong><code>broker</code></strong> component can intercept all messages published to a Topic, say, and publish them to a Queue instead, changing their priority along the way:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;route id=&quot;setPriority&quot;&gt;
-   &lt;from uri=&quot;broker:topic:test.broker.&gt;&quot;/&gt;
-      &lt;setHeader headerName=&quot;JMSPriority&quot;&gt;
+<div class="wiki-content maincontent"><h2>Broker Camel Component</h2><p><strong>Available as of ActiveMQ 5.9</strong></p><p>Embedding Apache Camel inside the ActiveMQ broker provides great flexibility for extending the message broker with the integration power of Camel. Apache Camel routes also benefit in that you can avoid the serialization and network costs of connecting to ActiveMQ remotely - if you use the <a shape="rect" href="http://camel.apache.org/activemq.html">activemq component</a>.</p><p>If however, you want to change the behavior of messages flowing through the ActiveMQ message broker itself you will be limited to the shipped set of ActiveMQ broker <a shape="rect" href="http://activemq.apache.org/interceptors.html">Interceptors</a> - or develop your own <a shape="rect" href="http://activemq.apache.org/developing-plugins.html">Broker plugin</a> and then introduce that as a jar on to the class path for the ActiveMQ broker. The&#160;<strong><code>broker</code></strong> Cam
 el component makes this even easier. It intercepts messages as they move through the broker itself, allowing them to be modified and manipulated before they are persisted to the message store or delivered to end consumers.</p><p>For example <a shape="rect" href="http://activemq.apache.org/how-should-i-package-applications-using-camel-and-activemq.html">by defining a CamelContext to run inside the broker's JVM </a>the&#160;<strong><code>broker</code></strong> component can intercept all messages published to a Topic, say, and publish them to a Queue instead, changing their priority along the way:</p><structured-macro ac:macro-id="46808b45-4f42-4c77-8d11-b064dc9fa99c" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;route id="setPriority"&gt;
+   &lt;from uri="broker:topic:test.broker.&gt;"/&gt;
+      &lt;setHeader headerName="JMSPriority"&gt;
          &lt;constant&gt;9&lt;/constant&gt;
       &lt;/setHeader&gt;
-   &lt;to uri=&quot;broker:queue:test.broker.component.queue&quot;/&gt;
+   &lt;to uri="broker:queue:test.broker.component.queue"/&gt;
 &lt;/route&gt;
-]]></script>
-</div></div><p>Notes:</p><ul><li>A broker component only adds an intercept into the broker if its started - so the broker component will not add any overhead to the running broker until its used - and then the overhead will be trivial.</li><li>Messages are intercepted by the broker component when they have been received by the broker - but before they are processed (persisted or routed to a destination).</li><li>The&#160;<strong><code>IN</code></strong> message on the Exchange is a <strong><code>CamelMessage</code></strong>, but also a JMS Message (messages routed through ActiveMQ from STOMP/MQTT/AMQP etc. are always translated into JMS messages).</li><li>W<a shape="rect" class="external-link" href="http://activemq.apache.org/wildcards.html">ildcards</a> can be used on a destination to intercept messages from destinations matching the wildcard.</li><li>After the intercept, you have to explicitly send the message back to the broker component - this allows you to either drop select me
 ssages (by not sending) - or, like in the above case - re-route the message to a different destination.<br clear="none"><br clear="none"></li></ul><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>There is one deliberate caveat though, only intercepted messages can be sent to a&#160;<strong><code>broker</code></strong> component. For example, routing a Camel message from another Component e.g. <strong><code>file</code></strong>, will result in an error.</p></div></div><p>Extra classes that have been added to the&#160;<strong><code>activemq-broker</code></strong> package to support the&#160;<strong><code>broker</code></strong> component. They allow the state of the running broker to be interrogated without using JMX. These classes are:</p><ul><li><a shape="rect" class="external-link" href="http://activemq.apac
 he.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/MessageBrokerView.html">org.apache.activemq.broker.view.MessageBrokerView</a> - provides methods to retrieve statistics on a the broker</li><li>From the&#160;<strong><code>org.apache.activemq.broker.view.MessageBrokerView</code></strong> - you can retrieve a <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/BrokerDestinationView.html">org.apache.activemq.broker.view.BrokerDestinationView</a> for a particular destination.</li></ul><h3 id="BrokerCamelComponent-Example">Example</h3><p>How to route messages when a destination's queue depth has reached a certain limit:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;camelContext id=&quot;camel&quot; trace=&quot;false&quot; xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
-  &lt;route id=&quot;routeAboveQueueLimitTest&quot;&gt;
-    &lt;from uri=&quot;broker:queue:test.broker.queue&quot;/&gt;
+</plain-text-body></structured-macro><p>Notes:</p><ul><li>A broker component only adds an intercept into the broker if its started - so the broker component will not add any overhead to the running broker until its used - and then the overhead will be trivial.</li><li>Messages are intercepted by the broker component when they have been received by the broker - but before they are processed (persisted or routed to a destination).</li><li>The&#160;<strong><code>IN</code></strong> message on the Exchange is a <strong><code>CamelMessage</code></strong>, but also a JMS Message (messages routed through ActiveMQ from STOMP/MQTT/AMQP etc. are always translated into JMS messages).</li><li>W<a shape="rect" href="http://activemq.apache.org/wildcards.html">ildcards</a> can be used on a destination to intercept messages from destinations matching the wildcard.</li><li>After the intercept, you have to explicitly send the message back to the broker component - this allows you to either drop select
  messages (by not sending) - or, like in the above case - re-route the message to a different destination.<br clear="none"><br clear="none"></li></ul><structured-macro ac:macro-id="7fd157e0-4ac6-4027-9539-96ed3ed4828e" ac:name="warning" ac:schema-version="1"><rich-text-body><p>There is one deliberate caveat though, only intercepted messages can be sent to a&#160;<strong><code>broker</code></strong> component. For example, routing a Camel message from another Component e.g. <strong><code>file</code></strong>, will result in an error.</p></rich-text-body></structured-macro><p>Extra classes that have been added to the&#160;<strong><code>activemq-broker</code></strong> package to support the&#160;<strong><code>broker</code></strong> component. They allow the state of the running broker to be interrogated without using JMX. These classes are:</p><ul><li><a shape="rect" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/MessageBrokerView.html">org.apache.
 activemq.broker.view.MessageBrokerView</a> - provides methods to retrieve statistics on a the broker</li><li>From the&#160;<strong><code>org.apache.activemq.broker.view.MessageBrokerView</code></strong> - you can retrieve a <a shape="rect" href="http://activemq.apache.org/maven/5.9.0/apidocs/org/apache/activemq/broker/view/BrokerDestinationView.html">org.apache.activemq.broker.view.BrokerDestinationView</a> for a particular destination.</li></ul><h3>Example</h3><p>How to route messages when a destination's queue depth has reached a certain limit:</p><structured-macro ac:macro-id="15dd6e15-edd6-4a5e-9a16-c0faf86e2c2a" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;camelContext id="camel" trace="false" xmlns="http://camel.apache.org/schema/spring"&gt;
+  &lt;route id="routeAboveQueueLimitTest"&gt;
+    &lt;from uri="broker:queue:test.broker.queue"/&gt;
     &lt;choice&gt;
       &lt;when&gt;
         &lt;spel&gt;#{@destinationView.queueSize &gt;= 100}&lt;/spel&gt;
-        &lt;to uri=&quot;broker:queue:test.broker.processLater&quot;/&gt;
+        &lt;to uri="broker:queue:test.broker.processLater"/&gt;
       &lt;/when&gt;
       &lt;otherwise&gt;
-        &lt;to uri=&quot;broker:queue:test.broker.queue&quot;/&gt;
+        &lt;to uri="broker:queue:test.broker.queue"/&gt;
       &lt;/otherwise&gt;
     &lt;/choice&gt;
   &lt;/route&gt;
 &lt;/camelContext&gt;
 
-&lt;bean id=&quot;brokerView&quot; class=&quot;org.apache.activemq.broker.view.MessageBrokerView&quot;&gt;
-  &lt;constructor-arg value=&quot;testBroker&quot;/&gt;
+&lt;bean id="brokerView" class="org.apache.activemq.broker.view.MessageBrokerView"&gt;
+  &lt;constructor-arg value="testBroker"/&gt;
 &lt;/bean&gt;
 
-&lt;bean id=&quot;destinationView&quot; factory-bean=&quot;brokerView&quot; factory-method=&quot;getDestinationView&quot;&gt;
-  &lt;constructor-arg value=&quot;test.broker.component.route&quot;/&gt;
+&lt;bean id="destinationView" factory-bean="brokerView" factory-method="getDestinationView"&gt;
+  &lt;constructor-arg value="test.broker.component.route"/&gt;
 &lt;/bean&gt;
-]]></script>
-</div></div><p>This is using the Camel Message Router pattern. Note the use of the Spring expression language&#160;<strong><code>spel</code></strong> in the&#160;<strong><code>when</code></strong> clause.</p><p>&#160;</p></div>
+</plain-text-body></structured-macro><p>This is using the Camel Message Router pattern. Note the use of the Spring expression language&#160;<strong><code>spel</code></strong> in the&#160;<strong><code>when</code></strong> clause.</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-configuration-uri.xml
----------------------------------------------------------------------
diff --git a/broker-configuration-uri.xml b/broker-configuration-uri.xml
index db1e2d7..aa7d8ce 100644
--- a/broker-configuration-uri.xml
+++ b/broker-configuration-uri.xml
@@ -1,12 +1,12 @@
-<div class="wiki-content maincontent"><h3 id="BrokerConfigurationURI-Overview">Overview</h3>
+<div class="wiki-content maincontent"><h3>Overview</h3>
 
 <p>An ActiveMQ broker can be extensivly configured using a single configuration URI. The following URI schemes are supported</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Scheme</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-xbean-uri.xml">Broker XBean URI</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker using an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> from an XML file which is on the classpath (or in 4.2 onwards can be on the file system or an external URL) which uses Spring and xbean-spring to configure the broker </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> broker: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-uri.xml">Broker URI</a> </p></td><
 td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker explicitly using a URI syntax </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> properties: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="broker-properties-uri.xml">Broker Properties URI</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Configures the broker explicitly using a URI syntax </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Scheme</p></th><th colspan="1" rowspan="1"><p>Link</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p> xbean: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="Broker XBean URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker using an <link><page ri:content-title="Xml Configuration"></page></link> from an XML file which is on the classpath (or in 4.2 onwards can be on the file system or an external URL) which uses Spring and xbean-spring to configure the broker </p></td></tr><tr><td colspan="1" rowspan="1"><p> broker: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="Broker URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker explicitly using a URI syntax </p></td></tr><tr><td colspan="1" rowspan="1"><p> properties: </p></td><td colspan="1" rowspan="1"><p> <link><page ri:content-title="B
 roker Properties URI"></page></link> </p></td><td colspan="1" rowspan="1"><p> Configures the broker explicitly using a URI syntax </p></td></tr></tbody></table>
 
 
 
-<p>For the most flexible and powerful option we recommend the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> via the <a shape="rect" href="broker-xbean-uri.xml">Broker XBean URI</a> to configure AcitveMQ brokers.  </p>
+<p>For the most flexible and powerful option we recommend the <link><page ri:content-title="Xml Configuration"></page></link> via the <link><page ri:content-title="Broker XBean URI"></page></link> to configure AcitveMQ brokers.  </p>
 
-<p>If you are worried about jar dependencies then either the <a shape="rect" href="broker-uri.xml">Broker URI</a> or the <a shape="rect" href="broker-properties-uri.xml">Broker Properties URI</a> are useful as they are very simple and require no dependencies on Spring or xbean-spring and don't require any XML.</p></div>
+<p>If you are worried about jar dependencies then either the <link><page ri:content-title="Broker URI"></page></link> or the <link><page ri:content-title="Broker Properties URI"></page></link> are useful as they are very simple and require no dependencies on Spring or xbean-spring and don't require any XML.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-properties-uri.xml
----------------------------------------------------------------------
diff --git a/broker-properties-uri.xml b/broker-properties-uri.xml
index 13f5f95..b905668 100644
--- a/broker-properties-uri.xml
+++ b/broker-properties-uri.xml
@@ -1,10 +1,7 @@
-<div class="wiki-content maincontent"><h2 id="BrokerPropertiesURI-BrokerPropertiesURI">Broker Properties URI</h2><p>From version 4.2 of ActiveMQ onwards the Broker Properties URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> by referencing a properties file which could be on the classpath, a local file or a remote URL.</p><h4 id="BrokerPropertiesURI-Syntax">Syntax</h4><p><strong>properties:name</strong></p><p>Where name is some name which is resolved on the classpath, as a local file or a remote URL which points to the properties file used to configure the broker.</p><h5 id="BrokerPropertiesURI-ExampleURI">Example URI</h5><p>The following examples show variations in using the URI</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>properties:/foo/bar.properties
+<div class="wiki-content maincontent"><h2>Broker Properties URI</h2><p>From version 4.2 of ActiveMQ onwards the Broker Properties URI allows you to <link><page ri:content-title="Run Broker"></page><plain-text-link-body>run a configured broker</plain-text-link-body></link> by referencing a properties file which could be on the classpath, a local file or a remote URL.</p><h4>Syntax</h4><p><strong>properties:name</strong></p><p>Where name is some name which is resolved on the classpath, as a local file or a remote URL which points to the properties file used to configure the broker.</p><h5>Example URI</h5><p>The following examples show variations in using the URI</p><structured-macro ac:macro-id="632155fb-8fe5-43c9-bb92-058d3e71366f" ac:name="noformat" ac:schema-version="1"><plain-text-body>properties:/foo/bar.properties
 properties:foo.properties
 properties:http://foo.com/foo.properties
-</pre>
-</div></div><p>Here is <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/config/broker.properties">an example properties file</a></p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>## ---------------------------------------------------------------------------
+</plain-text-body></structured-macro><p>Here is <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/config/broker.properties">an example properties file</a></p><structured-macro ac:macro-id="8e337744-7484-4c40-afec-e78bdd572746" ac:name="noformat" ac:schema-version="1"><plain-text-body>## ---------------------------------------------------------------------------
 ## Licensed to the Apache Software Foundation (ASF) under one or more
 ## contributor license agreements.  See the NOTICE file distributed with
 ## this work for additional information regarding copyright ownership.
@@ -25,6 +22,5 @@ useJmx = false
 persistent = false
 brokerName = Cheese
 # END SNIPPET: example
-</pre>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-uri.xml
----------------------------------------------------------------------
diff --git a/broker-uri.xml b/broker-uri.xml
index 1451726..641ffb3 100644
--- a/broker-uri.xml
+++ b/broker-uri.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="BrokerURI-BrokerURI">Broker URI</h2>
+<div class="wiki-content maincontent"><h2>Broker URI</h2>
 
-<p>The Broker URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> using a single URI for all the configuration.</p>
+<p>The Broker URI allows you to <link><page ri:content-title="Run Broker"></page><link-body>run a configured broker</link-body></link> using a single URI for all the configuration.</p>
 
-<h4 id="BrokerURI-Syntax">Syntax</h4>
+<h4>Syntax</h4>
 
 <p>The URI is assumed to be a composite uri with multiple uris that are used to bind the connectors of the broker.</p>
 
@@ -11,23 +11,22 @@
 <p>If a composite URI use the network: scheme, then the rest of the URI is bound as a network connector.</p>
 
 
-<h5 id="BrokerURI-BrokerOptions">Broker Options</h5>
+<h5>Broker Options</h5>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useJmx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker be exposed to JMX?</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>persistent</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker use persistent storage</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>populateJMSXUserID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the broker popul
 ate the <a shape="rect" href="jmsxuserid.xml">JMSXUserID</a> property of messages to indicate the authenticated sender username who sent the message</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useShutdownHook</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>should the broker install a shutdown hook so that it can properly shut itself down on a JVM kill</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>brokerName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the broker</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>deleteAllMessagesOnStartup</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should all the messages in the persistent store be deleted on broker startup</p></td><
 /tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>enableStatistics</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should statistics gathering be enabled</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>useJmx</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should the broker be exposed to JMX?</p></td></tr><tr><td colspan="1" rowspan="1"><p>persistent</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should the broker use persistent storage</p></td></tr><tr><td colspan="1" rowspan="1"><p>populateJMSXUserID</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should the broker populate the <link><page ri:content-title="JMSXUserID"></page></link> property of messages to indicate the authenticated sender username who sent the message</p></td></tr><tr><td colspan="1" rowspan="1"><p>useShutdownHook</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>
 should the broker install a shutdown hook so that it can properly shut itself down on a JVM kill</p></td></tr><tr><td colspan="1" rowspan="1"><p>brokerName</p></td><td colspan="1" rowspan="1"><p>localhost</p></td><td colspan="1" rowspan="1"><p>The name of the broker</p></td></tr><tr><td colspan="1" rowspan="1"><p>deleteAllMessagesOnStartup</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should all the messages in the persistent store be deleted on broker startup</p></td></tr><tr><td colspan="1" rowspan="1"><p>enableStatistics</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should statistics gathering be enabled</p></td></tr></tbody></table>
 
 
 
-<h5 id="BrokerURI-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
 
 <p>The following example starts up a broker accepting connections on port 61616, and establishes a network connection to remotehost:61616 and disables persistence.</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>broker:(tcp://localhost:61616,network:static:tcp://remotehost:61616)?persistent=false&amp;useJmx=true
-</pre>
-</div></div> 
+<structured-macro ac:macro-id="35981ad4-c2b0-4fcf-bb9e-612ecd03d351" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+broker:(tcp://localhost:61616,network:static:tcp://remotehost:61616)?persistent=false&amp;useJmx=true
+</plain-text-body></structured-macro> 
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">You can use the Broker URI on other transports</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you are using another transport - such as the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a> then you can refer to the above broker URI properties inside that URL. e.g. using the URL</p>
+<structured-macro ac:macro-id="b7bfcf5a-8d17-471e-a907-133785ea5950" ac:name="info" ac:schema-version="1"><parameter ac:name="title">You can use the Broker URI on other transports</parameter><rich-text-body>
+<p>If you are using another transport - such as the <link><page ri:content-title="VM Transport Reference"></page></link> then you can refer to the above broker URI properties inside that URL. e.g. using the URL</p>
 
-<p>vm://localhost?broker.persistent=false</p></div></div></div>
+<p>vm://localhost?broker.persistent=false</p></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/broker-xbean-uri.xml
----------------------------------------------------------------------
diff --git a/broker-xbean-uri.xml b/broker-xbean-uri.xml
index 6456dcc..5e76c8b 100644
--- a/broker-xbean-uri.xml
+++ b/broker-xbean-uri.xml
@@ -1,28 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="BrokerXBeanURI-BrokerXBeanURI">Broker XBean URI</h2>
+<div class="wiki-content maincontent"><h2>Broker XBean URI</h2>
 
-<p>The Broker XBean URI allows you to <a shape="rect" href="run-broker.xml">run a configured broker</a> by referencing an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> on the classpath. The URI points to an XML document which can be parsed via XBean or Spring. This URI is typically on the classpath; though in 4.2 onwards you can point to a file or URL as well.</p>
+<p>The Broker XBean URI allows you to <link><page ri:content-title="Run Broker"></page><link-body>run a configured broker</link-body></link> by referencing an <link><page ri:content-title="Xml Configuration"></page></link> on the classpath. The URI points to an XML document which can be parsed via XBean or Spring. This URI is typically on the classpath; though in 4.2 onwards you can point to a file or URL as well.</p>
 
-<h4 id="BrokerXBeanURI-Syntax">Syntax</h4>
+<h4>Syntax</h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Syntax </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:classPathResource </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where classPathResource is some name which is resolved on the classpath and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:</p>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Syntax </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> xbean:classPathResource </p></td><td colspan="1" rowspan="1"><p> Where classPathResource is some name which is resolved on the classpath and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1"><p> xbean:</p>
 file:filePathResource
-<p></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where filePathResource is some name which is resolved on the file system and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> xbean:urlResource </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Where urlResource is some resource which points to an XML document </p></td></tr></tbody></table></div>
+<p></p></td><td colspan="1" rowspan="1"><p> Where filePathResource is some name which is resolved on the file system and interpreted to be an XML document. </p></td></tr><tr><td colspan="1" rowspan="1"><p> xbean:urlResource </p></td><td colspan="1" rowspan="1"><p> Where urlResource is some resource which points to an XML document </p></td></tr></tbody></table>
 
 
-<h5 id="BrokerXBeanURI-ExampleURI">Example URI</h5>
+<h5>Example URI</h5>
 
 <p>The following example starts up a broker using the activemq.xml configuration file which is on the classpath</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>xbean:activemq.xml
-</pre>
-</div></div> 
+<structured-macro ac:macro-id="6e9a3e33-967a-4bd2-bc8b-e1471f52fcab" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+xbean:activemq.xml
+</plain-text-body></structured-macro> 
 
 
 <p>The following example starts up a broker using the activemq.xml configuration file which is in the current directory</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>xbean:file:./activemq.xml
-</pre>
-</div></div> </div>
+<structured-macro ac:macro-id="f555bed5-94eb-497b-8756-df9a749cf33b" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+xbean:file:./activemq.xml
+</plain-text-body></structured-macro> </div>
 


[24/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/configuring.xml
----------------------------------------------------------------------
diff --git a/cms/configuring.xml b/cms/configuring.xml
index 4811a50..c7b660a 100644
--- a/cms/configuring.xml
+++ b/cms/configuring.xml
@@ -1,96 +1,91 @@
-<div class="wiki-content maincontent"><h2 id="Configuring-ConfiguringActiveMQ-CPP">Configuring ActiveMQ-CPP</h2>
+<div class="wiki-content maincontent"><h2>Configuring ActiveMQ-CPP</h2>
 
 <p>The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP.  All configuration is achieved via URI-encoded parameters, either on the connection or destinations.  Through the URIs, you can configure virtually every facet of your ActiveMQ-CPP client.  The tables below show the comprehensive set of parameters.</p>
 
-<h3 id="Configuring-ConnectionURIParameters"><strong>Connection URI Parameters</strong></h3>
+<h3><strong>Connection URI Parameters</strong></h3>
 
 
-<h5 id="Configuring-ExampleConfiguration">&#160;Example Configuration</h5>
+<h5>&#160;Example Configuration</h5>
 
 <p>This first example uses a standard TCP based transport.</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="9a908a3e-b888-4657-a1af-6db14b3832ae" ac:name="code" ac:schema-version="1"><plain-text-body>
 cf = new ActiveMQConnectionFactory(
-    &quot;tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true&quot;);
-]]></script>
-</div></div>
+    "tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true");
+</plain-text-body></structured-macro>
 
 <p>For a more reliable connection use the Failover Transport and configure in alternate locations to connect to.</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="ce34d2df-d2e2-402a-af17-ff1c373639a2" ac:name="code" ac:schema-version="1"><plain-text-body>
 cf = new ActiveMQConnectionFactory(
-    &quot;failover://(tcp://localhost:61616,tcp://anotherhost:61616)?connection.useAsyncSend=true&quot;);
-]]></script>
-</div></div>
+    "failover://(tcp://localhost:61616,tcp://anotherhost:61616)?connection.useAsyncSend=true");
+</plain-text-body></structured-macro>
 
-<h3 id="Configuring-ProtocolOptions">Protocol Options</h3>
+<h3>Protocol Options</h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> tcp </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Uses TCP/IP Sockets to connect to the broker. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ssl </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Uses OpenSSL to secure TCP/IP sockets. <strong>(Since v3.2.0)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> failover </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Composite of other Transports, when a Transport connection fails, the Failover Transport connects to the next Transport in the list or retries the connection to the failed broker URI. </p></td></tr></tbody></table>
 </div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> tcp </p></td><td colspan="1" rowspan="1"><p> Uses TCP/IP Sockets to connect to the broker. </p></td></tr><tr><td colspan="1" rowspan="1"><p> ssl </p></td><td colspan="1" rowspan="1"><p> Uses OpenSSL to secure TCP/IP sockets. <strong>(Since v3.2.0)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> failover </p></td><td colspan="1" rowspan="1"><p> Composite of other Transports, when a Transport connection fails, the Failover Transport connects to the next Transport in the list or retries the connection to the failed broker URI. </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-SocketOptions"><strong>Socket Options</strong></h4>
+<h4><strong>Socket Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> inputBufferSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 10000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of bytes in the buffered input stream's buffer </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> outputBufferSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 10000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of bytes in the buffered output stream's buffer </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> soLinger </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p> Socket SOLinger value </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> soKeepAlive </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Socket SOKeepAlive value </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> soReceiveBufferSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> -1 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Socket receive buffer. If -1, use OS default. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> soSendBufferSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> -1 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Socket send buffer. If -1, use OS default. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> soConnectTimeout </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> -1 </p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p> Socket connection timeout in microseconds.  If -1, use OS default. <strong>(Since ActiveMQ-CPP 2.2)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> tcpNoDelay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Sets the Socket level TCP_NODELAY option </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> inputBufferSize </p></td><td colspan="1" rowspan="1"><p> 10000 </p></td><td colspan="1" rowspan="1"><p> The number of bytes in the buffered input stream's buffer </p></td></tr><tr><td colspan="1" rowspan="1"><p> outputBufferSize </p></td><td colspan="1" rowspan="1"><p> 10000 </p></td><td colspan="1" rowspan="1"><p> The number of bytes in the buffered output stream's buffer </p></td></tr><tr><td colspan="1" rowspan="1"><p> soLinger </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Socket SOLinger value </p></td></tr><tr><td colspan="1" rowspan="1"><p> soKeepAlive </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Socket SOKeepAlive value </p></td></tr><tr><td colspan="1" rowspan="1"><p> soReceiveBufferSi
 ze </p></td><td colspan="1" rowspan="1"><p> -1 </p></td><td colspan="1" rowspan="1"><p> Socket receive buffer. If -1, use OS default. </p></td></tr><tr><td colspan="1" rowspan="1"><p> soSendBufferSize </p></td><td colspan="1" rowspan="1"><p> -1 </p></td><td colspan="1" rowspan="1"><p> Socket send buffer. If -1, use OS default. </p></td></tr><tr><td colspan="1" rowspan="1"><p> soConnectTimeout </p></td><td colspan="1" rowspan="1"><p> -1 </p></td><td colspan="1" rowspan="1"><p> Socket connection timeout in microseconds.  If -1, use OS default. <strong>(Since ActiveMQ-CPP 2.2)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> tcpNoDelay </p></td><td colspan="1" rowspan="1"><p> true </p></td><td colspan="1" rowspan="1"><p> Sets the Socket level TCP_NODELAY option </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-GeneralTransportOptions"><strong>General Transport Options</strong></h4>
+<h4><strong>General Transport Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> transport.commandTracingEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> If true, enables tracing of incoming and outgoing transport commands </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> transport.tcpTracingEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> If true, enables tracing of raw network IO (in hex) </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> transport.useAsyncSend </p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> If true, enables asynchronous sending of messages. *<strong>WARNING: Using this could result in a loss of data if messages are pending and the client is shut down or crashes.</strong>* <strong>(Deprecated Since ActiveMQ-CPP 2.2.2 has no effect as of this release, use connection.useAsyncSend instead)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> transport.ResponseCorrelator.maxResponseWaitTime </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 3000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Milliseconds to wait for responses from the broker. <strong>(Removed as of ActiveMQ-CPP 2.2.1, use connection.sendTimeout instead)</strong> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> transport.commandTracingEnabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> If true, enables tracing of incoming and outgoing transport commands </p></td></tr><tr><td colspan="1" rowspan="1"><p> transport.tcpTracingEnabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> If true, enables tracing of raw network IO (in hex) </p></td></tr><tr><td colspan="1" rowspan="1"><p> transport.useAsyncSend </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> If true, enables asynchronous sending of messages. *<strong>WARNING: Using this could result in a loss of data if messages are pending and the client is shut down or crashes.</strong>* <strong>(Deprecated Since Acti
 veMQ-CPP 2.2.2 has no effect as of this release, use connection.useAsyncSend instead)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> transport.ResponseCorrelator.maxResponseWaitTime </p></td><td colspan="1" rowspan="1"><p> 3000 </p></td><td colspan="1" rowspan="1"><p> Milliseconds to wait for responses from the broker. <strong>(Removed as of ActiveMQ-CPP 2.2.1, use connection.sendTimeout instead)</strong> </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-FailoverTransportOptions"><strong>Failover Transport Options</strong></h4>
+<h4><strong>Failover Transport Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> initialReconnectDelay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 10 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> How long to wait if the initial attempt to connect to the broker fails. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxReconnectDelay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 30000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Maximum time that the transport waits before trying to connect to the Broker again. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> useExponentialBackOff </p></td><td colspan="1" rowspan="
 1" class="confluenceTd"><p> true </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the delay between connection attempt grow on each try up to the max reconnect delay </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxReconnectAttempts </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Max number of times to attempt to reconnect before failing the transport, default is forever (0). </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> startupMaxReconnectAttempts </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Max number of times to attempt to reconnect before failing the transport, default is forever (0).  Only applies during the initial attempt to connect, after one successful connection the <em>maxReconnectAttempts</em> flag applies from then on. <strong>(Since v3.2.0)</st
 rong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> randomize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the transport attempt to connect to the listed Broker URI's in Random order. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> backup </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the Failover transport maintain hot backups. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> backupPoolSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> If enabled, how many hot backup connections are made. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> timeout </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> -1 </p></td><td colspan="1" row
 span="1" class="confluenceTd"><p> If a send is blocked waiting on a failed connection to reconnect how long should it wait before failing the send, default is forever (-1). </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> initialReconnectDelay </p></td><td colspan="1" rowspan="1"><p> 10 </p></td><td colspan="1" rowspan="1"><p> How long to wait if the initial attempt to connect to the broker fails. </p></td></tr><tr><td colspan="1" rowspan="1"><p> maxReconnectDelay </p></td><td colspan="1" rowspan="1"><p> 30000 </p></td><td colspan="1" rowspan="1"><p> Maximum time that the transport waits before trying to connect to the Broker again. </p></td></tr><tr><td colspan="1" rowspan="1"><p> useExponentialBackOff </p></td><td colspan="1" rowspan="1"><p> true </p></td><td colspan="1" rowspan="1"><p> Should the delay between connection attempt grow on each try up to the max reconnect delay </p></td></tr><tr><td colspan="1" rowspan="1"><p> maxReconnectAttempts </p></td><td colspan="1" rowspan="1"><p> 0 
 </p></td><td colspan="1" rowspan="1"><p> Max number of times to attempt to reconnect before failing the transport, default is forever (0). </p></td></tr><tr><td colspan="1" rowspan="1"><p> startupMaxReconnectAttempts </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Max number of times to attempt to reconnect before failing the transport, default is forever (0).  Only applies during the initial attempt to connect, after one successful connection the <em>maxReconnectAttempts</em> flag applies from then on. <strong>(Since v3.2.0)</strong></p></td></tr><tr><td colspan="1" rowspan="1"><p> randomize </p></td><td colspan="1" rowspan="1"><p> true </p></td><td colspan="1" rowspan="1"><p> Should the transport attempt to connect to the listed Broker URI's in Random order. </p></td></tr><tr><td colspan="1" rowspan="1"><p> backup </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the Failover transport maintain hot ba
 ckups. </p></td></tr><tr><td colspan="1" rowspan="1"><p> backupPoolSize </p></td><td colspan="1" rowspan="1"><p> 1 </p></td><td colspan="1" rowspan="1"><p> If enabled, how many hot backup connections are made. </p></td></tr><tr><td colspan="1" rowspan="1"><p> timeout </p></td><td colspan="1" rowspan="1"><p> -1 </p></td><td colspan="1" rowspan="1"><p> If a send is blocked waiting on a failed connection to reconnect how long should it wait before failing the send, default is forever (-1). </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-TransactionOptions"><strong>Transaction Options</strong></h4>
+<h4><strong>Transaction Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> transaction.maxRedeliveryCount </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 5 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Maximum number of redelivery attempts. <strong>(Removed in v3.2.0, see instead Connection Redelivery Policy)</strong></p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> transaction.maxRedeliveryCount </p></td><td colspan="1" rowspan="1"><p> 5 </p></td><td colspan="1" rowspan="1"><p> Maximum number of redelivery attempts. <strong>(Removed in v3.2.0, see instead Connection Redelivery Policy)</strong></p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-ConnectionOptions"><strong>Connection Options</strong></h4>
+<h4><strong>Connection Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> connection.sendTimeout </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Time to wait on Message Sends for a Response, default value of zero indicates to wait forever.  Waiting forever allows the broker to have flow control over messages coming from this client if it is a fast producer or there is no consumer such that the broker would run out of memory if it did not slow down the producer. <strong>Does not affect Stomp clients as the sends are ack'd by the broker.</strong> <strong>(Since ActiveMQ-CPP 2.2.1)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class=
 "confluenceTd"><p> connection.producerWindowSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The ProducerWindowSize is the maximum number of bytes in memory that a producer will transmit to a broker before waiting for acknowledgement messages from the broker that it has accepted the previously sent messages. In other words, this how you configure the producer flow control window that is used for async sends where the client is responsible for managing memory usage.  The default value of 0 means no flow control at the client.  See also <a shape="rect" class="external-link" href="http://activemq.apache.org/producer-flow-control.html">Producer Flow Control</a>. <strong>This option only affects Openwire clients as Stomp does not have a means of notifying the clients of accepted messages asynchronously</strong>. <strong>(Since ActiveMQ-CPP 2.2.2)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class=
 "confluenceTd"><p> connnection.closeTimeout </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 15000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The amount of time to wait for a response from the broker when shutting down.  Normally we want a response to indicate that the client has been disconnected cleanly, but we don't want to wait forever, however if you do, set this to zero. <strong>(Since ActiveMQ-CPP 2.2.1)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> connection.useAsyncSend </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Forces the use of Async Sends which adds a massive performance boost; but means that the send() method will return immediately whether the message has been sent or not which could lead to message loss.  Normally only Persistant messages that are not part of a transaction are sent synchronously, using this options f
 orces those messages to also be async. <strong>(</strong><strong>Since ActiveMQ-CPP 2.2.2</strong><strong>)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> connection.alwaysSyncSend </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Forces all messages that are sent to be sent synchronously overriding any usage of the useAsyncSend flag.  This can reduce performance in some cases since the only messages we normally send synchronously are Persistent messages not sent in a transaction.  This options guarantees that no send will return until the broker has acknowledge receipt of the message. <strong>(</strong><strong>Since ActiveMQ-CPP 2.2.2</strong><strong>)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> connection.useCompression </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="conf
 luenceTd"><p> Should outgoing messages have their body portion compressed using the ZLib compression algorithms <strong>(Since v3.2.0)</strong> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> connection.dispatchAsync </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the broker <a shape="rect" class="external-link" href="http://activemq.apache.org/consumer-dispatch-async.html">dispatch messages asynchronously</a> to the consumer, this causes all consumers from this Connection to use this setting. <strong>(Since v3.2.0)</strong> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> connection.sendTimeout </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Time to wait on Message Sends for a Response, default value of zero indicates to wait forever.  Waiting forever allows the broker to have flow control over messages coming from this client if it is a fast producer or there is no consumer such that the broker would run out of memory if it did not slow down the producer. <strong>Does not affect Stomp clients as the sends are ack'd by the broker.</strong> <strong>(Since ActiveMQ-CPP 2.2.1)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connection.producerWindowSize </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> The ProducerWindowSize is the maximum number of bytes in memor
 y that a producer will transmit to a broker before waiting for acknowledgement messages from the broker that it has accepted the previously sent messages. In other words, this how you configure the producer flow control window that is used for async sends where the client is responsible for managing memory usage.  The default value of 0 means no flow control at the client.  See also <a shape="rect" href="http://activemq.apache.org/producer-flow-control.html">Producer Flow Control</a>. <strong>This option only affects Openwire clients as Stomp does not have a means of notifying the clients of accepted messages asynchronously</strong>. <strong>(Since ActiveMQ-CPP 2.2.2)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connnection.closeTimeout </p></td><td colspan="1" rowspan="1"><p> 15000 </p></td><td colspan="1" rowspan="1"><p> The amount of time to wait for a response from the broker when shutting down.  Normally we want a response to indicate that the client has been disc
 onnected cleanly, but we don't want to wait forever, however if you do, set this to zero. <strong>(Since ActiveMQ-CPP 2.2.1)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connection.useAsyncSend </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Forces the use of Async Sends which adds a massive performance boost; but means that the send() method will return immediately whether the message has been sent or not which could lead to message loss.  Normally only Persistant messages that are not part of a transaction are sent synchronously, using this options forces those messages to also be async. <strong>(</strong><strong>Since ActiveMQ-CPP 2.2.2</strong><strong>)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connection.alwaysSyncSend </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Forces all messages that are sent to be sent synchronously overriding any usage of the useAsyncSend flag
 .  This can reduce performance in some cases since the only messages we normally send synchronously are Persistent messages not sent in a transaction.  This options guarantees that no send will return until the broker has acknowledge receipt of the message. <strong>(</strong><strong>Since ActiveMQ-CPP 2.2.2</strong><strong>)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connection.useCompression </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should outgoing messages have their body portion compressed using the ZLib compression algorithms <strong>(Since v3.2.0)</strong> </p></td></tr><tr><td colspan="1" rowspan="1"><p> connection.dispatchAsync </p></td><td colspan="1" rowspan="1"><p> true </p></td><td colspan="1" rowspan="1"><p> Should the broker <a shape="rect" href="http://activemq.apache.org/consumer-dispatch-async.html">dispatch messages asynchronously</a> to the consumer, this causes all consumers from this Connection to use 
 this setting. <strong>(Since v3.2.0)</strong> </p></td></tr></tbody></table>
 
 
-<h5 id="Configuring-ConnectionPolicyOptions"><strong>Connection Policy Options</strong></h5>
+<h5><strong>Connection Policy Options</strong></h5>
 
 <p>As of version 3.2.0 the Connection object supports policies that control various aspects its behaviour and of the Consumer objects it creates.</p>
 
-<h6 id="Configuring-PrefetchPolicy">Prefetch Policy</h6>
+<h6>Prefetch Policy</h6>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.PrefetchPolicy.durableTopicPrefetch </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 100 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Max prefetch for Durable Topics </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.PrefetchPolicy.queueBrowserPrefetch </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 500 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Max prefetch for a Queue Browser </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.PrefetchPolicy.queuePrefetch </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1000 </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> Max prefetch for a Queue or Temp Queue </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.PrefetchPolicy.topicPrefetch </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 65535 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Max prefetch for a Topic or Temp Topic </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> cms.PrefetchPolicy.durableTopicPrefetch </p></td><td colspan="1" rowspan="1"><p> 100 </p></td><td colspan="1" rowspan="1"><p> Max prefetch for Durable Topics </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.PrefetchPolicy.queueBrowserPrefetch </p></td><td colspan="1" rowspan="1"><p> 500 </p></td><td colspan="1" rowspan="1"><p> Max prefetch for a Queue Browser </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.PrefetchPolicy.queuePrefetch </p></td><td colspan="1" rowspan="1"><p> 1000 </p></td><td colspan="1" rowspan="1"><p> Max prefetch for a Queue or Temp Queue </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.PrefetchPolicy.topicPrefetch </p></td><td colspan="1" rowspan="1"><p> 65535 </p></td><td colspan="1" rowspan="1"><p> Max prefetch for a Topic or Temp Top
 ic </p></td></tr></tbody></table>
 
 
-<h6 id="Configuring-RedeliveryPolicy">Redelivery Policy</h6>
+<h6>Redelivery Policy</h6>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.RedeliveryPolicy.backOffMultiplier </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 5.0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Used to extend the redelivery window when the _useExponentialBackOff option is enabled. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.RedeliveryPolicy.collisionAvoidancePercent </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 15 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Percentage of randomness to add to redelivery backoff to keep multiple consumers in a rollback from redelivering at the same time. </p></td></tr><tr><t
 d colspan="1" rowspan="1" class="confluenceTd"><p> cms.RedeliveryPolicy.initialRedeliveryDelay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Amount of time to wait before starting redeliveries, in milliseconds. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.RedeliveryPolicy.maximumRedeliveries </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 6 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Maximum number of time to attempt a redelivery before giving up and NAck'ing the message. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> cms.RedeliveryPolicy.useCollisionAvoidance </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the Random avoidance percentage be added into the redelivery delay. </p></td></tr><tr><td colspan="1" rowspan="1" class="con
 fluenceTd"><p> cms.RedeliveryPolicy.useExponentialBackOff </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should redeliveries be slowed on each cycle. </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.backOffMultiplier </p></td><td colspan="1" rowspan="1"><p> 5.0 </p></td><td colspan="1" rowspan="1"><p> Used to extend the redelivery window when the _useExponentialBackOff option is enabled. </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.collisionAvoidancePercent </p></td><td colspan="1" rowspan="1"><p> 15 </p></td><td colspan="1" rowspan="1"><p> Percentage of randomness to add to redelivery backoff to keep multiple consumers in a rollback from redelivering at the same time. </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.initialRedeliveryDelay </p></td><td colspan="1" rowspan="1"><p> 1000 </p></td><td colspan="1" rowspan="1"><p> Amount of time to wait before starting redeliveries, in milliseconds. </p></
 td></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.maximumRedeliveries </p></td><td colspan="1" rowspan="1"><p> 6 </p></td><td colspan="1" rowspan="1"><p> Maximum number of time to attempt a redelivery before giving up and NAck'ing the message. </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.useCollisionAvoidance </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the Random avoidance percentage be added into the redelivery delay. </p></td></tr><tr><td colspan="1" rowspan="1"><p> cms.RedeliveryPolicy.useExponentialBackOff </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should redeliveries be slowed on each cycle. </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-WireFormatProtocolOptions"><strong>Wire Format Protocol Options</strong></h4>
+<h4><strong>Wire Format Protocol Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFormat </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> openwire </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Selects the wire format to use.  Out of the box, can be either stomp or openwire. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFormat.stackTraceEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFor
 mat.cacheEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFormat.tcpNoDelayEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> true </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFormat.sizePrefixDisabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should serialized messages include a payload length prefix?  Only used by openwire protocol. </p></td></tr><tr><td colspa
 n="1" rowspan="1" class="confluenceTd"><p> wireFormat.tightEncodingEnabled </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should wire size be optimized over CPU usage? Only used by the openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> wireFormat.maxInactivityDuration </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 30000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The maximum inactivity duration (before which the socket is considered dead) in milliseconds. On some platforms it can take a long time for a socket to appear to die, so we allow the broker to kill connections if they are inactive for a period of time. Use by some transports to enable a keep alive heart beat feature. Set to a value &lt;= 0 to disable inactivity monitoring. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> maxInactivityDurationInitalDe
 lay </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 10000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The initial delay in starting the maximum inactivity checks (and, yes, the word 'Inital' is supposed to be misspelled like that) </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> wireFormat </p></td><td colspan="1" rowspan="1"><p> openwire </p></td><td colspan="1" rowspan="1"><p> Selects the wire format to use.  Out of the box, can be either stomp or openwire. </p></td></tr><tr><td colspan="1" rowspan="1"><p> wireFormat.stackTraceEnabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1"><p> wireFormat.cacheEnabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1">
 <p> wireFormat.tcpNoDelayEnabled </p></td><td colspan="1" rowspan="1"><p> true </p></td><td colspan="1" rowspan="1"><p> Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1"><p> wireFormat.sizePrefixDisabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should serialized messages include a payload length prefix?  Only used by openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1"><p> wireFormat.tightEncodingEnabled </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should wire size be optimized over CPU usage? Only used by the openwire protocol. </p></td></tr><tr><td colspan="1" rowspan="1"><p> wireFormat.maxInactivityDuration </p></td><td colspan="1" rowspan="1"><p> 30000 </p></td><td colspan="1" rowspan="1"><p> The maximum inactivity duration
  (before which the socket is considered dead) in milliseconds. On some platforms it can take a long time for a socket to appear to die, so we allow the broker to kill connections if they are inactive for a period of time. Use by some transports to enable a keep alive heart beat feature. Set to a value &lt;= 0 to disable inactivity monitoring. </p></td></tr><tr><td colspan="1" rowspan="1"><p> maxInactivityDurationInitalDelay </p></td><td colspan="1" rowspan="1"><p> 10000 </p></td><td colspan="1" rowspan="1"><p> The initial delay in starting the maximum inactivity checks (and, yes, the word 'Inital' is supposed to be misspelled like that) </p></td></tr></tbody></table>
 
 
-<h3 id="Configuring-DestinationURIParameters"><strong>Destination URI Parameters</strong></h3>
+<h3><strong>Destination URI Parameters</strong></h3>
 
 
-<h5 id="Configuring-ExampleConfiguration.1">Example Configuration</h5>
+<h5>Example Configuration</h5>
 
-<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[
-d = session-&gt;createTopic(&quot;com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true&quot;);
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="f6141dc2-cae3-47c9-9a43-87c6b026a5ea" ac:name="code" ac:schema-version="1"><plain-text-body>
+d = session-&gt;createTopic("com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true");
+</plain-text-body></structured-macro>
 
-<h4 id="Configuring-GeneralOptions"><strong>General Options</strong></h4>
+<h4><strong>General Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.prefetchSize </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of message the consumer will <a shape="rect" class="external-link" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">prefetch</a>. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.maximumPendingMessageLimit </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Use to control if messages are dropped if a <a shape="rect" class="external-link" href="http://activemq.a
 pache.org/slow-consumer-handling.html">slow consumer</a> situation exists. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.noLocal </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Same as the noLocal flag on a Topic consumer.  Exposed here so that it can be used with a queue. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.dispatchAsync </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the broker <a shape="rect" class="external-link" href="http://activemq.apache.org/consumer-dispatch-async.html">dispatch messages asynchronously</a> to the consumer. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.retroactive </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> Is this a <a shape="rect" class="external-link" href="http://activemq.apache.org/retroactive-consumer.html">Retroactive Consumer</a>. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.selector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> null </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JMS Selector used with the consumer. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.exclusive </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Is this an <a shape="rect" class="external-link" href="http://activemq.apache.org/exclusive-consumer.html">Exclusive Consumer</a>. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.priority </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Allows you to configure a <a s
 hape="rect" class="external-link" href="http://activemq.apache.org/consumer-priority.html">Consumer Priority</a>. </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> consumer.prefetchSize </p></td><td colspan="1" rowspan="1"><p> 1000 </p></td><td colspan="1" rowspan="1"><p> The number of message the consumer will <a shape="rect" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">prefetch</a>. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.maximumPendingMessageLimit </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Use to control if messages are dropped if a <a shape="rect" href="http://activemq.apache.org/slow-consumer-handling.html">slow consumer</a> situation exists. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.noLocal </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Same as the noLocal flag on a Topic consumer.  Expo
 sed here so that it can be used with a queue. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.dispatchAsync </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the broker <a shape="rect" href="http://activemq.apache.org/consumer-dispatch-async.html">dispatch messages asynchronously</a> to the consumer. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.retroactive </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Is this a <a shape="rect" href="http://activemq.apache.org/retroactive-consumer.html">Retroactive Consumer</a>. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.selector </p></td><td colspan="1" rowspan="1"><p> null </p></td><td colspan="1" rowspan="1"><p> JMS Selector used with the consumer. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.exclusive </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Is this an <a shape
 ="rect" href="http://activemq.apache.org/exclusive-consumer.html">Exclusive Consumer</a>. </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.priority </p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Allows you to configure a <a shape="rect" href="http://activemq.apache.org/consumer-priority.html">Consumer Priority</a>. </p></td></tr></tbody></table>
 
 
-<h4 id="Configuring-OpenWire-onlyOptions"><strong>OpenWire-only Options</strong></h4>
+<h4><strong>OpenWire-only Options</strong></h4>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Option Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.browser </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.networkSubscription </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.optimizedAcknowledge </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Enables an optimised acknowledgem
 ent mode where messages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.noRangeAcks </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> consumer.retroactive </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started. </p></td></tr></tbody></table></div>
 </div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Option Name </p></th><th colspan="1" rowspan="1"><p> Default </p></th><th colspan="1" rowspan="1"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1"><p> consumer.browser </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.networkSubscription </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.optimizedAcknowledge </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Enables an optimised acknowledgement mode where messages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on r
 econnection </p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.noRangeAcks </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p> consumer.retroactive </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started. </p></td></tr></tbody></table>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/connectivity.xml
----------------------------------------------------------------------
diff --git a/cms/connectivity.xml b/cms/connectivity.xml
index 24cc369..f88b162 100644
--- a/cms/connectivity.xml
+++ b/cms/connectivity.xml
@@ -1,4 +1,5 @@
 <div class="wiki-content maincontent"><p>ActiveMQ-CPP has been designed to have a pluggable connector architecture.  Out of the box, it comes with support for the following protocols:</p>
 
-<ul class="alternate"><li><a shape="rect" href="stomp-support.xml">Stomp</a></li><li><a shape="rect" href="openwire-support.xml">OpenWire</a></li></ul></div>
+<ul class="alternate"><li><link><page ri:content-title="Stomp Support"></page><link-body>Stomp</link-body></link></li><li><link><page ri:content-title="OpenWire Support"></page><link-body>OpenWire</link-body></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/creating-distributions.xml
----------------------------------------------------------------------
diff --git a/cms/creating-distributions.xml b/cms/creating-distributions.xml
index c1c4f30..e9010de 100644
--- a/cms/creating-distributions.xml
+++ b/cms/creating-distributions.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="CreatingDistributions-CreatingaDistributionofActiveMQ-CPP">Creating a Distribution of ActiveMQ-CPP</h2>
+<div class="wiki-content maincontent"><h2>Creating a Distribution of ActiveMQ-CPP</h2>
 
 <p>This should give you an idea of the steps involved with creating a new distribution of ActiveMQ-CPP.  This content was extracted from <a shape="rect" class="external-link" href="http://www.apache.org/dev/mirror-guide-bodewig.html">http://www.apache.org/dev/mirror-guide-bodewig.html</a>, so you may want to reference that for more information.</p>
 
-<h3 id="CreatingDistributions-ALittleBackgroundInfo...">A Little Background Info ...</h3>
+<h3>A Little Background Info ...</h3>
 <p>Apache mirrors everything under /www.www.apache.org/dist.  We have had the infrastructure team add a directory under there for activemq.  All you need in order to write to this directory is to be a member of the activemq group.  If you're not, you'll have to create an infrastructure issue to get yourself added.  Under the dir activemq,  there is a directory activemq-cpp/source for the source distributions of ActiveMQ-CPP.</p>
 
 <p>Under the source dir, we just drop the archive files (*.zip, *.tar.gz, *.zip.asc, *.tar.gz.asc) for the release versions. (NOTE: After you add files here, you should wait about 24 hours before notifying the lists since it takes a while for all the mirrors to pick up the files).</p>
@@ -17,61 +17,58 @@
 
 <p>... and click on one of the archives.  You'll be taken to a generic-looking download page.</p>
 
-<p>Like I said, this is a quick and dirty for now, but it works! <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>Like I said, this is a quick and dirty for now, but it works! <emoticon ac:name="smile"></emoticon></p>
 
-<h3 id="CreatingDistributions-Productversion,interfaceversionandpackagename">Product version, interface version and package name</h3>
+<h3>Product version, interface version and package name</h3>
 
-<p>The page <a shape="rect" href="activemq-cpp-product-version-number.xml">ActiveMQ-CPP product version number</a> has been created to specify the way version numbers are used in the project, with some examples.</p>
+<p>The page <link><page ri:content-title="ActiveMQ-CPP product version number"></page></link> has been created to specify the way version numbers are used in the project, with some examples.</p>
 
-<p><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.xml">ActiveMQ-CPP, libtool and packaging notes</a> discusses the way version numbers impact libtool and packaging, and make some recommendations for this project.</p>
+<p><link><page ri:content-title="ActiveMQ-CPP, libtool and packaging notes"></page></link> discusses the way version numbers impact libtool and packaging, and make some recommendations for this project.</p>
 
-<h3 id="CreatingDistributions-CreatingaDistribution(step-by-step)">Creating a Distribution (step-by-step)</h3>
+<h3>Creating a Distribution (step-by-step)</h3>
 <ul><li>Create a pre-release download page for your distribution.  This should have a disclaimer that the release is not yet official and should have a temporary link to a pre-release distribution.  For the pre-release, you do not need to have both zip and tar.gz, but a detached signature file (.asc) file should accompany any distribution.  Below is an example of the disclaimer that should appear at the top of the download page:</li></ul>
 
 
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">The Release is still in progress</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="dff08b99-9f5f-48f8-97b2-e641c7c4aeb0" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">The Release is still in progress</parameter><rich-text-body>
 <p> 	You are previewing the release page for unreleased version of yadda. The download links on the page below may not work until it is officially released.</p>
 
 <p> 	Until the release is approved you could try the current source bundle:<br clear="none">
- 	<a shape="rect" class="external-link" href="http://people.apache.org/~myaccount/yadda.zip">http://people.apache.org/~myaccount/yadda.zip</a></p></div></div>
+ 	<a shape="rect" href="http://people.apache.org/~myaccount/yadda.zip">http://people.apache.org/~myaccount/yadda.zip</a></p></rich-text-body></structured-macro>
 
 <p>Here is the Wiki Test for the above:</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>{warning:title=The Release is still in progress}
+<structured-macro ac:macro-id="d1a0132f-2605-47fd-8dfb-8f025c1033e5" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+{warning:title=The Release is still in progress}
  	You are previewing the release page for unreleased version of yadda. The download links on the page below may not work until it is officially released.
  	 
  	Until the release is approved you could try the current source bundle:
  	[http://people.apache.org/~myaccount/yadda.zip]
 {warning}
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
 
-<ul><li>Call a vote on the release of the distribution.  This email typically has <p>[VOTE]</p> in the subject line and should provide a link to the download page and the pre-release distribution.</li><li>Wait 3 days.  If there &gt;= 3 +1's and no -1's, you can proceed with the release.</li><li>Create all of the distributions of the source (*.zip, *.tar.gz).  Make sure that you remove the .svn directories from the directory before you create the archives.  On *nix, this can be done with the command:</li></ul>
+<ul><li>Call a vote on the release of the distribution.  This email typically has <p><structured-macro ac:macro-id="a3ebd840-af2e-420f-b8f4-66e95fa1dbb9" ac:name="html" ac:schema-version="1"><parameter ac:name="nopanel">true</parameter><plain-text-body>[VOTE]</plain-text-body></structured-macro></p> in the subject line and should provide a link to the download page and the pre-release distribution.</li><li>Wait 3 days.  If there &gt;= 3 +1's and no -1's, you can proceed with the release.</li><li>Create all of the distributions of the source (*.zip, *.tar.gz).  Make sure that you remove the .svn directories from the directory before you create the archives.  On *nix, this can be done with the command:</li></ul>
 
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>rm -rf `find . -type d -name .svn`
-</pre>
-</div></div>
+<structured-macro ac:macro-id="6fbc2b45-33bf-4edb-9e16-e9e3d73045f7" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+rm -rf `find . -type d -name .svn`
+</plain-text-body></structured-macro>
 
 <ul><li>Sign your distribution files, creating an asc file for both the tar and zip files, see this page <a shape="rect" class="external-link" href="http://www.apache.org/dev/release-signing.html">http://www.apache.org/dev/release-signing.html</a> for more information on release signing.</li></ul>
 
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>gpg --armor --output foo.tar.gz.asc --detach-sig foo.tar.gz
+<structured-macro ac:macro-id="ca3a314e-73c2-4310-af92-69f282dc9041" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+gpg --armor --output foo.tar.gz.asc --detach-sig foo.tar.gz
 gpg --armor --output foo.zip.asc --detach-sig foo.zip
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
 
 <ul><li>Copy the distribution files to <strong>/www/www.apache.org/dist/activemq/activemq-cpp/source</strong> on minotaur.</li><li>Wait 24 hours for the mirrors to be updated with the distribution.</li><li>Update the links on the download page to reference your distribution through the CGI script.  This simply means that you precede the file names with the path <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/">http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/</a>.</li></ul>
 
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>i.e. http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip
-</pre>
-</div></div>
+<structured-macro ac:macro-id="425298a1-5ba0-4668-80c3-b6a5148fbf77" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+i.e. http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip
+</plain-text-body></structured-macro>
+
+<ul><li>Generate the Doxygen API and place it under /www/activemq.apache.org/cms/api_docs.</li><li>Add the link to the release API to the <link><page ri:content-title="API"></page></link> page.</li><li>Add a news item under the CMS space on the wiki about the release.</li><li>Send out an e-mail on both the dev and users list about the release.</li></ul>
 
-<ul><li>Generate the Doxygen API and place it under /www/activemq.apache.org/cms/api_docs.</li><li>Add the link to the release API to the <a shape="rect" href="api.xml">API</a> page.</li><li>Add a news item under the CMS space on the wiki about the release.</li><li>Send out an e-mail on both the dev and users list about the release.</li></ul>
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/developers.xml
----------------------------------------------------------------------
diff --git a/cms/developers.xml b/cms/developers.xml
index 39dc126..aa29589 100644
--- a/cms/developers.xml
+++ b/cms/developers.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="creating-distributions.xml">Creating Distributions</a></li><li><a shape="rect" href="source.xml">Source</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="ffdbf83a-e3c0-4a31-b22a-128b580da75e" 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/cms/discussion-forums.xml
----------------------------------------------------------------------
diff --git a/cms/discussion-forums.xml b/cms/discussion-forums.xml
index 63253ca..d5bb77a 100644
--- a/cms/discussion-forums.xml
+++ b/cms/discussion-forums.xml
@@ -1,13 +1,13 @@
-<div class="wiki-content maincontent"><p>Before posting you might want to read the <a shape="rect" class="unresolved" href="#">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>Before posting you might want to read the <link><page ri:content-title="Tips for getting help"></page></link>.</p>
 
-<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" class="external-link" href="http://www.nabble.com/ActiveMQ-f2354.html" rel="nofollow">Nabble forums</a> which also work with our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
+<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" href="http://www.nabble.com/ActiveMQ-f2354.html">Nabble forums</a> which also work with our <link><page ri:content-title="Mailing Lists"></page></link> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
 
-<h3 id="DiscussionForums-ActiveMQForums"><a shape="rect" class="external-link" href="http://www.nabble.com/ActiveMQ-f2354.html" rel="nofollow">ActiveMQ Forums</a></h3>
+<h3><a shape="rect" href="http://www.nabble.com/ActiveMQ-f2354.html">ActiveMQ Forums</a></h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://www.nabble.com/ActiveMQ---User-f2356.html" rel="nofollow">ActiveMQ User Forum</a></li><li><a shape="rect" class="external-link" href="http://www.nabble.com/ActiveMQ---Dev-f2355.html" rel="nofollow">ActiveMQ Developer Forum</a></li></ul>
+<ul><li><a shape="rect" href="http://www.nabble.com/ActiveMQ---User-f2356.html">ActiveMQ User Forum</a></li><li><a shape="rect" href="http://www.nabble.com/ActiveMQ---Dev-f2355.html">ActiveMQ Developer Forum</a></li></ul>
 
 
-<h3 id="DiscussionForums-MailingLists">Mailing Lists</h3>
+<h3>Mailing Lists</h3>
 
-<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> are kept in sync so its your choice which you use.</p></div>
+<p>If you prefer to use a mailing list instead then check out our <link><page ri:content-title="Mailing Lists"></page></link>. Note that the Forums and <link><page ri:content-title="Mailing Lists"></page></link> are kept in sync so its your choice which you use.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/download.xml
----------------------------------------------------------------------
diff --git a/cms/download.xml b/cms/download.xml
index 1c41b8a..083b4fa 100644
--- a/cms/download.xml
+++ b/cms/download.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="Download-DownloadActiveMQ-CPP">Download ActiveMQ-CPP</h2><h3 id="Download-LatestReleases">Latest Releases</h3><p>The current stable release of the code is the <span class="confluence-link"><a shape="rect" href="activemq-cpp-394-release.xml">ActiveMQ-CPP 3.9.4</a> Release</span>.</p><h3 id="Download-AllReleases">All Releases</h3><p></p><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-394-release.xml">ActiveMQ-CPP 3.9.4 Release</a></li><li><a shape="rect" href="activemq-cpp-393-release.xml">ActiveMQ-CPP 3.9.3 Release</a></li><li><a shape="rect" href="activemq-cpp-392-release.xml">ActiveMQ-CPP 3.9.2 Release</a></li><li><a shape="rect" href="activemq-cpp-391-release.xml">ActiveMQ-CPP 3.9.1 Release</a></li><li><a shape="rect" href="activemq-cpp-390-release.xml">ActiveMQ-CPP 3.9.0 Release</a></li><li><a shape="rect" href="activemq-cpp-384-release.xml">ActiveMQ-CPP 3.8.4 Release</a></li><li><a shape="rect" href="activemq-cpp-
 383-release.xml">ActiveMQ-CPP 3.8.3 Release</a></li><li><a shape="rect" href="activemq-cpp-382-release.xml">ActiveMQ-CPP 3.8.2 Release</a></li><li><a shape="rect" href="activemq-cpp-381-release.xml">ActiveMQ-CPP 3.8.1 Release</a></li><li><a shape="rect" href="activemq-cpp-380-release.xml">ActiveMQ-CPP 3.8.0 Release</a></li><li><a shape="rect" href="activemq-cpp-371-release.xml">ActiveMQ-CPP 3.7.1 Release</a></li><li><a shape="rect" href="activemq-cpp-370-release.xml">ActiveMQ-CPP 3.7.0 Release</a></li><li><a shape="rect" href="activemq-cpp-360-release.xml">ActiveMQ-CPP 3.6.0 Release</a></li><li><a shape="rect" href="activemq-cpp-350-release.xml">ActiveMQ-CPP 3.5.0 Release</a></li><li><a shape="rect" href="activemq-cpp-345-release.xml">ActiveMQ-CPP 3.4.5 Release</a></li><li><a shape="rect" href="activemq-cpp-344-release.xml">ActiveMQ-CPP 3.4.4 Release</a></li><li><a shape="rect" href="activemq-cpp-343-release.xml">ActiveMQ-CPP 3.4.3 Release</a></li><li><a shape="rect" href="activemq-
 cpp-342-release.xml">ActiveMQ-CPP 3.4.2 Release</a></li><li><a shape="rect" href="activemq-cpp-341-release.xml">ActiveMQ-CPP 3.4.1 Release</a></li><li><a shape="rect" href="activemq-cpp-340-release.xml">ActiveMQ-CPP 3.4.0 Release</a></li><li><a shape="rect" href="activemq-cpp-330-release.xml">ActiveMQ-CPP 3.3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-325-release.xml">ActiveMQ-CPP 3.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-324-release.xml">ActiveMQ-CPP 3.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-323-release.xml">ActiveMQ-CPP 3.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-322-release.xml">ActiveMQ-CPP 3.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-321-release.xml">ActiveMQ-CPP 3.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-320-release.xml">ActiveMQ-CPP 3.2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-313-release.xml">ActiveMQ-CPP 3.1.3 Release</a></li><li><a shape="rect" href="activ
 emq-cpp-312-release.xml">ActiveMQ-CPP 3.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-311-release.xml">ActiveMQ-CPP 3.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-310-release.xml">ActiveMQ-CPP 3.1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-301-release.xml">ActiveMQ-CPP 3.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-30-release.xml">ActiveMQ-CPP 3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-226-release.xml">ActiveMQ-CPP 2.2.6 Release</a></li><li><a shape="rect" href="activemq-cpp-225-release.xml">ActiveMQ-CPP 2.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-224-release.xml">ActiveMQ-CPP 2.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-223-release.xml">ActiveMQ-CPP 2.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-222-release.xml">ActiveMQ-CPP 2.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-221-release.xml">ActiveMQ-CPP 2.2.1 Release</a></li><li><a shape="rect" href="acti
 vemq-cpp-22-release.xml">ActiveMQ CPP 2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-213-release.xml">ActiveMQ-CPP 2.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.xml">ActiveMQ-CPP, libtool and packaging notes</a></li><li><a shape="rect" href="activemq-cpp-212-release.xml">ActiveMQ-CPP 2.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-211-release.xml">ActiveMQ-CPP 2.1.1 Release</a></li><li><a shape="rect" href="cms-api-12-release.xml">CMS API 1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a></li><li><a shape="rect" href="cms-api-11-release.xml">CMS API 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-201-release.xml">ActiveMQ-CPP 2.0.1 Release</a></li><li><a shape="rect" href="cms-api-10-release.xml">CMS API 1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-20-release.xml">ActiveMQ-CPP 2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-11-r
 elease.xml">ActiveMQ-CPP 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-10-release.xml">ActiveMQ-CPP 1.0 Release</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>Download ActiveMQ-CPP</h2><h3>Latest Releases</h3><p>The current stable release of the code is the <span class="confluence-link"><link><page ri:content-title="ActiveMQ-CPP 3.9.4 Release"></page><plain-text-link-body>ActiveMQ-CPP 3.9.4</plain-text-link-body></link> Release</span>.</p><h3>All Releases</h3><p><structured-macro ac:macro-id="dfb6a07d-17da-4bb0-a5a9-7c68c32bccb1" ac:name="children" ac:schema-version="1"><parameter ac:name="sort">creation</parameter><parameter ac:name="reverse">true</parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/enable-openssl-support-with-autotools.xml
----------------------------------------------------------------------
diff --git a/cms/enable-openssl-support-with-autotools.xml b/cms/enable-openssl-support-with-autotools.xml
index dedcd25..dba82d4 100644
--- a/cms/enable-openssl-support-with-autotools.xml
+++ b/cms/enable-openssl-support-with-autotools.xml
@@ -1,7 +1,6 @@
 <div class="wiki-content maincontent"><p>When you build the ActiveMQ-CPP library using the GNU AutoTools the Configure script will automatically search for OpenSSL on your system and enable support for it in the code if its found.  The search might fail if you have installed OpenSSL in a non-standard location in which case you can tell the configure script where to look using the <em>with-openssl</em> option, see below for an example.</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>./configure --with-openssl=/opt/special/openssl
-</pre>
-</div></div></div>
+<structured-macro ac:macro-id="eb19df99-c256-49b9-ad5f-de3e5b67ccbf" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+./configure --with-openssl=/opt/special/openssl
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml
----------------------------------------------------------------------
diff --git a/cms/errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml b/cms/errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml
index 36f5ac9..46f02c3 100644
--- a/cms/errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml
+++ b/cms/errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml
@@ -1,10 +1,9 @@
 <div class="wiki-content maincontent"><p>On Solaris 10 the libstdc++.la file is empty which causes the build to fail.  In order to fix this you must fill in the libstdc++.la file with the correct information.  There are two versions, one for 32 bit and one for 64 bit.  The following listings show the correct contents of these files respectively.  </p>
 
-<p>From <a shape="rect" class="external-link" href="http://forum.java.sun.com/thread.jspa?threadID=5073150" rel="nofollow">Sun Forums</a></p>
+<p>From <a shape="rect" href="http://forum.java.sun.com/thread.jspa?threadID=5073150">Sun Forums</a></p>
 
 <p>/usr/sfw/lib/libstdc++.la</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
+<structured-macro ac:macro-id="40d128d2-ef20-4e2d-9b0e-d8dd6753686c" ac:name="noformat" ac:schema-version="1"><plain-text-body> 
 # libstdc++.la - a libtool library file
 # Generated by ltmain.sh - GNU libtool 1.4a-GCC3.0 (1.641.2.256 2001/05/28 20:09:07 with GCC-local changes)
 #
@@ -37,12 +36,10 @@ dlpreopen=''
  
 # Directory that this library needs to be installed in:
 libdir='/usr/sfw/lib'
-</pre>
-</div></div> 
+</plain-text-body></structured-macro> 
 
 <p>/usr/sfw/lib/64/libstdc++.la</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
+<structured-macro ac:macro-id="1ba95c70-1934-4802-ade9-885ed7966585" ac:name="noformat" ac:schema-version="1"><plain-text-body> 
 # libstdc++.la - a libtool library file
 # Generated by ltmain.sh - GNU libtool 1.4a-GCC3.0 (1.641.2.256 2001/05/28 20:09:07 with GCC-local changes)
 #
@@ -75,14 +72,11 @@ dlpreopen=''
  
 # Directory that this library needs to be installed in:
 libdir='/usr/sfw/lib/64'
-</pre>
-</div></div> 
+</plain-text-body></structured-macro> 
 
 <p>Note that this doesn't seem to get us all the way.  For some reason the shared library dependencies can't seem to all be resolved so you must build only static libraries.  This can be accomplished by passing the following to the configure script.</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
+<structured-macro ac:macro-id="fc32c26c-e2fe-4eaa-8bf5-365e451ec2dd" ac:name="noformat" ac:schema-version="1"><plain-text-body> 
 ./configure --enable-shared=no
-</pre>
-</div></div> </div>
+</plain-text-body></structured-macro> </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/example.xml
----------------------------------------------------------------------
diff --git a/cms/example.xml b/cms/example.xml
index 76bdaa8..e15fc3e 100644
--- a/cms/example.xml
+++ b/cms/example.xml
@@ -1,23 +1,22 @@
-<div class="wiki-content maincontent"><h2 id="Example-ActiveMQ-CPPinAction">ActiveMQ-CPP in Action</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ-CPP in Action</h2>
 
 <p>In the example below we create two classes <strong>HolloWorldConsumer</strong> and <strong>HelloWorldProducer</strong> each of which runs in its own thread.  The Producer sends TextMessage objects via a <strong>MessageProducer</strong> instance to the ActiveMQ broker.  The Consumer receives messages asynchronously from the broker on the same Topic or Queue as the Producer looking for a set number of TextMessages to arrive.  </p>
 
 <p>The following example is taken from the source code and shows a basic usage scenario of ActiveMQ-CPP, you can find other examples in the examples folder that ships with the source distribution of ActiveMQ-CPP:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>main.cpp</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="6137a35b-c89a-4c44-89d0-d0ac7ebd9d8c" ac:name="code" ac:schema-version="1"><parameter ac:name="title">main.cpp</parameter><plain-text-body>
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the &quot;License&quot;); you may not use this file except in compliance with
+ * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -112,9 +111,9 @@ public:
 
             // Create the destination (Topic or Queue)
             if (useTopic) {
-                destination = session-&gt;createTopic(&quot;TEST.FOO&quot;);
+                destination = session-&gt;createTopic("TEST.FOO");
             } else {
-                destination = session-&gt;createQueue(&quot;TEST.FOO&quot;);
+                destination = session-&gt;createQueue("TEST.FOO");
             }
 
             // Create a MessageProducer from the Session to the Topic or Queue
@@ -125,12 +124,12 @@ public:
             string threadIdStr = Long::toString(Thread::currentThread()-&gt;getId());
 
             // Create a messages
-            string text = (string) &quot;Hello world! from thread &quot; + threadIdStr;
+            string text = (string) "Hello world! from thread " + threadIdStr;
 
             for (int ix = 0; ix &lt; numMessages; ++ix) {
                 std::auto_ptr&lt;TextMessage&gt; message(session-&gt;createTextMessage(text));
-                message-&gt;setIntProperty(&quot;Integer&quot;, ix);
-                printf(&quot;Sent message #%d from thread %s\n&quot;, ix + 1, threadIdStr.c_str());
+                message-&gt;setIntProperty("Integer", ix);
+                printf("Sent message #%d from thread %s\n", ix + 1, threadIdStr.c_str());
                 producer-&gt;send(message.get());
             }
 
@@ -238,9 +237,9 @@ public:
 
             // Create the destination (Topic or Queue)
             if (useTopic) {
-                destination = session-&gt;createTopic(&quot;TEST.FOO&quot;);
+                destination = session-&gt;createTopic("TEST.FOO");
             } else {
-                destination = session-&gt;createQueue(&quot;TEST.FOO&quot;);
+                destination = session-&gt;createQueue("TEST.FOO");
             }
 
             // Create a MessageConsumer from the Session to the Topic or Queue
@@ -272,15 +271,15 @@ public:
         try {
             count++;
             const TextMessage* textMessage = dynamic_cast&lt;const TextMessage*&gt; (message);
-            string text = &quot;&quot;;
+            string text = "";
 
             if (textMessage != NULL) {
                 text = textMessage-&gt;getText();
             } else {
-                text = &quot;NOT A TEXTMESSAGE!&quot;;
+                text = "NOT A TEXTMESSAGE!";
             }
 
-            printf(&quot;Message #%d Received: %s\n&quot;, count, text.c_str());
+            printf("Message #%d Received: %s\n", count, text.c_str());
 
         } catch (CMSException&amp; e) {
             e.printStackTrace();
@@ -298,7 +297,7 @@ public:
     // If something bad happens you see it here as this class is also been
     // registered as an ExceptionListener with the connection.
     virtual void onException(const CMSException&amp; ex AMQCPP_UNUSED) {
-        printf(&quot;CMS Exception occurred.  Shutting down client.\n&quot;);
+        printf("CMS Exception occurred.  Shutting down client.\n");
         ex.printStackTrace();
         exit(1);
     }
@@ -334,9 +333,9 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
 
     activemq::library::ActiveMQCPP::initializeLibrary();
     {
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
-    std::cout &lt;&lt; &quot;Starting the example:&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
+    std::cout &lt;&lt; "=====================================================\n";
+    std::cout &lt;&lt; "Starting the example:" &lt;&lt; std::endl;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
 
 
     // Set the URI to point to the IP Address of your broker.
@@ -362,16 +361,16 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     // the trusted root.  If using client authentication you also need to specify
     // the location of the client Certificate.
     //
-    //     System::setProperty( &quot;decaf.net.ssl.keyStore&quot;, &quot;&lt;path&gt;/client.pem&quot; );
-    //     System::setProperty( &quot;decaf.net.ssl.keyStorePassword&quot;, &quot;password&quot; );
-    //     System::setProperty( &quot;decaf.net.ssl.trustStore&quot;, &quot;&lt;path&gt;/rootCA.pem&quot; );
+    //     System::setProperty( "decaf.net.ssl.keyStore", "&lt;path&gt;/client.pem" );
+    //     System::setProperty( "decaf.net.ssl.keyStorePassword", "password" );
+    //     System::setProperty( "decaf.net.ssl.trustStore", "&lt;path&gt;/rootCA.pem" );
     //
     // The you just specify the ssl transport in the URI, for example:
     //
     //     ssl://localhost:61617
     //
     std::string brokerURI =
-        &quot;failover:(tcp://localhost:61616)&quot;;
+        "failover:(tcp://localhost:61616)";
 
     //============================================================
     // set to true to use topics instead of queues
@@ -408,10 +407,10 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
     consumer.close();
     producer.close();
 
-    std::cout &lt;&lt; &quot;Time to completion = &quot; &lt;&lt; totalTime &lt;&lt; &quot; seconds.&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;-----------------------------------------------------\n&quot;;
-    std::cout &lt;&lt; &quot;Finished with the example.&quot; &lt;&lt; std::endl;
-    std::cout &lt;&lt; &quot;=====================================================\n&quot;;
+    std::cout &lt;&lt; "Time to completion = " &lt;&lt; totalTime &lt;&lt; " seconds." &lt;&lt; std::endl;
+    std::cout &lt;&lt; "-----------------------------------------------------\n";
+    std::cout &lt;&lt; "Finished with the example." &lt;&lt; std::endl;
+    std::cout &lt;&lt; "=====================================================\n";
 
     }
     activemq::library::ActiveMQCPP::shutdownLibrary();
@@ -419,6 +418,5 @@ int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
 
 // END SNIPPET: demo
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/faq.xml
----------------------------------------------------------------------
diff --git a/cms/faq.xml b/cms/faq.xml
index 380a4a2..e09f76d 100644
--- a/cms/faq.xml
+++ b/cms/faq.xml
@@ -1,23 +1,18 @@
-<div class="wiki-content maincontent"><h2 id="FAQ-FAQ">FAQ</h2>
+<div class="wiki-content maincontent"><h2>FAQ</h2>
 
-<p>Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the <a shape="rect" href="discussion-forums.xml">forums</a>.</p>
+<p>Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the <link><page ri:content-title="Discussion Forums"></page><link-body>forums</link-body></link>.</p>
 
-<p>We <a shape="rect" href="../contributing.xml">welcome contributions</a> and this entire website is a <a shape="rect" href="../how-does-the-website-work.xml">wiki that you can edit</a> so please join in and help us make the documentation better!  If you have a suggestion for more topics you can open a new Jira Issue or post on the forums, and if you provide a complete FAQ entry we'll put it up right away.</p>
+<p>We <link><page ri:content-title="Contributing" ri:space-key="ACTIVEMQ"></page><link-body>welcome contributions</link-body></link> and this entire website is a <link><page ri:content-title="How does the website work" ri:space-key="ACTIVEMQ"></page><link-body>wiki that you can edit</link-body></link> so please join in and help us make the documentation better!  If you have a suggestion for more topics you can open a new Jira Issue or post on the forums, and if you provide a complete FAQ entry we'll put it up right away.</p>
 
-<h3 id="FAQ-General"><a shape="rect" href="general.xml">General</a></h3>
+<h3><link><page ri:content-title="General"></page></link></h3>
 
-General Questions about ActiveMQ's CMS client.
+<structured-macro ac:macro-id="b3c8a23b-ed63-4ca6-b3fe-de78b0f5a7b1" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="General"></page></link></parameter></structured-macro>
 
-<ul class="childpages-macro"><li><a shape="rect" href="are-there-more-faq-entries.xml">Are there more FAQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.xml">What is ActiveMQ CPP</a></li></ul>
+<h3><link><page ri:content-title="ActiveMQ-CPP Usage FAQs"></page></link></h3>
 
-<h3 id="FAQ-ActiveMQ-CPPUsageFAQs"><a shape="rect" href="activemq-cpp-usage-faqs.xml">ActiveMQ-CPP Usage FAQs</a></h3>
+<structured-macro ac:macro-id="d38d330a-55b2-4532-908c-c0b8a64112b1" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="ActiveMQ-CPP Usage FAQs"></page></link></parameter></structured-macro>
 
-This section covers general questions on how to use various feature of the ActiveMQ-CPP Library
-<ul class="childpages-macro"><li><a shape="rect" href="how-do-i-use-the-ssl-transport.xml">How do I use the SSL Transport</a></li></ul> 
+<h3><link><page ri:content-title="Building FAQs"></page></link></h3>
 
-<h3 id="FAQ-BuildingFAQs"><a shape="rect" href="building-faqs.xml">Building FAQs</a></h3>
-
-These are general hints and tips on Building the Library on various platforms etc.
-
-<ul class="childpages-macro"><li><a shape="rect" href="general-build-issues.xml">General Build Issues</a></li><li><a shape="rect" href="openssl-support.xml">OpenSSL Support</a><ul class="childpages-macro"><li><a shape="rect" href="enable-openssl-support-with-autotools.xml">Enable OpenSSL support with autotools</a></li><li><a shape="rect" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.xml">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.xml">How to enable SSL support on Windows</a></li></ul></li><li><a shape="rect" href="solaris-platform.xml">Solaris Platform</a><ul class="childpages-macro"><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-t
 he-solaris-cc-compiler.xml">Using the Solaris CC compiler</a></li></ul></li></ul> </div>
+<structured-macro ac:macro-id="398000a2-61a1-4d8a-a932-ca44d2228dbc" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Building FAQs"></page></link></parameter></structured-macro></div>
 


[33/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201701-january.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201701-january.xml b/apache-activemq-board-report-201701-january.xml
index 55089f0..fce8778 100644
--- a/apache-activemq-board-report-201701-january.xml
+++ b/apache-activemq-board-report-201701-january.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Continued hardening of AMQP protocol support</span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Fixes to some memory leaks and deadlocks added</span></span></s
 pan></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Latest release now supports Jetty releases in the 9.3.x family.</span></span></span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Apache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. &#160;Highlights:</span></p><ul><li><p><span style="color: rgb(0,0,0);">Outgoing AMQP connections supported<br clear="none"></span></p></li><li><p><span style="color: rgb(0,0,0);">The ability to broker to detect network failures was added</span></p></li><li><p><span style="color: rgb(0,0,0);">CDI Integration was added</span></p></li></ul></li><li><p><span style="color: rgb(0,0,0);">Apache Artemis 2.0.0 is planned which i</span><span style="colo
 r: rgb(0,0,0);">ncludes major overhaul of the Artemis addressing model</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">New model has been proposed and implemented, highlights include:</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Better support for address naming across protocols added<br clear="none"></span></p></li><li><p><span style="color: rgb(0,0,0);">Ability to define prefixes for specifying pub/sub and point to point messaging requirements added</span></p></li><li><p><span style="color: rgb(0,0,0);">Consolidation of JMS and other protocol management/configuration</span><span style="color: rgb(0,0,0);"><br clear="none"></span></p></li></ul></ul></ul><li><span style="color: rgb(0,0,0);">Both projects are now base-lined on Java 8</span></li><li><span style="color: rgb(0,0,0);">Begin blogging about the ActiveMQ project on&#160;<a shape="rect" class="external-link" href="https://blogs.apache.org/">https://blogs.apache.org/</a></span></li></ul><p><strong>PMC
  changes</strong></p><ul><li>Currently 23 PMC members</li><li>Clebert Suconic was added to the PMC on Thu Oct 27 2016</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 58 committers</li><li>Christian Schneider was added as a committer on Wed Jan 04 2017</li></ul><p><strong>Releases</strong></p><ul><li>5.13.5 was released on Mon Dec 19 2016</li><li>5.14.2 was released on Wed Dec 07 2016</li><li>5.14.3 was released on Wed Dec 21 2016</li><li>ActiveMQ Artemis 1.5.0 was released on Mon Nov 07 2016</li><li>ActiveMQ Artemis 1.5.1 was released on Thu Dec 08 2016</li></ul><pre> </pre><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Continued hardening of AMQP protocol support</span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Fixes to some memory leaks and deadlocks added</span></span></s
 pan></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Latest release now supports Jetty releases in the 9.3.x family.</span></span></span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Apache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. &#160;Highlights:</span></p><ul><li><p><span style="color: rgb(0,0,0);">Outgoing AMQP connections supported<br clear="none"></span></p></li><li><p><span style="color: rgb(0,0,0);">The ability to broker to detect network failures was added</span></p></li><li><p><span style="color: rgb(0,0,0);">CDI Integration was added</span></p></li></ul></li><li><p><span style="color: rgb(0,0,0);">Apache Artemis 2.0.0 is planned which i</span><span style="colo
 r: rgb(0,0,0);">ncludes major overhaul of the Artemis addressing model</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">New model has been proposed and implemented, highlights include:</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Better support for address naming across protocols added<br clear="none"></span></p></li><li><p><span style="color: rgb(0,0,0);">Ability to define prefixes for specifying pub/sub and point to point messaging requirements added</span></p></li><li><p><span style="color: rgb(0,0,0);">Consolidation of JMS and other protocol management/configuration</span><span style="color: rgb(0,0,0);"><br clear="none"></span></p></li></ul></ul></ul><li><span style="color: rgb(0,0,0);">Both projects are now base-lined on Java 8</span></li><li><span style="color: rgb(0,0,0);">Begin blogging about the ActiveMQ project on&#160;<a shape="rect" href="https://blogs.apache.org/">https://blogs.apache.org/</a></span></li></ul><p><strong>PMC changes</strong></p><
 ul><li>Currently 23 PMC members</li><li>Clebert Suconic was added to the PMC on Thu Oct 27 2016</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 58 committers</li><li>Christian Schneider was added as a committer on Wed Jan 04 2017</li></ul><p><strong>Releases</strong></p><ul><li>5.13.5 was released on Mon Dec 19 2016</li><li>5.14.2 was released on Wed Dec 07 2016</li><li>5.14.3 was released on Wed Dec 21 2016</li><li>ActiveMQ Artemis 1.5.0 was released on Mon Nov 07 2016</li><li>ActiveMQ Artemis 1.5.1 was released on Thu Dec 08 2016</li></ul><pre> </pre><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201704-april.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201704-april.xml b/apache-activemq-board-report-201704-april.xml
index 6fbf21e..394f1db 100644
--- a/apache-activemq-board-report-201704-april.xml
+++ b/apache-activemq-board-report-201704-april.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">The 5.x broker continues to see ongoing bug fixing and stabilization work.</span><span style="color: rgb(0,0,0);"><br clear="none"></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Continued work on broker performance especi
 ally around the AMQP protocol.</span></p></li><li><span style="color: rgb(0,0,0);">Artemis now uses Netty Epoll on platforms that support it providing improved performance at the network layer.<br clear="none"></span></li></ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">A new tooling project aimed at provided a simple means of migrating data from existing ActiveMQ 5.x brokers to Artemis install has started.</span></li><li><span style="color: rgb(0,0,0);">The ActiveMQ NMS project had its SVN repositories migrated to Git to make future contributions simpler.</span><span style="color: rgb(0,0,0);">&#160;</span></li><li><span style="color: rgb(0,0,0);">Discussion in the community around donation of work on a new ActiveMQ NMS AMQP client implementation.<br clear="none"></span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Currently 24 PMC members</li><li>Clebert Suconic was added to the PMC on Thu Oct 27 2016</li></ul
 ><p><strong>Committer base changes</strong></p><ul><li>Currently 58 committers</li><li>Christian Schneider was added as a committer on Wed Jan 04 2017</li></ul><p><strong>Releases</strong></p><ul><li><strong>ActiveMQ 5.14.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Wed Mar 01 2017</span></li><li><strong>ActiveMQ Artemis 1.5.3</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Feb 19 2017</span></li><li><strong>ActiveMQ Artemis 1.5.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Mar 12 2017</span></li><li><strong>ActiveMQ Artemis 2.0.0</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Mar 19 2017</span></li><li><strong>ActiveMQ-CPP v3.9.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Wed Feb 22 2017</span></li></ul><pre> </pre><p>Report submitted on 11 Apr 2017</p><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/
 ">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">The 5.x broker continues to see ongoing bug fixing and stabilization work.</span><span style="color: rgb(0,0,0);"><br clear="none"></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p></li><ul><li><p><span style="color: rgb(0,0,0);">Continued work on broker performance especi
 ally around the AMQP protocol.</span></p></li><li><span style="color: rgb(0,0,0);">Artemis now uses Netty Epoll on platforms that support it providing improved performance at the network layer.<br clear="none"></span></li></ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">A new tooling project aimed at provided a simple means of migrating data from existing ActiveMQ 5.x brokers to Artemis install has started.</span></li><li><span style="color: rgb(0,0,0);">The ActiveMQ NMS project had its SVN repositories migrated to Git to make future contributions simpler.</span><span style="color: rgb(0,0,0);">&#160;</span></li><li><span style="color: rgb(0,0,0);">Discussion in the community around donation of work on a new ActiveMQ NMS AMQP client implementation.<br clear="none"></span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Currently 24 PMC members</li><li>Clebert Suconic was added to the PMC on Thu Oct 27 2016</li></ul
 ><p><strong>Committer base changes</strong></p><ul><li>Currently 58 committers</li><li>Christian Schneider was added as a committer on Wed Jan 04 2017</li></ul><p><strong>Releases</strong></p><ul><li><strong>ActiveMQ 5.14.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Wed Mar 01 2017</span></li><li><strong>ActiveMQ Artemis 1.5.3</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Feb 19 2017</span></li><li><strong>ActiveMQ Artemis 1.5.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Mar 12 2017</span></li><li><strong>ActiveMQ Artemis 2.0.0</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Mar 19 2017</span></li><li><strong>ActiveMQ-CPP v3.9.4</strong><span style="color: rgb(34,34,34);">&#160;was released on Wed Feb 22 2017</span></li></ul><pre> </pre><p>Report submitted on 11 Apr 2017</p><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org<
 /a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201707-july.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201707-july.xml b/apache-activemq-board-report-201707-july.xml
index fd9f8a8..5eb21ee 100644
--- a/apache-activemq-board-report-201707-july.xml
+++ b/apache-activemq-board-report-201707-july.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">Work continues on bug fixes and hardening of the ActiveMQ 5.x broker.<br clear="none"></span></li><li><span style="color: rgb(0,0,0);">New 5.15.0 release is out which now requires Java 8 and includes the latest Camel 2.19.0 release</span></li></ul><span style="color: rgb(0,0,0);"><br clear="none"></span></li><l
 i><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></li></ul><ul><li style="list-style-type: none;background-image: none;"><ul><li><span style="color: rgb(0,0,0);">Continued work on adding new features with several active discussions both on the mailing list and in JIRA and PR comments around the implementation of those features and their affect on existing usecases from members of the community. <br clear="none"></span></li><li><span style="color: rgb(0,0,0);">Improving AMQP support</span></li><li><span style="color: rgb(0,0,0);">Many fixes around compatibility with older clients.</span></li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">The community has opened up a call for new Logo's for the project website, a vote to pick a winner is expected late July.<br clear="none"></span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Last PMC addition:&#160;<span style="color: rgb(34,34,34);">Thu 
 Oct 27 2016 (Clebert Suconic)</span></li><li>Currently 24 PMC members</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 59 committers.&#160;</li><li>Francesco Nigro was added as a committer on Tue May 09 2017&#160;</li></ul><p><strong>Releases</strong></p><ul><li>5.14.5 was released on Sun Apr 16 2017</li><li>5.15.0 was released on Thu Jun 29 2017</li><li>ActiveMQ Artemis 1.5.5 was released on Sun May 14 2017</li><li>ActiveMQ Artemis 2.1.0 was released on Sun May 14 2017</li><li>ActiveMQ CLI Tools 0.1.0 was released on Sun May 07 2017</li></ul><p>Report submitted: 11 Jul 2017</p><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">Work continues on bug fixes and hardening of the ActiveMQ 5.x broker.<br clear="none"></span></li><li><span style="color: rgb(0,0,0);">New 5.15.0 release is out which now requires Java 8 and includes the latest Camel 2.19.0 release</span></li></ul><span style="color: rgb(0,0,0);"><br clear="none"></span></li><l
 i><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></li></ul><ul><li style="list-style-type: none;background-image: none;"><ul><li><span style="color: rgb(0,0,0);">Continued work on adding new features with several active discussions both on the mailing list and in JIRA and PR comments around the implementation of those features and their affect on existing usecases from members of the community. <br clear="none"></span></li><li><span style="color: rgb(0,0,0);">Improving AMQP support</span></li><li><span style="color: rgb(0,0,0);">Many fixes around compatibility with older clients.</span></li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">The community has opened up a call for new Logo's for the project website, a vote to pick a winner is expected late July.<br clear="none"></span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Last PMC addition:&#160;<span style="color: rgb(34,34,34);">Thu 
 Oct 27 2016 (Clebert Suconic)</span></li><li>Currently 24 PMC members</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 59 committers.&#160;</li><li>Francesco Nigro was added as a committer on Tue May 09 2017&#160;</li></ul><p><strong>Releases</strong></p><ul><li>5.14.5 was released on Sun Apr 16 2017</li><li>5.15.0 was released on Thu Jun 29 2017</li><li>ActiveMQ Artemis 1.5.5 was released on Sun May 14 2017</li><li>ActiveMQ Artemis 2.1.0 was released on Sun May 14 2017</li><li>ActiveMQ CLI Tools 0.1.0 was released on Sun May 07 2017</li></ul><p>Report submitted: 11 Jul 2017</p><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201710-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201710-october.xml b/apache-activemq-board-report-201710-october.xml
index b674e3d..5de0cee 100644
--- a/apache-activemq-board-report-201710-october.xml
+++ b/apache-activemq-board-report-201710-october.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">ActiveMQ 5.15.1 released on Oct 2nd</span></li></ul></li><li><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></li></ul><ul><li style="list-style-type: none;background-image: none;"><ul><li>Artemis 2.3.0 was released on Sept 13th</li><li>Artemis 2.2.0 was released on July 31st</li><li>An embedded web man
 agement console was added</li><li>The download page was refreshed to improve clarity and ease future maintenance</li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">&#160;</span>A new logo was selected by community vote following a period of open submissions.<span style="color: rgb(0,0,0);">&#160;</span><span style="color: rgb(0,0,0);"><span style="color: rgb(0,0,0);">&#160;</span></span></li><li><p>The website was updated to use the new logo and slightly freshen the look.</p></li><li><p>Some release process improvements were discussed and implemented.</p></li></ul></li></ul><p><strong><span style="color: rgb(102,0,51);">Releases</span></strong></p><p>&#160;</p><ul><li><strong>5.15.1</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Oct 01 2017</span></li><li><strong>ActiveMQ Artemis 2.2.0</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Jul 30 2017</span></li></ul><p>&#160
 ;</p><p>Report submitted on 10 Oct 2017</p><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p><p>&#160;</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><ul><li><span style="color: rgb(0,0,0);">ActiveMQ 5.15.1 released on Oct 2nd</span></li></ul></li><li><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></li></ul><ul><li style="list-style-type: none;background-image: none;"><ul><li>Artemis 2.3.0 was released on Sept 13th</li><li>Artemis 2.2.0 was released on July 31st</li><li>An embedded web man
 agement console was added</li><li>The download page was refreshed to improve clarity and ease future maintenance</li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Other</span><ul><li><span style="color: rgb(0,0,0);">&#160;</span>A new logo was selected by community vote following a period of open submissions.<span style="color: rgb(0,0,0);">&#160;</span><span style="color: rgb(0,0,0);"><span style="color: rgb(0,0,0);">&#160;</span></span></li><li><p>The website was updated to use the new logo and slightly freshen the look.</p></li><li><p>Some release process improvements were discussed and implemented.</p></li></ul></li></ul><p><strong><span style="color: rgb(102,0,51);">Releases</span></strong></p><p>&#160;</p><ul><li><strong>5.15.1</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Oct 01 2017</span></li><li><strong>ActiveMQ Artemis 2.2.0</strong><span style="color: rgb(34,34,34);">&#160;was released on Sun Jul 30 2017</span></li></ul><p>&#160
 ;</p><p>Report submitted on 10 Oct 2017</p><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-april-2008.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-april-2008.xml b/apache-activemq-board-report-april-2008.xml
index cfdce8b..987f3d3 100644
--- a/apache-activemq-board-report-april-2008.xml
+++ b/apache-activemq-board-report-april-2008.xml
@@ -1,10 +1,9 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-April2008-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1>
-<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[
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1>
+<structured-macro ac:macro-id="f353b1d5-8149-4612-80d5-170391ccdfe7" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>
 Community:
 
  The ActiveMQ community continues to stay vibrant with a very healthy amount of email traffic 
- flowing through it&#39;s email lists.  It has also added several new committers to it&#39;s ranks.
+ flowing through it's email lists.  It has also added several new committers to it's ranks.
 
 New Committers:
 
@@ -36,6 +35,5 @@ ECN Status:
   * Apache ActiveMQ
   * Apache Camel
  
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-reports.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-reports.xml b/apache-activemq-board-reports.xml
index aa2f889..6da4828 100644
--- a/apache-activemq-board-reports.xml
+++ b/apache-activemq-board-reports.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The current ActiveMQ reporting schedule is: January, April, July, October</p><p></p><ul class="childpages-macro"><li><a shape="rect" href="apache-activemq-board-report-201710-october.xml">Apache ActiveMQ Board Report - 2017.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201707-july.xml">Apache ActiveMQ Board Report - 2017.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201704-april.xml">Apache ActiveMQ Board Report - 2017.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-201701-january.xml">Apache ActiveMQ Board Report - 2017.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-201610-october.xml">Apache ActiveMQ Board Report - 2016.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201607-july.xml">Apache ActiveMQ Board Report - 2016.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201605-may.x
 ml">Apache ActiveMQ Board Report - 2016.05 (May)</a></li><li><a shape="rect" href="apache-activemq-board-report-201604-april.xml">Apache ActiveMQ Board Report - 2016.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-201602-february.xml">Apache ActiveMQ Board Report - 2016.02 (February)</a></li><li><a shape="rect" href="apache-activemq-board-report-201510-october.xml">Apache ActiveMQ Board Report - 2015.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201508-august.xml">Apache ActiveMQ Board Report - 2015.08 (August)</a></li><li><a shape="rect" href="apache-activemq-board-report-201507-july.xml">Apache ActiveMQ Board Report - 2015.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201506-june.xml">Apache ActiveMQ Board Report - 2015.06 (June)</a></li><li><a shape="rect" href="apache-activemq-board-report-201504-april.xml">Apache ActiveMQ Board Report - 2015.04 (April)</a></li><li><a shape="rect" href="apache-act
 ivemq-board-report-201502-february.xml">Apache ActiveMQ Board Report - 2015.02 (February)</a></li><li><a shape="rect" href="apache-activemq-board-report-201410-october.xml">Apache ActiveMQ Board Report - 2014.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201407-july.xml">Apache ActiveMQ Board Report - 2014.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201404-april.xml">Apache ActiveMQ Board Report - 2014.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-201401-january.xml">Apache ActiveMQ Board Report - 2014.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-201310-october.xml">Apache ActiveMQ Board Report - 2013.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201307-july.xml">Apache ActiveMQ Board Report - 2013.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201304-april.xml">Apache ActiveMQ Board Report - 2013.04 (April)</a>
 </li><li><a shape="rect" href="apache-activemq-board-report-201301-january.xml">Apache ActiveMQ Board Report - 2013.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-201210-october.xml">Apache ActiveMQ Board Report - 2012.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201207-july.xml">Apache ActiveMQ Board Report - 2012.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201204-april.xml">Apache ActiveMQ Board Report - 2012.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-201201-january.xml">Apache ActiveMQ Board Report - 2012.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-201110-october.xml">Apache ActiveMQ Board Report - 2011.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201107-july.xml">Apache ActiveMQ Board Report - 2011.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201104-april.xml">Apache Acti
 veMQ Board Report - 2011.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-201101-january.xml">Apache ActiveMQ Board Report - 2011.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-201010-october.xml">Apache ActiveMQ Board Report - 2010.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-201007-july.xml">Apache ActiveMQ Board Report - 2010.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-201005-may.xml">Apache ActiveMQ Board Report - 2010.05 (May)</a></li><li><a shape="rect" href="apache-activemq-board-report-201001-january.xml">Apache ActiveMQ Board Report - 2010.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-200910-october.xml">Apache ActiveMQ Board Report - 2009.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-200907-july.xml">Apache ActiveMQ Board Report - 2009.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-r
 eport-200904-april.xml">Apache ActiveMQ Board Report - 2009.04 (April)</a></li><li><a shape="rect" href="apache-activemq-board-report-200901-january.xml">Apache ActiveMQ Board Report - 2009.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-200810-october.xml">Apache ActiveMQ Board Report - 2008.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-200807-july.xml">Apache ActiveMQ Board Report - 2008.07 (July)</a></li><li><a shape="rect" href="apache-activemq-board-report-200801-january.xml">Apache ActiveMQ Board Report - 2008.01 (January)</a></li><li><a shape="rect" href="apache-activemq-board-report-200710-october.xml">Apache ActiveMQ Board Report - 2007.10 (October)</a></li><li><a shape="rect" href="apache-activemq-board-report-200708-august.xml">Apache ActiveMQ Board Report - 2007.08 (August)</a></li></ul></div>
+<div class="wiki-content maincontent"><p>The current ActiveMQ reporting schedule is: January, April, July, October</p><p><structured-macro ac:macro-id="ebb67c1d-3c7d-4164-acf1-1a0b9d62908a" ac:name="children" ac:schema-version="1"><parameter ac:name="all">true</parameter><parameter ac:name="sort">title</parameter><parameter ac:name="reverse">true</parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/articles.xml
----------------------------------------------------------------------
diff --git a/articles.xml b/articles.xml
index c1239dc..7be92ef 100644
--- a/articles.xml
+++ b/articles.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>This page captures resources and articles outside the ActiveMQ project which may assist your development. Please add any new resources that you come across by clicking the edit link at the bottom of the page. If you do this, please make sure to attach a date to the article as well so users are aware of how recent it is.</p><h3 id="Articles-InterviewsandPodcasts">Interviews and Podcasts</h3><ul><li><a shape="rect" class="external-link" href="http://feathercast.org/?p=42" rel="nofollow">ActiveMQ FeatherCast</a>, James Strachan is interviewed on the ActiveMQ project</li></ul><h3 id="Articles-Webinars,VideosandScreencasts">Webinars, Videos and Screencasts</h3><ul><li><a shape="rect" class="external-link" href="http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm" rel="nofollow">Apache ActiveMQ - Connecting Applications everywhere</a> by <em><a shape="rect" class="external-link" href="http://rajdavies.blogspot.com/" 
 rel="nofollow">Rob Davies</a></em></li><li><a shape="rect" class="external-link" href="http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm" rel="nofollow">Performance Tuning ActiveMQ webinar </a> <em>by <a shape="rect" class="external-link" href="http://rajdavies.blogspot.com/" rel="nofollow">Rob Davies</a></em></li><li><a shape="rect" class="external-link" href="http://fusesource.com/resources/video-archived-webinars/" rel="nofollow">FuseSource Webinars</a> - Upcoming and archived webinars on Apache ActiveMQ and other related Apache products.</li><li><a shape="rect" class="external-link" href="http://fusesource.com/resources/fuse-tv/" rel="nofollow">FuseSource TV</a> - webcasts about Apache ActiveMQ and related Apache projects.</li></ul><h3 id="Articles-ArticlesonActiveMQ,MessagingandJMS">Articles on ActiveMQ, Messaging and JMS</h3><h4 id="Articles-GeneralArticles">General Articles</h4><ul><li><a shape="rect" class="external-link" href="http://blog.p
 ayara.fish/connecting-to-activemq-with-payara-server" rel="nofollow">Connecting to ActiveMQ with Payara Server</a> by Steve Millidge (December, 2015)</li><li><a shape="rect" class="external-link" href="http://de.slideshare.net/dejanb/messaging-for-web-and-mobile-with-apache-activemq" rel="nofollow">Messaging for Web and Mobile with Apache ActiveMQ</a> by <a shape="rect" class="external-link" href="http://Dejan Bosanac" rel="nofollow">Dejan Bosanac</a> (June, 2013)</li><li><a shape="rect" class="external-link" href="http://de.slideshare.net/bruce.snyder/activemq-in-action" rel="nofollow">ActiveMQ in Action: Common Problems and Solutions</a> by Bruce Snyder (July, 2011)</li><li><a shape="rect" class="external-link" href="http://blog.phatboyg.com/2009/07/12/accessing-activemq-on-mac-osx-from-a-windows-vm/" rel="nofollow">Accessing ActiveMQ on Mac OSX from a Windows VM</a></li><li><a shape="rect" class="external-link" href="http://www.theserverlabs.com/blog/2009/01/22/flex-with-jms-usin
 g-blazeds-jetty-and-activemq/" rel="nofollow">Flex with JMS using BlazeDS, Jetty and ActiveMQ</a> <em>by Kevin McCormack</em> (January, 2009)</li><li><a shape="rect" class="external-link" href="http://christopherhunt-software.blogspot.com/2009/03/mutual-ssl-authentication-and-ldap.html" rel="nofollow">Mutual SSL authentication and LDAP authorisation for ActiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://christopherhunt-software.blogspot.com" rel="nofollow">Christopher Hunt</a></em> (March, 2009)</li><li><a shape="rect" class="external-link" href="http://www.slideshare.net/carsonified/dopplr-its-made-of-messages-matt-biddulph-presentation" rel="nofollow">Made of Messages</a> <em>by Matt Biddulph of <a shape="rect" class="external-link" href="http://www.dopplr.com/" rel="nofollow">Dopplr</a></em></li><li><a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html" rel="nofollow">Simplified BlazeDS and JMS 
 article</a> <em>by <a shape="rect" class="external-link" href="http://mmartinsoftware.blogspot.com/" rel="nofollow">Michael Martin</a></em> (May, 2008)</li><li><a shape="rect" class="external-link" href="http://ourcraft.wordpress.com/2008/07/03/trying-out-xa/" rel="nofollow">Trying out XA</a> with ActiveMQ <em>by Daniel Meyer</em> (July, 2008)</li><li><a shape="rect" class="external-link" href="http://latrz.com/2586" rel="nofollow">Squawk (simple queues using awk)</a> <em>by <a shape="rect" class="external-link" href="http://www.nobugs.org/blog/" rel="nofollow">Andrew Birkett</a></em></li><li><a shape="rect" class="external-link" href="http://p-st.blogspot.com/2007/12/activemq-and-rest.html" rel="nofollow">Using ActiveMQ and REST</a> <em>by <a shape="rect" class="external-link" href="http://p-st.blogspot.com/" rel="nofollow">marlet</a></em> (December, 2007)</li><li><a shape="rect" class="external-link" href="http://esammer.blogspot.com/2007/09/apache-activemq-and-perl.html" rel="nof
 ollow">Apache ActiveMQ and Perl</a> (September, 2007)</li><li><a shape="rect" class="external-link" href="http://remark.wordpress.com/articles/publish-subscribe-with-activemq-and-nms/" rel="nofollow">Publish-Subscribe with ActiveMQ and NMS</a></li><li><a shape="rect" class="external-link" href="http://note19.com/2007/06/24/activemq-masterslave-setup/" rel="nofollow">ActiveMQ Master/Slave Setup</a></li><li><a shape="rect" class="external-link" href="http://weblogs.java.net/blog/rampsarathy/archive/2007/03/glassfish_v2_an.html" rel="nofollow">GlassFish and ActiveMQ</a> <em>by Ramesh Parthasarathy</em> (March, 2007)</li><li><a shape="rect" class="external-link" href="http://jroller.com/page/sjivan?entry=asynchronous_calls_and_callbacks_using" rel="nofollow">Asynchronous calls and callbacks with Lingo and ActiveMQ</a> <em>by Sanjiv Jivan</em> (May, 2006)</li><li><a shape="rect" class="external-link" href="http://www-128.ibm.com/developerworks/opensource/library/os-ag-jmsbeans/" rel="nof
 ollow">Magic with JMS, MDBs, and ActiveMQ in Geronimo</a> <em>by Sing Li</em> (July, 2005)</li><li><a shape="rect" class="external-link" href="http://remark.wordpress.com/articles/implementing-request-response-with-activemq-and-nms/" rel="nofollow">Implementing Request-Response with ActiveMQ and NMS</a> <em>by Mark</em></li><li><a shape="rect" class="external-link" href="http://www.christianposta.com/blog/?p=273" rel="nofollow">Understanding Memory Usage</a> <em>by Christian Posta</em> gives an overview and dive into the memory usage of the broker.</li></ul><h4 id="Articles-ActiveMQMaintenanceandMonitoring">ActiveMQ Maintenance and Monitoring</h4><ul><li><a shape="rect" class="external-link" href="http://www.bennet-schulz.com/2016/07/apache-activemq-and-hawtio.html" rel="nofollow">Running ActiveMQ and hawtio in Standalone Mode</a> by <a shape="rect" class="external-link" href="https://twitter.com/bennetelli" rel="nofollow">Bennet Schulz</a> (July, 2016)</li><li><a shape="rect" class
 ="external-link" href="http://sensatic.net/activemq/activemq-and-hawtio.html" rel="nofollow">Management and monitoring ActiveMQ using hawtio</a> (how to install hawtio out of &#160;the box in ActiveMQ) by Dejan Bosanac (April 2014)</li><li><a shape="rect" class="external-link" href="http://it.toolbox.com/blogs/unix-sysadmin/monitoring-activemq-from-nagios-27743" rel="nofollow">Monitoring ActiveMQ from Nagios</a> <em>by <a shape="rect" class="external-link" href="http://it.toolbox.com/people/therek/" rel="nofollow">Cezary Morga</a></em></li><li><a shape="rect" class="external-link" href="http://soatechlab.blogspot.com/2008/01/use-jconsole-with-activemq-for-quick.html" rel="nofollow">Use JConsole with ActiveMQ for a quick JMS test client</a> <em>by <a shape="rect" class="external-link" href="http://soatechlab.blogspot.com/" rel="nofollow">Rod Biresch</a></em> (January 2008)</li><li><a shape="rect" class="external-link" href="http://www.oreillynet.com/onjava/blog/2007/06/integrating_ac
 tivemq_web_conso.html" rel="nofollow">Integrating ActiveMQ Web Console</a> <em>by <a shape="rect" class="external-link" href="http://www.oreillynet.com/pub/au/1763" rel="nofollow">Dejan Bosanac</a></em> (June 2007)</li><li><a shape="rect" class="external-link" href="http://hermesjms.com/demos/messagestores.html" rel="nofollow">Hermes Message Stores with ActiveMQ demo</a> <em>by Colin Crist</em></li></ul><h4 id="Articles-ActiveMQandDatabases">ActiveMQ and Databases</h4><ul><li><a shape="rect" class="external-link" href="http://barkingiguana.com/2008/12/16/high-availability-activemq-using-a-mysql-datastore" rel="nofollow">High Availability ActiveMQ using MySQL and Ruby</a> <em>by <a shape="rect" class="external-link" href="http://barkingiguana.com/" rel="nofollow">Craig R Webster</a></em> (December 2008)</li><li><a shape="rect" class="external-link" href="http://trenaman.blogspot.com/2008/09/setting-up-postgresql-database-for.html" rel="nofollow">Setting up a PostgreSQL database for A
 ctiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://trenaman.blogspot.com/" rel="nofollow">Adrian Trenaman</a></em> (September 2008)</li><li><a shape="rect" class="external-link" href="http://note19.com/2007/06/23/configure-activemq-with-mysql/" rel="nofollow">Configure ActiveMQ with MySQL</a> <em>By Shahram Javey</em> (June 2007)</li></ul><h4 id="Articles-ActiveMQandSpring">ActiveMQ and Spring</h4><ul><li><a shape="rect" class="external-link" href="https://github.com/bsnyder/spring-jms-examples" rel="nofollow">Spring JMS Examples with ActiveMQ</a> by <a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/" rel="nofollow">Bruce Snyder</a> (June 2011)</li><li><a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html" rel="nofollow">Tuning JMS Message Consumption In Spring</a>&#160;by <a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/" rel="nofollow">Bru
 ce Snyder</a> (May 2010)</li><li><a shape="rect" class="external-link" href="http://codedependents.com/2010/03/04/synchronous-request-response-with-activemq-and-spring/" rel="nofollow">Synchronous Request Response with ActiveMQ and Spring</a> <em>by <a shape="rect" class="external-link" href="http://codedependents.com/" rel="nofollow">CodeDependents</a></em> (March 2010)</li><li><a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html" rel="nofollow">Using Spring to Receive JMS Messages</a>&#160;by&#160;<a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/" rel="nofollow">Bruce Snyder</a> (February 2010)</li><li><a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html" rel="nofollow">Using Spring to Send JMS Messages</a> by <a shape="rect" class="external-link" href="https://bsnyderblog.blogspot.com/" rel="nofollow">Bruce
  Snyder</a> (February 2010)</li><li><a shape="rect" class="external-link" href="http://codedependents.com/2009/10/16/efficient-lightweight-jms-with-spring-and-activemq/" rel="nofollow">Efficient Lightweight JMS with Spring and ActiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://codedependents.com/" rel="nofollow">CodeDependents</a></em> (Octover 2009)</li><li><a shape="rect" class="external-link" href="http://javaandjava.blogspot.com/2008/10/activemq-message-consumer-in-spring.html" rel="nofollow">ActiveMQ Message Consumer in Spring</a> <em>by <a shape="rect" class="external-link" href="http://javaandjava.blogspot.com/" rel="nofollow">Saveen Kumar</a></em> (October 2008)</li><li><a shape="rect" class="external-link" href="http://www.springframework.org/node/527" rel="nofollow">Message-Driven Architectures at The Spring Experience</a> <em>by Keith Donald</em> (September 2007)</li></ul><h4 id="Articles-ActiveMQwithJRuby/Ruby,Railsand/orStomp">ActiveMQ with JRuby/Rub
 y, Rails and/or Stomp</h4><ul><li><a shape="rect" class="external-link" href="http://beechbonanza.blogspot.com/2007/07/jruby-jms-as-replacement-for.html" rel="nofollow">JRuby JMS as a replacement for ActiveMessaging</a></li><li><a shape="rect" class="external-link" href="http://nutrun.com/weblog/jms-with-jruby-and-activemq/" rel="nofollow">JMS with JRuby and ActiveMQ</a></li><li><a shape="rect" class="external-link" href="http://romjethoughts.blogspot.com/2007/05/first-steps-with-rubystomp-and-activemq.html" rel="nofollow">First Steps on Ruby/STOMP and ActiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://romjethoughts.blogspot.com/" rel="nofollow">jerome moliere</a></em></li><li><a shape="rect" class="external-link" href="http://beechbonanza.blogspot.com/2007/06/asynchronous-messaging-with-rails.html" rel="nofollow">Asynchronous Messaging with Rails</a> <em>by <a shape="rect" class="external-link" href="http://beechbonanza.blogspot.com/" rel="nofollow">Shane Harvie
 </a></em></li><li><a shape="rect" class="external-link" href="http://notdennisbyrne.blogspot.com/2007/06/integrating-rails-and-activemq-with.html" rel="nofollow">Integrating Rails and ActiveMQ with ActiveMessaging/REST</a> <em>by <a shape="rect" class="external-link" href="http://notdennisbyrne.blogspot.com/" rel="nofollow">(not) Dennis Byrne</a></em></li><li><a shape="rect" class="external-link" href="http://ramesh-rubyonrails.blogspot.com/2007/09/asynchronous-messaging-using-rails.html" rel="nofollow">Asynchronous Messaging using Rails</a></li><li><a shape="rect" class="external-link" href="http://www.infoq.com/articles/intro-active-messaging-rails" rel="nofollow">Introduction to ActiveMessaging, using Rails with ActiveMQ or Stomp</a> <em>by Andrew Kuklewicz</em></li><li><a shape="rect" class="external-link" href="http://flexonrails.net/?p=83" rel="nofollow">Flex, Rails, ActiveMQ and Stomp</a> <em>by <a shape="rect" class="external-link" href="http://flexonrails.net" rel="nofollow
 ">Flex On Rails</a></em></li><li><a shape="rect" class="external-link" href="http://just-another.net/2008/09/03/activemq-stomp-end-end-test-nagios/" rel="nofollow">ActiveMQ stomp end to end test for nagios</a> <em>by <a shape="rect" class="external-link" href="http://just-another.net/" rel="nofollow">Benjamin Smith</a></em></li><li><a shape="rect" class="external-link" href="http://www.kaazing.org/confluence/display/Doc/JavaScript+STOMP+Client+How-To" rel="nofollow">How to Create a Stomp-Driven Application in JavaScript Using Apache ActiveMQ as a Message Broker</a> <em>by <a shape="rect" class="external-link" href="http://www.kaazing.org/confluence/display/KAAZING/Home" rel="nofollow">Kaazing</a></em></li><li><a shape="rect" class="external-link" href="http://cometdaily.com/2008/10/08/scalable-real-time-web-architecture-part-1-stomp-comet-and-message-queues/" rel="nofollow">Scalable Real-Time Web Architecture, Part 1: Stomp, Comet, and Message Queues</a> <em>by <a shape="rect" class
 ="external-link" href="http://cometdaily.com/people/michael_carter/" rel="nofollow">Michael Carter</a></em></li></ul><h4 id="Articles-ActiveMQand.NET">ActiveMQ and .NET</h4><ul><li><a shape="rect" class="external-link" href="http://remark.wordpress.com/articles/messaging-with-net-and-activemq/" rel="nofollow">Messaging with .NET and ActiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://remark.wordpress.com/" rel="nofollow">Re.Mark</a></em></li><li><a shape="rect" class="external-link" href="http://remark.wordpress.com/articles/messaging-with-net-and-activemq/" rel="nofollow">Using .Net and ActiveMQ</a> <em>by <a shape="rect" class="external-link" href="http://remark.wordpress.com/" rel="nofollow">Re.Mark</a></em></li></ul><h3 id="Articles-MessageBrokerComparison">Message Broker Comparison</h3><ul><li><a shape="rect" class="external-link" href="http://bhavin.directi.com/rabbitmq-vs-apache-activemq-vs-apache-qpid/" rel="nofollow">RabbitMQ vs Apache ActiveMQ vs Apache 
 qpid </a> <em>by Bhavin Turakhia</em> (May, 2010)</li><li><a shape="rect" class="external-link" href="http://www.nighttale.net/activemq/python-messaging-activemq-and-rabbitmq.html" rel="nofollow">Python messaging: ActiveMQ and RabbitMQ</a> <em>by Night Tale</em></li><li><a shape="rect" class="external-link" href="http://stackoverflow.com/questions/32851/multicasting-messaging-activemq-vs-msmq" rel="nofollow">Multicasting, Messaging, ActiveMQ vs. MSMQ?</a> <em>by stackoverflow.com</em></li><li><a shape="rect" class="external-link" href="http://www.fiorano.com/whitepapers/java-message-service/JMS-performance-comparison.php" rel="nofollow">JMS Performance Comparison</a> <em>by www.fiarano.com</em></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/how-does-activemq-compare-to-jbossmq.html">How does ActiveMQ compare to JBossMQ</a></li><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/activemq-users@geronimo.apache.org/msg05630.html" 
 rel="nofollow">Why use ActiveMQ over JBossMQ?</a></li><li><a shape="rect" class="external-link" href="http://www.manning-sandbox.com/thread.jspa?threadID=39270&amp;tstart=45" rel="nofollow">Thread: ActiveMQ vs Websphere MQ </a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/how-does-activemq-compare-to-mule.html">How does ActiveMQ compare to Mule?</a></li><li><a shape="rect" class="external-link" href="http://www.roklee.com/?p=52" rel="nofollow">HornetQ 2.0GA vs ActiveMQ 5.3 &#8211; feature by feature comparison</a> <em>by www.roklee.com</em></li><li><a shape="rect" class="external-link" href="http://www.theserverside.com/discussions/thread.tss?thread_id=57192" rel="nofollow">Performance and scalability: Analysis and comparison of ActiveMQ, Websphere MQ and SonicMQ</a></li><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-vs-Camel-vs-Qpid-td2355914.html" rel="nofollow">ActiveMQ vs. Camel vs. Qpid </a></li><
 /ul><h3 id="Articles-ActiveMQtoolingandscripts">ActiveMQ tooling and scripts</h3><ul><li><a shape="rect" class="external-link" href="https://github.com/ebuzzing/bash-mq" rel="nofollow">Bash-MQ</a> - a bash/awk producer/consumer for activemq or any STOMP compatible MQ</li></ul><h3 id="Articles-BooksandReferenceGuides">Books and Reference Guides</h3><ul><li>Beside these extract of interviews, articles and videos there are also some books available. Take a look at the <a shape="rect" href="books.xml">Books</a> page.</li></ul><h3 id="Articles-AdditionalResources">Additional Resources</h3><ul><li>Many of the Commercial Providers listed on the <a shape="rect" href="support.xml">Support</a> page provide additional examples, articles, tutorials, documentation, etc...</li></ul><h3 id="Articles-ActiveMQbloggers">ActiveMQ bloggers</h3><ul><li><a shape="rect" class="external-link" href="http://rajdavies.blogspot.com/" rel="nofollow">Rob Davies</a></li><li><a shape="rect" class="external-link" h
 ref="http://hiramchirino.com/blog/" rel="nofollow">Hiram Chirino</a></li><li><a shape="rect" class="external-link" href="http://blog.garytully.com/" rel="nofollow">Gary Tully</a></li><li><a shape="rect" class="external-link" href="http://www.nighttale.net" rel="nofollow">Dejan Bosanac</a></li><li><a shape="rect" class="external-link" href="http://bruceblog.org/" rel="nofollow">Bruce Snyder</a></li><li><a shape="rect" class="external-link" href="http://www.christianposta.com/blog" rel="nofollow">Christian Posta</a></li></ul></div>
+<div class="wiki-content maincontent"><p>This page captures resources and articles outside the ActiveMQ project which may assist your development. Please add any new resources that you come across by clicking the edit link at the bottom of the page. If you do this, please make sure to attach a date to the article as well so users are aware of how recent it is.</p><h3>Interviews and Podcasts</h3><ul><li><a shape="rect" href="http://feathercast.org/?p=42">ActiveMQ FeatherCast</a>, James Strachan is interviewed on the ActiveMQ project</li></ul><h3>Webinars, Videos and Screencasts</h3><ul><li><a shape="rect" href="http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm">Apache ActiveMQ - Connecting Applications everywhere</a> by <em><a shape="rect" href="http://rajdavies.blogspot.com/">Rob Davies</a></em></li><li><a shape="rect" href="http://download.progress.com/5331/open/adobe/prc/psc/perf_tuning_activemq/index.htm">Performance Tuning ActiveMQ webinar </a> 
 <em>by <a shape="rect" href="http://rajdavies.blogspot.com/">Rob Davies</a></em></li><li><a shape="rect" href="http://fusesource.com/resources/video-archived-webinars/">FuseSource Webinars</a> - Upcoming and archived webinars on Apache ActiveMQ and other related Apache products.</li><li><a shape="rect" href="http://fusesource.com/resources/fuse-tv/">FuseSource TV</a> - webcasts about Apache ActiveMQ and related Apache projects.</li></ul><h3>Articles on ActiveMQ, Messaging and JMS</h3><h4>General Articles</h4><ul><li><a shape="rect" href="http://blog.payara.fish/connecting-to-activemq-with-payara-server">Connecting to ActiveMQ with Payara Server</a> by Steve Millidge (December, 2015)</li><li><a shape="rect" href="http://de.slideshare.net/dejanb/messaging-for-web-and-mobile-with-apache-activemq">Messaging for Web and Mobile with Apache ActiveMQ</a> by <a shape="rect" href="http://Dejan Bosanac">Dejan Bosanac</a> (June, 2013)</li><li><a shape="rect" href="http://de.slideshare.net/bruce
 .snyder/activemq-in-action">ActiveMQ in Action: Common Problems and Solutions</a> by Bruce Snyder (July, 2011)</li><li><a shape="rect" href="http://blog.phatboyg.com/2009/07/12/accessing-activemq-on-mac-osx-from-a-windows-vm/">Accessing ActiveMQ on Mac OSX from a Windows VM</a></li><li><a shape="rect" href="http://www.theserverlabs.com/blog/2009/01/22/flex-with-jms-using-blazeds-jetty-and-activemq/">Flex with JMS using BlazeDS, Jetty and ActiveMQ</a> <em>by Kevin McCormack</em> (January, 2009)</li><li><a shape="rect" href="http://christopherhunt-software.blogspot.com/2009/03/mutual-ssl-authentication-and-ldap.html">Mutual SSL authentication and LDAP authorisation for ActiveMQ</a> <em>by <a shape="rect" href="http://christopherhunt-software.blogspot.com">Christopher Hunt</a></em> (March, 2009)</li><li><a shape="rect" href="http://www.slideshare.net/carsonified/dopplr-its-made-of-messages-matt-biddulph-presentation">Made of Messages</a> <em>by Matt Biddulph of <a shape="rect" href="ht
 tp://www.dopplr.com/">Dopplr</a></em></li><li><a shape="rect" href="http://mmartinsoftware.blogspot.com/2008/05/simplified-blazeds-and-jms.html">Simplified BlazeDS and JMS article</a> <em>by <a shape="rect" href="http://mmartinsoftware.blogspot.com/">Michael Martin</a></em> (May, 2008)</li><li><a shape="rect" href="http://ourcraft.wordpress.com/2008/07/03/trying-out-xa/">Trying out XA</a> with ActiveMQ <em>by Daniel Meyer</em> (July, 2008)</li><li><a shape="rect" href="http://latrz.com/2586">Squawk (simple queues using awk)</a> <em>by <a shape="rect" href="http://www.nobugs.org/blog/">Andrew Birkett</a></em></li><li><a shape="rect" href="http://p-st.blogspot.com/2007/12/activemq-and-rest.html">Using ActiveMQ and REST</a> <em>by <a shape="rect" href="http://p-st.blogspot.com/">marlet</a></em> (December, 2007)</li><li><a shape="rect" href="http://esammer.blogspot.com/2007/09/apache-activemq-and-perl.html">Apache ActiveMQ and Perl</a> (September, 2007)</li><li><a shape="rect" href="htt
 p://remark.wordpress.com/articles/publish-subscribe-with-activemq-and-nms/">Publish-Subscribe with ActiveMQ and NMS</a></li><li><a shape="rect" href="http://note19.com/2007/06/24/activemq-masterslave-setup/">ActiveMQ Master/Slave Setup</a></li><li><a shape="rect" href="http://weblogs.java.net/blog/rampsarathy/archive/2007/03/glassfish_v2_an.html">GlassFish and ActiveMQ</a> <em>by Ramesh Parthasarathy</em> (March, 2007)</li><li><a shape="rect" href="http://jroller.com/page/sjivan?entry=asynchronous_calls_and_callbacks_using">Asynchronous calls and callbacks with Lingo and ActiveMQ</a> <em>by Sanjiv Jivan</em> (May, 2006)</li><li><a shape="rect" href="http://www-128.ibm.com/developerworks/opensource/library/os-ag-jmsbeans/">Magic with JMS, MDBs, and ActiveMQ in Geronimo</a> <em>by Sing Li</em> (July, 2005)</li><li><a shape="rect" href="http://remark.wordpress.com/articles/implementing-request-response-with-activemq-and-nms/">Implementing Request-Response with ActiveMQ and NMS</a> <em>
 by Mark</em></li><li><a shape="rect" href="http://www.christianposta.com/blog/?p=273">Understanding Memory Usage</a> <em>by Christian Posta</em> gives an overview and dive into the memory usage of the broker.</li></ul><h4>ActiveMQ Maintenance and Monitoring</h4><ul><li><a shape="rect" href="http://www.bennet-schulz.com/2016/07/apache-activemq-and-hawtio.html">Running ActiveMQ and hawtio in Standalone Mode</a> by <a shape="rect" href="https://twitter.com/bennetelli">Bennet Schulz</a> (July, 2016)</li><li><a shape="rect" href="http://sensatic.net/activemq/activemq-and-hawtio.html">Management and monitoring ActiveMQ using hawtio</a> (how to install hawtio out of &#160;the box in ActiveMQ) by Dejan Bosanac (April 2014)</li><li><a shape="rect" href="http://it.toolbox.com/blogs/unix-sysadmin/monitoring-activemq-from-nagios-27743">Monitoring ActiveMQ from Nagios</a> <em>by <a shape="rect" href="http://it.toolbox.com/people/therek/">Cezary Morga</a></em></li><li><a shape="rect" href="http:/
 /soatechlab.blogspot.com/2008/01/use-jconsole-with-activemq-for-quick.html">Use JConsole with ActiveMQ for a quick JMS test client</a> <em>by <a shape="rect" href="http://soatechlab.blogspot.com/">Rod Biresch</a></em> (January 2008)</li><li><a shape="rect" href="http://www.oreillynet.com/onjava/blog/2007/06/integrating_activemq_web_conso.html">Integrating ActiveMQ Web Console</a> <em>by <a shape="rect" href="http://www.oreillynet.com/pub/au/1763">Dejan Bosanac</a></em> (June 2007)</li><li><a shape="rect" href="http://hermesjms.com/demos/messagestores.html">Hermes Message Stores with ActiveMQ demo</a> <em>by Colin Crist</em></li></ul><h4>ActiveMQ and Databases</h4><ul><li><a shape="rect" href="http://barkingiguana.com/2008/12/16/high-availability-activemq-using-a-mysql-datastore">High Availability ActiveMQ using MySQL and Ruby</a> <em>by <a shape="rect" href="http://barkingiguana.com/">Craig R Webster</a></em> (December 2008)</li><li><a shape="rect" href="http://trenaman.blogspot.com
 /2008/09/setting-up-postgresql-database-for.html">Setting up a PostgreSQL database for ActiveMQ</a> <em>by <a shape="rect" href="http://trenaman.blogspot.com/">Adrian Trenaman</a></em> (September 2008)</li><li><a shape="rect" href="http://note19.com/2007/06/23/configure-activemq-with-mysql/">Configure ActiveMQ with MySQL</a> <em>By Shahram Javey</em> (June 2007)</li></ul><h4>ActiveMQ and Spring</h4><ul><li><a shape="rect" href="https://github.com/bsnyder/spring-jms-examples">Spring JMS Examples with ActiveMQ</a> by <a shape="rect" href="https://bsnyderblog.blogspot.com/">Bruce Snyder</a> (June 2011)</li><li><a shape="rect" href="https://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html">Tuning JMS Message Consumption In Spring</a>&#160;by <a shape="rect" href="https://bsnyderblog.blogspot.com/">Bruce Snyder</a> (May 2010)</li><li><a shape="rect" href="http://codedependents.com/2010/03/04/synchronous-request-response-with-activemq-and-spring/">Synchronous Reques
 t Response with ActiveMQ and Spring</a> <em>by <a shape="rect" href="http://codedependents.com/">CodeDependents</a></em> (March 2010)</li><li><a shape="rect" href="https://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html">Using Spring to Receive JMS Messages</a>&#160;by&#160;<a shape="rect" href="https://bsnyderblog.blogspot.com/">Bruce Snyder</a> (February 2010)</li><li><a shape="rect" href="https://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html">Using Spring to Send JMS Messages</a> by <a shape="rect" href="https://bsnyderblog.blogspot.com/">Bruce Snyder</a> (February 2010)</li><li><a shape="rect" href="http://codedependents.com/2009/10/16/efficient-lightweight-jms-with-spring-and-activemq/">Efficient Lightweight JMS with Spring and ActiveMQ</a> <em>by <a shape="rect" href="http://codedependents.com/">CodeDependents</a></em> (Octover 2009)</li><li><a shape="rect" href="http://javaandjava.blogspot.com/2008/10/activemq-message-co
 nsumer-in-spring.html">ActiveMQ Message Consumer in Spring</a> <em>by <a shape="rect" href="http://javaandjava.blogspot.com/">Saveen Kumar</a></em> (October 2008)</li><li><a shape="rect" href="http://www.springframework.org/node/527">Message-Driven Architectures at The Spring Experience</a> <em>by Keith Donald</em> (September 2007)</li></ul><h4>ActiveMQ with JRuby/Ruby, Rails and/or Stomp</h4><ul><li><a shape="rect" href="http://beechbonanza.blogspot.com/2007/07/jruby-jms-as-replacement-for.html">JRuby JMS as a replacement for ActiveMessaging</a></li><li><a shape="rect" href="http://nutrun.com/weblog/jms-with-jruby-and-activemq/">JMS with JRuby and ActiveMQ</a></li><li><a shape="rect" href="http://romjethoughts.blogspot.com/2007/05/first-steps-with-rubystomp-and-activemq.html">First Steps on Ruby/STOMP and ActiveMQ</a> <em>by <a shape="rect" href="http://romjethoughts.blogspot.com/">jerome moliere</a></em></li><li><a shape="rect" href="http://beechbonanza.blogspot.com/2007/06/asynch
 ronous-messaging-with-rails.html">Asynchronous Messaging with Rails</a> <em>by <a shape="rect" href="http://beechbonanza.blogspot.com/">Shane Harvie</a></em></li><li><a shape="rect" href="http://notdennisbyrne.blogspot.com/2007/06/integrating-rails-and-activemq-with.html">Integrating Rails and ActiveMQ with ActiveMessaging/REST</a> <em>by <a shape="rect" href="http://notdennisbyrne.blogspot.com/">(not) Dennis Byrne</a></em></li><li><a shape="rect" href="http://ramesh-rubyonrails.blogspot.com/2007/09/asynchronous-messaging-using-rails.html">Asynchronous Messaging using Rails</a></li><li><a shape="rect" href="http://www.infoq.com/articles/intro-active-messaging-rails">Introduction to ActiveMessaging, using Rails with ActiveMQ or Stomp</a> <em>by Andrew Kuklewicz</em></li><li><a shape="rect" href="http://flexonrails.net/?p=83">Flex, Rails, ActiveMQ and Stomp</a> <em>by <a shape="rect" href="http://flexonrails.net">Flex On Rails</a></em></li><li><a shape="rect" href="http://just-another
 .net/2008/09/03/activemq-stomp-end-end-test-nagios/">ActiveMQ stomp end to end test for nagios</a> <em>by <a shape="rect" href="http://just-another.net/">Benjamin Smith</a></em></li><li><a shape="rect" href="http://www.kaazing.org/confluence/display/Doc/JavaScript+STOMP+Client+How-To">How to Create a Stomp-Driven Application in JavaScript Using Apache ActiveMQ as a Message Broker</a> <em>by <a shape="rect" href="http://www.kaazing.org/confluence/display/KAAZING/Home">Kaazing</a></em></li><li><a shape="rect" href="http://cometdaily.com/2008/10/08/scalable-real-time-web-architecture-part-1-stomp-comet-and-message-queues/">Scalable Real-Time Web Architecture, Part 1: Stomp, Comet, and Message Queues</a> <em>by <a shape="rect" href="http://cometdaily.com/people/michael_carter/">Michael Carter</a></em></li></ul><h4>ActiveMQ and .NET</h4><ul><li><a shape="rect" href="http://remark.wordpress.com/articles/messaging-with-net-and-activemq/">Messaging with .NET and ActiveMQ</a> <em>by <a shape
 ="rect" href="http://remark.wordpress.com/">Re.Mark</a></em></li><li><a shape="rect" href="http://remark.wordpress.com/articles/messaging-with-net-and-activemq/">Using .Net and ActiveMQ</a> <em>by <a shape="rect" href="http://remark.wordpress.com/">Re.Mark</a></em></li></ul><h3>Message Broker Comparison</h3><ul><li><a shape="rect" href="http://bhavin.directi.com/rabbitmq-vs-apache-activemq-vs-apache-qpid/">RabbitMQ vs Apache ActiveMQ vs Apache qpid </a> <em>by Bhavin Turakhia</em> (May, 2010)</li><li><a shape="rect" href="http://www.nighttale.net/activemq/python-messaging-activemq-and-rabbitmq.html">Python messaging: ActiveMQ and RabbitMQ</a> <em>by Night Tale</em></li><li><a shape="rect" href="http://stackoverflow.com/questions/32851/multicasting-messaging-activemq-vs-msmq">Multicasting, Messaging, ActiveMQ vs. MSMQ?</a> <em>by stackoverflow.com</em></li><li><a shape="rect" href="http://www.fiorano.com/whitepapers/java-message-service/JMS-performance-comparison.php">JMS Performance
  Comparison</a> <em>by www.fiarano.com</em></li><li><a shape="rect" href="http://activemq.apache.org/how-does-activemq-compare-to-jbossmq.html">How does ActiveMQ compare to JBossMQ</a></li><li><a shape="rect" href="http://www.mail-archive.com/activemq-users@geronimo.apache.org/msg05630.html">Why use ActiveMQ over JBossMQ?</a></li><li><a shape="rect" href="http://www.manning-sandbox.com/thread.jspa?threadID=39270&amp;tstart=45">Thread: ActiveMQ vs Websphere MQ </a></li><li><a shape="rect" href="http://activemq.apache.org/how-does-activemq-compare-to-mule.html">How does ActiveMQ compare to Mule?</a></li><li><a shape="rect" href="http://www.roklee.com/?p=52">HornetQ 2.0GA vs ActiveMQ 5.3 &#8211; feature by feature comparison</a> <em>by www.roklee.com</em></li><li><a shape="rect" href="http://www.theserverside.com/discussions/thread.tss?thread_id=57192">Performance and scalability: Analysis and comparison of ActiveMQ, Websphere MQ and SonicMQ</a></li><li><a shape="rect" href="http://act
 ivemq.2283324.n4.nabble.com/ActiveMQ-vs-Camel-vs-Qpid-td2355914.html">ActiveMQ vs. Camel vs. Qpid </a></li></ul><h3>ActiveMQ tooling and scripts</h3><ul><li><a shape="rect" href="https://github.com/ebuzzing/bash-mq">Bash-MQ</a> - a bash/awk producer/consumer for activemq or any STOMP compatible MQ</li></ul><h3>Books and Reference Guides</h3><ul><li>Beside these extract of interviews, articles and videos there are also some books available. Take a look at the <link><page ri:content-title="Books"></page></link> page.</li></ul><h3>Additional Resources</h3><ul><li>Many of the Commercial Providers listed on the <link><page ri:content-title="Support"></page></link> page provide additional examples, articles, tutorials, documentation, etc...</li></ul><h3>ActiveMQ bloggers</h3><ul><li><a shape="rect" href="http://rajdavies.blogspot.com/">Rob Davies</a></li><li><a shape="rect" href="http://hiramchirino.com/blog/">Hiram Chirino</a></li><li><a shape="rect" href="http://blog.garytully.com/">Gar
 y Tully</a></li><li><a shape="rect" href="http://www.nighttale.net">Dejan Bosanac</a></li><li><a shape="rect" href="http://bruceblog.org/">Bruce Snyder</a></li><li><a shape="rect" href="http://www.christianposta.com/blog">Christian Posta</a></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/async-sends.xml
----------------------------------------------------------------------
diff --git a/async-sends.xml b/async-sends.xml
index 2dfa1a9..8e20b90 100644
--- a/async-sends.xml
+++ b/async-sends.xml
@@ -1,11 +1,5 @@
-<div class="wiki-content maincontent"><h2 id="AsyncSends-Background">Background</h2><p>ActiveMQ supports sending messages to a broker in sync or async mode. The mode used has a huge impact in the latency of the send call. Since latency is typically a huge factor in the throughput that can achieved by producer, using async sends can increase the performance of your system dramatically.</p><p>The good news is that ActiveMQ sends message in async mode by default in several cases. It is only in cases where the JMS specification required the use of sync sending that we default to sync sending. The cases that we are forced to send in sync mode are when persistent messages are being sent outside of a transaction.</p><p>If you are not using transactions and are sending persistent messages, then each send is synch and blocks until the broker has sent back an acknowledgement to the producer that the message has been safely persisted to disk. This ack provides that guarantee that the message w
 ill not be lost but it also costs a huge latency penalty since the client is blocked.</p><p>Many high performance applications are designed to be tolerate a small amount of message loss in failure scenarios. If your application has been designed in this fashion, you can enable the use of async sends to increase throughput even when using persistent messages.</p><h3 id="AsyncSends-ConfiguringAsyncSendusingaConnectionURI">Configuring Async Send using a Connection URI</h3><p>You can use the <a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a> to configure async sends 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[cf = new ActiveMQConnectionFactory(&quot;tcp://locahost:61616?jms.useAsyncSend=true&quot;);
-]]></script>
-</div></div><h3 id="AsyncSends-ConfiguringAsyncSendattheConnectionFactoryLevel">Configuring Async Send at the ConnectionFactory Level</h3><p>You can enable this feature on the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory </a> object using the property.</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).setUseAsyncSend(true);
-]]></script>
-</div></div><h3 id="AsyncSends-ConfiguringAsyncSendattheConnectionLevel">Configuring Async Send at the Connection Level</h3><p>Configuring the dispatchAsync setting at this level overrides the settings at the connection factory level.</p><p>You can enable this feature on the <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> object using the property.</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[((ActiveMQConnection)connection).setUseAsyncSend(true);
-]]></script>
-</div></div><h3 id="AsyncSends-Alsosee">Also see</h3><ul><li><a shape="rect" href="connection-configuration-uri.xml">Connection Configuration URI</a></li><li><a shape="rect" href="should-i-use-transactions.xml">Should I use transactions</a></li><li><a shape="rect" href="consumer-dispatch-async.xml">Consumer Dispatch Async</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>Background</h2><p>ActiveMQ supports sending messages to a broker in sync or async mode. The mode used has a huge impact in the latency of the send call. Since latency is typically a huge factor in the throughput that can achieved by producer, using async sends can increase the performance of your system dramatically.</p><p>The good news is that ActiveMQ sends message in async mode by default in several cases. It is only in cases where the JMS specification required the use of sync sending that we default to sync sending. The cases that we are forced to send in sync mode are when persistent messages are being sent outside of a transaction.</p><p>If you are not using transactions and are sending persistent messages, then each send is synch and blocks until the broker has sent back an acknowledgement to the producer that the message has been safely persisted to disk. This ack provides that guarantee that the message will not be lost but it also
  costs a huge latency penalty since the client is blocked.</p><p>Many high performance applications are designed to be tolerate a small amount of message loss in failure scenarios. If your application has been designed in this fashion, you can enable the use of async sends to increase throughput even when using persistent messages.</p><h3>Configuring Async Send using a Connection URI</h3><p>You can use the <link><page ri:content-title="Connection Configuration URI"></page></link> to configure async sends as follows</p><structured-macro ac:macro-id="bc12bc02-703c-484c-910d-2e32a9a0ec5b" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>cf = new ActiveMQConnectionFactory("tcp://locahost:61616?jms.useAsyncSend=true");
+</plain-text-body></structured-macro><h3>Configuring Async Send at the ConnectionFactory Level</h3><p>You can enable this feature on the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory </a> object using the property.</p><structured-macro ac:macro-id="f193f85f-3401-4dd5-a594-dbc3128f51c4" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>((ActiveMQConnectionFactory)connectionFactory).setUseAsyncSend(true);
+</plain-text-body></structured-macro><h3>Configuring Async Send at the Connection Level</h3><p>Configuring the dispatchAsync setting at this level overrides the settings at the connection factory level.</p><p>You can enable this feature on the <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html">ActiveMQConnection</a> object using the property.</p><structured-macro ac:macro-id="68830b08-1a0d-4d5a-ab6e-78cd6ef9089e" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>((ActiveMQConnection)connection).setUseAsyncSend(true);
+</plain-text-body></structured-macro><h3>Also see</h3><ul><li><link><page ri:content-title="Connection Configuration URI"></page></link></li><li><link><page ri:content-title="Should I use transactions"></page></link></li><li><link><page ri:content-title="Consumer Dispatch Async"></page></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/audit-logging.xml
----------------------------------------------------------------------
diff --git a/audit-logging.xml b/audit-logging.xml
index 15f7c2c..7ccd2eb 100644
--- a/audit-logging.xml
+++ b/audit-logging.xml
@@ -1,15 +1,12 @@
-<div class="wiki-content maincontent"><p>For many secured environments there's a requirement to log every user management action. For that ActiveMQ implements <em>audit logging</em>, which means that every management action made through JMX or Web Console management interface will be logged and available for later inspection.</p><p>Audit logging comes pre-configured with the distribution, so it's very easy to turn it on or off. All you have to do is to set <code>org.apache.activemq.audit</code> system property. &#160;From 5.16.0 the value can be one of "true|entry|exit|all". When the value is all or exit, the audit captures the time the JMX operation completed. You can do that by uncommenting the following line in the startup script:</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[ACTIVEMQ_OPTS=&quot;$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true&quot;
-]]></script>
-</div></div><p>The actual logs are by default stored in <code>${ACTIVEMQ_HOME}/data/audit.log</code> and for secured broker you may expect entries similar to 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[2010-12-22 12:12:07,225 | INFO  | admin requested /admin/createDestination.action [JMSDestination=&#39;test&#39; JMSDestinationType=&#39;queue&#39; 
-secret=&#39;4eb0bc3e-9d7a-4256-844c-24f40fda98f1&#39; ] from 127.0.0.1 | qtp12205619-39
-2010-12-22 12:12:14,512 | INFO  | admin requested /admin/purgeDestination.action [JMSDestination=&#39;test&#39; JMSDestinationType=&#39;queue&#39; 
-secret=&#39;eff6a932-1b58-45da-a64a-1b30b246cfc9&#39; ] from 127.0.0.1 | qtp12205619-36
-2010-12-22 12:12:17,802 | INFO  | admin requested /admin/sendMessage.action [JMSTimeToLive=&#39;&#39; JMSXGroupSeq=&#39;&#39; AMQ_SCHEDULED_DELAY=&#39;&#39; JMSType=&#39;&#39; 
-JMSMessageCountHeader=&#39;JMSXMessageCounter&#39; JMSXGroupID=&#39;&#39; JMSReplyTo=&#39;&#39; JMSDestination=&#39;test&#39; AMQ_SCHEDULED_PERIOD=&#39;&#39; JMSText=&#39;Enter some text 
-here for the message body...&#39; JMSDestinationType=&#39;queue&#39; AMQ_SCHEDULED_CRON=&#39;&#39; JMSCorrelationID=&#39;&#39; AMQ_SCHEDULED_REPEAT=&#39;&#39; JMSMessageCount=&#39;1&#39; 
-secret=&#39;a0e1df62-14d6-4425-82a2-17aa01a16e7d&#39; JMSPriority=&#39;&#39; ] from 127.0.0.1 | qtp12205619-37
+<div class="wiki-content maincontent"><p>For many secured environments there's a requirement to log every user management action. For that ActiveMQ implements <em>audit logging</em>, which means that every management action made through JMX or Web Console management interface will be logged and available for later inspection.</p><p>Audit logging comes pre-configured with the distribution, so it's very easy to turn it on or off. All you have to do is to set <code>org.apache.activemq.audit</code> system property. &#160;From 5.16.0 the value can be one of "true|entry|exit|all". When the value is all or exit, the audit captures the time the JMX operation completed. You can do that by uncommenting the following line in the startup script:</p><structured-macro ac:macro-id="133e6c51-e580-4b57-b0c7-1c109a35b72b" ac:name="code" ac:schema-version="1"><plain-text-body>ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true"
+</plain-text-body></structured-macro><p>The actual logs are by default stored in <code>${ACTIVEMQ_HOME}/data/audit.log</code> and for secured broker you may expect entries similar to the following:</p><structured-macro ac:macro-id="d87a0230-8455-4ec7-82a5-9126c485fd82" ac:name="code" ac:schema-version="1"><plain-text-body>2010-12-22 12:12:07,225 | INFO  | admin requested /admin/createDestination.action [JMSDestination='test' JMSDestinationType='queue' 
+secret='4eb0bc3e-9d7a-4256-844c-24f40fda98f1' ] from 127.0.0.1 | qtp12205619-39
+2010-12-22 12:12:14,512 | INFO  | admin requested /admin/purgeDestination.action [JMSDestination='test' JMSDestinationType='queue' 
+secret='eff6a932-1b58-45da-a64a-1b30b246cfc9' ] from 127.0.0.1 | qtp12205619-36
+2010-12-22 12:12:17,802 | INFO  | admin requested /admin/sendMessage.action [JMSTimeToLive='' JMSXGroupSeq='' AMQ_SCHEDULED_DELAY='' JMSType='' 
+JMSMessageCountHeader='JMSXMessageCounter' JMSXGroupID='' JMSReplyTo='' JMSDestination='test' AMQ_SCHEDULED_PERIOD='' JMSText='Enter some text 
+here for the message body...' JMSDestinationType='queue' AMQ_SCHEDULED_CRON='' JMSCorrelationID='' AMQ_SCHEDULED_REPEAT='' JMSMessageCount='1' 
+secret='a0e1df62-14d6-4425-82a2-17aa01a16e7d' JMSPriority='' ] from 127.0.0.1 | qtp12205619-37
 
 ...
 
@@ -17,6 +14,5 @@ secret=&#39;a0e1df62-14d6-4425-82a2-17aa01a16e7d&#39; JMSPriority=&#39;&#39; ] f
 2010-12-22 12:13:21,976 | INFO  | admin called org.apache.activemq.broker.jmx.QueueView.resetStatistics[] | RMI TCP Connection(8)-192.168.1.107
 2010-12-22 12:13:32,457 | INFO  | admin called org.apache.activemq.broker.jmx.QueueView.sendTextMessage[message] | RMI TCP Connection(6)-
 192.168.1.107
-]]></script>
-</div></div><p>In this example you can see sample entries for actions taken both in Web Console or via JMX. Log entries contain info like:</p><ul><li>username (if available), or "anonymous" otherwise</li><li>Operation performed, which in JMX case is the method name and request URL if the operation is performed over web</li><li>Parameters used for the operation and</li><li>IP address from which call has been made</li></ul><p>A default location of the audit log can be configured in <code>${ACTIVEMQ_HOME}/conf/log4j.properties</code></p></div>
+</plain-text-body></structured-macro><p>In this example you can see sample entries for actions taken both in Web Console or via JMX. Log entries contain info like:</p><ul><li>username (if available), or "anonymous" otherwise</li><li>Operation performed, which in JMX case is the method name and request URL if the operation is performed over web</li><li>Parameters used for the operation and</li><li>IP address from which call has been made</li></ul><p>A default location of the audit log can be configured in <code>${ACTIVEMQ_HOME}/conf/log4j.properties</code></p></div>
 


[35/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/amq-message-store.xml
----------------------------------------------------------------------
diff --git a/amq-message-store.xml b/amq-message-store.xml
index 4ec1613..a9e7bed 100644
--- a/amq-message-store.xml
+++ b/amq-message-store.xml
@@ -1,76 +1,74 @@
-<div class="wiki-content maincontent"><h2 id="AMQMessageStore-TheBasics">The Basics</h2>
+<div class="wiki-content maincontent"><h2>The Basics</h2>
 
 <p>This is the default storage for AcitveMQ 5 and above. The AMQ Message Store is an embeddable  transactional message storage solution that is extremely fast and reliable.<br clear="none">
 message commands are written to a transactional journal - which consists of rolling data logs - which means writing is extremely fast and the state of the store is easily recoverable.</p>
 
 <p>Messages themselves are persisted in the data logs of the journal - with references to their location being held by a reference store (by default Kaha) for fast retrevial.</p>
 
-<div class="sectionColumnWrapper"><div class="sectionMacro">
-<div class="sectionMacroRow"><div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;">
-<p><span class="confluence-embedded-file-wrapper image-left-wrapper"><img class="confluence-embedded-image image-left" src="amq-message-store.data/amqstore.png" data-image-src="/confluence/download/attachments/69705/amqstore.png?version=1&amp;modificationDate=1193701758000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="59670904" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="amqstore.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="69705" data-linked-resource-container-version="21"></span></p></div>
-<div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;">
+<structured-macro ac:macro-id="7b4e09fb-98ad-415f-948f-997829c0c1e0" ac:name="section" ac:schema-version="1"><rich-text-body>
+<structured-macro ac:macro-id="0723c06c-d5db-4d8f-abc1-61861fe50ad6" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text-body>
+<p><image ac:align="left"><attachment ri:filename="amqstore.png"></attachment></image></p></rich-text-body></structured-macro>
+<structured-macro ac:macro-id="84ca978d-31f3-486b-a66f-851f790e124e" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text-body>
 <p><br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
 References to messages are held in memory, and periodically inserted into the reference store to improve performance.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
-The messages are stored in data logs, which are individual files, typically 32mb in size (though this is configurable, they can be larger if the size of a message is large than the file size). When all the messages in a data log have been successfully consumed, the data log file is marked as being ready to be deleted - or archived - which will happen at the next clean up period.</p></div>
-</div></div></div>
+The messages are stored in data logs, which are individual files, typically 32mb in size (though this is configurable, they can be larger if the size of a message is large than the file size). When all the messages in a data log have been successfully consumed, the data log file is marked as being ready to be deleted - or archived - which will happen at the next clean up period.</p></rich-text-body></structured-macro>
+</rich-text-body></structured-macro>
 
-<h2 id="AMQMessageStore-Configuration">Configuration</h2>
+<h2>Configuration</h2>
 
 <p>By default ActiveMQ will use the the AMQ Store - and its default settings. You can configure the properties of the AMQ Store however, by explictly defining its persistence adapter (amqPersistenceAdapter):</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
- &lt;broker brokerName=&quot;broker&quot; persistent=&quot;true&quot; useShutdownHook=&quot;false&quot;&gt;
+<structured-macro ac:macro-id="2c5bea15-0e72-4a54-87da-44e58c3c6f55" ac:name="code" ac:schema-version="1"><plain-text-body>
+ &lt;broker brokerName="broker" persistent="true" useShutdownHook="false"&gt;
     &lt;persistenceAdapter&gt;
-      &lt;amqPersistenceAdapter directory=&quot;${activemq.base}/activemq-data&quot; maxFileLength=&quot;32mb&quot;/&gt;
+      &lt;amqPersistenceAdapter directory="${activemq.base}/activemq-data" maxFileLength="32mb"/&gt;
     &lt;/persistenceAdapter&gt;
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61616&quot;/&gt;
+      &lt;transportConnector uri="tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
   &lt;/broker&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The above shows the configuration required to set the AMQ Store through its amqPersistenceAdapter - and explicity setting the directory and maxFileLength properties.</p>
 
-<h3 id="AMQMessageStore-AMQStoreProperties">AMQ Store Properties</h3>
+<h3>AMQ Store Properties</h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>directory</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-data</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the path to the directory to use to store the message store data and log files</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useNIO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>use NIO to write messages to the data logs</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>syncOnWrite</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" cla
 ss="confluenceTd"><p>sync every write to disk</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxFileLength</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>32mb</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>a hint to set the maximum size of the message data logs</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>persistentIndex</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>use a persistent index for the message logs. If this is false, an in-memory structure is maintained</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maxCheckpointMessageAddSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>4kb</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the maximum number of messages to keep in a transaction before automatically committing</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p
 >cleanupInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>time (ms) before checking for a discarding/moving message data logs that are no longer used</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>indexBinSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1024</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>default number of bins used by the index. The bigger the bin size - the better the relative performance of the index</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>indexKeySize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>96</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the size of the index key - the key is the message id </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>indexPageSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>16kb</p></td><td colspan="1" rowspa
 n="1" class="confluenceTd"><p>the size of the index page - the bigger the page - the better the write performance of the index </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>directoryArchive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>archive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the path to the directory to use to store discarded data logs</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>archiveDataLogs</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if true data logs are moved to the archive directory instead of being deleted</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>Comments</p></th></tr><tr><td colspan="1" rowspan="1"><p>directory</p></td><td colspan="1" rowspan="1"><p>activemq-data</p></td><td colspan="1" rowspan="1"><p>the path to the directory to use to store the message store data and log files</p></td></tr><tr><td colspan="1" rowspan="1"><p>useNIO</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>use NIO to write messages to the data logs</p></td></tr><tr><td colspan="1" rowspan="1"><p>syncOnWrite</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>sync every write to disk</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxFileLength</p></td><td colspan="1" rowspan="1"><p>32mb</p></td><td colspan="1" rowspan="1"><p>a hint to set the maximum size of the message data logs</p></td></tr><tr><td colspan="1" rowspan="1"><p>persi
 stentIndex</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>use a persistent index for the message logs. If this is false, an in-memory structure is maintained</p></td></tr><tr><td colspan="1" rowspan="1"><p>maxCheckpointMessageAddSize</p></td><td colspan="1" rowspan="1"><p>4kb</p></td><td colspan="1" rowspan="1"><p>the maximum number of messages to keep in a transaction before automatically committing</p></td></tr><tr><td colspan="1" rowspan="1"><p>cleanupInterval</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>time (ms) before checking for a discarding/moving message data logs that are no longer used</p></td></tr><tr><td colspan="1" rowspan="1"><p>indexBinSize</p></td><td colspan="1" rowspan="1"><p>1024</p></td><td colspan="1" rowspan="1"><p>default number of bins used by the index. The bigger the bin size - the better the relative performance of the index</p></td></tr><tr><td colspan="1" rowspan="1"><p>indexKey
 Size</p></td><td colspan="1" rowspan="1"><p>96</p></td><td colspan="1" rowspan="1"><p>the size of the index key - the key is the message id </p></td></tr><tr><td colspan="1" rowspan="1"><p>indexPageSize</p></td><td colspan="1" rowspan="1"><p>16kb</p></td><td colspan="1" rowspan="1"><p>the size of the index page - the bigger the page - the better the write performance of the index </p></td></tr><tr><td colspan="1" rowspan="1"><p>directoryArchive</p></td><td colspan="1" rowspan="1"><p>archive</p></td><td colspan="1" rowspan="1"><p>the path to the directory to use to store discarded data logs</p></td></tr><tr><td colspan="1" rowspan="1"><p>archiveDataLogs</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>if true data logs are moved to the archive directory instead of being deleted</p></td></tr></tbody></table>
 
 
-<h2 id="AMQMessageStore-DataStructure">Data Structure</h2>
+<h2>Data Structure</h2>
 
 <p>In the data directory defined for the AMQ Store there is the following directory structure:</p>
 
-<div class="sectionColumnWrapper"><div class="sectionMacro">
-<div class="sectionMacroRow"><div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;">
-<p><span class="confluence-embedded-file-wrapper image-left-wrapper"><img class="confluence-embedded-image image-left" src="amq-message-store.data/amqdir.png" data-image-src="/confluence/download/attachments/69705/amqdir.png?version=1&amp;modificationDate=1193927867000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="59670910" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="amqdir.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="69705" data-linked-resource-container-version="21"></span></p></div>
-<div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;">
-<h3 id="AMQMessageStore-Toplevel">Top level</h3>
+<structured-macro ac:macro-id="7a6c812e-6ce6-4a10-a407-abe98d623408" ac:name="section" ac:schema-version="1"><rich-text-body>
+<structured-macro ac:macro-id="acd7fd4d-13a5-4cdb-a62e-0d91765ed0d6" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text-body>
+<p><image ac:align="left"><attachment ri:filename="amqdir.png"></attachment></image></p></rich-text-body></structured-macro>
+<structured-macro ac:macro-id="51bcef4f-c3cf-41ad-b525-016965a64462" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text-body>
+<h3>Top level</h3>
 <p>the message broker's name is used to distinguish its directory of message data. By default, the broker name is local host.<br clear="none">
 Below this top level directory are the following sub directories:</p>
 
-<h3 id="AMQMessageStore-archive">archive</h3>
+<h3>archive</h3>
 <p>message data logs are moved here when they are discarded.<br clear="none">
 n.b. this directory only exists when the property archiveDataLogs is enabled</p>
-<h3 id="AMQMessageStore-journal">journal</h3>
+<h3>journal</h3>
 <p>Used to hold the message data logs</p>
-<h3 id="AMQMessageStore-kr-store">kr-store</h3>
+<h3>kr-store</h3>
 <p>The directory structure of the Kaha reference store (if used)</p>
-<h5 id="AMQMessageStore-data">data</h5>
+<h5>data</h5>
 <p>The indexes used to reference the message data logs in the journal for fast retrieval</p>
-<h5 id="AMQMessageStore-state">state</h5>
-<p>The state of the store - i.e. names of durable subscribers - the reason for this is described in <a shape="rect" href="#AMQMessageStore-Recovery">Recovery</a></p>
-<h3 id="AMQMessageStore-tmp-storage">tmp-storage</h3>
-<p>use to hold data files for transient messages that may be stored on disk to alleviate memory consumption - e.g. non-persistent topic messages awaiting delivery to an active, but slow subscriber.</p></div></div></div></div>
+<h5>state</h5>
+<p>The state of the store - i.e. names of durable subscribers - the reason for this is described in <link ac:anchor="Recovery"><link-body>Recovery</link-body></link></p>
+<h3>tmp-storage</h3>
+<p>use to hold data files for transient messages that may be stored on disk to alleviate memory consumption - e.g. non-persistent topic messages awaiting delivery to an active, but slow subscriber.</p></rich-text-body></structured-macro></rich-text-body></structured-macro>
 
 
 
-<h2 id="AMQMessageStore-Recovery">Recovery</h2>
+<h2>Recovery</h2>
 
 <p>If the message broker does not shutdown properly, then the reference store indexes are cleaned and the message data files (which contain messages/acknowledgements and transactional boundaries) are replayed to rebuild up the message store state. It is possbile to force automatic recovery if using the Kaha reference store (the default) by deleting the kr-store/state/ directory.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/amqp.xml
----------------------------------------------------------------------
diff --git a/amqp.xml b/amqp.xml
index a3751ff..157d1e2 100644
--- a/amqp.xml
+++ b/amqp.xml
@@ -1,20 +1,8 @@
-<div class="wiki-content maincontent"><p>ActiveMQ supports the <a shape="rect" class="external-link" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=amqp" rel="nofollow">AMQP 1.0</a> protocol which is an OASIS standard.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Availability</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available from ActiveMQ version <a shape="rect" href="activemq-580-release.xml">5.8</a> onward.</p></div></div><h3 id="AMQP-EnablingtheActiveMQBrokerforAMQP">Enabling the ActiveMQ Broker for AMQP</h3><p>To enable AMQP protocol support on the broker add the following transport connector configuration referencing the&#160;<strong><code>amqp</code></strong> scheme in its URI:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;transportConnectors&gt;
-   &lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://0.0.0.0:5672&quot;/&gt;
+<div class="wiki-content maincontent"><p>ActiveMQ supports the <a shape="rect" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=amqp">AMQP 1.0</a> protocol which is an OASIS standard.</p><structured-macro ac:macro-id="f7ac2108-fc07-4918-880f-69a75f359248" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Availability</parameter><rich-text-body><p>Available from ActiveMQ version <link><page ri:content-title="ActiveMQ 5.8.0 Release"></page><plain-text-link-body>5.8</plain-text-link-body></link> onward.</p></rich-text-body></structured-macro><h3>Enabling the ActiveMQ Broker for AMQP</h3><p>To enable AMQP protocol support on the broker add the following transport connector configuration referencing the&#160;<strong><code>amqp</code></strong> scheme in its URI:</p><structured-macro ac:macro-id="ef3fdf06-2ed8-4cff-8c83-850e28ce1eca" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;transportConnectors&gt;
+   &lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672"/&gt;
 &lt;/transportConnectors&gt;
-]]></script>
-</div></div><p>It is enabled in the default ActiveMQ server configuration. For more help see <a shape="rect" href="run-broker.xml">Run Broker</a>.</p><h3 id="AMQP-Security">Security</h3><p>The AMQP implementation fully supports an <a shape="rect" href="security.xml">ActiveMQ security</a> mechanism. This allows the broker to accept plain SASL authentication. Authorization policies are applied to a destination when it's accessed (read/write).</p><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">SSL</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For additional security AMQP can be configured to run over SSL as described in the following section.</p></div></div><h3 id="AMQP-EnablingAMQPoverNIO">Enabling AMQP over NIO</h3><p>For better scalability (and performance) the AMQP protocol should be configured to use NIO, rather than the default of 
 TCP. To use NIO use the transport scheme <strong><code>amqp+nio</code></strong> instead of <strong><code>amqp</code></strong>.</p><p>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[&lt;transportConnector name=&quot;amqp+nio&quot; uri=&quot;amqp+nio://localhost:5672&quot;/&gt;
-]]></script>
-</div></div><p>This transport uses the <a shape="rect" class="external-link" href="http://activemq.apache.org/configuring-transports.html#ConfiguringTransports-TheNIOTransport">NIO transport</a> underneath and will generally use much less threads than the standard connector. This connector can help if you want to use <a shape="rect" class="external-link" href="http://activemq.apache.org/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker-.html">large number of queues</a></p><h3 id="AMQP-EnablingAMQPoverSSL">Enabling AMQP over SSL</h3><p>It's easy to configure ActiveMQ to use AMQP over a SSL connection. To use SSL use the transport scheme <strong><code>amqp+ssl</code></strong> instead of <strong><code>amqp</code></strong>.</p><p>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[&lt;transportConnector name=&quot;amqp+ssl&quot; uri=&quot;amqp+ssl://localhost:5671&quot;/&gt;
-]]></script>
-</div></div><p>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" class="external-link" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</p><h3 id="AMQP-WorkingwithDestinationswithAMQP">Working with Destinations with AMQP</h3><p>You should prefix destination address with&#160;<strong><code>queue://</code></strong> to use queue based destinations or&#160;<strong><code>topic://</code></strong> to use topic based destinations. The destination type defaults to queue when the destination prefix is omitted.</p><h3 id="AMQP-PrefetchSizeandCredit">Prefetch Size and Credit</h3><p>When AMQP receiver connects to the broker it's mapped to the JMS consumer. This JMS consumer has to have appropriate <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch size</a> set.&#160;<span style="line-height: 1.4285715;">The broker will honor the credit set by the client or use the default value of&#160;<strong><code>1000</code></
 strong> if client doesn't set it.</span></p><p>Example: tuning the default <strong><code>prefetch</code></strong> size:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&amp;amp;transport.prefetch=10&quot;/&gt;]]></script>
-</div></div><p class="p1">In this case, client preference will be ignored and the configured value will be used.</p><p class="p1">You can also tune broker-side&#160;<strong><code>amqp</code></strong> receiver link that handles incoming messages. It will use credit of&#160;<strong><code>1000</code></strong> messages by default, but you can override this by using&#160;<span><strong><code>producerCredit</code></strong> property, like&#160;</span></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&amp;amp;transport.producerCredit=10000&quot;/&gt;]]></script>
-</div></div><h3 id="AMQP-MappingtoJMS">Mapping to JMS</h3><p>There are three basic conversion strategies that can be used with AMQP and inter-operating with the JMS API.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Strategy</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>native</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>(<strong>Default</strong>) Wraps the bytes of the AMQP message into a JMS&#160;<strong><code>BytesMessage</code></strong> and maps the headers of the AMQP message to headers on the JMS message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>raw</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Wraps the bytes of the AMQP message into a JMS <strong><code>BytesMessage</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1" 
 class="confluenceTd"><p><code>jms</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maps headers of the AMQP message to JMS message headers and the body of the AMQP message to the JMS body.</p></td></tr></tbody></table></div><p>Set the <strong>transformer</strong> transport option on the&#160;<strong><code>transportConnector</code></strong> to the desired mapping strategy. For example, to inter-operate with JMS at the payload level, set the <strong><code>transformer</code></strong> option to <strong><code>jms</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[&lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://localhost:5672?transport.transformer=jms&quot;/&gt;
-]]></script>
-</div></div><h4 id="AMQP-HowAMQPMessageHeadersareMappedtoJMSHeaders">How AMQP Message Headers are Mapped to JMS Headers</h4><p>The following headers are mapped regardless of the transformer used:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>AMQP Message</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>JMS Message</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_NATIVE</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Will be set to&#160;<strong><code>true</code></strong> if the transformer is&#160;<strong><code>native</code></strong> or <strong><code>raw</code></strong>,&#160;<strong><code>false</code></strong> otherwise.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>message-format</code
 ></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_MESSAGE_FORMAT</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div><p>The following header mappings apply when the transformer is either <strong><code>native</code></strong> or <strong><code>jms</code></strong>:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>AMQP Message</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>JMS Message</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>application-properties.JMSXGroupID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXGroupID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>application-properties.JMSXGroupSeq
 uence</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXGroupSequence</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>application-properties.JMSXUserID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXUserID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>application-properties.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><u><strong><code>name</code></strong></u></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>delivery-annotations.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_DA_<u><strong>name</strong></u></code></p></td><t
 d colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>footer.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_FT_<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>header.deliveryCount</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXDeliveryCount</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>header.durable</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSDeliveryMode</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>javax.jms.Message.DEFAULT_DELIVERY_MODE</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="conflue
 nceTd"><p><code>header.first-acquirer</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_FirstAcquirer</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>header.priority</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSPriority</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>javax.jms.Message.DEFAULT_PRIORITY</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>header.ttl</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSExpiration</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>javax.jms.Message.DEFAULT_TIME_TO_LIVE</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>message-annotations.<u><strong>name</strong></u></code></p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_MA_<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>message-annotations.x-opt-jms-type</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSType</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>message-annotations.x-opt-reply-type</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Type of the&#160;<code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Comma separated list of <strong><code>queue</code></strong>, <strong><code>topic</code></strong>, or <strong><code>temporary</code></strong>. Defaults to&#160;<strong><code>queue</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>messag
 e-annotations.x-opt-to-type</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Type of the&#160;<code>JMSDestination</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Comma separated list of <strong><code>queue</code></strong>, <strong><code>topic</code></strong>, or <strong><code>temporary</code></strong>. Defaults to&#160;<strong><code>queue</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.content-encoding</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_ContentEncoding</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.content-type</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_ContentType</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" cla
 ss="confluenceTd"><p><code>properties.correlation-id</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSCorrelationID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.creation-time</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSTimestamp</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.group-sequence</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXGroupSequence</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.message-id</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSMessageID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Auto
  generated if not set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.reply-to</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the&#160;<strong><code>JMSReplyTo</code></strong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.reply-to-group-id</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_ReplyToGroupID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.subject</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMS_AMQP_Subject</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.to</code></p></td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p><code>JMSDestination</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the&#160;<strong><code>JMSDestination</code></strong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>properties.user-id</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXUserID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>properties.user-id</code></strong> is decoded as a UTF-8 String.</p></td></tr></tbody></table></div><p>&#160;</p><p>AMQP property value types are converted as follows:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>AMQP Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Java Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>binary</code></p></td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Hex encoding of the binary value</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>bool</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Boolean</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>byte</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Byte</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>double</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Double</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>float</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Floa
 t</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Integer</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>short</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Short</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>symbol</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenc
 eTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ubyte</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Byte</code> or&#160;<code>Short</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>Short</code></strong> is used if: <strong><code>value &gt;</code></strong> <strong><code>Byte.MAX_VALUE</code></strong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>uint</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Integer</code> or&#160;<code>Long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>Long</code></strong> is used if: <strong><code>value &gt;</code></strong> <strong><code>Integer.MAX_VALUE</code></strong></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ulong</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Long</code></p></td><td colspan="1" rowspan="1" cla
 ss="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ushort</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Short</code> or&#160;<code>Integer</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><strong><code>Integer</code></strong> is used if:&#160;<strong><code>value &gt;</code></strong> <strong><code>Short.MAX_VALUE</code></strong></p></td></tr></tbody></table></div><h4 id="AMQP-HowaAMQPMessagesBodyisMappedtoaJMSMessage">How a AMQP Messages Body is Mapped to a JMS Message</h4><p>If the transformer is set to <strong><code>jms</code></strong> then the JMS message type will depend on the body type of the AMQP message.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Body Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>JMS Message Type</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><cod
 e>AmqpSequence</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>StreamMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>AmqpValue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ObjectMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>AmqpValue</code> holding a&#160;<code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>AmqpValue</code> holding a&#160;<code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>TextMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>AmqpValue</code> holding a&#160;<code>binary</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>BytesMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Amq
 pValue</code> holding a&#160;<code>list</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>StreamMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Data</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>BytesMessage</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td></tr></tbody></table></div><h3 id="AMQP-AMQP1.0clientlibrary">AMQP 1.0 client library</h3><p>You can use <a shape="rect" class="external-link" href="http://qpid.apache.org/proton/">Apache Qpid Proton</a>.</p></div>
+</plain-text-body></structured-macro><p>It is enabled in the default ActiveMQ server configuration. For more help see <link><page ri:content-title="Run Broker"></page></link>.</p><h3>Security</h3><p>The AMQP implementation fully supports an <link><page ri:content-title="Security"></page><plain-text-link-body>ActiveMQ security</plain-text-link-body></link> mechanism. This allows the broker to accept plain SASL authentication. Authorization policies are applied to a destination when it's accessed (read/write).</p><structured-macro ac:macro-id="23a9920d-bead-4048-9614-45d166255570" ac:name="tip" ac:schema-version="1"><parameter ac:name="title">SSL</parameter><rich-text-body><p>For additional security AMQP can be configured to run over SSL as described in the following section.</p></rich-text-body></structured-macro><h3>Enabling AMQP over NIO</h3><p>For better scalability (and performance) the AMQP protocol should be configured to use NIO, rather than the default of TCP. To use NIO use 
 the transport scheme <strong><code>amqp+nio</code></strong> instead of <strong><code>amqp</code></strong>.</p><p>Example:</p><structured-macro ac:macro-id="0ab55b1f-ee01-434f-82d9-e009f1c68625" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;transportConnector name="amqp+nio" uri="amqp+nio://localhost:5672"/&gt;
+</plain-text-body></structured-macro><p>This transport uses the <a shape="rect" href="http://activemq.apache.org/configuring-transports.html#ConfiguringTransports-TheNIOTransport">NIO transport</a> underneath and will generally use much less threads than the standard connector. This connector can help if you want to use <a shape="rect" href="http://activemq.apache.org/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker-.html">large number of queues</a></p><h3>Enabling AMQP over SSL</h3><p>It's easy to configure ActiveMQ to use AMQP over a SSL connection. To use SSL use the transport scheme <strong><code>amqp+ssl</code></strong> instead of <strong><code>amqp</code></strong>.</p><p>Example:</p><structured-macro ac:macro-id="1b2eaa95-2237-4062-85d0-8f9e9566e4ce" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;transportConnector name="amqp+ssl" uri="amqp+ssl://localhost:5671"/&gt;
+</plain-text-body></structured-macro><p>For more details on using SSL with ActiveMQ, see the following article (<a shape="rect" href="http://activemq.apache.org/how-do-i-use-ssl.html">How do I use SSL</a>).</p><h3>Working with Destinations with AMQP</h3><p>You should prefix destination address with&#160;<strong><code>queue://</code></strong> to use queue based destinations or&#160;<strong><code>topic://</code></strong> to use topic based destinations. The destination type defaults to queue when the destination prefix is omitted.</p><h3>Prefetch Size and Credit</h3><p>When AMQP receiver connects to the broker it's mapped to the JMS consumer. This JMS consumer has to have appropriate <link><page ri:content-title="What is the Prefetch Limit For?"></page><plain-text-link-body>prefetch size</plain-text-link-body></link> set.&#160;<span style="line-height: 1.4285715;">The broker will honor the credit set by the client or use the default value of&#160;<strong><code>1000</code></strong> if 
 client doesn't set it.</span></p><p>Example: tuning the default <strong><code>prefetch</code></strong> size:</p><structured-macro ac:macro-id="9a30b86c-fde9-40bc-be6b-86af0f621a5b" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&amp;amp;transport.prefetch=10"/&gt;</plain-text-body></structured-macro><p class="p1">In this case, client preference will be ignored and the configured value will be used.</p><p class="p1">You can also tune broker-side&#160;<strong><code>amqp</code></strong> receiver link that handles incoming messages. It will use credit of&#160;<strong><code>1000</code></strong> messages by default, but you can override this by using&#160;<span><strong><code>producerCredit</code></strong> property, like&#160;</span></p><structured-macro ac:macro-id="e342bae5-f001-43ea-aac3-191f7f4d8b81" ac:name="co
 de" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&amp;amp;transport.producerCredit=10000"/&gt;</plain-text-body></structured-macro><h3>Mapping to JMS</h3><p>There are three basic conversion strategies that can be used with AMQP and inter-operating with the JMS API.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Strategy</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>native</code></p></td><td colspan="1" rowspan="1"><p>(<strong>Default</strong>) Wraps the bytes of the AMQP message into a JMS&#160;<strong><code>BytesMessage</code></strong> and maps the headers of the AMQP message to headers on the JMS message.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>raw</code></p></td><td colspan="1" rowspan="1"><p>Wraps the bytes of the AMQP message into a JMS <st
 rong><code>BytesMessage</code></strong>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>jms</code></p></td><td colspan="1" rowspan="1"><p>Maps headers of the AMQP message to JMS message headers and the body of the AMQP message to the JMS body.</p></td></tr></tbody></table><p>Set the <strong>transformer</strong> transport option on the&#160;<strong><code>transportConnector</code></strong> to the desired mapping strategy. For example, to inter-operate with JMS at the payload level, set the <strong><code>transformer</code></strong> option to <strong><code>jms</code></strong>:</p><structured-macro ac:macro-id="92bbef4f-f76c-4b71-b56c-ee2f2afda28d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;transportConnector name="amqp" uri="amqp://localhost:5672?transport.transformer=jms"/&gt;
+</plain-text-body></structured-macro><h4>How AMQP Message Headers are Mapped to JMS Headers</h4><p>The following headers are mapped regardless of the transformer used:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>AMQP Message</p></th><th colspan="1" rowspan="1"><p>JMS Message</p></th><th colspan="1" rowspan="1"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1"><p>&#160;</p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_NATIVE</code></p></td><td colspan="1" rowspan="1"><p>Will be set to&#160;<strong><code>true</code></strong> if the transformer is&#160;<strong><code>native</code></strong> or <strong><code>raw</code></strong>,&#160;<strong><code>false</code></strong> otherwise.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>message-format</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_MESSAGE_FORMAT</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr></tbody></table><p>The following header mappings apply when the transformer is either 
 <strong><code>native</code></strong> or <strong><code>jms</code></strong>:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>AMQP Message</p></th><th colspan="1" rowspan="1"><p>JMS Message</p></th><th colspan="1" rowspan="1"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>application-properties.JMSXGroupID</code></p></td><td colspan="1" rowspan="1"><p><code>JMSXGroupID</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>application-properties.JMSXGroupSequence</code></p></td><td colspan="1" rowspan="1"><p><code>JMSXGroupSequence</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>application-properties.JMSXUserID</code></p></td><td colspan="1" rowspan="1"><p><code>JMSXUserID</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>application-properties.<u><strong>name</strong></u></code></p></td><td colspan=
 "1" rowspan="1"><p><u><strong><code>name</code></strong></u></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>delivery-annotations.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_DA_<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>footer.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_FT_<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>header.deliveryCount</code></p></td><td colspan="1" rowspan="1"><p><code>JMSXDeliveryCount</code></p></td><td colspan="1" rowspan="1">&#160;</td></tr><tr><td colspan="1" rowspan="1"><p><code>header.durable</code></p></td><td colspan="1" rowspan="1"><p><code>JMSDeliveryMode</code></p></td><td colspan="1" rowspan="1"><p><strong><code>javax.jms.Messag
 e.DEFAULT_DELIVERY_MODE</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>header.first-acquirer</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_FirstAcquirer</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>header.priority</code></p></td><td colspan="1" rowspan="1"><p><code>JMSPriority</code></p></td><td colspan="1" rowspan="1"><p><strong><code>javax.jms.Message.DEFAULT_PRIORITY</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>header.ttl</code></p></td><td colspan="1" rowspan="1"><p><code>JMSExpiration</code></p></td><td colspan="1" rowspan="1"><p><strong><code>javax.jms.Message.DEFAULT_TIME_TO_LIVE</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>message-annotations.<u><strong>name</strong></u></code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_MA_<u><strong>name</strong></u></code></p></td><td colspan="1"
  rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>message-annotations.x-opt-jms-type</code></p></td><td colspan="1" rowspan="1"><p><code>JMSType</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>message-annotations.x-opt-reply-type</code></p></td><td colspan="1" rowspan="1"><p>Type of the&#160;<code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1"><p>Comma separated list of <strong><code>queue</code></strong>, <strong><code>topic</code></strong>, or <strong><code>temporary</code></strong>. Defaults to&#160;<strong><code>queue</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>message-annotations.x-opt-to-type</code></p></td><td colspan="1" rowspan="1"><p>Type of the&#160;<code>JMSDestination</code></p></td><td colspan="1" rowspan="1"><p>Comma separated list of <strong><code>queue</code></strong>, <strong><code>topic</code></strong>, or <strong><code>temporary</code
 ></strong>. Defaults to&#160;<strong><code>queue</code></strong> if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.content-encoding</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_ContentEncoding</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.content-type</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_ContentType</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.correlation-id</code></p></td><td colspan="1" rowspan="1"><p><code>JMSCorrelationID</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.creation-time</code></p></td><td colspan="1" rowspan="1"><p><code>JMSTimestamp</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.group-sequence</code></p></td><td colspa
 n="1" rowspan="1"><p><code>JMSXGroupSequence</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.message-id</code></p></td><td colspan="1" rowspan="1"><p><code>JMSMessageID</code></p></td><td colspan="1" rowspan="1"><p>Auto generated if not set.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.reply-to</code></p></td><td colspan="1" rowspan="1"><p><code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1"><p>The name of the&#160;<strong><code>JMSReplyTo</code></strong></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.reply-to-group-id</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_ReplyToGroupID</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.subject</code></p></td><td colspan="1" rowspan="1"><p><code>JMS_AMQP_Subject</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" 
 rowspan="1"><p><code>properties.to</code></p></td><td colspan="1" rowspan="1"><p><code>JMSDestination</code></p></td><td colspan="1" rowspan="1"><p>The name of the&#160;<strong><code>JMSDestination</code></strong></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>properties.user-id</code></p></td><td colspan="1" rowspan="1"><p><code>JMSXUserID</code></p></td><td colspan="1" rowspan="1"><p><strong><code>properties.user-id</code></strong> is decoded as a UTF-8 String.</p></td></tr></tbody></table><p>&#160;</p><p>AMQP property value types are converted as follows:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>AMQP Type</p></th><th colspan="1" rowspan="1"><p>Java Type</p></th><th colspan="1" rowspan="1"><p>Notes</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>binary</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p>Hex encoding of the binary value</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>bool</code></p><
 /td><td colspan="1" rowspan="1"><p><code>Boolean</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>byte</code></p></td><td colspan="1" rowspan="1"><p><code>Byte</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>double</code></p></td><td colspan="1" rowspan="1"><p><code>Double</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>float</code></p></td><td colspan="1" rowspan="1"><p><code>Float</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>int</code></p></td><td colspan="1" rowspan="1"><p><code>Integer</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>long</code></p></td><td colspan="1" rowspan="1"><p><code>Long</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="
 1"><p><code>short</code></p></td><td colspan="1" rowspan="1"><p><code>Short</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>symbol</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ubyte</code></p></td><td colspan="1" rowspan="1"><p><code>Byte</code> or&#160;<code>Short</code></p></td><td colspan="1" rowspan="1"><p><strong><code>Short</code></strong> is used if: <strong><code>value &gt;</code></strong> <strong><code>Byte.MAX_VALUE</code></strong></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>uint</code></p></td><td colspan="1" rowspan="1"><p><code>Integer</code> or&#160;<code>Long</code></p></td><td colspan="1" rowspan="1"><p><strong><code>Long</code></strong> is used if: <strong><code>value &gt;</code></strong> <strong><code>Integer.MAX_VALUE</code></strong></p></td></tr><tr><td colspan="1" rowspan="1"
 ><p><code>ulong</code></p></td><td colspan="1" rowspan="1"><p><code>Long</code></p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ushort</code></p></td><td colspan="1" rowspan="1"><p><code>Short</code> or&#160;<code>Integer</code></p></td><td colspan="1" rowspan="1"><p><strong><code>Integer</code></strong> is used if:&#160;<strong><code>value &gt;</code></strong> <strong><code>Short.MAX_VALUE</code></strong></p></td></tr></tbody></table><structured-macro ac:macro-id="1bc9267d-a4b2-4453-931f-845db9ecf314" ac:name="htmlcomment" ac:schema-version="1"><parameter ac:name="atlassian-macro-output-type">BLOCK</parameter><rich-text-body><table><tbody><tr><td colspan="1" rowspan="1"><p>char</p></td><td colspan="1" rowspan="1"><p>String</p></td></tr><tr><td colspan="1" rowspan="1"><p>timestamp</p></td><td colspan="1" rowspan="1"><p>Long</p></td></tr></tbody></table></rich-text-body></structured-macro><h4>How a AMQP Messages Body is Mapped to a 
 JMS Message</h4><p>If the transformer is set to <strong><code>jms</code></strong> then the JMS message type will depend on the body type of the AMQP message.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Body Type</p></th><th colspan="1" rowspan="1"><p>JMS Message Type</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpSequence</code></p></td><td colspan="1" rowspan="1"><p><code>StreamMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpValue</code></p></td><td colspan="1" rowspan="1"><p><code>ObjectMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpValue</code> holding a&#160;<code>null</code></p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpValue</code> holding a&#160;<code>String</code></p></td><td colspan="1" rowspan="1"><p><code>TextMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpValue</code> holding a&#160;<code>binary</code></p><
 /td><td colspan="1" rowspan="1"><p><code>BytesMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>AmqpValue</code> holding a&#160;<code>list</code></p></td><td colspan="1" rowspan="1"><p><code>StreamMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>Data</code></p></td><td colspan="1" rowspan="1"><p><code>BytesMessage</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td></tr></tbody></table><h3>AMQP 1.0 client library</h3><p>You can use <a shape="rect" href="http://qpid.apache.org/proton/">Apache Qpid Proton</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200708-august.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200708-august.xml b/apache-activemq-board-report-200708-august.xml
index ff38e37..cbfb247 100644
--- a/apache-activemq-board-report-200708-august.xml
+++ b/apache-activemq-board-report-200708-august.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2007.08(August)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[July board report was missed in part due to a change in PMC chair.
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="5a6c948d-f150-4690-9906-a96776c77ce9" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>July board report was missed in part due to a change in PMC chair.
 
 Community:
  * The developer and user communities remain very active.
@@ -18,6 +17,5 @@ Maintenance Releases:
  * ActiveMQ CPP 2.0.1 - Updated to use the CMS 1.0 API
  * ActiveMQ CMS 1.1 - Updated to build as a shared lib
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200710-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200710-october.xml b/apache-activemq-board-report-200710-october.xml
index b327295..97a9bc3 100644
--- a/apache-activemq-board-report-200710-october.xml
+++ b/apache-activemq-board-report-200710-october.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2007.10(October)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="b384dd9c-a988-487b-b276-e2abc9cda884" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * The developer and user communities remain very active.
  * The Camel project, NMS project, and recent release candidate for ActiveMQ 
    5.0 have generated much mailing list activity. 
@@ -14,6 +13,5 @@ Development:
 Releases:
  * ActiveMQ Camel 1.1.0 - A routing and mediation engine
  * ActiveMQ CPP 2.1 - A C++ client to ActiveMQ that implements the CMS API
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200801-january.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200801-january.xml b/apache-activemq-board-report-200801-january.xml
index 6d755ed..707a058 100644
--- a/apache-activemq-board-report-200801-january.xml
+++ b/apache-activemq-board-report-200801-january.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2008.01(January)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="0c9eddee-b43e-47c5-b6cf-90b4fc01e8d1" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * Nicky Sandhu and Hadrian Zbarcea were voted in and accepted becoming ActiveMQ committers
  * A code grant was accepted for an NMS implementation that access 
     Tibco EMS.
@@ -16,6 +15,5 @@ Releases:
  * ActiveMQ CPP 2.1.1
  * ActiveMQ CPP 2.1.2
  * ActiveMQ CPP 2.1.3
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200807-july.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200807-july.xml b/apache-activemq-board-report-200807-july.xml
index 02c22bc..06ce4a5 100644
--- a/apache-activemq-board-report-200807-july.xml
+++ b/apache-activemq-board-report-200807-july.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2008.07(July)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="e63d73fc-c415-4b30-b192-415e94ab6290" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * The ActiveMQ project has had another very busy quarter.  Seven new contributors were voted in and accepted becoming ActiveMQ committers:
    * Gary Tully 
    * Gert Vanthienen 
@@ -21,6 +20,5 @@ Releases:
  * ActiveIO 3.0.1
  * ActiveMQ-CPP 2.2
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200810-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200810-october.xml b/apache-activemq-board-report-200810-october.xml
index 80576f6..c7e8682 100644
--- a/apache-activemq-board-report-200810-october.xml
+++ b/apache-activemq-board-report-200810-october.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2008.10(October)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="3cc0a94c-a838-4c88-85d9-75b700554bd2" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * The ActiveMQ project has had another very busy quarter.  Jonathan Anstey was voted in as an ActiveMQ committer.
  * The development and user lists continue to stay vibrant.
 
@@ -12,6 +11,5 @@ Releases:
  * Camel 1.4.0 
 
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200901-january.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200901-january.xml b/apache-activemq-board-report-200901-january.xml
index 72edb4c..8740c58 100644
--- a/apache-activemq-board-report-200901-january.xml
+++ b/apache-activemq-board-report-200901-january.xml
@@ -1,8 +1,7 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2009.01(January)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="9beca253-915a-448a-8eba-49ce980c70d0" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * The ActiveMQ project has had another very busy quarter.  William Tam has been added as an ActiveMQ committer.
  * The development and user lists continue to stay vibrant.
- * The Camel sub project has been approved to become a TLP and is currently setting it&#39;s infrastructure to do so.
+ * The Camel sub project has been approved to become a TLP and is currently setting it's infrastructure to do so.
  * A privacy policy page has been added to all the ActiveMQ wikis and websites.
 
 Development:
@@ -17,6 +16,5 @@ Releases:
  * ActiveMQ-CPP 2.2.2
  * ActiveMQ-CPP 2.2.3
  * Camel 1.5.0
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200904-april.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200904-april.xml b/apache-activemq-board-report-200904-april.xml
index cd2e085..af2a239 100644
--- a/apache-activemq-board-report-200904-april.xml
+++ b/apache-activemq-board-report-200904-april.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2009.04(April)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Community:
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="8750c421-9c4d-459f-9384-dccd065a1251" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Community:
  * The ActiveMQ project has had another very busy but quiet quarter.
  * The development and user lists continue to stay vibrant.
  * The Camel sub project has completed moving to a TLP.
@@ -14,6 +13,5 @@ Development:
 Releases:
  * ActiveMQ-CPP 2.2.4
  * ActiveMQ-CPP 2.2.5
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200907-july.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200907-july.xml b/apache-activemq-board-report-200907-july.xml
index 257a525..2fcf50f 100644
--- a/apache-activemq-board-report-200907-july.xml
+++ b/apache-activemq-board-report-200907-july.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Community:
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="b7e799f9-4d6a-4397-900e-7eb12546bcac" ac:name="noformat" ac:schema-version="1"><plain-text-body>Community:
  * The ActiveMQ project has had another very busy but quiet quarter.
  * The development and user lists continue to stay vibrant.
  * New PMC members: Dejan Bosanac
@@ -16,6 +15,5 @@ Releases:
  * ActiveMQ-CPP 3.0.0
  * ActiveMQ-CPP 3.0.1
 
-</pre>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-200910-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-200910-october.xml b/apache-activemq-board-report-200910-october.xml
index d13a6ce..5b7b245 100644
--- a/apache-activemq-board-report-200910-october.xml
+++ b/apache-activemq-board-report-200910-october.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Community:
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="72b9438f-f3cf-4c0c-83f2-9c086cc84be4" ac:name="noformat" ac:schema-version="1"><plain-text-body>Community:
  * The ActiveMQ project has had another very busy but quiet quarter.
  * The development and user lists continue to stay vibrant.
 
@@ -17,6 +16,5 @@ Releases:
  * ActiveMQ Protocol Buffers 1.0
  * ActiveMQ 5.3.0
 
-</pre>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201001-january.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201001-january.xml b/apache-activemq-board-report-201001-january.xml
index 7724d88..8ebd9ca 100644
--- a/apache-activemq-board-report-201001-january.xml
+++ b/apache-activemq-board-report-201001-january.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Community:
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="afed1d78-2444-449e-b098-7e89e02110cd" ac:name="noformat" ac:schema-version="1"><plain-text-body>Community:
  * The ActiveMQ project has had another very busy but quiet quarter.
  * The development and user lists continue to stay vibrant.
  * Tim Bish has joined the ActiveMQ PMC
@@ -11,6 +10,5 @@ Development:
 Releases:
  * ActiveMQ-CPP 3.1.0
 
-</pre>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201005-may.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201005-may.xml b/apache-activemq-board-report-201005-may.xml
index 2693fdb..d9c4e3e 100644
--- a/apache-activemq-board-report-201005-may.xml
+++ b/apache-activemq-board-report-201005-may.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ApacheActiveMQBoardReport-2010.05(May)-StatusreportfortheApacheActiveMQProject">Status report for the Apache ActiveMQ Project</h1><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[Apologies for missing the April board report deadline.
+<div class="wiki-content maincontent"><h1>Status report for the Apache ActiveMQ Project</h1><structured-macro ac:macro-id="f0c3b6cc-e3b6-400d-aaeb-47b9c61d88c4" ac:name="code" ac:schema-version="1"><parameter ac:name="">none</parameter><plain-text-body>Apologies for missing the April board report deadline.
 
 Community:
  * The ActiveMQ project has had another very busy but quiet quarter.
@@ -17,6 +16,5 @@ Releases:
  * Apache.NMS.Stomp v1.2.0
  * Apache.NMS API 1.2.0
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 


[39/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-command-line-tools-reference.xml
----------------------------------------------------------------------
diff --git a/activemq-command-line-tools-reference.xml b/activemq-command-line-tools-reference.xml
index d9e1cff..1e763e4 100644
--- a/activemq-command-line-tools-reference.xml
+++ b/activemq-command-line-tools-reference.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="ActiveMQCommandLineToolsReference-CommandLineTools">Command Line Tools</h1><p>The current script contains the entire functionality to manage activemq.</p><ul><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-activemq">activemq</a> - runs an activemq broker<br clear="none">(see <a shape="rect" href="unix-shell-script.xml">Unix Shell Script</a>)</li></ul><p>In versions prior 5.4.1 some management functionalities beyond controlling the service itself where part of the "activemq-admin" script.<br clear="none">This script is currently still part of the distribution to provide access to this for Windows users-</p><ul><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-activemq-admin">activemq-admin</a> - manages a broker instance</li></ul><p>In versions prior to 5.0 the functionality of activemq-admin script was scattered over multiple scripts, such as:</p><ul><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-sto
 p">shutdown</a> - shutdowns an activemq broker</li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-list">list</a> - lists all running brokers in the specified JMX context</li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-query">query</a> - queries the JMX context for broker statistics and information</li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-bstat">bstat</a> - predefined query that displays useful broker statistics</li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-browse">browse</a> - browse the messages of a specific queue</li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-purge">purge</a> - delete selected destination's messages that matches the message selector</li></ul><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-activemq"></span></p><h2 id="ActiveMQCommandLineToolsReference-activemqscript">activemq script<br clear="none"><br clear="none"></h2><div class="confluence-i
 nformation-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>Description of this script is valid for Windows platform.</strong> For Unix platform it is valid for broker versions prior to 5.4.0. With version 5.4.0 and later, ActiveMQ comes with enhanced <a shape="rect" href="unix-shell-script.xml">Unix Shell Script</a></p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Script Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq.bat, activemq</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq [options] [config]</em> or <em>java -jar run.jar start [options] [config]</em></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p
 >Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Script to run an activemq broker either by specifying a broker configuration file or through a broker URI configuration.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will r
 eturn c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help messages for the activemq script.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1
 " rowspan="1" class="confluenceTd"><p>activemq</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker using the default 'xbean:activemq.xml' as the broker configuration file.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq xbean:myconfig.xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker using the file myconfig.xml as the broker configuration file that is located in the classpath.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq xbean:file:./conf/broker1.xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker using the file broker1.xml as the broker configuration file that is located in the relative file path ./conf/broker1.xml</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq xbean:file:C:/ActiveMQ/conf/broker2.xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker using the file broker2.xml as the broker c
 onfiguration file that is located in the absolute file path C:/ActiveMQ/conf/broker2.xml</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq broker:(tcp://localhost:61616, tcp://localhost:5000)?useJmx=true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker with two transport connectors and JMX enabled.&#194;&#185;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq broker:(tcp://localhost:61616, network:tcp://localhost:5000)?persistent=false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Runs a broker with 1 transport connector and 1 network connector with persistence disabled.&#194;&#185;</p></td></tr></tbody></table></div><p>For details on how to configure using broker URI refer to:&#160;<a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a></p><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-activemq-admin"></span></p><h2 id="ActiveMQComma
 ndLineToolsReference-activemq-admin">activemq-admin</h2><p>As of ActiveMQ 5.x, the above standalone utilities have been incorporated into the activemq-admin command (with the exception of the activemq script), as follows:</p><ul><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-stop">activemq-admin stop</a></li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-list">activemq-admin list</a></li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-query">activemq-admin query</a></li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-bstat">activemq-admin bstat</a></li><li><a shape="rect" href="#ActiveMQCommandLineToolsReference-browse">activemq-admin browse</a></li></ul><p>The syntax of each task remains as described below. Note also that the activemq command is still supported.</p><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-stop"></span></p><h3 id="ActiveMQCommandLineToolsReference-stoptask">stop task</h3><div 
 class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>stop</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin stop [options] [broker names]</em></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Script to stop a running activemq broker. This task requires that JMX is enabled.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>
 Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Stop All Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--all</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>stop --all</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Stops all registered brokers in the specified JMX context</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX URL Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser user --jmxpas
 sword password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help mes
 sages for the stop script.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin stop</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Stops the only running broker in the default JMX context. It assumes that there is only one running broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin stop --jmxurl service:jmx:rm
 i:///jndi/rmi://remotehost:1099/jmxrmi --all</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Stops all the running broker in the specified JMX context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin stop localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Stops the broker named 'localhost' in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin stop localhost remotehost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Stops the brokers 'localhost' and 'remotehost' in the default JMX context.</p></td></tr></tbody></table></div><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-list"></span></p><h3 id="ActiveMQCommandLineToolsReference-listtask">list task</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class=
 "confluenceTd"><p>list</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin list [options]</em></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Script to list the names of all running brokers in the specified JMX context. This task requires that JMX is enabled.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX URL Option</p></td><td colspan="1" rowspan="1" class="confl
 uenceTd"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan=
 "1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help messages for the list script.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable
 "><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin list</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Lists the names of all running brokers in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin list --jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>List the names of all running brokers in the specified JMX context.</p></td></tr></tbody></table></div><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-query"></span></p><h3 id="ActiveMQCommandLineToolsReference-querytask">query task</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspa
 n="1" class="confluenceTd"><p>query</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin query [options]</em></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Script to query the specified JMX context for mbean attributes and information. This script requires that JMX is enabled.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Predefined Query Option</p></td><td colspan="
 1" rowspan="1" class="confluenceTd"><p>-Q&lt;type&gt;=&lt;name&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-QTopic=TEST.FOO, -QBroker=*host</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Predefined object name query option that queries a specific type of mbean object based on its type and selected identifier. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-xQ&lt;type&gt;=&lt;name&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-xQTopic=ActiveMQ.Advisory.*, -xQNetworkConnector=*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Predefined object name query option that removes all mbeans that matches the query from the search result. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Object Name Query Option</p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p>--objname &lt;object name query&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--objname Type=<strong>Connect</strong>,BrokerName=local*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Query option loosely based on the JMX object name format, which lets you filter mbeans based on their object name information. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--xobjname &lt;object name query&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--xobjname Type=Topic,Destination=ActiveMQ.Advisory.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Object name query that removes all mbeans that matches the query from the search result. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1" class="conflue
 nceTd"><p>View Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--view &lt;view list&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--view Type,BrokerName,Destination,EnqueueCount,DequeueCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Lets you specify the attributes and object name information to view. If the view is omitted, all attributes and information will be displayed.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX URL Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX Authentication Option</p>
 </td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--help<
 /p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help messages for the query script.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all attributes and object name information of all registered mbeans in the default JMX context.</p></td></tr><tr><td colspan="1" r
 owspan="1" class="confluenceTd"><p>activemq-admin query -QTopic=TEST.FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information of the destination topic 'TEST.FOO'</p></td></tr></tbody></table></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query -QQueue=*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information of all registered queues.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query -QTopic=*.FOO -xQTopic=ActiveMQ.Advisory.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information of all topics that ends with '.FOO' except those that also begins with 'ActiveMQ.Advisory.'.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query -QBroker=local???
 ? --view Type,BrokerName,EnqueueCount,DequeueCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the object type, broker name, enqueue count, and dequeue count information for all 9-letter brokers that begins with 'local'.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query --objname Type=<strong>Connect</strong>,BrokerName=localhost -xQNetworkConnector=*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information for all connections and connectors for broker 'localhost' except its network connectors.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query --objname Type=Connection --xobjname Type=Connection,BrokerName=localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information for all registered connections except those belonging to broker 'localhost'.</p></td></tr><tr><t
 d colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin query -QQueue=???? --objname Type=Connection --xobjname BrokerName=remote*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display all the attributes and object name information for all 4-letter queues and connections except those belonging to a broker that begins with 'remote'.</p></td></tr></tbody></table></div><p><strong>ActiveMQ MBean Reference:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Mbean Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties / ObjectName</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Attributes</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Broker</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>Type</strong>=Broker</li><li><strong>BrokerName</strong>=&lt;broker identifier&gt;</li></ul></td><td colspan="1" rowspan="1
 " class="confluenceTd"><ul><li>BrokerId</li><li>TotalEnqueueCount</li><li>TotalDequeueCount</li><li>TotalConsumerCount</li><li>TotalMessages</li><li>TotalMessagesCached</li><li>MemoryLimit</li><li>MemoryPercentageUsed</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Destination</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>Type</strong>=Queue|Topic</li><li><strong>Destination</strong>=&lt;destination identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>EnqueueCount</li><li>DequeueCount</li><li>ConsumerCount</li><li>Messages</li><li>MessagesCached</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>NetworkConnector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>Type</strong>=NetworkConnector</li><li><strong>BrokerName</strong>=&lt;connector identifierr&gt;</li></ul></td><td colspan="1" rowspan
 ="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Connector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>Type</strong>=Connector</li><li><strong>ConnectorName</strong>=&lt;connector identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>EnqueueCount</li><li>DequeueCount</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Connection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>Type</strong>=Connection</li><li><strong>Connection</strong>=&lt;connection identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>EnqueueCount</li><li>DequeueCount</li><li>DispatchQueueSize</li><li>Active</li><li>Blocked</li><li>Connected</li><li>Slow</li></ul></td></tr></tbody></table></div><p><span c
 lass="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-bstat"></span></p><h3 id="ActiveMQCommandLineToolsReference-bstattask">bstat task</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>bstat</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin bstat</em> [broker name]</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Predefined query script that displays useful statistics regarding a broker and its components.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1"
  class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin bstat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display useful statistics for all registered brokers in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin bstat localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display useful statistics for the registered broker 'localhost'.</p></td></tr></tbody></table></div><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-browse"></span></p><h3 id="ActiveMQCommandLineToolsReference-browsetask">browse task</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>browse</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" row
 span="1" class="confluenceTd"><p><em>activemq-admin browse --amqurl &lt;broker url&gt; [options] &lt;destinations&gt;</em> or <em>java -jar run.jar browse --amqurl &lt;broker url&gt; [options] &lt;destinations&gt;</em></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Script to browse selected destinations' messages.&#160; The browse operation may not return all messages due to limitations of broker configuration and system resources.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceT
 d"><p>Broker URL Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--amqurl &lt;url&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--amqurl tcp://localhost:61616</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specify the broker URL to connect to.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Message Selector Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--msgsel "&lt;msgsel1,msgsel2,...&gt;"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--msgsel "JMSMessageID='*:10',JMSPriority&gt;5"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Allows you to filter the specific messages to view. Place the entire selector criteria in double quotes " ". You can use wildcard queries by enclosing the string message property in ' '. Other than using wildcard queries to filter string properties, other queries follows the message selector format.</p></td></tr><tr><td colspan="1" rowspan="
 1" class="confluenceTd"><p>Group View Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-V[header | custom | body]</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Vheader, -Vcustom, -Vbody</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Let's you specify a specific group of message attributes to view. The header view shows all the standard JMS message headers. The custom view shows all the custom fields added to each JMS message. The body view shows the message body of the JMS message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Specific View Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--view &lt;attr1&gt;,[header:|custom:]&lt;attr2&gt;,...</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--view JMSMessageID='*:10',custom:MyCustomField</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Let's you specifically select a specific message attribute. It allows you to select specif
 ic attributes from the JMS and custom headers. You could add the tags header: and custom: to explicitly specify where the attribute belongs to. Refer to the message header table below for details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help messages for the browse script.</p></td></tr><tr><td colspan="1" rowspan="1" cl
 ass="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin browse --amqurl tcp://localhost:61616 TEST.FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Prints the JMS message header, custom message header, and message body of the messages in the queue 'TEST.FOO'</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin browse --amqurl tcp://localhost:61616 -Vheader,body TEST.
 FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Prints the JMS message header and message body of the messages in the queue 'TEST.FOO'</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin browse --amqurl tcp://localhost:61616 -Vheader --view custom:MyCustomField TEST.FOO TEST.BAR</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Prints all the JMS message header and the custom field 'MyCustomField' of the messages in the queue 'TEST.FOO' and 'TEST.BAR'.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin browse --amqurl tcp://localhost:61616 --msgsel "JMSMessageID='*:10',JMSPriority&gt;5" TEST.FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Prints all the attributes of the messages in the queue 'TEST.FOO' that has a JMSMessageID that matches the wildcard query *:10 and has a JMSPriority greater than 5.</p></td></tr></tbody></table></div><p><strong>JMS Message Header Reference:</s
 trong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Header Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Header Type</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSCorrelation ID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSDelivery Mode</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>int (1-Non-Persistent, 2-Persistent)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSDestination</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>javax.jms.Destination</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSExpiration</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSMessageID</p></td><td colspan="1" rowspan="1" class="confluenc
 eTd"><p>String</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSPriority</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>int</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSRedelivered</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>boolean</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSReplyTo</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>javax.jms.Destination</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSTimestamp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>long</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMSType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String</p></td></tr></tbody></table></div><p><span class="confluence-anchor-link" id="ActiveMQCommandLineToolsReference-purge"></span></p><h3 id="ActiveMQCommandLineToolsReference-purgetask">purge task</h3><div class="table-wrap"><table cl
 ass="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>purge</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin purge</em> [purge-options] &lt;destinations&gt;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Delete selected destination's messages that matches the message selector.</p></td></tr></tbody></table></div><p><strong>Options:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Syntax</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></
 tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX URL Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxurl service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Message Selector Opt
 ion</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--msgsel "&lt;msgsel1,msgsel2,...&gt;"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--msgsel "JMSMessageID='*:10',JMSPriority&gt;5"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Allows you to filter the specific messages to view. Place the entire selector criteria in double quotes " ". You can use wildcard queries by enclosing the string message property in ' '. Other than using wildcard queries to filter string properties, other queries follows the message selector format.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>System Define Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td>
 </tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Help Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--help</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the help messages for the browse script.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Version Option</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>--version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq --version</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display the activemq version information.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p
 >activemq-admin purge FOO.BAR</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Delete all the messages in queue FOO.BAR</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin purge --msgsel "JMSMessageID='*:10',JMSPriority&gt;5" FOO.*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Delete all the messages in the destinations that matches FOO.* and has a JMSMessageID in", the header field that matches the wildcard *:10, and has a JMSPriority field &gt; 5 in the", queue FOO.BAR <br clear="none"> To use wildcard queries, the field must be a string and the query enclosed in ''</p></td></tr></tbody></table></div><h3 id="ActiveMQCommandLineToolsReference-dstattask">dstat task</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Task Name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>dstat</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p
 >Task Usage</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><em>activemq-admin dstat</em> [destination type]</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Predefined query script that displays useful statistics regarding destinations on a broker.</p></td></tr></tbody></table></div><p><strong>Examples:</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin dstat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Display useful statistics for all destinations on the broker in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-admin dstat topics</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p>Display useful statistics for the Topics that currently exist on the Broker.</p></td></tr></tbody></table></div></div>
+<div class="wiki-content maincontent"><h1>Command Line Tools</h1><p>The current script contains the entire functionality to manage activemq.</p><ul><li><link ac:anchor="activemq"></link> - runs an activemq broker<br clear="none">(see <link><page ri:content-title="Unix Shell Script"></page></link>)</li></ul><p>In versions prior 5.4.1 some management functionalities beyond controlling the service itself where part of the "activemq-admin" script.<br clear="none">This script is currently still part of the distribution to provide access to this for Windows users-</p><ul><li><link ac:anchor="activemq-admin"></link> - manages a broker instance</li></ul><p>In versions prior to 5.0 the functionality of activemq-admin script was scattered over multiple scripts, such as:</p><ul><li><link ac:anchor="stop"><plain-text-link-body>shutdown</plain-text-link-body></link> - shutdowns an activemq broker</li><li><link ac:anchor="list"></link> - lists all running brokers in the specified JMX context</li>
 <li><link ac:anchor="query"></link> - queries the JMX context for broker statistics and information</li><li><link ac:anchor="bstat"></link> - predefined query that displays useful broker statistics</li><li><link ac:anchor="browse"></link> - browse the messages of a specific queue</li><li><link ac:anchor="purge"></link> - delete selected destination's messages that matches the message selector</li></ul><p><structured-macro ac:macro-id="02495172-e5eb-48f0-8318-c4ff5647a8e3" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">activemq</parameter></structured-macro></p><h2>activemq script<br clear="none"><br clear="none"></h2><structured-macro ac:macro-id="ec719b30-dc47-4944-91ed-20e2eb36914c" ac:name="note" ac:schema-version="1"><rich-text-body><p><strong>Description of this script is valid for Windows platform.</strong> For Unix platform it is valid for broker versions prior to 5.4.0. With version 5.4.0 and later, ActiveMQ comes with enhanced <link><page ri:content-title="Uni
 x Shell Script"></page></link></p></rich-text-body></structured-macro><table><tbody><tr><th colspan="1" rowspan="1"><p>Script Name</p></th><td colspan="1" rowspan="1"><p>activemq.bat, activemq</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq [options] [config]</em> or <em>java -jar run.jar start [options] [config]</em></p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Script to run an activemq broker either by specifying a broker configuration file or through a broker URI configuration.</p></td></tr></tbody></table><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;va
 lue&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>activemq --help</p></td><td colspan="1" rowspan="1"><p>Display the help messages for the activemq script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version</p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq</p></td><td colspan="1" rowspan="1"><p>Runs a broke
 r using the default 'xbean:activemq.xml' as the broker configuration file.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq xbean:myconfig.xml</p></td><td colspan="1" rowspan="1"><p>Runs a broker using the file myconfig.xml as the broker configuration file that is located in the classpath.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq xbean:file:./conf/broker1.xml</p></td><td colspan="1" rowspan="1"><p>Runs a broker using the file broker1.xml as the broker configuration file that is located in the relative file path ./conf/broker1.xml</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq xbean:file:C:/ActiveMQ/conf/broker2.xml</p></td><td colspan="1" rowspan="1"><p>Runs a broker using the file broker2.xml as the broker configuration file that is located in the absolute file path C:/ActiveMQ/conf/broker2.xml</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq broker:(tcp://localhost:61616, tcp://localhost:5000)?useJmx=true</p></td><td colspan="1" rowspan="1
 "><p>Runs a broker with two transport connectors and JMX enabled.&#194;&#185;</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq broker:(tcp://localhost:61616, network:tcp://localhost:5000)?persistent=false</p></td><td colspan="1" rowspan="1"><p>Runs a broker with 1 transport connector and 1 network connector with persistence disabled.&#194;&#185;</p></td></tr></tbody></table><p>For details on how to configure using broker URI refer to:&#160;<link><page ri:content-title="Broker Configuration URI"></page></link></p><p><structured-macro ac:macro-id="a3804351-d111-4c58-b42c-e4a84ece705b" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">activemq-admin</parameter></structured-macro></p><h2>activemq-admin</h2><p>As of ActiveMQ 5.x, the above standalone utilities have been incorporated into the activemq-admin command (with the exception of the activemq script), as follows:</p><ul><li><link ac:anchor="stop"><plain-text-link-body>activemq-admin stop</plain-text-link-body></
 link></li><li><link ac:anchor="list"><plain-text-link-body>activemq-admin list</plain-text-link-body></link></li><li><link ac:anchor="query"><plain-text-link-body>activemq-admin query</plain-text-link-body></link></li><li><link ac:anchor="bstat"><plain-text-link-body>activemq-admin bstat</plain-text-link-body></link></li><li><link ac:anchor="browse"><plain-text-link-body>activemq-admin browse</plain-text-link-body></link></li></ul><p>The syntax of each task remains as described below. Note also that the activemq command is still supported.</p><p><structured-macro ac:macro-id="9f87a0cb-cbd3-4abc-9afd-7e4c0a4d1b4e" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">stop</parameter></structured-macro></p><h3>stop task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>stop</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin stop [options] [broker names]</em></p>
 </td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Script to stop a running activemq broker. This task requires that JMX is enabled.</p></td></tr></tbody></table><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>Stop All Option</p></td><td colspan="1" rowspan="1"><p>--all</p></td><td colspan="1" rowspan="1"><p>stop --all</p></td><td colspan="1" rowspan="1"><p>Stops all registered brokers in the specified JMX context</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX URL Option</p></td><td colspan="1" rowspan="1"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1"><p>--jmxurl service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td><td colspan="1" rowspan="1"><p>Change the JMX service url to conne
 ct to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1"><p>System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>--help</p></td><td colspan="1" rowspan="1"><p>Display 
 the help messages for the stop script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version</p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin stop</p></td><td colspan="1" rowspan="1"><p>Stops the only running broker in the default JMX context. It assumes that there is only one running broker.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin stop --jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi --all</p></td><td colspan="1" rowspan="1"><p>Stops all the running broker in the specified JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin stop localhost</p></td><t
 d colspan="1" rowspan="1"><p>Stops the broker named 'localhost' in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin stop localhost remotehost</p></td><td colspan="1" rowspan="1"><p>Stops the brokers 'localhost' and 'remotehost' in the default JMX context.</p></td></tr></tbody></table><p><structured-macro ac:macro-id="6801ac7e-543d-4646-8225-36df3eb041a2" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">list</parameter></structured-macro></p><h3>list task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>list</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin list [options]</em></p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Script to list the names of all running brokers in the specified JMX context. This task requires that JMX is enabled.</p></td></tr></tbody></tab
 le><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>JMX URL Option</p></td><td colspan="1" rowspan="1"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1"><p>--jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></t
 d></tr><tr><td colspan="1" rowspan="1"><p>System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>--help</p></td><td colspan="1" rowspan="1"><p>Display the help messages for the list script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version</p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description
 </p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin list</p></td><td colspan="1" rowspan="1"><p>Lists the names of all running brokers in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin list --jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1"><p>List the names of all running brokers in the specified JMX context.</p></td></tr></tbody></table><p><structured-macro ac:macro-id="36aa53c3-86fd-402d-9eb1-8fb13ac5b9bf" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">query</parameter></structured-macro></p><h3>query task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>query</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin query [options]</em></p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Script to query the spe
 cified JMX context for mbean attributes and information. This script requires that JMX is enabled.</p></td></tr></tbody></table><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>Predefined Query Option</p></td><td colspan="1" rowspan="1"><p>-Q&lt;type&gt;=&lt;name&gt;</p></td><td colspan="1" rowspan="1"><p>-QTopic=TEST.FOO, -QBroker=*host</p></td><td colspan="1" rowspan="1"><p>Predefined object name query option that queries a specific type of mbean object based on its type and selected identifier. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;</p></td><td colspan="1" rowspan="1"><p>-xQ&lt;type&gt;=&lt;name&gt;</p></td><td colspan="1" rowspan="1"><p>-xQTopic=ActiveMQ.Advisory.*, -xQNetworkCo
 nnector=*</p></td><td colspan="1" rowspan="1"><p>Predefined object name query option that removes all mbeans that matches the query from the search result. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Object Name Query Option</p></td><td colspan="1" rowspan="1"><p>--objname &lt;object name query&gt;</p></td><td colspan="1" rowspan="1"><p>--objname Type=<strong>Connect</strong>,BrokerName=local*</p></td><td colspan="1" rowspan="1"><p>Query option loosely based on the JMX object name format, which lets you filter mbeans based on their object name information. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;</p></td><td colspan="1" rowspan="1"><p>--xobjname &lt;object name query&gt;</p></td><td colspan="1" rowspan="1"><p>--xobjname Type=Topic,Destination=ActiveMQ.Advisory.*</p></td><td colspan="1" rowspan="1"><p>Object name query that removes all mbeans that matches the 
 query from the search result. Refer to the mbean reference table below for details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>View Option</p></td><td colspan="1" rowspan="1"><p>--view &lt;view list&gt;</p></td><td colspan="1" rowspan="1"><p>--view Type,BrokerName,Destination,EnqueueCount,DequeueCount</p></td><td colspan="1" rowspan="1"><p>Lets you specify the attributes and object name information to view. If the view is omitted, all attributes and information will be displayed.</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX URL Option</p></td><td colspan="1" rowspan="1"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1"><p>--jmxurl service:jmx:rmi:///jndi/rmi://remotehost:1099/jmxrmi</p></td><td colspan="1" rowspan="1"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1"><p>--jmxuser 
 user --jmxpassword password</p></td><td colspan="1" rowspan="1"><p>--jmxuser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1"><p>System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>--help</p></td><td colspan="1" rowspan="1"><p>Display the help messages for the query script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version
 </p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query</p></td><td colspan="1" rowspan="1"><p>Display all attributes and object name information of all registered mbeans in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query -QTopic=TEST.FOO</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information of the destination topic 'TEST.FOO'</p></td></tr></tbody></table><table><tbody><tr><td colspan="1" rowspan="1"><p>activemq-admin query -QQueue=*</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information of all registered queues.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query -QTopic=*.FOO -xQTo
 pic=ActiveMQ.Advisory.*</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information of all topics that ends with '.FOO' except those that also begins with 'ActiveMQ.Advisory.'.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query -QBroker=local???? --view Type,BrokerName,EnqueueCount,DequeueCount</p></td><td colspan="1" rowspan="1"><p>Display the object type, broker name, enqueue count, and dequeue count information for all 9-letter brokers that begins with 'local'.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query --objname Type=<strong>Connect</strong>,BrokerName=localhost -xQNetworkConnector=*</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information for all connections and connectors for broker 'localhost' except its network connectors.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query --objname Type=Connection --xobjname Type=Connection,BrokerName=localhos
 t</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information for all registered connections except those belonging to broker 'localhost'.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin query -QQueue=???? --objname Type=Connection --xobjname BrokerName=remote*</p></td><td colspan="1" rowspan="1"><p>Display all the attributes and object name information for all 4-letter queues and connections except those belonging to a broker that begins with 'remote'.</p></td></tr></tbody></table><p><strong>ActiveMQ MBean Reference:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Mbean Type</p></th><th colspan="1" rowspan="1"><p>Properties / ObjectName</p></th><th colspan="1" rowspan="1"><p>Attributes</p></th></tr><tr><td colspan="1" rowspan="1"><p>Broker</p></td><td colspan="1" rowspan="1"><ul><li><strong>Type</strong>=Broker</li><li><strong>BrokerName</strong>=&lt;broker identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li
 >BrokerId</li><li>TotalEnqueueCount</li><li>TotalDequeueCount</li><li>TotalConsumerCount</li><li>TotalMessages</li><li>TotalMessagesCached</li><li>MemoryLimit</li><li>MemoryPercentageUsed</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>Destination</p></td><td colspan="1" rowspan="1"><ul><li><strong>Type</strong>=Queue|Topic</li><li><strong>Destination</strong>=&lt;destination identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>EnqueueCount</li><li>DequeueCount</li><li>ConsumerCount</li><li>Messages</li><li>MessagesCached</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>NetworkConnector</p></td><td colspan="1" rowspan="1"><ul><li><strong>Type</strong>=NetworkConnector</li><li><strong>BrokerName</strong>=&lt;connector identifierr&gt;</li></ul></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>Connector</p></td><td colspan="1" rowspan="1"><ul><li><strong>Type</stro
 ng>=Connector</li><li><strong>ConnectorName</strong>=&lt;connector identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>EnqueueCount</li><li>DequeueCount</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>Connection</p></td><td colspan="1" rowspan="1"><ul><li><strong>Type</strong>=Connection</li><li><strong>Connection</strong>=&lt;connection identifier&gt;</li><li><strong>BrokerName</strong>=&lt;name of broker&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>EnqueueCount</li><li>DequeueCount</li><li>DispatchQueueSize</li><li>Active</li><li>Blocked</li><li>Connected</li><li>Slow</li></ul></td></tr></tbody></table><p><structured-macro ac:macro-id="60c898c5-ba0d-43b2-83a5-cb91b4f8efaa" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">bstat</parameter></structured-macro></p><h3>bstat task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>bstat</p
 ></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin bstat</em> [broker name]</p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Predefined query script that displays useful statistics regarding a broker and its components.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin bstat</p></td><td colspan="1" rowspan="1"><p>Display useful statistics for all registered brokers in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin bstat localhost</p></td><td colspan="1" rowspan="1"><p>Display useful statistics for the registered broker 'localhost'.</p></td></tr></tbody></table><p><structured-macro ac:macro-id="712ec0d8-e5e9-4c0f-9242-2058c7d53e58" ac:name="anchor" ac:
 schema-version="1"><parameter ac:name="">browse</parameter></structured-macro></p><h3>browse task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>browse</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin browse --amqurl &lt;broker url&gt; [options] &lt;destinations&gt;</em> or <em>java -jar run.jar browse --amqurl &lt;broker url&gt; [options] &lt;destinations&gt;</em></p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Script to browse selected destinations' messages.&#160; The browse operation may not return all messages due to limitations of broker configuration and system resources.</p></td></tr></tbody></table><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1
 " rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>Broker URL Option</p></td><td colspan="1" rowspan="1"><p>--amqurl &lt;url&gt;</p></td><td colspan="1" rowspan="1"><p>--amqurl tcp://localhost:61616</p></td><td colspan="1" rowspan="1"><p>Specify the broker URL to connect to.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Message Selector Option</p></td><td colspan="1" rowspan="1"><p>--msgsel "&lt;msgsel1,msgsel2,...&gt;"</p></td><td colspan="1" rowspan="1"><p>--msgsel "JMSMessageID='*:10',JMSPriority&gt;5"</p></td><td colspan="1" rowspan="1"><p>Allows you to filter the specific messages to view. Place the entire selector criteria in double quotes " ". You can use wildcard queries by enclosing the string message property in ' '. Other than using wildcard queries to filter string properties, other queries follows the message selector format.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Group View Option</p></td><td colspan="1" rowspan="1"><p>-V[header | c
 ustom | body]</p></td><td colspan="1" rowspan="1"><p>-Vheader, -Vcustom, -Vbody</p></td><td colspan="1" rowspan="1"><p>Let's you specify a specific group of message attributes to view. The header view shows all the standard JMS message headers. The custom view shows all the custom fields added to each JMS message. The body view shows the message body of the JMS message.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Specific View Option</p></td><td colspan="1" rowspan="1"><p>--view &lt;attr1&gt;,[header:|custom:]&lt;attr2&gt;,...</p></td><td colspan="1" rowspan="1"><p>--view JMSMessageID='*:10',custom:MyCustomField</p></td><td colspan="1" rowspan="1"><p>Let's you specifically select a specific message attribute. It allows you to select specific attributes from the JMS and custom headers. You could add the tags header: and custom: to explicitly specify where the attribute belongs to. Refer to the message header table below for details.</p></td></tr><tr><td colspan="1" rowspan="1"><p
 >System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>--help</p></td><td colspan="1" rowspan="1"><p>Display the help messages for the browse script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version</p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowsp
 an="1"><p>activemq-admin browse --amqurl tcp://localhost:61616 TEST.FOO</p></td><td colspan="1" rowspan="1"><p>Prints the JMS message header, custom message header, and message body of the messages in the queue 'TEST.FOO'</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin browse --amqurl tcp://localhost:61616 -Vheader,body TEST.FOO</p></td><td colspan="1" rowspan="1"><p>Prints the JMS message header and message body of the messages in the queue 'TEST.FOO'</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin browse --amqurl tcp://localhost:61616 -Vheader --view custom:MyCustomField TEST.FOO TEST.BAR</p></td><td colspan="1" rowspan="1"><p>Prints all the JMS message header and the custom field 'MyCustomField' of the messages in the queue 'TEST.FOO' and 'TEST.BAR'.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin browse --amqurl tcp://localhost:61616 --msgsel "JMSMessageID='*:10',JMSPriority&gt;5" TEST.FOO</p></td><td colspan="1" rowspan="1"><p>Prints
  all the attributes of the messages in the queue 'TEST.FOO' that has a JMSMessageID that matches the wildcard query *:10 and has a JMSPriority greater than 5.</p></td></tr></tbody></table><p><strong>JMS Message Header Reference:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Header Name</p></th><th colspan="1" rowspan="1"><p>Header Type</p></th></tr><tr><td colspan="1" rowspan="1"><p>JMSCorrelation ID</p></td><td colspan="1" rowspan="1"><p>String</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSDelivery Mode</p></td><td colspan="1" rowspan="1"><p>int (1-Non-Persistent, 2-Persistent)</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSDestination</p></td><td colspan="1" rowspan="1"><p>javax.jms.Destination</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSExpiration</p></td><td colspan="1" rowspan="1"><p>long</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSMessageID</p></td><td colspan="1" rowspan="1"><p>String</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSPri
 ority</p></td><td colspan="1" rowspan="1"><p>int</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSRedelivered</p></td><td colspan="1" rowspan="1"><p>boolean</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSReplyTo</p></td><td colspan="1" rowspan="1"><p>javax.jms.Destination</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSTimestamp</p></td><td colspan="1" rowspan="1"><p>long</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMSType</p></td><td colspan="1" rowspan="1"><p>String</p></td></tr></tbody></table><p><structured-macro ac:macro-id="71ca7af0-8ada-4ab6-865a-a7084464aa65" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">purge</parameter></structured-macro></p><h3>purge task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>purge</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin purge</em> [purge-options] &lt;destinations&gt;</p></td></tr><tr><th 
 colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Delete selected destination's messages that matches the message selector.</p></td></tr></tbody></table><p><strong>Options:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Syntax</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>JMX URL Option</p></td><td colspan="1" rowspan="1"><p>--jmxurl &lt;url&gt;</p></td><td colspan="1" rowspan="1"><p>--jmxurl service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td><td colspan="1" rowspan="1"><p>Change the JMX service url to connect to. By default it connects to: service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</p></td></tr><tr><td colspan="1" rowspan="1"><p>JMX Authentication Option</p></td><td colspan="1" rowspan="1"><p>--jmxuser user --jmxpassword password</p></td><td colspan="1" rowspan="1"><p>--jmxu
 ser smx --jmxpassword smx</p></td><td colspan="1" rowspan="1"><p>For cases where username/password based authentication of the JMX client is required. Not set by default.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Message Selector Option</p></td><td colspan="1" rowspan="1"><p>--msgsel "&lt;msgsel1,msgsel2,...&gt;"</p></td><td colspan="1" rowspan="1"><p>--msgsel "JMSMessageID='*:10',JMSPriority&gt;5"</p></td><td colspan="1" rowspan="1"><p>Allows you to filter the specific messages to view. Place the entire selector criteria in double quotes " ". You can use wildcard queries by enclosing the string message property in ' '. Other than using wildcard queries to filter string properties, other queries follows the message selector format.</p></td></tr><tr><td colspan="1" rowspan="1"><p>System Define Option</p></td><td colspan="1" rowspan="1"><p>-D&lt;key&gt;=&lt;value&gt;</p></td><td colspan="1" rowspan="1"><p>-Dactivemq.home=c:/ActiveMQ</p></td><td colspan="1" rowspan="1"><p>Sets a 
 systems property. i.e Systems.getProperty("activemq.home"); will return c:/ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>Help Option</p></td><td colspan="1" rowspan="1"><p>-h or -? or --help</p></td><td colspan="1" rowspan="1"><p>--help</p></td><td colspan="1" rowspan="1"><p>Display the help messages for the browse script.</p></td></tr><tr><td colspan="1" rowspan="1"><p>Version Option</p></td><td colspan="1" rowspan="1"><p>--version</p></td><td colspan="1" rowspan="1"><p>activemq --version</p></td><td colspan="1" rowspan="1"><p>Display the activemq version information.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin purge FOO.BAR</p></td><td colspan="1" rowspan="1"><p>Delete all the messages in queue FOO.BAR</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin purge --msgsel "JMSM
 essageID='*:10',JMSPriority&gt;5" FOO.*</p></td><td colspan="1" rowspan="1"><p>Delete all the messages in the destinations that matches FOO.* and has a JMSMessageID in", the header field that matches the wildcard *:10, and has a JMSPriority field &gt; 5 in the", queue FOO.BAR <br clear="none"> To use wildcard queries, the field must be a string and the query enclosed in ''</p></td></tr></tbody></table><h3>dstat task</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Task Name</p></th><td colspan="1" rowspan="1"><p>dstat</p></td></tr><tr><th colspan="1" rowspan="1"><p>Task Usage</p></th><td colspan="1" rowspan="1"><p><em>activemq-admin dstat</em> [destination type]</p></td></tr><tr><th colspan="1" rowspan="1"><p>Description</p></th><td colspan="1" rowspan="1"><p>Predefined query script that displays useful statistics regarding destinations on a broker.</p></td></tr></tbody></table><p><strong>Examples:</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example</p></th><th 
 colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin dstat</p></td><td colspan="1" rowspan="1"><p>Display useful statistics for all destinations on the broker in the default JMX context.</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-admin dstat topics</p></td><td colspan="1" rowspan="1"><p>Display useful statistics for the Topics that currently exist on the Broker.</p></td></tr></tbody></table></div>
 


[42/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-530-release.xml
----------------------------------------------------------------------
diff --git a/activemq-530-release.xml b/activemq-530-release.xml
index c87dbd6..96e5695 100644
--- a/activemq-530-release.xml
+++ b/activemq-530-release.xml
@@ -1,36 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.3 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11914&amp;styleName=Html&amp;projectId=10520">resolves</a> 334 issues.
-
-</p><h2 id="ActiveMQ5.3.0Release-NewFeaturesin5.3">New Features in 5.3</h2>
-<p>The new features and enhancements in this release include:</p>
-
-<ul><li>New <a shape="rect" href="kahadb.xml">KahaDB</a> persistent storage</li><li><a shape="rect" class="external-link" href="http://camel.apache.org">Camel 2.0.0</a> along with its web console</li><li>stomp over SSL and NIO support</li><li>Improved configuration - default one production oriented and a lot of use case configuration examples (like scalability and throughput)</li><li>Ability to query broker for statistics from non-Java clients (by sending a message)</li><li>More broker plugins included to help tracing messages in networks, improving logging, etc.</li><li>FTP support for blob messages</li><li>Improved activemq-admin to lookup for local processes if possible</li><li>... and much more</li></ul><h2 id="ActiveMQ5.3.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluence
 Th"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.zip">apache-activemq-5.3.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.zip.asc">apache-activemq-5.3.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/apache-activemq-5.3.0-bin.tar.gz">apache-activemq-5.3.0-bin.tar.g
 z</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.tar.gz.asc">apache-activemq-5.3.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Do not use Safari to download, the above URLs use redirection</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" class="external-link" href="http://www.mozilla.com/en-US/firefox/" rel="nofollow">FireFox</a></p></div></div>
 <p></p><h2 id="ActiveMQ5.3.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.3.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="d1f6a43b-b963-4d7e-a0b1-565b2869d36c" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p><structured-macro ac:macro-id="69d45a4a-ad25-46b5-91be-7f9af439f37a" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.3"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.zip">apache-activemq-5.3.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq
 /5.3.0/apache-activemq-5.3.0-bin.zip.asc">apache-activemq-5.3.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/apache-activemq-5.3.0-bin.tar.gz">apache-activemq-5.3.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/apache-activemq-5.3.0-bin.tar.gz.asc">apache-activemq-5.3.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><structured-macro ac:macro-id="559fe820-e936-4ce6-a30f-d68483feecf2" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Do not use Safari to download, the above URLs use redirection</parameter><rich-text-body><p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers).
  If the download doesn't seem to work for you from the above URL then try using <a shape="rect" href="http://www.mozilla.com/en-US/firefox/">FireFox</a></p></rich-text-body></structured-macro><p><structured-macro ac:macro-id="1479affa-0245-4cab-937b-af25354c4f89" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="8061e073-9557-4262-9b82-8067f5716191" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.3.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.3.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.3.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.zip">activemq-parent-5.3.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.zip.
 asc">activemq-parent-5.3.0-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.tar.gz">activemq-parent-5.3.0-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.tar.gz.asc">activemq-parent-5.3.0-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.3.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.3.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.3.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11914&amp;styleName=Html&amp;projectId=10520">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-520-release.xml">ActiveMQ 5.2.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="364f5aae-88cd-49f5-b326-0a4d91c26e66" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.zip">activemq-parent-5.3.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.zip.asc">activemq-parent-5.3.0-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.tar.gz">activemq-parent-5.3.0-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.0/activemq-parent-5.3.0-source-release.tar.gz.asc">activemq-parent-5.3.0-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="3ca15ec1-353e-4644-b527-dde284e66580" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.3.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11914&amp;styleName=Html&amp;projectId=10520">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.2.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-531-release.xml
----------------------------------------------------------------------
diff --git a/activemq-531-release.xml b/activemq-531-release.xml
index 4b604a4..c45ec9c 100644
--- a/activemq-531-release.xml
+++ b/activemq-531-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.3 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12183">resolves</a> 98 issues.</p><p>The most improved areas in this release are:</p><ul><li>KahaDB message store - fixed performance limiting issues in indexes for both Queues and Topics</li><li>JDBC message store - a lot of improvements in reliability of this messages store</li><li><code>nio</code> and <code>stomp+nio</code> transports - fixed problems with leaking resources</li><li>OSGi integration - a lot of small improvements and better Apache Karaf integration</li><li>Web console security - secured against XSS and XSRF attacks</li></ul><h2 id="ActiveMQ5.3.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th>
 <th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.zip">apache-activemq-5.3.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.zip.asc">apache-activemq-5.3.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activem
 q-5.3.1-bin.tar.gz">apache-activemq-5.3.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.tar.gz.asc">apache-activemq-5.3.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.3.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeC
 ontent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.3.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="1d6269ec-1eef-4e4b-8b73-3078f0ab3c7f" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.3 is primarily a maintenance release which <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12183">resolves</a> 98 issues.</p><p>The most improved areas in this release are:</p><ul><li>KahaDB message store - fixed performance limiting issues in indexes for both Queues and Topics</li><li>JDBC message store - a lot of improvements in reliability of this messages store</li><li><code>nio</code> and <code>stomp+nio</code> transports - fixed problems with leaking resources</li><li>OSGi integration - a lot of small improvements and better Apache Karaf integration</li><li>Web console security - secured against XSS and XSRF attacks</li></ul><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>De
 scription</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.zip">apache-activemq-5.3.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.zip.asc">apache-activemq-5.3.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq-5.3.1-bin.tar.gz">apache-activemq-5.3.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/apache-activemq
 -5.3.1-bin.tar.gz.asc">apache-activemq-5.3.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="dba18de2-08fb-4fa8-929b-27eeb69115e0" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="86a957fd-ab6c-4aaf-9967-199e5a0a6524" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.3.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.3.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.3.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.zip">activemq-parent-5.3.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.zip.
 asc">activemq-parent-5.3.1-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.tar.gz">activemq-parent-5.3.1-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.tar.gz.asc">activemq-parent-5.3.1-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.3.1Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.3.1
-]]></script>
-</div></div><h2 id="ActiveMQ5.3.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12183">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-530-release.xml">ActiveMQ 5.3.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="b45a04cb-5581-4aad-842f-0fd3b2d37907" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.zip">activemq-parent-5.3.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.zip.asc">activemq-parent-5.3.1-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.tar.gz">activemq-parent-5.3.1-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.1/activemq-parent-5.3.1-source-release.tar.gz.asc">activemq-parent-5.3.1-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="174c3439-b07e-45c2-a366-7b0ca7fcfef3" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.3.1
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12183">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.3.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-532-release.xml
----------------------------------------------------------------------
diff --git a/activemq-532-release.xml b/activemq-532-release.xml
index bedf75f..1c9db36 100644
--- a/activemq-532-release.xml
+++ b/activemq-532-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.3.2 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12310&amp;sorter/field=priority&amp;sorter/order=DESC">resolves</a> 3 issues.</p><h2 id="ActiveMQ5.3.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.zip">apache-activemq-5.3.2-bi
 n.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.zip.asc">apache-activemq-5.3.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.tar.gz">apache-activemq-5.3.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.tar.gz.asc">apache-activemq-5.3.2-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.3.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that yo
 u verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.3.2Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="044a8bd2-0b89-4ac4-82b8-c51f27797322" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.3.2 is primarily a maintenance release which <a shape="rect" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12310&amp;sorter/field=priority&amp;sorter/order=DESC">resolves</a> 3 issues.</p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.zip">apache-activemq-5.3.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.ap
 ache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.zip.asc">apache-activemq-5.3.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.tar.gz">apache-activemq-5.3.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/apache-activemq-5.3.2-bin.tar.gz.asc">apache-activemq-5.3.2-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="85fb67c8-9909-43e5-833b-d4e2f6688176" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use
  in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="f36ed2e6-24ef-4d39-a0c1-0521222e1789" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.3.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.3.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.3.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.zip">activemq-parent-5.3.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.zip.
 asc">activemq-parent-5.3.2-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.tar.gz">activemq-parent-5.3.2-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.tar.gz.asc">activemq-parent-5.3.2-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.3.2Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-parent-5.3.2
-]]></script>
-</div></div><h2 id="ActiveMQ5.3.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12310">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-531-release.xml">ActiveMQ 5.3.1 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="eec8319a-87bd-4eb3-bdd3-5d258c669ed2" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.zip">activemq-parent-5.3.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.zip.asc">activemq-parent-5.3.2-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.tar.gz">activemq-parent-5.3.2-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.3.2/activemq-parent-5.3.2-source-release.tar.gz.asc">activemq-parent-5.3.2-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="237f1cbc-4887-48c0-af6d-adaafa2ce3d2" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-parent-5.3.2
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12310">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.3.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-540-release.xml
----------------------------------------------------------------------
diff --git a/activemq-540-release.xml b/activemq-540-release.xml
index b52c0bc..0337ae0 100644
--- a/activemq-540-release.xml
+++ b/activemq-540-release.xml
@@ -1,38 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release has been retracted due to bug <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <a shape="rect" href="activemq-543-release.xml">ActiveMQ 5.4.3 Release</a> instead.</p></div></div><p>Apache ActiveMQ 5.4.0 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12110&amp;sorter/field=priority&amp;sorter/order=DESC">resolves</a> 283 issues.</p><p></p><h2 id="ActiveMQ5.4.0Release-NewFeaturesin5.4.1">New Features in 5.4.1</h2>
-<ul><li><a shape="rect" href="encrypted-passwords.xml">Encrypted passwords</a></li><li>Added selector support in <a shape="rect" href="ajax.xml">Ajax</a></li></ul>
-
-
-<h2 id="ActiveMQ5.4.0Release-NewFeaturesin5.4">New Features in 5.4</h2>
-
-<ul><li><a shape="rect" href="delay-and-schedule-message-delivery.xml">Delay and Schedule Message Delivery</a></li><li>Message Priority</li><li><a shape="rect" href="websockets.xml">WebSockets</a></li><li><a shape="rect" href="osgi-integration.xml">Better OSGi support</a></li><li>Broker side options for updating failover clients automatically of new brokers joining and leaving the cluster - see <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></li><li><a shape="rect" href="unix-shell-script.xml">Enhanced Shell Script</a> - for starting, stopping and managing the broker in a Unix environment</li><li><a shape="rect" href="web-console.xml#WebConsole-SecuringWebConsole">Easy way to configure Web Console</a></li><li><a shape="rect" href="rest.xml#REST-Consumingwithselectors">Selectors for Ajax and REST consumers</a></li><li>JaasDualAuthentcationPlugin</li><li><a shape="rect" href="security.xml#Security-Anonymousaccess">Anonymous users</a></li><li>Aj
 ax Adapters</li><li>... and much more</li></ul>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Note: XML configuration is now validated against the schema</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The XML configuration syntax is now validated. The broker schema element is an alphabetically ordered sequence. Validation can now cause existing xml configuration files, with out of order elements, to fail to load with XML parse errors, halting the broker start. Fix any ordering issues to continue.</p></div></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Note: New jetty XML configuration</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The jetty XML configuration now uses direct jetty bean syntax in the absence of xbean s
 upport. This renders existing (pre 5.4) jetty xml configuration invalid. It will be necessary to reapply custom changes using the default jetty.xml as a template.</p></div></div><h2 id="ActiveMQ5.4.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.zip">apache-activemq-5.4.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="ht
 tp://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.zip.asc">apache-activemq-5.4.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.tar.gz">apache-activemq-5.4.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.tar.gz.asc">apache-activemq-5.4.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.4.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified u
 sing PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.4.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="f9843f57-8ffa-4e2d-aed7-ca64676d03e2" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="f84f3922-0383-4445-8a21-e2a9b5143273" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>This release has been retracted due to bug <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <link><page ri:content-title="ActiveMQ 5.4.3 Release"></page></link> instead.</p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.4.0 is primarily a maintenance release which <a shape="rect" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12110&amp;sorter/field=priority&amp;sorter/order=DESC">resolves</a> 283 issues.</p><p><structured-macro ac:macro-id="6c0c82c6-e969-4973-b25b-3948ec1b774f" ac:nam
 e="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.4"></page></link></parameter></structured-macro></p><structured-macro ac:macro-id="be629fd6-e0b7-4504-83ca-5ded30fd04f7" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Note: XML configuration is now validated against the schema</parameter><rich-text-body><p>The XML configuration syntax is now validated. The broker schema element is an alphabetically ordered sequence. Validation can now cause existing xml configuration files, with out of order elements, to fail to load with XML parse errors, halting the broker start. Fix any ordering issues to continue.</p></rich-text-body></structured-macro><structured-macro ac:macro-id="202916fb-1baf-4490-b21b-a002b32e8903" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Note: New jetty XML configuration</parameter><rich-text-body><p>The jetty XML configuration now uses direct jetty bean syntax in the absence of x
 bean support. This renders existing (pre 5.4) jetty xml configuration invalid. It will be necessary to reapply custom changes using the default jetty.xml as a template.</p></rich-text-body></structured-macro><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.zip">apache-activemq-5.4.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.zip.asc">apache-activemq-5.4.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan=
 "1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.tar.gz">apache-activemq-5.4.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/apache-activemq-5.4.0-bin.tar.gz.asc">apache-activemq-5.4.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="af7f9ae5-2814-4cfb-8823-03ee81b5f09b" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="4dbc3884-dede-4340-9b6d-47e2327828fe" ac:name="code" ac:schema-version="
 1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.4.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.4.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.4.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.zip">activemq-parent-5.4.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.zip.
 asc">activemq-parent-5.4.0-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.tar.gz">activemq-parent-5.4.0-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.tar.gz.asc">activemq-parent-5.4.0-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.4.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.4.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12110">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-532-release.xml">ActiveMQ 5.3.2 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="9a795a0b-35bd-435b-a3d6-9bcc43a95d04" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.zip">activemq-parent-5.4.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.zip.asc">activemq-parent-5.4.0-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.tar.gz">activemq-parent-5.4.0-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.0/activemq-parent-5.4.0-source-release.tar.gz.asc">activemq-parent-5.4.0-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="86c64a8d-fce1-4880-8c61-5f34b513dd8b" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12110">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.3.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-541-release.xml
----------------------------------------------------------------------
diff --git a/activemq-541-release.xml b/activemq-541-release.xml
index f23484e..18e2ff1 100644
--- a/activemq-541-release.xml
+++ b/activemq-541-release.xml
@@ -1,38 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release has been retracted due to bug <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <a shape="rect" href="activemq-543-release.xml">ActiveMQ 5.4.3 Release</a> instead.</p></div></div><p>Apache ActiveMQ 5.4.1 is primarily a maintenance release which resolves<br clear="none"> <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12332&amp;sorter/field=priority&amp;sorter/order=DESC">49 issues</a> mostly bug fixes and improvements</p><p></p><h2 id="ActiveMQ5.4.1Release-NewFeaturesin5.4.1">New Features in 5.4.1</h2>
-<ul><li><a shape="rect" href="encrypted-passwords.xml">Encrypted passwords</a></li><li>Added selector support in <a shape="rect" href="ajax.xml">Ajax</a></li></ul>
-
-
-<h2 id="ActiveMQ5.4.1Release-NewFeaturesin5.4">New Features in 5.4</h2>
-
-<ul><li><a shape="rect" href="delay-and-schedule-message-delivery.xml">Delay and Schedule Message Delivery</a></li><li>Message Priority</li><li><a shape="rect" href="websockets.xml">WebSockets</a></li><li><a shape="rect" href="osgi-integration.xml">Better OSGi support</a></li><li>Broker side options for updating failover clients automatically of new brokers joining and leaving the cluster - see <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></li><li><a shape="rect" href="unix-shell-script.xml">Enhanced Shell Script</a> - for starting, stopping and managing the broker in a Unix environment</li><li><a shape="rect" href="web-console.xml#WebConsole-SecuringWebConsole">Easy way to configure Web Console</a></li><li><a shape="rect" href="rest.xml#REST-Consumingwithselectors">Selectors for Ajax and REST consumers</a></li><li>JaasDualAuthentcationPlugin</li><li><a shape="rect" href="security.xml#Security-Anonymousaccess">Anonymous users</a></li><li>Aj
 ax Adapters</li><li>... and much more</li></ul>
-<h2 id="ActiveMQ5.4.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.zip">apache-activemq-5.4.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.zip.asc">apache-activemq-5.4.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" 
 class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.tar.gz">apache-activemq-5.4.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.tar.gz.asc">apache-activemq-5.4.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.4.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Do
 wnload the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.4.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="4b367ff5-13b7-4a1d-8c60-d76b3c1de7c1" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="4e2cfa20-544c-4f9d-b1a9-d80dfd1fed23" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>This release has been retracted due to bug <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <link><page ri:content-title="ActiveMQ 5.4.3 Release"></page></link> instead.</p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.4.1 is primarily a maintenance release which resolves<br clear="none"> <a shape="rect" href="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10520&amp;fixfor=12332&amp;sorter/field=priority&amp;sorter/order=DESC">49 issues</a> mostly bug fixes and improvements</p><p><structured-macro ac:macro
 -id="02870b3e-799c-485f-ba21-42293f63a638" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.4"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.zip">apache-activemq-5.4.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.zip.asc">apache-activemq-5.4.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"
 ><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.tar.gz">apache-activemq-5.4.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/apache-activemq-5.4.1-bin.tar.gz.asc">apache-activemq-5.4.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="7a393d4f-4bf3-4ebd-8111-6540b1569140" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="c3dd93fd-58b8-4888-ac8e-8098f0a6d9ad" ac:name="code" ac:schema-version="1">
 <parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.4.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.4.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.4.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.zip">activemq-parent-5.4.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.zip.
 asc">activemq-parent-5.4.1-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.tar.gz">activemq-parent-5.4.1-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.tar.gz.asc">activemq-parent-5.4.1-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.4.1Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.1
-]]></script>
-</div></div><h2 id="ActiveMQ5.4.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12332">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-540-release.xml">ActiveMQ 5.4.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="ecac7b3a-7a76-4a11-adb3-8a0e7b744099" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.zip">activemq-parent-5.4.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.zip.asc">activemq-parent-5.4.1-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.tar.gz">activemq-parent-5.4.1-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.1/activemq-parent-5.4.1-source-release.tar.gz.asc">activemq-parent-5.4.1-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="dfaea627-5ec1-4e8b-935c-e1b7ac22c4fa" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.1
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=12332">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.4.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-542-release.xml
----------------------------------------------------------------------
diff --git a/activemq-542-release.xml b/activemq-542-release.xml
index e1ab508..9923807 100644
--- a/activemq-542-release.xml
+++ b/activemq-542-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release has been retracted due to bug <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <a shape="rect" href="activemq-543-release.xml">ActiveMQ 5.4.3 Release</a> instead.</p></div></div><p>Apache ActiveMQ 5.4.2 is primarily a maintenance release which resolves<br clear="none"> <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12311210&amp;status=5&amp;status=6&amp;fixfor=12315625&amp;sorter/field=priority&amp;sorter/order=DESC">61 issues</a> mostly bug fixes and improvements</p><h2 id="ActiveMQ5.4.2Release-GettingtheBinaryDistributions"
 >Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.zip">apache-activemq-5.4.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.zip.asc">apache-activemq-5.4.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p><
 /td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.tar.gz">apache-activemq-5.4.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.tar.gz.asc">apache-activemq-5.4.2-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.4.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution
 </li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.4.2Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="ae8f560a-d855-4682-ac70-8bbe94de8c5d" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="78fc3592-7d26-4a6d-b5cb-7fcec3f9a1bd" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>This release has been retracted due to bug <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <link><page ri:content-title="ActiveMQ 5.4.3 Release"></page></link> instead.</p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.4.2 is primarily a maintenance release which resolves<br clear="none"> <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12311210&amp;status=5&amp;status=6&amp;fixfor=12315625&amp;sorter/field=priority&amp;sorter/order=DESC">61 issues</a> mostly bug fixes and improvements</p><
 h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.zip">apache-activemq-5.4.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.zip.asc">apache-activemq-5.4.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.tar.gz">apache-activemq-5.4.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape
 ="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/apache-activemq-5.4.2-bin.tar.gz.asc">apache-activemq-5.4.2-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="d94f935d-2f37-4305-8b51-9f97d05eb7aa" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="dc8a7d64-629b-4a73-8aeb-bac76cbcec75" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.4.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.4.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.4.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.zip">activemq-parent-5.4.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.zip.
 asc">activemq-parent-5.4.2-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.tar.gz">activemq-parent-5.4.2-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.tar.gz.asc">activemq-parent-5.4.2-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.4.2Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.2
-]]></script>
-</div></div><h2 id="ActiveMQ5.4.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;styleName=Html&amp;version=12315625">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-541-release.xml">ActiveMQ 5.4.1 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="7b9d6bc2-ab3d-4ec2-b5dc-63dc4ea36f9b" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.zip">activemq-parent-5.4.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.zip.asc">activemq-parent-5.4.2-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.tar.gz">activemq-parent-5.4.2-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.2/activemq-parent-5.4.2-source-release.tar.gz.asc">activemq-parent-5.4.2-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="5c035ae4-6358-4731-8667-06d70907119a" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.2
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;styleName=Html&amp;version=12315625">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.4.1 Release"></page></link></p></div>
 


[43/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5145-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5145-release.xml b/activemq-5145-release.xml
index 30f83b2..c87e581 100644
--- a/activemq-5145-release.xml
+++ b/activemq-5145-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.5Release-ActiveMQ5.14.5Release">ActiveMQ 5.14.5 Release</h2><p>Apache ActiveMQ 5.14.5 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.14.5Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.5/apache-activemq-5.14.5-bin.zip&amp;ac
 tion=download">apache-activemq-5.14.5-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz&amp;action=download">apache-activemq-5.14.5-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/
 dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.5Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" sty
 le="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.5Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.5 Release</h2><p>Apache ActiveMQ 5.14.5 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.5/apache-activemq-5.14.5-bin.zip&amp;action=download">apache-activemq-5.14.5-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz&amp;action=download">apache-activemq-5.14.5-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.asc">ASC</a>, <a shape="rect" h
 ref="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.5&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.5Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.5Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip">activemq-parent-5.14.5-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.5Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.5">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.5</a></p><h2 id="ActiveMQ5.14.5Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12339772">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-er
 ror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5144-release.xml">ActiveMQ 5.14.4 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip">activemq-parent-5.14.5-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/act
 ivemq-parent-5.14.5-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.14.5/activemq-parent-5.14.5-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.5">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.5</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12339772">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rec
 t" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="c9a03419-6ce8-48b5-859c-13cbb7cb3474" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.4 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5150-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5150-release.xml b/activemq-5150-release.xml
index c22de44..cd0f97d 100644
--- a/activemq-5150-release.xml
+++ b/activemq-5150-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.15.0Release-ActiveMQ5.15.0Release">ActiveMQ 5.15.0 Release</h2><p>Apache ActiveMQ 5.15.0 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338054">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.15.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip">apache-activemq-5.15
 .0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz">apache-activemq-5.15.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz
 .asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.15.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeConten
 t panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.15.0Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.15.0 Release</h2><p>Apache ActiveMQ 5.15.0 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338054">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip">apache-activemq-5.15.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz">apache-activemq-5.15.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/a
 pache-activemq-5.15.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/apache-activemq-5.15.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.15.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.15.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.15.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip">activemq-parent-5.15.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.15.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.0</a></p><h2 id="ActiveMQ5.15.0Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338054">release notes</a></p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Java 8 Required</p><span class="aui-i
 con aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The minimum Java version has been upgraded to Java 8.</p></div></div><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>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5145-release.xml">ActiveMQ 5.14.5 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip">activemq-parent-5.15.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-p
 arent-5.15.0-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.0/activemq-parent-5.15.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.0</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338054">release notes</a></p><structured-macro ac:macro-id="e70ca3f1-0f56-47f3-8abe-cda8c5d368eb" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Java 8 Required</parameter><rich-text-body><p>The minimum Java version has been
  upgraded to Java 8.</p></rich-text-body></structured-macro><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="c7651598-142b-418b-a5f1-1720c8523d78" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.5 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5151-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5151-release.xml b/activemq-5151-release.xml
index 2b7493c..75c2298 100644
--- a/activemq-5151-release.xml
+++ b/activemq-5151-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.15.1Release-ActiveMQ5.15.1Release">ActiveMQ 5.15.1 Release</h2><p>Apache ActiveMQ 5.15.1 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341031">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.15.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip">apache-activemq-5.15
 .1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.sha512">SHA512</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz">apache-activemq-5.15.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.ta
 r.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512">SHA512</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.15.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="co
 deContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.15.1Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.15.1 Release</h2><p>Apache ActiveMQ 5.15.1 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341031">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip">apache-activemq-5.15.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.sha512">SHA512</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz">apache-activemq-5.15.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15
 .1/apache-activemq-5.15.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512">SHA512</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.15.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.15.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.15.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip">activemq-parent-5.15.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512">SHA512</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.15.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.1</a></p><h2 id="ActiveMQ5.15.1Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341031">release notes</a></p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Java 8 Required</p><span class="a
 ui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The minimum Java version has been upgraded to Java 8.</p></div></div><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>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5150-release.xml">ActiveMQ 5.15.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip">activemq-parent-5.15.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-p
 arent-5.15.1-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512">SHA512</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.1</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341031">release notes</a></p><structured-macro ac:macro-id="e70ca3f1-0f56-47f3-8abe-cda8c5d368eb" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Java 8 Required</parameter><rich-text-body><p>The minimum Java version has 
 been upgraded to Java 8.</p></rich-text-body></structured-macro><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="26711eaf-a64b-44ac-b670-b361d4ded9af" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.15.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5152-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5152-release.xml b/activemq-5152-release.xml
index 621bb88..de498c0 100644
--- a/activemq-5152-release.xml
+++ b/activemq-5152-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.15.2Release-ActiveMQ5.15.2Release">ActiveMQ 5.15.2 Release</h2><p>Apache ActiveMQ 5.15.2 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341669">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.15.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.zip&amp;ac
 tion=download">apache-activemq-5.15.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.sha512">SHA512</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz&amp;action=download">apache-activemq-5.15.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.
 org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512">SHA512</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.15.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.15.2Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.15.2 Release</h2><p>Apache ActiveMQ 5.15.2 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341669">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.zip&amp;action=download">apache-activemq-5.15.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.sha512">SHA512</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz&amp;action=download">apache-activemq-5.15.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc">ASC</a>, <a shape="rec
 t" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512">SHA512</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.15.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.15.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.15.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip">activemq-parent-5.15.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512">SHA512</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.15.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.2</a></p><h2 id="ActiveMQ5.15.2Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341669">release notes</a></p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Java 8 Required</p><span class="au
 i-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The minimum Java version has been upgraded to Java 8.</p></div></div><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>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5150-release.xml">ActiveMQ 5.15.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip">activemq-parent-5.15.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/act
 ivemq-parent-5.15.2-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512">SHA512</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.15.2</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12341669">release notes</a></p><structured-macro ac:macro-id="e70ca3f1-0f56-47f3-8abe-cda8c5d368eb" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Java 8 Required</parameter><rich-text-body><p>The minimum Java version has b
 een upgraded to Java 8.</p></rich-text-body></structured-macro><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="fe2b7e81-08f6-4199-8fab-dc8733befcb7" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.15.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-520-release.xml
----------------------------------------------------------------------
diff --git a/activemq-520-release.xml b/activemq-520-release.xml
index 214a595..ba6806d 100644
--- a/activemq-520-release.xml
+++ b/activemq-520-release.xml
@@ -1,42 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.2 is primarily a maintenance release which <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11841">resolves</a> </p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-.
-
-<h2 id="ActiveMQ5.2.0Release-NewFeaturesin5.2">New Features in 5.2</h2>
-<p>The new features and enhancements in this release include:</p>
-
-<ul><li><a shape="rect" href="advisory-message.xml">Additional advisory messages</a> for messages delivered/consumed fast producers/slow consumers, Usage limits, Slaves become masters etc.</li><li>Enhanced ssl context configuration through spring/xbean</li><li>New individual acknowledge mode for message consumption</li><li>Ability to configure the automatic discarding of the items being sent to the dead letter queue</li><li>Ability to limit the maximum number of connections to a Broker</li><li>Ability to configure <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-1244">separate lock</a> Datasource for JDBC Master slave.</li><li>activemq-camel and activemq-connection-pool now have their own modules, no longer in activemq-core</li><li>The default <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html">ActiveMQConnectionFactory</a> brokerUrl now uses th
 e <a shape="rect" href="failover-transport-reference.xml">failover transport</a>.</li><li>Uses Apache Camel <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/camel-150-release.html">1.5</a>.</li></ul><h2 id="ActiveMQ5.2.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.zip">apache-activemq-5.2.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.zip.asc">apache-activemq-5.2.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.tar.gz">apache-activemq-5.2.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.tar.gz.asc">apache-activemq-5.2.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Do not use Safari to download, the above URLs use redirection</p><span class="aui-icon aui-icon-sm
 all aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" class="external-link" href="http://www.mozilla.com/en-US/firefox/" rel="nofollow">FireFox</a></p></div></div><p></p><h2 id="ActiveMQ5.2.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution
 </li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.2.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="b99a04f3-f6d6-46c7-8fd4-8e60d7398ba5" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p><structured-macro ac:macro-id="e19ea26c-0c8d-471b-a6b7-42cd75681069" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.2"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.zip">apache-activemq-5.2.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq
 /5.2.0/apache-activemq-5.2.0-bin.zip.asc">apache-activemq-5.2.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.tar.gz">apache-activemq-5.2.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.tar.gz.asc">apache-activemq-5.2.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><structured-macro ac:macro-id="60ad5f08-4485-4c3a-8cd3-0b1d9f3ae3e2" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Do not use Safari to download, the above URLs use redirection</parameter><rich-text-body><p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari brow
 sers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" href="http://www.mozilla.com/en-US/firefox/">FireFox</a></p></rich-text-body></structured-macro><p><structured-macro ac:macro-id="f5c22e81-4286-40ce-9346-2da4250cdcd4" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="ccc28a51-3097-4b56-8154-b8ba1851e55a" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.2.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.2.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.2.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.zip">apache-activemq-5.2.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.zip.asc">apache-activemq-5.2.0-src.zi
 p.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.tar.gz">apache-activemq-5.2.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.tar.gz.asc">apache-activemq-5.2.0-src.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.2.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.2.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.2.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11841">release notes</a></p><p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-<p>Also see the previous <a shape="rect" href="activemq-510-release.xml">ActiveMQ 5.1.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="13ab3b02-460c-433c-8d16-a3e7c780a372" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.zip">apache-activemq-5.2.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.zip.asc">apache-activemq-5.2.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="ht
 tp://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.tar.gz">apache-activemq-5.2.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-src.tar.gz.asc">apache-activemq-5.2.0-src.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="c53e1e9f-cad7-43e1-9a71-dafd8f4f8d2b" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.2.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11841">release notes</a></p><p><structured-macro ac:macro-id="231b862f-a00e-4b38-8136-025527fcc651" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11841&amp;sorter/field=priority"></url></parameter></structured-macro></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.1.0 Release"></page></link></p></div>
 


[03/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms-to-jms-bridge.xml
----------------------------------------------------------------------
diff --git a/jms-to-jms-bridge.xml b/jms-to-jms-bridge.xml
index 3bd7a46..dc046cb 100644
--- a/jms-to-jms-bridge.xml
+++ b/jms-to-jms-bridge.xml
@@ -1,104 +1,97 @@
-<div class="wiki-content maincontent"><h3 id="JMStoJMSBridge-Introduction">Introduction</h3><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning, try Camel first!</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 we recommend you look at using <a shape="rect" class="external-link" href="http://camel.apache.org/">Apache Camel</a> for bridging ActiveMQ to or from any message broker (or indeed <a shape="rect" class="external-link" href="http://camel.apache.org/components.html">any other technology, protocol or middleware</a>) as its much easier to:</p><ul><li>keep things flexible; its very easy to map different queue/topic to one or more queues or topics on the other provider</li><li>perform content based routing, filtering and other <a shape="rect" class="external-link" href="http://camel.apache.org/enterprise-integration-pat
 terns.html">Enterprise Integration Patterns</a></li><li>allows you to work with <a shape="rect" class="external-link" href="http://camel.apache.org/components.html">any technology, protocol or middleware</a>, not just JMS providers</li></ul><p>e.g. in your Spring XML file just add:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;camelContext xmlns=&quot;http://camel.apache.org/schema/spring&quot;&gt;
+<div class="wiki-content maincontent"><h3>Introduction</h3><structured-macro ac:macro-id="8f3d34a6-d2b2-4ae6-9592-7af58f76c70a" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning, try Camel first!</parameter><rich-text-body><p>Note that we recommend you look at using <a shape="rect" href="http://camel.apache.org/">Apache Camel</a> for bridging ActiveMQ to or from any message broker (or indeed <a shape="rect" href="http://camel.apache.org/components.html">any other technology, protocol or middleware</a>) as its much easier to:</p><ul><li>keep things flexible; its very easy to map different queue/topic to one or more queues or topics on the other provider</li><li>perform content based routing, filtering and other <a shape="rect" href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li>allows you to work with <a shape="rect" href="http://camel.apache.org/components.html">any technology, protocol or middlewar
 e</a>, not just JMS providers</li></ul><p>e.g. in your Spring XML file just add:</p><structured-macro ac:macro-id="1c8e34e4-e50f-4c2e-8f5f-b474b46eb8ce" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;camelContext xmlns="http://camel.apache.org/schema/spring"&gt;
   &lt;route&gt;
-   &lt;from uri=&quot;mqseries:Foo.Bar&quot;/&gt;
-   &lt;to uri=&quot;activemq:Cheese&quot;/&gt;
+   &lt;from uri="mqseries:Foo.Bar"/&gt;
+   &lt;to uri="activemq:Cheese"/&gt;
   &lt;/route&gt;
 &lt;/camelContext&gt;
-]]></script>
-</div></div></div></div><p>ActiveMQ provides bridging functionality to other JMS providers that implement the JMS 1.0.2 and above specification.<br clear="none"> A JMS bridge can be co-located with an ActiveMQ broker or run remotely.<br clear="none"> In order to support JMS 1.0.2 there is seperation between Queues and Topics.</p><p>temporary destinations and replyTo destinations in the inbound message exchanges are automatically handled, enabling an ActiveMQ service to handle a foreign JMS TopicRequestor or QueueResquestor exchanges.</p><h3 id="JMStoJMSBridge-properties">properties</h3><p><strong>JMS Bridge Topic Connector</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localTo
 picConnection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used to connect to ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localTopicConnectionFactory</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used to initialize the ActiveMQ JMS Connection if localTopicConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localClientId</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set the id of the local connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundClientId</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set the id of the outbound connection</p></td></tr><tr><t
 d colspan="1" rowspan="1" class="confluenceTd"><p>jndiLocalTemplate</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Spring default template</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localTopicConnection or localTopicConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundTopicConnection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used to connect to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundTopicConnectionFactory</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used to initialize the foreign JMS Connection if outboundTopicConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluen
 ceTd"><p>jndiOutboundTemplate</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Spring default template</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localTopicConnection or localTopicConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundUsername</p></td><td colspan="1" rowspan="1" class="con
 fluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundMessageConvertor</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for converting foreign JMS Messages to a format for ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundMessageConvertor</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for converting ActiveMQ messages to
  a format for the foriegn JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundTopicBridges</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>an array of InboundTopicBridge instances - used for defining inbound (subscribe to) traffic from the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundTopicBridges</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>an array of OutboundTopicBridge instances - used for defining destinations that will be published to the foreign JMS provider</p></td></tr></tbody></table></div><p><strong>JMS Bridge Queue Connector</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>defa
 ult value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localQueueConnection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used to connect to ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localQueueConnectionFactory</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used to initialize the ActiveMQ JMS Connection if localQueueConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localClientId</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set the id of the local connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundClientId</p></td><td colspan="1" 
 rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>set the id of the outbound connection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jndiLocalTemplate</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Spring default template</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localQueueConnection or localQueueConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundQueueConnection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used to connect to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundQueueConnectionFactory</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="con
 fluenceTd"><p>used to initialize the foreign JMS Connection if localQueueConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jndiOutboundTemplate</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Spring default template</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localQueueConnection or localQueueConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the
  ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundMessageConvertor</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for converting foreign JMS Messages to a format for ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundMessageConvertor</p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will be used for converting ActiveMQ messages to a format for the foriegn JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundQueueBridges</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>an array of InboundQueueBridge instances - used for defining inbound (subscribe to) traffic from the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundQueueBridges</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>an array of OutboundQueueBridge instances - used for defining destinations that will be forwarded to the foreign JMS provider</p></td></tr></tbody></table></div><div class="sectionColumnWrapper"><div class="sectionMacroWithBorder"><div class="sectionMa
 croRow"><div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;"><h4 id="JMStoJMSBridge-TopicBridges">Topic Bridges</h4><p><strong>InboundTopicBridge</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localTopicName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundTopicName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the foreign topic name to subscribe to</p></td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"><p>selector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>selector to use - if any</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumerName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>if set will create a durable consumer</p></td></tr></tbody></table></div><p><strong>OutboundTopicBridge</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localTopicName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the n
 ame of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundTopicName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the foreign topic name to publish to</p></td></tr></tbody></table></div></div><div class="columnMacro" style="width:50%;min-width:50%;max-width:50%;"><h4 id="JMStoJMSBridge-QueueBridges">Queue Bridges</h4><p><strong>InboundQueueBridge</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localQueueName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the name of the loc
 al ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inboundQueueName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the foreign queue name to receive from</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>selector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>selector to use - if any</p></td></tr></tbody></table></div><p><br clear="none" class="atl-forced-newline"> <strong>OutboundQueueBridge</strong></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>localQueueName</p></td><td cols
 pan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outboundQueueName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>the foreign queue name to send to</p></td></tr></tbody></table></div></div></div></div></div><h3 id="JMStoJMSBridge-ExampleXBeanConfiguration">Example XBean Configuration</h3><p>The following <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml">example config file</a> shows how to use the regular <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> to configure a JMS to JMS bridge.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[  &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; id=&quot;localbroker&quot;
-    brokerName=&quot;localBroker&quot; persistent=&quot;false&quot;&gt;
+</plain-text-body></structured-macro></rich-text-body></structured-macro><p>ActiveMQ provides bridging functionality to other JMS providers that implement the JMS 1.0.2 and above specification.<br clear="none"> A JMS bridge can be co-located with an ActiveMQ broker or run remotely.<br clear="none"> In order to support JMS 1.0.2 there is seperation between Queues and Topics.</p><p>temporary destinations and replyTo destinations in the inbound message exchanges are automatically handled, enabling an ActiveMQ service to handle a foreign JMS TopicRequestor or QueueResquestor exchanges.</p><h3>properties</h3><p><strong>JMS Bridge Topic Connector</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localTopicConnection</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be us
 ed to connect to ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>localTopicConnectionFactory</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>used to initialize the ActiveMQ JMS Connection if localTopicConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>localClientId</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>set the id of the local connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundClientId</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>set the id of the outbound connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>jndiLocalTemplate</p></td><td colspan="1" rowspan="1"><p>Spring default template</p></td><td colspan="1" rowspan="1"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localTopicConnection or localTopicConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundT
 opicConnection</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used to connect to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundTopicConnectionFactory</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>used to initialize the foreign JMS Connection if outboundTopicConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>jndiOutboundTemplate</p></td><td colspan="1" rowspan="1"><p>Spring default template</p></td><td colspan="1" rowspan="1"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localTopicConnection or localTopicConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>localUsername</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>localPassword</p></td><
 td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundUsername</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundPassword</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundMessageConvertor</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for converting foreign JMS Messages to a format for ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundMessageConvertor</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for convertin
 g ActiveMQ messages to a format for the foriegn JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundTopicBridges</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>an array of InboundTopicBridge instances - used for defining inbound (subscribe to) traffic from the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundTopicBridges</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>an array of OutboundTopicBridge instances - used for defining destinations that will be published to the foreign JMS provider</p></td></tr></tbody></table><p><strong>JMS Bridge Queue Connector</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localQueueConnection</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" ro
 wspan="1"><p>if set will be used to connect to ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>localQueueConnectionFactory</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>used to initialize the ActiveMQ JMS Connection if localQueueConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>localClientId</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>set the id of the local connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundClientId</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>set the id of the outbound connection</p></td></tr><tr><td colspan="1" rowspan="1"><p>jndiLocalTemplate</p></td><td colspan="1" rowspan="1"><p>Spring default template</p></td><td colspan="1" rowspan="1"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localQueueConnection or localQueueConnectionFactory is not set</p></td></tr><tr><td colspa
 n="1" rowspan="1"><p>outboundQueueConnection</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used to connect to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundQueueConnectionFactory</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>used to initialize the foreign JMS Connection if localQueueConnection is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>jndiOutboundTemplate</p></td><td colspan="1" rowspan="1"><p>Spring default template</p></td><td colspan="1" rowspan="1"><p>used for locating the Connection Factory for the ActiveMQ Connection if the localQueueConnection or localQueueConnectionFactory is not set</p></td></tr><tr><td colspan="1" rowspan="1"><p>localUsername</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"
 ><p>localPassword</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the ActiveMQ JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundUsername</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundPassword</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for authentication to the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundMessageConvertor</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will be used for converting foreign JMS Messages to a format for ActiveMQ</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundMessageConvertor</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set
  will be used for converting ActiveMQ messages to a format for the foriegn JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundQueueBridges</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>an array of InboundQueueBridge instances - used for defining inbound (subscribe to) traffic from the foreign JMS provider</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundQueueBridges</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>an array of OutboundQueueBridge instances - used for defining destinations that will be forwarded to the foreign JMS provider</p></td></tr></tbody></table><structured-macro ac:macro-id="fc5033ca-749d-4ac3-be79-ed9adc8602dc" ac:name="section" ac:schema-version="1"><parameter ac:name="border">true</parameter><rich-text-body><structured-macro ac:macro-id="f6b52566-a480-48f4-9ef9-a166aa599cc0" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text
 -body><h4>Topic Bridges</h4><p><strong>InboundTopicBridge</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localTopicName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundTopicName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the foreign topic name to subscribe to</p></td></tr><tr><td colspan="1" rowspan="1"><p>selector</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>selector to use - if any</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumerName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>if set will create a durable consumer</p></td></tr></tbody></table><p><strong>Out
 boundTopicBridge</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localTopicName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundTopicName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the foreign topic name to publish to</p></td></tr></tbody></table></rich-text-body></structured-macro><structured-macro ac:macro-id="d88262df-141e-4074-b048-13eeadb6cadf" ac:name="column" ac:schema-version="1"><parameter ac:name="width">50%</parameter><rich-text-body><h4>Queue Bridges</h4><p><strong>InboundQueueBridge</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="
 1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localQueueName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1"><p>inboundQueueName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the foreign queue name to receive from</p></td></tr><tr><td colspan="1" rowspan="1"><p>selector</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>selector to use - if any</p></td></tr></tbody></table><p><br clear="none" class="atl-forced-newline"> <strong>OutboundQueueBridge</strong></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property name</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th></tr><tr><td colspan="1" rowspan="1"><p>localQueueName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>th
 e name of the local ActiveMQ Queue</p></td></tr><tr><td colspan="1" rowspan="1"><p>outboundQueueName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>the foreign queue name to send to</p></td></tr></tbody></table></rich-text-body></structured-macro></rich-text-body></structured-macro><h3>Example XBean Configuration</h3><p>The following <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml">example config file</a> shows how to use the regular <link><page ri:content-title="Xml Configuration"></page></link> to configure a JMS to JMS bridge.</p><structured-macro ac:macro-id="e7254210-9de0-4ff4-9b7c-e66ccb0f342d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>  &lt;broker xmlns="http://activemq.apache.org/schema/core" id="localbroker"
+    brokerName="localBroker" persistent="false"&gt;
     &lt;jmsBridgeConnectors&gt;
       &lt;jmsQueueConnector
-        outboundQueueConnectionFactory=&quot;#remoteFactory&quot;&gt;
+        outboundQueueConnectionFactory="#remoteFactory"&gt;
         &lt;inboundQueueBridges&gt;
           &lt;inboundQueueBridge
-            inboundQueueName=&quot;org.apache.activemq.network.jms.QueueBridgeXBeanTest&quot; /&gt;
+            inboundQueueName="org.apache.activemq.network.jms.QueueBridgeXBeanTest" /&gt;
         &lt;/inboundQueueBridges&gt;
       &lt;/jmsQueueConnector&gt;
     &lt;/jmsBridgeConnectors&gt;
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61234&quot; /&gt;
+      &lt;transportConnector uri="tcp://localhost:61234" /&gt;
     &lt;/transportConnectors&gt;
   &lt;/broker&gt;
   &lt;!-- JMS ConnectionFactory to use remote --&gt;
-  &lt;bean id=&quot;remoteFactory&quot;
-    class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-    &lt;property name=&quot;brokerURL&quot; value=&quot;tcp://localhost:61666&quot; /&gt;
+  &lt;bean id="remoteFactory"
+    class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+    &lt;property name="brokerURL" value="tcp://localhost:61666" /&gt;
   &lt;/bean&gt;
-]]></script>
-</div></div><h3 id="JMStoJMSBridge-ExamplepureSpringConfiguration">Example pure Spring Configuration</h3><p>The following example shows how to use raw Spring XML to wire together a broker - bridging to a Foreign JMS provider</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;!-- local broker with embedded Jms to Jms bridge (ok - it&#39;s contrived) --&gt;
-  &lt;bean id=&quot;localbroker&quot; class=&quot;org.apache.activemq.broker.BrokerService&quot;
-    init-method=&quot;start&quot;&gt;
-    &lt;property name=&quot;brokerName&quot; value = &quot;localBroker&quot;/&gt;
-      &lt;property name=&quot;persistent&quot; value = &quot;false&quot;/&gt;
-    &lt;property name=&quot;transportConnectorURIs&quot;&gt;
+</plain-text-body></structured-macro><h3>Example pure Spring Configuration</h3><p>The following example shows how to use raw Spring XML to wire together a broker - bridging to a Foreign JMS provider</p><structured-macro ac:macro-id="efa48821-6721-4f88-980e-9a707b669bec" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;!-- local broker with embedded Jms to Jms bridge (ok - it's contrived) --&gt;
+  &lt;bean id="localbroker" class="org.apache.activemq.broker.BrokerService"
+    init-method="start"&gt;
+    &lt;property name="brokerName" value = "localBroker"/&gt;
+      &lt;property name="persistent" value = "false"/&gt;
+    &lt;property name="transportConnectorURIs"&gt;
       &lt;list&gt;
         &lt;value&gt;tcp://localhost:61234&lt;/value&gt;
       &lt;/list&gt;
     &lt;/property&gt;
-    &lt;property name=&quot;jmsBridgeConnectors&quot;&gt;
+    &lt;property name="jmsBridgeConnectors"&gt;
       &lt;list&gt;
-      	&lt;ref bean=&quot;jmsConnector&quot;/&gt;
+      	&lt;ref bean="jmsConnector"/&gt;
       &lt;/list&gt;
     &lt;/property&gt;
   &lt;/bean&gt;
 
   &lt;!-- JMS ConnectionFactory to use local broker (the one with the bridge) --&gt;
-  &lt;bean id=&quot;localFactory&quot;
-    class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-    &lt;property name=&quot;brokerURL&quot; value=&quot;tcp://localhost:61234&quot; /&gt;
+  &lt;bean id="localFactory"
+    class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+    &lt;property name="brokerURL" value="tcp://localhost:61234" /&gt;
   &lt;/bean&gt;
 
   &lt;!--JmsTopicConnector - the Jms bridge --&gt;
-  &lt;bean id=&quot;jmsConnector&quot;
-  	class=&quot;org.apache.activemq.network.jms.JmsTopicConnector&quot;&gt;
-  	&lt;property name = &quot;outboundTopicConnectionFactory&quot; ref = &quot;remoteFactory&quot;/&gt;
+  &lt;bean id="jmsConnector"
+  	class="org.apache.activemq.network.jms.JmsTopicConnector"&gt;
+  	&lt;property name = "outboundTopicConnectionFactory" ref = "remoteFactory"/&gt;
 
-  	&lt;property name = &quot;inboundTopicBridges&quot;&gt;
+  	&lt;property name = "inboundTopicBridges"&gt;
   	 &lt;list&gt;
-  	  &lt;ref bean=&quot;InboundTopicBridge&quot; /&gt;
+  	  &lt;ref bean="InboundTopicBridge" /&gt;
   	 &lt;/list&gt;
   	 &lt;/property&gt;
 
   &lt;/bean&gt;
 
-  &lt;bean id =&quot;InboundTopicBridge&quot; class=&quot;org.apache.activemq.network.jms.InboundTopicBridge&quot;&gt;
-  	&lt;property name = &quot;inboundTopicName&quot; value = &quot;org.apache.activemq.network.jms.TopicBridgeSpringTest&quot;/&gt;
+  &lt;bean id ="InboundTopicBridge" class="org.apache.activemq.network.jms.InboundTopicBridge"&gt;
+  	&lt;property name = "inboundTopicName" value = "org.apache.activemq.network.jms.TopicBridgeSpringTest"/&gt;
   &lt;/bean&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div><h3 id="JMStoJMSBridge-ExampleXBeanConfigurationtoBridgeActiveMQtoProviderWithNoURLSetter">Example XBean Configuration to Bridge ActiveMQ to Provider With No URL Setter</h3><p>Some JMS providers, WebLogic for instance, do not expose a setter for connection properties like host and port (setBrokerUrl) on their ConnectionFactory object. In this case you need to set outboundQueueConnectionFactoryName and jndiOutboundTemplate in your activemq.xml config file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;!-- START SNIPPET: example --&gt;
+</plain-text-body></structured-macro><h3>Example XBean Configuration to Bridge ActiveMQ to Provider With No URL Setter</h3><p>Some JMS providers, WebLogic for instance, do not expose a setter for connection properties like host and port (setBrokerUrl) on their ConnectionFactory object. In this case you need to set outboundQueueConnectionFactoryName and jndiOutboundTemplate in your activemq.xml config file.</p><structured-macro ac:macro-id="9ab28010-3e37-4a07-9f51-a419b333462f" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;!-- START SNIPPET: example --&gt;
 &lt;beans&gt;
 
   &lt;!-- Allows us to use 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 useJmx=&quot;true&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
+  &lt;broker useJmx="true" xmlns="http://activemq.org/config/1.0"&gt;
 
     &lt;persistenceAdapter&gt;
-        &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;${activemq.home}/activemq-data&quot;/&gt;
+        &lt;journaledJDBC journalLogFiles="5" dataDirectory="${activemq.home}/activemq-data"/&gt;
     &lt;/persistenceAdapter&gt;
 
     &lt;transportConnectors&gt;
-       &lt;transportConnector name=&quot;default&quot; uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
-       &lt;transportConnector name=&quot;stomp&quot;   uri=&quot;stomp://localhost:61613&quot;/&gt;
+       &lt;transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/&gt;
+       &lt;transportConnector name="stomp"   uri="stomp://localhost:61613"/&gt;
     &lt;/transportConnectors&gt;
 
     &lt;networkConnectors&gt;
-      &lt;networkConnector name=&quot;default&quot; uri=&quot;multicast://default&quot;/&gt;
+      &lt;networkConnector name="default" uri="multicast://default"/&gt;
     &lt;/networkConnectors&gt;
 
     &lt;jmsBridgeConnectors&gt;
-     &lt;jmsQueueConnector name=&quot;JreportRequestBridge-Inbound&quot;
-        jndiOutboundTemplate=&quot;#remoteJndi&quot;
-        outboundQueueConnectionFactoryName=&quot;jms/ConnectionFactory&quot;
-        localQueueConnectionFactory=&quot;#localFactory&quot;&gt;
+     &lt;jmsQueueConnector name="JreportRequestBridge-Inbound"
+        jndiOutboundTemplate="#remoteJndi"
+        outboundQueueConnectionFactoryName="jms/ConnectionFactory"
+        localQueueConnectionFactory="#localFactory"&gt;
         &lt;inboundQueueBridges&gt;
-          &lt;inboundQueueBridge inboundQueueName=&quot;jms/queue/jreport/request&quot;/&gt;
+          &lt;inboundQueueBridge inboundQueueName="jms/queue/jreport/request"/&gt;
         &lt;/inboundQueueBridges&gt;
       &lt;/jmsQueueConnector&gt;
     &lt;/jmsBridgeConnectors&gt;
@@ -106,62 +99,60 @@
   &lt;/broker&gt;
 
     &lt;!-- Set up the template for connecting to Weblogic --&gt;
-    &lt;bean id=&quot;remoteJndi&quot; class=&quot;org.springframework.jndi.JndiTemplate&quot;&gt;
-        &lt;property name=&quot;environment&quot;&gt;
+    &lt;bean id="remoteJndi" class="org.springframework.jndi.JndiTemplate"&gt;
+        &lt;property name="environment"&gt;
                 &lt;props&gt;
-                        &lt;prop key=&quot;java.naming.factory.initial&quot;&gt;weblogic.jndi.WLInitialContextFactory&lt;/prop&gt;
-                        &lt;prop key=&quot;java.naming.provider.url&quot;&gt;t3://&lt;your ip here&gt;:7001&lt;/prop&gt;
+                        &lt;prop key="java.naming.factory.initial"&gt;weblogic.jndi.WLInitialContextFactory&lt;/prop&gt;
+                        &lt;prop key="java.naming.provider.url"&gt;t3://&lt;your ip here&gt;:7001&lt;/prop&gt;
                 &lt;/props&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
 
-  &lt;bean id=&quot;localFactory&quot;
-    class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-    &lt;property name=&quot;brokerURL&quot; value=&quot;tcp://localhost:61616&quot; /&gt;
+  &lt;bean id="localFactory"
+    class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+    &lt;property name="brokerURL" value="tcp://localhost:61616" /&gt;
   &lt;/bean&gt;
 
-  &lt;bean id=&quot;localQueue&quot; class=&quot;org.apache.activemq.command.ActiveMQQueue&quot;&gt;
-    &lt;constructor-arg value=&quot;dynamic/jms.queue.jreport.request&quot;/&gt;
+  &lt;bean id="localQueue" class="org.apache.activemq.command.ActiveMQQueue"&gt;
+    &lt;constructor-arg value="dynamic/jms.queue.jreport.request"/&gt;
   &lt;/bean&gt;
 &lt;/beans&gt;
 &lt;!-- END SNIPPET: xbean --&gt;
-]]></script>
-</div></div><h3 id="JMStoJMSBridge-ExamplepureSpringConfigurationforsendingmessagestoexternalActiveMQdestinationthroughbridge">Example pure Spring Configuration for sending messages to external ActiveMQ destination through bridge</h3><p>Spring beans:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;!DOCTYPE beans PUBLIC &quot;-//SPRING//DTD BEAN//EN&quot; &quot;http://www.springframework.org/dtd/spring-beans.dtd&quot;&gt;
+</plain-text-body></structured-macro><h3>Example pure Spring Configuration for sending messages to external ActiveMQ destination through bridge</h3><p>Spring beans:</p><structured-macro ac:macro-id="cbcd3077-34d7-42fc-a2fc-b21579cd26b5" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
 
 &lt;beans&gt;
 
-	&lt;bean id=&quot;mainBroker&quot; class=&quot;org.apache.activemq.broker.BrokerService&quot; init-method=&quot;start&quot; destroy-method=&quot;stop&quot;&gt;
-		&lt;property name=&quot;brokerName&quot; value = &quot;mainBroker&quot;/&gt;
-		&lt;property name=&quot;persistent&quot; value=&quot;false&quot;/&gt;
-		&lt;property name=&quot;transportConnectorURIs&quot;&gt;
+	&lt;bean id="mainBroker" class="org.apache.activemq.broker.BrokerService" init-method="start" destroy-method="stop"&gt;
+		&lt;property name="brokerName" value = "mainBroker"/&gt;
+		&lt;property name="persistent" value="false"/&gt;
+		&lt;property name="transportConnectorURIs"&gt;
 			&lt;list&gt;
 				&lt;value&gt;tcp://localhost:7000&lt;/value&gt;
 			&lt;/list&gt;
 		&lt;/property&gt;
 	&lt;/bean&gt;
 
-	&lt;bean id=&quot;bridgedBroker&quot; class=&quot;org.apache.activemq.broker.BrokerService&quot; init-method=&quot;start&quot; destroy-method=&quot;stop&quot;&gt;
-		&lt;property name=&quot;brokerName&quot; value = &quot;bridgedBroker&quot;/&gt;
-		&lt;property name=&quot;persistent&quot; value=&quot;false&quot;/&gt;
-		&lt;property name=&quot;transportConnectorURIs&quot;&gt;
+	&lt;bean id="bridgedBroker" class="org.apache.activemq.broker.BrokerService" init-method="start" destroy-method="stop"&gt;
+		&lt;property name="brokerName" value = "bridgedBroker"/&gt;
+		&lt;property name="persistent" value="false"/&gt;
+		&lt;property name="transportConnectorURIs"&gt;
 			&lt;list&gt;
 				&lt;value&gt;tcp://localhost:7001&lt;/value&gt;
 			&lt;/list&gt;
 		&lt;/property&gt;
-		&lt;property name=&quot;jmsBridgeConnectors&quot;&gt;
+		&lt;property name="jmsBridgeConnectors"&gt;
 			&lt;list&gt;
-				&lt;bean class=&quot;org.apache.activemq.network.jms.JmsQueueConnector&quot;&gt;
-					&lt;property name=&quot;outboundQueueConnectionFactory&quot;&gt;
-						&lt;bean class=&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;&gt;
-							&lt;property name=&quot;brokerURL&quot; value=&quot;tcp://localhost:7000&quot; /&gt;
+				&lt;bean class="org.apache.activemq.network.jms.JmsQueueConnector"&gt;
+					&lt;property name="outboundQueueConnectionFactory"&gt;
+						&lt;bean class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+							&lt;property name="brokerURL" value="tcp://localhost:7000" /&gt;
 						&lt;/bean&gt;
 					&lt;/property&gt;
-					&lt;property name=&quot;outboundQueueBridges&quot;&gt;
+					&lt;property name="outboundQueueBridges"&gt;
 						&lt;list&gt;
-							&lt;bean class=&quot;org.apache.activemq.network.jms.OutboundQueueBridge&quot;&gt;
-								&lt;constructor-arg value=&quot;messages.input&quot;/&gt;
+							&lt;bean class="org.apache.activemq.network.jms.OutboundQueueBridge"&gt;
+								&lt;constructor-arg value="messages.input"/&gt;
 							&lt;/bean&gt;
 						&lt;/list&gt;
 					&lt;/property&gt;
@@ -171,34 +162,32 @@
 	&lt;/bean&gt;
 
 &lt;/beans&gt;
-]]></script>
-</div></div><p>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[public class BridgeTest {
+</plain-text-body></structured-macro><p>Java code:</p><structured-macro ac:macro-id="ccd7cc10-d4e9-4405-829a-17a18774ab9f" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>public class BridgeTest {
 
 	public BridgeTest() throws Exception {
 
 	    Log log = LogFactory.getLog(getClass());
 
-	    new ClassPathXmlApplicationContext(&quot;bridge/context-bridge.xml&quot;);
+	    new ClassPathXmlApplicationContext("bridge/context-bridge.xml");
 
-	    ActiveMQConnection connection = ActiveMQConnection.makeConnection(&quot;tcp://localhost:7001&quot;);
+	    ActiveMQConnection connection = ActiveMQConnection.makeConnection("tcp://localhost:7001");
 	    connection.start();
 	    Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-	    Destination destination = session.createQueue(&quot;messages.input&quot;);
+	    Destination destination = session.createQueue("messages.input");
 	    MessageProducer producer = session.createProducer(destination);
-	    producer.send(session.createTextMessage(&quot;Test Message&quot;));
-	    log.debug(&quot;send message&quot;);
+	    producer.send(session.createTextMessage("Test Message"));
+	    log.debug("send message");
 	    session.close();
 	    connection.close();
 
-	    connection = ActiveMQConnection.makeConnection(&quot;tcp://localhost:7000&quot;);
+	    connection = ActiveMQConnection.makeConnection("tcp://localhost:7000");
 	    connection.start();
 	    session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-	    destination = session.createQueue(&quot;messages.input&quot;);
+	    destination = session.createQueue("messages.input");
             MessageConsumer consumer = session.createConsumer(destination);
-            log.debug(&quot;receive message&quot;);
+            log.debug("receive message");
             Message message = consumer.receive(5000);
-            log.debug(&quot;Received: &quot; + message);
+            log.debug("Received: " + message);
 	    session.close();
 	    connection.close();
 	}
@@ -208,6 +197,5 @@
 	}
 
 }
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jms.xml
----------------------------------------------------------------------
diff --git a/jms.xml b/jms.xml
index 8d0ae10..63a9f43 100644
--- a/jms.xml
+++ b/jms.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<p>Questions on using the JMS API and <a shape="rect" href="mom.xml">MOM</a> in general</p>
+<p>Questions on using the JMS API and <link ac:tooltip="Message Orientated Middleware"><page ri:content-title="MOM"></page><link-body>MOM</link-body></link> in general</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="can-i-modify-messages-on-a-queue.xml">Can I modify messages on a queue</a></li><li><a shape="rect" href="can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml">Can I send and receive messages concurrently on one JMS Connection</a></li><li><a shape="rect" href="can-you-browse-a-topic.xml">Can you browse a topic</a></li><li><a shape="rect" href="how-do-durable-queues-and-topics-work.xml">How do durable queues and topics work</a></li><li><a shape="rect" href="how-does-a-queue-compare-to-a-topic.xml">How does a Queue compare to a Topic</a></li><li><a shape="rect" href="how-does-connectionfactory-relate-to-the-broker.xml">How does ConnectionFactory relate to the Broker</a></li><li><a shape="rect" href="how-does-jms-compare-with-email.xml">How does JMS compare with email</a></li><li><a shape="rect" href="how-do-i-consume-a-specific-message.xml">How do I consume a specific message</a></li><li><a shape="rect" href="how-
 do-i-get-started-with-jms.xml">How do I get started with JMS</a></li><li><a shape="rect" href="how-do-i-make-messages-durable.xml">How do I make messages durable</a></li><li><a shape="rect" href="how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml">How do I send messages to different Destinations from a single MessageProducer</a></li><li><a shape="rect" href="how-do-i-use-jms-efficiently.xml">How do I use JMS efficiently</a></li><li><a shape="rect" href="how-should-i-implement-request-response-with-jms.xml">How should I implement request response with JMS</a></li><li><a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a></li><li><a shape="rect" href="multiple-consumers-on-a-queue.xml">Multiple consumers on a queue</a></li><li><a shape="rect" href="should-i-use-transactions.xml">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.xml">Should I use XA</a></li><li><a shape="rect" href="what-are-administe
 red-objects.xml">What are administered objects</a></li></ul></div>
+<structured-macro ac:macro-id="e46b407d-1d1b-4200-8a01-c1974f0207eb" 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/jmstemplate-gotchas.xml
----------------------------------------------------------------------
diff --git a/jmstemplate-gotchas.xml b/jmstemplate-gotchas.xml
index b6c13fa..c8bef49 100644
--- a/jmstemplate-gotchas.xml
+++ b/jmstemplate-gotchas.xml
@@ -1,18 +1,19 @@
 <div class="wiki-content maincontent"><p>The thing to remember is JmsTemplate is designed for use in EJBs using the EJB containers JMS pooling abstraction. So every method will typically create a connection, session, producer or consumer, do something, then close them all down again. The idea being that this will use the J2EE containers pooling mechanism to pool the JMS resources under the covers. Without using a pooled JMS provider from the EJB container this is the worst possible way of working with JMS; since typically each create/close of a connection, producer/consumer results in a request-response with the JMS broker.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">User Story</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>We had a bug once in ActiveMQ where if you created 65535 MessageProducer instances within the space of a few seconds, we'd get an exception thrown in the broker. Its a kinda silly thing to do, to create that many producers in a small space of time (one for each message to be sent) - JMS is designed for resources like producers and consumers to be created up front and reused across many message exchanges. The bug was highlighted by a user using JmsTemplate without a JMS pool underneath. Well at least it helped find our bug which I'm glad to say is now fixed, but it didn't help their performance too much <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></div></div>
+<structured-macro ac:macro-id="b1b7138d-6479-4785-b123-cb2f14d691e6" ac:name="info" ac:schema-version="1"><parameter ac:name="title">User Story</parameter><rich-text-body>
+<p>We had a bug once in ActiveMQ where if you created 65535 MessageProducer instances within the space of a few seconds, we'd get an exception thrown in the broker. Its a kinda silly thing to do, to create that many producers in a small space of time (one for each message to be sent) - JMS is designed for resources like producers and consumers to be created up front and reused across many message exchanges. The bug was highlighted by a user using JmsTemplate without a JMS pool underneath. Well at least it helped find our bug which I'm glad to say is now fixed, but it didn't help their performance too much <emoticon ac:name="smile"></emoticon></p></rich-text-body></structured-macro>
 
-<p>You should only use JmsTemplate with a pooled JMS provider. In J2EE 1.4 or later that typically means a JCA based JMS ConnectionFactory. If you are in an EJB then make sure you use your J2EE containers ConnectionFactory, never a plain-old-connection factory. If you are not inside an EJB Then you should use our <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/pool/PooledConnectionFactory.html">PooledConnectionFactory</a>, then things will be nicely pooled. If you need to take part in XA transactions then look into our spring based <a shape="rect" href="jca-container.xml">JCA Container</a>.</p>
+<p>You should only use JmsTemplate with a pooled JMS provider. In J2EE 1.4 or later that typically means a JCA based JMS ConnectionFactory. If you are in an EJB then make sure you use your J2EE containers ConnectionFactory, never a plain-old-connection factory. If you are not inside an EJB Then you should use our <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/pool/PooledConnectionFactory.html">PooledConnectionFactory</a>, then things will be nicely pooled. If you need to take part in XA transactions then look into our spring based <link><page ri:content-title="JCA Container"></page></link>.</p>
 
-<p>Another gotcha I've seen folks do is to create a MessageConsumer inside one of the SessionCallback methods then wonder why messages are not being received. After the SessionCallback is called, the session will be closed; which will close your consumers too <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)">. So if you want to create a MessageConsumer you should create a connection, session and consumer yourself.</p>
+<p>Another gotcha I've seen folks do is to create a MessageConsumer inside one of the SessionCallback methods then wonder why messages are not being received. After the SessionCallback is called, the session will be closed; which will close your consumers too <emoticon ac:name="smile"></emoticon>. So if you want to create a MessageConsumer you should create a connection, session and consumer yourself.</p>
 
-<p>Another problem I've seen is folks using the JmsTemplate.receive() method; as I've said above if you're not in an EJB using the J2EE containers ConnnectionFactory, a connection, session &amp; consumer will be create and closed for each receive() method. This is all fine and well - if painfully slow unless you are using pooling - but be aware that this mechanism, without pooling, may well miss messages. If you are consuming on a topic which has messages sent with NON_PERSISTENT delivery mode then chances are you will miss messages, since each receive() call is a brand new consumer which will not receive any messages sent before the consumer existed. To receive messages efficiently you should use Spring's <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-mdp" rel="nofollow">MessageListenerContainer</a>.</p>
+<p>Another problem I've seen is folks using the JmsTemplate.receive() method; as I've said above if you're not in an EJB using the J2EE containers ConnnectionFactory, a connection, session &amp; consumer will be create and closed for each receive() method. This is all fine and well - if painfully slow unless you are using pooling - but be aware that this mechanism, without pooling, may well miss messages. If you are consuming on a topic which has messages sent with NON_PERSISTENT delivery mode then chances are you will miss messages, since each receive() call is a brand new consumer which will not receive any messages sent before the consumer existed. To receive messages efficiently you should use Spring's <a shape="rect" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-mdp">MessageListenerContainer</a>.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">New in 4.x</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>In ActiveMQ <a shape="rect" href="changes-in-40.xml">4.x</a> we have a new feature called <a shape="rect" href="subscription-recovery-policy.xml">Subscription Recovery Policy</a> which even in non-durable delivery mode allows a new consumer to go back in time and receive messages delivered within a window (a fixed amount of RAM or time window). e.g. if your broker dies you have 2 minutes to reconnect to another broker and not miss any messages - even without durable delivery.</p></div></div>
+<structured-macro ac:macro-id="c93967d2-f5ce-4be6-8fa0-91d117d43290" ac:name="info" ac:schema-version="1"><parameter ac:name="title">New in 4.x</parameter><rich-text-body>
+<p>In ActiveMQ <link><page ri:content-title="Changes in 4.0"></page><link-body>4.x</link-body></link> we have a new feature called <link><page ri:content-title="Subscription Recovery Policy"></page></link> which even in non-durable delivery mode allows a new consumer to go back in time and receive messages delivered within a window (a fixed amount of RAM or time window). e.g. if your broker dies you have 2 minutes to reconnect to another broker and not miss any messages - even without durable delivery.</p></rich-text-body></structured-macro>
 
-<h3 id="JmsTemplateGotchas-RecommendationsforusingJmsTemplate">Recommendations for using JmsTemplate</h3>
+<h3>Recommendations for using JmsTemplate</h3>
 
-<ul><li>Never use a regular ConnectionFactory unless you are totally sure it does all the pooling you need</li><li>If using in an EJB ensure you use the EJB containers ConnectionFactory</li><li>If you are only publishing messages and you are not in an EJB container and you are using ActiveMQ, then you can use either the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/activemq/pool/PooledConnectionFactory.html" rel="nofollow">PooledConnectionFactory</a> or the <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/api/org/springframework/jms/connection/CachingConnectionFactory.html" rel="nofollow">Spring CachingConnectionFactory</a></li><li>If you are consuming messages its probably simpler &amp; more efficient &amp; less likely to lose messages to avoid using the receive() method and use Spring's <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.h
 tml#jms-mdp" rel="nofollow">MessageListenerContainer</a> instead</li><li>See also <a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html" rel="nofollow">Using Spring to Send JMS Messages</a> and <a shape="rect" class="external-link" href="http://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html" rel="nofollow">Using Spring to Receive JMS Messages</a></li></ul></div>
+<ul><li>Never use a regular ConnectionFactory unless you are totally sure it does all the pooling you need</li><li>If using in an EJB ensure you use the EJB containers ConnectionFactory</li><li>If you are only publishing messages and you are not in an EJB container and you are using ActiveMQ, then you can use either the <a shape="rect" href="http://activemq.codehaus.org/maven/apidocs/org/activemq/pool/PooledConnectionFactory.html">PooledConnectionFactory</a> or the <a shape="rect" href="http://static.springsource.org/spring/docs/2.5.x/api/org/springframework/jms/connection/CachingConnectionFactory.html">Spring CachingConnectionFactory</a></li><li>If you are consuming messages its probably simpler &amp; more efficient &amp; less likely to lose messages to avoid using the receive() method and use Spring's <a shape="rect" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-mdp">MessageListenerContainer</a> instead</li><li>See also <a shape="rect" href="http://
 bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.html">Using Spring to Send JMS Messages</a> and <a shape="rect" href="http://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html">Using Spring to Receive JMS Messages</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jmsxuserid.xml
----------------------------------------------------------------------
diff --git a/jmsxuserid.xml b/jmsxuserid.xml
index 4c12574..74d7408 100644
--- a/jmsxuserid.xml
+++ b/jmsxuserid.xml
@@ -1,32 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="JMSXUserID-JMSXUserIDsupport">JMSXUserID support</h2>
+<div class="wiki-content maincontent"><h2>JMSXUserID support</h2>
 
 <p>It is sometimes useful to know the authenticated username of the sender of a message. This is not added by default but you can enable it by setting the <strong>populateJMSXUserID</strong> property on the broker via 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[
+<structured-macro ac:macro-id="b5da1390-e2d9-495f-b57d-445b3748f0a7" ac:name="code" ac:schema-version="1"><plain-text-body>
 BrokerService broker = new BrokerService();
 broker.setPopulateJMSXUserID(true);
 broker.start();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>Or via the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a></p>
+<p>Or via the <link><page ri:content-title="Xml Configuration"></page></link></p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;broker xmlns=&quot;http://activemq.org/config/1.0&quot; populateJMSXUserID=&quot;true&quot;&gt;
+<structured-macro ac:macro-id="2c740d5e-cee9-4294-9c5f-2128b841dbb8" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;broker xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true"&gt;
 ...
 &lt;/broker&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>Or via the <a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a>.</p>
+<p>Or via the <link><page ri:content-title="Broker Configuration URI"></page></link>.</p>
 
 <p>Once enabled this feature adds the JMS property <strong>JMSXUserID</strong> to each JMS message so that a consumer can know exactly who the sender was using the broker's authentication policy. i.e. it is not possibile for a producer to spoof this value if this feature is enabled since the broker attaches the property to the message after the senders connection is authenticated.</p>
 
 <p>If you allow anonymous access, you MUST also add the </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[useAuthenticatedPrincipalForJMSXUserID=&quot;true&quot;]]></script>
-</div></div>
+<structured-macro ac:macro-id="467587ab-74a0-4e73-bfbe-091d09bd2305" ac:name="code" ac:schema-version="1"><plain-text-body>useAuthenticatedPrincipalForJMSXUserID="true"</plain-text-body></structured-macro>
 <p> property of the broker element. Otherwise, anonymous clients can spoof identities by setting the JMSXUserID property on from the client. This property is available in version 5.5 or 5.5-SNAPSHOT &gt; March 12th. Note, though, that for SSL certificate based authentication, e.g., when using TextFileCertificateLoginModule JAAS module, this will change the semantics of the broker-provided JMSXUserID. Instead of returning the DN of the certificate, it will provide the name the DN is mapped to by the JAAS module.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jmx-support.xml
----------------------------------------------------------------------
diff --git a/jmx-support.xml b/jmx-support.xml
index b5523c1..5ff0e41 100644
--- a/jmx-support.xml
+++ b/jmx-support.xml
@@ -1,15 +1,15 @@
 <div class="wiki-content maincontent">
 <p>This page describes the JMX management requirements.</p>
 
-<h2 id="JMXSupport-RequiredMBeans">Required MBeans</h2>
+<h2>Required MBeans</h2>
 
-<h3 id="JMXSupport-BrokerMBeans">Broker MBeans</h3>
+<h3>Broker MBeans</h3>
 
 <p>We need MBeans for the core Broker types in the activemq.broker package to allow folks to see a broker's configuration, its connectors, currently connected clients &amp; disconnect clients etc.</p>
 
 <p>e.g. MBeans for </p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>MBean</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Broker/BrokerContainer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The Message Broker itself</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>BrokerConnector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The inbound connector listening to new client connections</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>BrokerClient</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A specific client connection</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>MBean</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>Broker/BrokerContainer</p></td><td colspan="1" rowspan="1"><p>The Message Broker itself</p></td></tr><tr><td colspan="1" rowspan="1"><p>BrokerConnector</p></td><td colspan="1" rowspan="1"><p>The inbound connector listening to new client connections</p></td></tr><tr><td colspan="1" rowspan="1"><p>BrokerClient</p></td><td colspan="1" rowspan="1"><p>A specific client connection</p></td></tr></tbody></table>
 
 
 <p>We have an old BrokerAdmin interface we should replace with proper MBeans ASAP.</p>
@@ -18,11 +18,11 @@
 
 <p>So we'll need some way of viewing and looking up of thesse MC MBeans as they are created dynamically as users start using different destionations.</p>
 
-<h3 id="JMXSupport-Statistics">Statistics</h3>
+<h3>Statistics</h3>
 
 <p>We implement J2EE Management Stats which add stats to each JMS resource; Connection, Session, Consumer, Producer (and we've added support to Destination too). So we need to expose those somehow in JMX so users can watch/view stats for JMS clients</p>
 
-<h2 id="JMXSupport-Usecases">Use cases</h2>
+<h2>Use cases</h2>
 
 <p>Here's a list of end user use cases we need to support easily...</p>
 
@@ -33,9 +33,10 @@
 <ul><li>viewing contents of queues/topics</li><li>starting/stopping remote brokers</li></ul>
 
 
-<h2 id="JMXSupport-Issues">Issues</h2>
+<h2>Issues</h2>
 
 <ul><li>do we need/want an MBean per JMS Connection/Session/Producer/Consumer? Am not sure why other than a way to grab stats; if so maybe some kinda stats MBean instead?</li></ul>
 
+
 </div>
 


[18/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/contributing.xml
----------------------------------------------------------------------
diff --git a/contributing.xml b/contributing.xml
index 49575e4..13587c1 100644
--- a/contributing.xml
+++ b/contributing.xml
@@ -1,15 +1,7 @@
-<div class="wiki-content maincontent"><p>There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!</p><p>Try surf the documentation - if somethings confusing or not clear, let us know. Download the code &amp; try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?</p><p>Want to do some hacking on ActiveMQ? Try surfing to our <a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/AMQ">issue tracker</a> for open issues or features that need to be implemented, take ownership of an issue and try fix it.</p><h2 id="Contributing-Gettingintouch">Getting in touch</h2><p>There are various ways of communicating with the ActiveMQ community.</p><ul class="alternate"><li>join us on the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> or subscribe to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> and take part in any con
 versations</li><li><p>pop by on <span>in <a shape="rect" href="irc.xml">irc</a> and say hi</span></p></li><li>add some comments to the <a shape="rect" href="navigation.xml">wiki</a></li></ul><h2 id="Contributing-Ifyoufindabugorproblem">If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a></p><p>If you can create a JUnit test case then your issue is more likely to be resolved quicker.<br clear="none"> e.g. take a look at some of the existing <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master">unit tests cases</a></p><p>Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem <strong>stays fixed</strong> in future releases.</p><h2 id="Contributing-Ifyouwant
 tohelpoutwiththedocumentation">If you want to help out with the documentation</h2><p>If you want to contribute to the ActiveMQ documentation you should first subscribe our <a shape="rect" class="external-link" href="mailto:dev-subscribe@activemq.apache.org" rel="nofollow">dev@</a>&#160;where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the <a shape="rect" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ">ActiveMQ wiki</a> and fill in and submit an ICLA to the ASF (see the&#160;<a shape="rect" href="becoming-a-committer.xml">Committer Guide</a>). Then ask on the dev@ list to be granted edit rights and an admin will do so fairly quickly. If you want to just contribute the content, please submit the content on the dev@ list or create an issue and attach it there. <strong>All</strong> contributions are highly appreciated.</p><h2 id="Contributing-Workingonthecode">Working on the code</h2><p>Grab the <a shape="r
 ect" href="source.xml">Source</a> from git</p><p>Build the project.</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[export MAVEN_OPTS=&quot;-Xmx512M -XX:MaxPermSize=128M&quot;
+<div class="wiki-content maincontent"><p>There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!</p><p>Try surf the documentation - if somethings confusing or not clear, let us know. Download the code &amp; try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?</p><p>Want to do some hacking on ActiveMQ? Try surfing to our <a shape="rect" href="http://issues.apache.org/jira/browse/AMQ">issue tracker</a> for open issues or features that need to be implemented, take ownership of an issue and try fix it.</p><h2>Getting in touch</h2><p>There are various ways of communicating with the ActiveMQ community.</p><ul class="alternate"><li>join us on the <link><page ri:content-title="Discussion Forums"></page></link> or subscribe to the <link><page ri:content-title="Mailing Lists"></page></link> and take part in any conversations</li><li><p>pop by on <span>in <link><page ri:c
 ontent-title="IRC"></page><plain-text-link-body>irc</plain-text-link-body></link> and say hi</span></p></li><li>add some comments to the <link><page ri:content-title="Navigation"></page><plain-text-link-body>wiki</plain-text-link-body></link></li></ul><h2>If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a></p><p>If you can create a JUnit test case then your issue is more likely to be resolved quicker.<br clear="none"> e.g. take a look at some of the existing <a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master">unit tests cases</a></p><p>Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem <strong>stays fixed</strong> in future releases.</p><h2>If you want to help out with the documentation</h2
 ><p>If you want to contribute to the ActiveMQ documentation you should first subscribe our <a shape="rect" href="mailto:dev-subscribe@activemq.apache.org">dev@</a>&#160;where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the <a shape="rect" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ">ActiveMQ wiki</a> and fill in and submit an ICLA to the ASF (see the&#160;<link><page ri:content-title="Becoming a committer"></page><plain-text-link-body>Committer Guide</plain-text-link-body></link>). Then ask on the dev@ list to be granted edit rights and an admin will do so fairly quickly. If you want to just contribute the content, please submit the content on the dev@ list or create an issue and attach it there. <strong>All</strong> contributions are highly appreciated.</p><h2>Working on the code</h2><p>Grab the <link><page ri:content-title="Source"></page></link> from git</p><p>Build the project.</p><structured-mac
 ro ac:macro-id="25d641b3-f919-4efd-a2ce-8623d0c25cc4" ac:name="code" ac:schema-version="1"><plain-text-body>export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=128M"
 mvn -Dtest=false install
-]]></script>
-</div></div><p>PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.</p><p>Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.</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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>Then import the projects into your workspace.</p><h2 id="Contributing-Creatingpatches">Creating patches</h2><p>We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.</p><p>Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -&gt; Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -&gt; Share... first to enable the Subversion options).</p><p>If you're a command line person try the following to create the patch</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[diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[git diff Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><h2 id="Contributing-Submittingpatches">Submitting patches</h2><p>The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> or <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>.</p><h2 id="Contributing-Becomingacommmitter">Becoming a commmitter</h2><p>Once you've got involved as above, we may well invite you to be a committer. See <a shape="rect" href="becoming-a-committer.xml">Becoming a committer</a> for more details.</p><h2 id="Contributing-Usingtheissuetracker">Using the issue tracker</h2><p>Before you can raise an issue in the issue tracker you need to register with it. This is quick &amp; painless.</p><p>If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, please mail the&
 #160;<a shape="rect" class="external-link" href="mailto:dev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a> mail list with the email address you used to register with the issue tracker and we'll add you to the group.</p><p>Why not dive in the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a>, and try tackle some of our outstanding issues?</p><h2 id="Contributing-Becomingacommitter">Becoming a committer</h2><p>The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the <a shape="rect" href="becoming-a-committer.xml">Committer Guide</a></p></div>
+</plain-text-body></structured-macro><p>PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.</p><p>Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.</p><structured-macro ac:macro-id="e56c51bd-0335-411a-af24-ad8f058f506e" ac:name="code" ac:schema-version="1"><plain-text-body>mvn eclipse:eclipse
+</plain-text-body></structured-macro><p>Then import the projects into your workspace.</p><h2>Creating patches</h2><p>We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.</p><p>Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -&gt; Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -&gt; Share... first to enable the Subversion options).</p><p>If you're a command line person try the following to create the patch</p><structured-macro ac:macro-id="2d0a96df-60e0-465e-9fd4-f4ad65c58016" ac:name="code" ac:schema-version="1"><plain-text-body>diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="c70274da-13ad-4f5e-9cd5-b777ce4af0d0" ac:name="code" ac:schema-version="1"><plain-text-body>git diff Main.java &gt;&gt; patchfile.txt
+</plain-text-body></structured-macro><h2>Submitting patches</h2><p>The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the <link><page ri:content-title="Mailing Lists"></page></link> or <link><page ri:content-title="Discussion Forums"></page></link>.</p><h2>Becoming a commmitter</h2><p>Once you've got involved as above, we may well invite you to be a committer. See <link><page ri:content-title="Becoming a committer"></page></link> for more details.</p><h2>Using the issue tracker</h2><p>Before you can raise an issue in the issue tracker you need to register with it. This is quick &amp; painless.</p><p>If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, please mail the&#160;<a shape="rect" href="mailto:dev@activemq.apache.org">dev@activemq.apache.org</a> mail list
  with the email address you used to register with the issue tracker and we'll add you to the group.</p><p>Why not dive in the <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a>, and try tackle some of our outstanding issues?</p><h2>Becoming a committer</h2><p>The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the <link><page ri:content-title="Becoming a committer"></page><plain-text-link-body>Committer Guide</plain-text-link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/could-not-find-packetreader-for-packet-type-unknown-packet-type.xml
----------------------------------------------------------------------
diff --git a/could-not-find-packetreader-for-packet-type-unknown-packet-type.xml b/could-not-find-packetreader-for-packet-type-unknown-packet-type.xml
index f078dae..b25bfc8 100644
--- a/could-not-find-packetreader-for-packet-type-unknown-packet-type.xml
+++ b/could-not-find-packetreader-for-packet-type-unknown-packet-type.xml
@@ -1,12 +1,10 @@
-<div class="wiki-content maincontent"><h3 id="CouldnotfindPacketReaderforpackettype-UNKNOWNPACKETTYPE-Error">Error</h3>
+<div class="wiki-content maincontent"><h3>Error</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="d1a91181-524f-47f6-9389-3bb5a7ef5e6c" ac:name="code" ac:schema-version="1"><plain-text-body>
 Could not find PacketReader for packet type: UNKNOWN PACKET TYPE: -102
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="CouldnotfindPacketReaderforpackettype-UNKNOWNPACKETTYPE-Reason">Reason</h3>
+<h3>Reason</h3>
 
 <p>You are probably using different versions of ActiveMQ jars on the client and the broker. Try using the same jars on each node and the problem should go away.</p>
 


[46/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5110-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5110-release.xml b/activemq-5110-release.xml
index 2fcf185..da8c2b9 100644
--- a/activemq-5110-release.xml
+++ b/activemq-5110-release.xml
@@ -1,24 +1,7 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ5.11.0Release-ActiveMQ5.11.0Release">ActiveMQ 5.11.0 Release</h2><p>Apache ActiveMQ 5.11.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?jql=fixVersion%20%3D%205.11.0%20AND%20project%20%3D%20AMQ">more than 130 issues</a>, mostly bug fixes and improvements. It is build with and requires jdk 1.7</p><p></p><h2 id="ActiveMQ5.11.0Release-NewFeaturesin5.11.0">New Features in 5.11.0</h2><ul class="alternate"><li><span style="line-height: 1.4285715;">Destination import/export for lock down mode <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5218">AMQ-5218</a></span></li><li><p>Dynamic camel root loading <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5351">AMQ-5351</a></p></li><li><p>MQTT - QOS2 mapped to virtual topics&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5290">A
 MQ-5290</a></p></li><li>start scripts simplification&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5378">AMQ-5378</a></li><li>Recover scheduler database option&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3758">AMQ-3758</a></li><li>Jetty 8</li><li>Karaf 2.4.1</li></ul><h2 id="ActiveMQ5.11.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.0/apa
 che-activemq-5.11.0-bin.zip">apache-activemq-5.11.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.zip.asc">apache-activemq-5.11.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.tar.gz">apache-activemq-5.11.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.tar.gz.asc">apache-activemq-5.11.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.11.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is e
 ssential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.11.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><h2>ActiveMQ 5.11.0 Release</h2><p>Apache ActiveMQ 5.11.0 resolves <a shape="rect" href="https://issues.apache.org/jira/issues/?jql=fixVersion%20%3D%205.11.0%20AND%20project%20%3D%20AMQ">more than 130 issues</a>, mostly bug fixes and improvements. It is build with and requires jdk 1.7</p><p><structured-macro ac:macro-id="040e0ddd-57d4-4e33-add5-cd6a987016ec" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.11"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.zip">a
 pache-activemq-5.11.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.zip.asc">apache-activemq-5.11.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.tar.gz">apache-activemq-5.11.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.0/apache-activemq-5.11.0-bin.tar.gz.asc">apache-activemq-5.11.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="dd53c3d9-5de0-4c37-aee0-d527229b69fd" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in yo
 ur maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="100579c4-0862-40d1-ad3f-2fba066f4d24" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.11.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.11.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.11.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.0/activemq-parent-5.11.0-source-release.zip">activemq-parent-5.11.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.0/activemq-parent-5.11.0-source-release.zip.asc">activemq-parent-5.11.0-
 source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.11.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.0</a></p><h2 id="ActiveMQ5.11.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324951&amp;projectId=12311210">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5100-release.xml">ActiveMQ 5.10.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="91c55dac-7402-4731-83fb-ae1c63f43e62" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.0/activemq-parent-5.11.0-source-release.zip">activemq-parent-5.11.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/act
 ivemq/5.11.0/activemq-parent-5.11.0-source-release.zip.asc">activemq-parent-5.11.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.0</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324951&amp;projectId=12311210">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.10.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5111-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5111-release.xml b/activemq-5111-release.xml
index 73f7352..a13d45c 100644
--- a/activemq-5111-release.xml
+++ b/activemq-5111-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.11.1Release-ActiveMQ5.11.1Release">ActiveMQ 5.11.1 Release</h2><p>Apache ActiveMQ 5.11.1 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.11.1">6 issues</a>, mostly bug fixes.</p><h3 id="ActiveMQ5.11.1Release-GettingtheBinaryDistributions"><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/d
 ist/activemq/5.11.1/apache-activemq-5.11.1-bin.zip">apache-activemq-5.11.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.zip.asc">apache-activemq-5.11.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.tar.gz">apache-activemq-5.11.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.tar.gz.asc">apache-activemq-5.11.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.11.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloa
 ds</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.11.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.11.1 Release</h2><p>Apache ActiveMQ 5.11.1 resolves <a shape="rect" href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.11.1">6 issues</a>, mostly bug fixes.</p><h3><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>W
 indows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.zip">apache-activemq-5.11.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.zip.asc">apache-activemq-5.11.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.tar.gz">apache-activemq-5.11.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.11.1/apache-activemq-5.11.1-bin.tar.gz.asc">apache-activemq-5.11.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page r
 i:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.11.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.11.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.11.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.1/activemq-parent-5.11.1-source-release.zip">activemq-parent-5.11.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.11.1/activemq-parent-5.11.1-source-release.zip.asc">activemq-parent
 -5.11.1-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.11.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1</a></p><h2 id="ActiveMQ5.11.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329382">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5110-release.xml">ActiveMQ 5.11.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.1/activemq-parent-5.11.1-source-release.zip">activemq-parent-5.11.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/
 dist/activemq/5.11.1/activemq-parent-5.11.1-source-release.zip.asc">activemq-parent-5.11.1-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329382">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.11.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5112-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5112-release.xml b/activemq-5112-release.xml
index eebaa3e..ca1e752 100644
--- a/activemq-5112-release.xml
+++ b/activemq-5112-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.11.2Release-ActiveMQ5.11.2Release">ActiveMQ 5.11.2 Release</h2><p>Apache ActiveMQ 5.11.2 resolves several<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669"> issues</a>, mostly bug fixes.</p><h3 id="ActiveMQ5.11.2Release-GettingtheBinaryDistributions"><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.
 org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.zip">apache-activemq-5.11.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.zip.asc">apache-activemq-5.11.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.tar.gz">apache-activemq-5.11.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.tar.gz.asc">apache-activemq-5.11.2-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.11.2Release-VerifytheIntegrityofDownloads">Verify the Integr
 ity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.11.2Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.11.2 Release</h2><p>Apache ActiveMQ 5.11.2 resolves several<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669"> issues</a>, mostly bug fixes.</p><h3><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1">
 <p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.zip">apache-activemq-5.11.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.zip.asc">apache-activemq-5.11.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.tar.gz">apache-activemq-5.11.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.2/apache-activemq-5.11.2-bin.tar.gz.asc">apache-activemq-5.11.2-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""
 ><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.11.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.11.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.11.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.2/activemq-parent-5.11.2-source-release.zip">activemq-parent-5.11.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.11.2/activemq-parent-5.11.2-source-release.zip.asc">activemq-parent
 -5.11.2-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.11.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1</a></p><h2 id="ActiveMQ5.11.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5111-release.xml">ActiveMQ 5.11.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.2/activemq-parent-5.11.2-source-release.zip">activemq-parent-5.11.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/
 dist/activemq/5.11.2/activemq-parent-5.11.2-source-release.zip.asc">activemq-parent-5.11.2-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.1</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.11.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5113-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5113-release.xml b/activemq-5113-release.xml
index dc5f65e..c015434 100644
--- a/activemq-5113-release.xml
+++ b/activemq-5113-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.11.3Release-ActiveMQ5.11.3Release">ActiveMQ 5.11.3 Release</h2><p>Apache ActiveMQ 5.11.3 resolves several<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669"> issues</a>, mostly bug fixes.</p><h3 id="ActiveMQ5.11.3Release-GettingtheBinaryDistributions"><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.
 org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.zip">apache-activemq-5.11.3-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.zip.asc">apache-activemq-5.11.3-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.tar.gz">apache-activemq-5.11.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.tar.gz.asc">apache-activemq-5.11.3-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.11.3Release-VerifytheIntegrityofDownloads">Verify the Integr
 ity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.11.3Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.11.3 Release</h2><p>Apache ActiveMQ 5.11.3 resolves several<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329669"> issues</a>, mostly bug fixes.</p><h3><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1">
 <p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.zip">apache-activemq-5.11.3-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.zip.asc">apache-activemq-5.11.3-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.tar.gz">apache-activemq-5.11.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.11.3/apache-activemq-5.11.3-bin.tar.gz.asc">apache-activemq-5.11.3-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""
 ><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.11.3&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.11.3Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.11.3Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.3/activemq-parent-5.11.3-source-release.zip">activemq-parent-5.11.3-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.11.3/activemq-parent-5.11.3-source-release.zip.asc">activemq-parent
 -5.11.3-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.11.3Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.3</a></p><h2 id="ActiveMQ5.11.3Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333254">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5112-release.xml">ActiveMQ 5.11.2 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.11.3/activemq-parent-5.11.3-source-release.zip">activemq-parent-5.11.3-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/
 dist/activemq/5.11.3/activemq-parent-5.11.3-source-release.zip.asc">activemq-parent-5.11.3-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.11.3</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333254">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.11.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5120-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5120-release.xml b/activemq-5120-release.xml
index 25e62f7..10be526 100644
--- a/activemq-5120-release.xml
+++ b/activemq-5120-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.12.0Release-ActiveMQ5.12.0Release">ActiveMQ 5.12.0 Release</h2><p>Apache ActiveMQ 5.12.0 resolves several<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329258"> issues</a>, and provides significant improves to the <a shape="rect" href="amqp.xml">AMQP</a> and <a shape="rect" href="mqtt.xml">MQTT</a> support in the broker as well as fixing issues with <a shape="rect" href="stomp.xml">STOMP</a> and <a shape="rect" href="mqtt.xml">MQTT</a> over WebSockets plus much much more.</p><h3 id="ActiveMQ5.12.0Release-GettingtheBinaryDistributions"><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1
 " rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip">apache-activemq-5.12.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a
  shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz">apache-activemq-5.12.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.12.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download t
 he <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.12.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.12.0 Release</h2><p>Apache ActiveMQ 5.12.0 resolves several<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329258"> issues</a>, and provides significant improves to the <link><page ri:content-title="AMQP"></page></link> and <link><page ri:content-title="MQTT"></page></link> support in the broker as well as fixing issues with <link><page ri:content-title="Stomp"></page><plain-text-link-body>STOMP</plain-text-link-body></link> and <link><page ri:content-title="MQTT"></page></link> over WebSock
 ets plus much much more.</p><h3><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip">apache-activemq-5.12.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix
 /Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz">apache-activemq-5.12.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.0/apache-activemq-5.12.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in y
 our <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.12.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.12.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.12.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip">activemq-parent-5.12.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.12.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.0</a></p><h2 id="ActiveMQ5.12.0Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329258">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5112-release.xml">ActiveMQ 5.11.2 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip">activemq-parent-5.12.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.12.0/act
 ivemq-parent-5.12.0-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.0/activemq-parent-5.12.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.0</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329258">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.11.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5121-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5121-release.xml b/activemq-5121-release.xml
index faf3423..6319c37 100644
--- a/activemq-5121-release.xml
+++ b/activemq-5121-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.12.1Release-ActiveMQ5.12.1Release">ActiveMQ 5.12.1 Release</h2><p>Apache ActiveMQ 5.12.1 includes several improvements and resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">&#160;issues</a></p><h3 id="ActiveMQ5.12.1Release-GettingtheBinaryDistributions"><span>Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip">apache-act
 ivemq-5.12.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz">apache-activemq-5.12.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-
 bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.12.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.12.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.12.1 Release</h2><p>Apache ActiveMQ 5.12.1 includes several improvements and resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">&#160;issues</a></p><h3><span>Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a s
 hape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip">apache-activemq-5.12.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz">apache-activemq-5.12.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activem
 q/5.12.1/apache-activemq-5.12.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.12.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.12.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.12.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip">activemq-parent-5.12.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.12.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.1</a></p><h2 id="ActiveMQ5.12.1Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">release notes</a></p><p>Also see the previous&#160;<a shape="rect" href="activemq-5120-release.xml">ActiveMQ 5.12.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip">activemq-parent-5.12.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.12.1/act
 ivemq-parent-5.12.1-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.1/activemq-parent-5.12.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.1</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">release notes</a></p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.12.0 Release"></page></link></p></div>
 


[22/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/overview.xml
----------------------------------------------------------------------
diff --git a/cms/overview.xml b/cms/overview.xml
index ab2fc3c..2ad050f 100644
--- a/cms/overview.xml
+++ b/cms/overview.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="Overview-OverviewofActiveMQ-CPP"><strong>Overview of ActiveMQ-CPP</strong></h2>
+<div class="wiki-content maincontent"><h2><strong>Overview of ActiveMQ-CPP</strong></h2>
 
 <p>ActiveMQ CPP ships with a JMS 1.1-like API, called CMS.  This helps to make your C++ client code much neater and easier to follow.  In addition to CMS, ActiveMQ-CPP also provides a robust set of classes that support things such as threading, I/O, sockets, etc. You may find many of these classes useful, such as the "synchronized" macro that let's you use a Java-like synchronization on any object that implements the activemq::concurrent::Synchronizable interface.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="cms-api-overview.xml">CMS API Overview</a></li><li><a shape="rect" href="download.xml">Download</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-22-release.xml">ActiveMQ CPP 2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-10-release.xml">ActiveMQ-CPP 1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-11-release.xml">ActiveMQ-CPP 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-201-release.xml">ActiveMQ-CPP 2.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-20-release.xml">ActiveMQ-CPP 2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-211-release.xml">ActiveMQ-CPP 2.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-212-release.xml">ActiveMQ-CPP 2.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-213-release.xml">ActiveMQ-CPP 2.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a></li><li><a sha
 pe="rect" href="activemq-cpp-221-release.xml">ActiveMQ-CPP 2.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-222-release.xml">ActiveMQ-CPP 2.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-223-release.xml">ActiveMQ-CPP 2.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-224-release.xml">ActiveMQ-CPP 2.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-225-release.xml">ActiveMQ-CPP 2.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-226-release.xml">ActiveMQ-CPP 2.2.6 Release</a></li><li><a shape="rect" href="activemq-cpp-301-release.xml">ActiveMQ-CPP 3.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-30-release.xml">ActiveMQ-CPP 3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-310-release.xml">ActiveMQ-CPP 3.1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-311-release.xml">ActiveMQ-CPP 3.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-312-release.xml">ActiveMQ-CPP 3.1.2 Release</a></li><li><a sh
 ape="rect" href="activemq-cpp-313-release.xml">ActiveMQ-CPP 3.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-320-release.xml">ActiveMQ-CPP 3.2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-321-release.xml">ActiveMQ-CPP 3.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-322-release.xml">ActiveMQ-CPP 3.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-323-release.xml">ActiveMQ-CPP 3.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-324-release.xml">ActiveMQ-CPP 3.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-325-release.xml">ActiveMQ-CPP 3.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-330-release.xml">ActiveMQ-CPP 3.3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-340-release.xml">ActiveMQ-CPP 3.4.0 Release</a></li><li><a shape="rect" href="activemq-cpp-341-release.xml">ActiveMQ-CPP 3.4.1 Release</a></li><li><a shape="rect" href="activemq-cpp-342-release.xml">ActiveMQ-CPP 3.4.2 Release</a></li><li><
 a shape="rect" href="activemq-cpp-343-release.xml">ActiveMQ-CPP 3.4.3 Release</a></li><li><a shape="rect" href="activemq-cpp-344-release.xml">ActiveMQ-CPP 3.4.4 Release</a></li><li><a shape="rect" href="activemq-cpp-345-release.xml">ActiveMQ-CPP 3.4.5 Release</a></li><li><a shape="rect" href="activemq-cpp-350-release.xml">ActiveMQ-CPP 3.5.0 Release</a></li><li><a shape="rect" href="activemq-cpp-360-release.xml">ActiveMQ-CPP 3.6.0 Release</a></li><li><a shape="rect" href="activemq-cpp-370-release.xml">ActiveMQ-CPP 3.7.0 Release</a></li><li><a shape="rect" href="activemq-cpp-371-release.xml">ActiveMQ-CPP 3.7.1 Release</a></li><li><a shape="rect" href="activemq-cpp-380-release.xml">ActiveMQ-CPP 3.8.0 Release</a></li><li><a shape="rect" href="activemq-cpp-381-release.xml">ActiveMQ-CPP 3.8.1 Release</a></li><li><a shape="rect" href="activemq-cpp-382-release.xml">ActiveMQ-CPP 3.8.2 Release</a></li><li><a shape="rect" href="activemq-cpp-383-release.xml">ActiveMQ-CPP 3.8.3 Release</a></li><
 li><a shape="rect" href="activemq-cpp-384-release.xml">ActiveMQ-CPP 3.8.4 Release</a></li><li><a shape="rect" href="activemq-cpp-390-release.xml">ActiveMQ-CPP 3.9.0 Release</a></li><li><a shape="rect" href="activemq-cpp-391-release.xml">ActiveMQ-CPP 3.9.1 Release</a></li><li><a shape="rect" href="activemq-cpp-392-release.xml">ActiveMQ-CPP 3.9.2 Release</a></li><li><a shape="rect" href="activemq-cpp-393-release.xml">ActiveMQ-CPP 3.9.3 Release</a></li><li><a shape="rect" href="activemq-cpp-394-release.xml">ActiveMQ-CPP 3.9.4 Release</a></li><li><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.xml">ActiveMQ-CPP, libtool and packaging notes</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-product-version-number.xml">ActiveMQ-CPP product version number</a></li></ul></li><li><a shape="rect" href="cms-api-10-release.xml">CMS API 1.0 Release</a></li><li><a shape="rect" href="cms-api-11-release.xml">CMS API 1.1 Release</a></li><li><a shape="rect" href="cms
 -api-12-release.xml">CMS API 1.2 Release</a></li></ul></li><li><a shape="rect" href="getting-started.xml">Getting Started</a></li><li><a shape="rect" href="tutorials.xml">Tutorials</a><ul class="childpages-macro"><li><a shape="rect" href="handling-advisory-messages.xml">Handling Advisory Messages</a></li></ul></li></ul></div>
+<structured-macro ac:macro-id="822d0745-229f-433f-9c2d-e8e99ca5e74c" 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/cms/privacy-policy.xml
----------------------------------------------------------------------
diff --git a/cms/privacy-policy.xml b/cms/privacy-policy.xml
index b6db1d7..e37a397 100644
--- a/cms/privacy-policy.xml
+++ b/cms/privacy-policy.xml
@@ -3,7 +3,7 @@
 <ol><li>The IP address from which you access the website;</li><li>The type of browser and operating system you use to access our site;</li><li>The date and time you access our site;</li><li>The pages you visit; and</li><li>The addresses of pages from where you followed a link to our site.</li></ol>
 
 
-<p>Part of this information is gathered using a tracking cookie set by the <a shape="rect" class="external-link" href="http://www.google.com/analytics/" rel="nofollow">Google Analytics</a> service and handled by Google as described in their <a shape="rect" class="external-link" href="http://www.google.com/privacy.html" rel="nofollow">privacy policy</a>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p>
+<p>Part of this information is gathered using a tracking cookie set by the <a shape="rect" href="http://www.google.com/analytics/">Google Analytics</a> service and handled by Google as described in their <a shape="rect" href="http://www.google.com/privacy.html">privacy policy</a>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p>
 
 <p>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/quicklinks.xml
----------------------------------------------------------------------
diff --git a/cms/quicklinks.xml b/cms/quicklinks.xml
index b2afa0b..cb12a42 100644
--- a/cms/quicklinks.xml
+++ b/cms/quicklinks.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><a shape="rect" href="download.xml">Download</a> | <a shape="rect" href="api.xml">API</a> | <a shape="rect" href="source.xml">Source</a> | <a shape="rect" class="external-link" href="http://activemq.apache.org/discussion-forums.html">Forums</a> | <a shape="rect" href="support.xml">Support</a></p></div>
+<div class="wiki-content maincontent"><p><link><page ri:content-title="Download"></page></link> | <link><page ri:content-title="API"></page></link> | <link><page ri:content-title="Source"></page></link> | <a shape="rect" href="http://activemq.apache.org/discussion-forums.html">Forums</a> | <link><page ri:content-title="Support"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/site.xml
----------------------------------------------------------------------
diff --git a/cms/site.xml b/cms/site.xml
index b668a62..cbb9d5c 100644
--- a/cms/site.xml
+++ b/cms/site.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="banner.xml">Banner</a></li><li><a shape="rect" href="navigation.xml">Navigation</a><ul class="childpages-macro"><li><a shape="rect" href="api.xml">API</a></li><li><a shape="rect" href="connectivity.xml">Connectivity</a></li><li><a shape="rect" href="news.xml">News</a></li><li><a shape="rect" href="openwire-support.xml">OpenWire Support</a></li><li><a shape="rect" href="stomp-support.xml">Stomp Support</a></li><li><a shape="rect" href="support.xml">Support</a></li><li><a shape="rect" href="using-activemq-cpp.xml">Using ActiveMQ-CPP</a></li></ul></li><li><a shape="rect" href="quicklinks.xml">QuickLinks</a></li><li><a shape="rect" href="siteindex.xml">SiteIndex</a></li><li><a shape="rect" href="sitemap.xml">SiteMap</a></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="2c573859-3be9-461d-87eb-ad1dc060eb4b" 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/cms/siteindex.xml
----------------------------------------------------------------------
diff --git a/cms/siteindex.xml b/cms/siteindex.xml
index 7fbad88..ad3584d 100644
--- a/cms/siteindex.xml
+++ b/cms/siteindex.xml
@@ -1,337 +1,3 @@
 <div class="wiki-content maincontent">
-<h2>Space Index</h2>
-
-<p>
-<table class="grid" width="99%" cellspacing="0"><tr><td colspan="2" rowspan="1">
-         <table width="100%"><tr><td colspan="1" rowspan="1"><a shape="rect" href="#index-0-9">0-9</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-A">A</a> ... 54</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-B">B</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-C">C</a> ... 8</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-D">D</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-E">E</a> ... 4</td></tr><tr><td colspan="1" rowspan="1"><a shape="rect" href="#index-F">F</a> ... 1</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-G">G</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-H">H</a> ... 4</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-I">I</a> ... 1</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-J">J</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-K">K</a> ... 0</td></tr><tr><td colspan="1" rowspan="1"><
 a shape="rect" href="#index-L">L</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-M">M</a> ... 1</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-N">N</a> ... 2</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-O">O</a> ... 3</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-P">P</a> ... 1</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-Q">Q</a> ... 1</td></tr><tr><td colspan="1" rowspan="1"><a shape="rect" href="#index-R">R</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-S">S</a> ... 7</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-T">T</a> ... 1</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-U">U</a> ... 2</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-V">V</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-W">W</a> ... 1</td></tr><tr><td colspan="1" rowspan="1"><a shape="rect" href="#index-X">X</a> ... 0</td><td colspan="1" rows
 pan="1"><a shape="rect" href="#index-Y">Y</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-Z">Z</a> ... 0</td><td colspan="1" rowspan="1"><a shape="rect" href="#index-%21@%23%24">!@#$</a> ... 0</td><td colspan="1" rowspan="1">&#160;</td><td colspan="1" rowspan="1">&#160;</td></tr></table>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-0-9"></a>0-9</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-A"></a>A</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ+CPP+2.2+Release">ActiveMQ CPP 2.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This release has seen a large restructuring of the codebase to separate out to platform code into a new package called decaf. We are now making use of the APR and APR-Util libraries for platform independence. Also many new tests and bug</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+1.0+Release">ActiveMQ-CPP 1.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is our first official release of ActiveMQ CPP. Some of the included features are: CMS - a JMS-like API Implementation of the Stomp protocol (compatable with AMQ broker 4.0.2 and later) Extensible architecture for supporting additio</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+1.1+Release">ActiveMQ-CPP 1.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version fixes several bugs and adds a few new features. Updated interface for cms::BytesMessage - more JMS-like. Updated the MessageProducer interface to add multiple versions of the send method Fixed several memory leaks Now run o</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.0+Release">ActiveMQ-CPP 2.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version fixes several bugs and adds a few new features. Full OpenWire v2 support! You can switch between openwire and stomp via the connection URL Temporary destinations when using OpenWire Added support for asynchronous send Fixed</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.0.1+Release">ActiveMQ-CPP 2.0.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version fixes several small bugs that made their way into the 2.0 release. NOTE: Compatable with ActiveMQ Broker version &gt;= 4.0.2 API Check out the API for this release here http://activemq.apache.org/cms/api_docs/activemqcpp-2.0.1</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.1+Release">ActiveMQ-CPP 2.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version includes several bugfixes, as well as some new features. Also a lot of work has been done on performance and memory leaks. One new feature that has been highly anticipated is that we now build both shared and static librari</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.1.1+Release">ActiveMQ-CPP 2.1.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version includes several bugfixes, as well as some new examples.  Also a lot of work has been done on performance and memory leaks and stability. NOTE: Compatable with ActiveMQ Broker versions in the 4.0 family API Check out the AP</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.1.2+Release">ActiveMQ-CPP 2.1.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version adds support for building the client code on the Solaris platform using the Sun Studio 11 compiler. Also makes some small improvements to the AutoConf scripts on various platforms. NOTE: Compatable with ActiveMQ Broker vers</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.1.3+Release">ActiveMQ-CPP 2.1.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This version adds more support for building the client code on the Solaris platform using the Sun Studio 11 and 12 compilers as well as fixed a small OS/X configure script problem. Also makes some small improvements to the AutoConf scri</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.1+Release">ActiveMQ-CPP 2.2.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release incorporating several bug fixes that have been found since the 2.2 release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API Check out the API for this release here http://activemq.apa</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.2+Release">ActiveMQ-CPP 2.2.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release that contains bugfixes that were found since the 2.2.1 release. Also in this release the there have been several meory leak fixes and threading issues resolved. The connection URI options have changed to reflect </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.3+Release">ActiveMQ-CPP 2.2.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release that contains bugfixes that were found since the 2.2.2 release. This version adds support for responding to KeepAlive requests from the broker, and it now properly sets JMSX properties on both stomp and openwire </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.4+Release">ActiveMQ-CPP 2.2.4 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release that contains bugfixes that were found since the 2.2.3 release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API Check out the API for this release here http://activemq.apache.org/cms/</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.5+Release">ActiveMQ-CPP 2.2.5 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release that contains bugfixes that were found since the 2.2.4 release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API Check out the API for this release here http://activemq.apache.org/cms/</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+2.2.6+Release">ActiveMQ-CPP 2.2.6 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release that contains bugfixes that were found since the 2.2.5 release. Most noteably the code now properly encodes the strings sent in text message's and as properties in any message as proper modified UTF-8 encoded str</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.0+Release">ActiveMQ-CPP 3.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy The 3.0 release is a major update the to ActiveMQ-CPP client code, many areas have been rewritten to enhance performance and improve stability. The following are some highlights of this release: Newly added Failover Transport CMS API ha</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.0.1+Release">ActiveMQ-CPP 3.0.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a bugfix release that mainly addresses problems found in the Failover support added in the initial 3.0 release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 1.3 AP</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.1.0+Release">ActiveMQ-CPP 3.1.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new Major release of ActiveMQ-CPP. Many new features have been added and several bugs have been fixed. The client now has an connection Inactivity Monitor which allows it to more quickly detect when a TCP connection has been b</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.1.1+Release">ActiveMQ-CPP 3.1.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a bug fix release that resolves several memory leaks found since the 3.1 release. Also a few small issues with some compilers was addressed. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This relea</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.1.2+Release">ActiveMQ-CPP 3.1.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a bug fix release that resolves several crash bugs found since the 3.1.1 release. Also a few small issues with some compilers was addressed. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This relea</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.1.3+Release">ActiveMQ-CPP 3.1.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a bug fix release that resolves an issue on Windows that could lead to deadlocks. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 2.1 API. Check out the API for this </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.0+Release">ActiveMQ-CPP 3.2.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a major update for the ActiveMQ-CPP library adding in support for SSL, QueueBrowser, Message compression and more. Many issues have been addressed as well as work to improve performance and prevent memory leaks. The SSL support </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.1+Release">ActiveMQ-CPP 3.2.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release that addresses issues with the original 3.2.0 release for users on Windows, NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 2.2 API. Check out the API</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.2+Release">ActiveMQ-CPP 3.2.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release that addresses issues with the 3.2.1 release. Several issues that users were seeing as segfaults from APR Atomics have been addressed as well as a fix for sending and receiving empty MapMessages. NOTE: Compatible</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.3+Release">ActiveMQ-CPP 3.2.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release that addresses issues with the 3.2.2 release. This release fixes an additional issue found in unmarshaling MapMessage objects on Windows as well as fixing a threading issue that causes invalid client Ids to be ge</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.4+Release">ActiveMQ-CPP 3.2.4 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release that addresses issues with the 3.2.3 release. This release fixes an issue with the Stomp support as well as addressing some problems in the CMSTemplate classes. NOTE: Compatible with ActiveMQ Broker versions in t</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.2.5+Release">ActiveMQ-CPP 3.2.5 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release that addresses issues with the 3.2.4 release. This release fixes a bug that was causing the client to segfault on Mac OS as well as fixing an issue with the SSL transport and X509v3 Certificates. Several small is</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.3.0+Release">ActiveMQ-CPP 3.3.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a major release of the ActiveMQ-CPP client which includes some API changes and several new features and improvements. Some additional methods have been added to the CMS API to make it easier to use. Some highlights for this rele</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.0+Release">ActiveMQ-CPP 3.4.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a major release of the ActiveMQ-CPP client which includes some API changes and several improvements. Some additional methods have been added to the CMS API to make it easier to use. Some highlights for this release: Added start </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.1+Release">ActiveMQ-CPP 3.4.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.0 release. Implements the Session recover method. Fixed some build issues on Mac with dynamic libs. Fixed an issue with BytesMe</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.2+Release">ActiveMQ-CPP 3.4.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.1 release. Some build issues on various platforms were resolved. A problem with setting the username / password from the Connec</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.3+Release">ActiveMQ-CPP 3.4.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.2 release. This release resolves some memory leaks found in the prior 3.4.x releases in the TCP transport and in the use of Tra</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.4+Release">ActiveMQ-CPP 3.4.4 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.3 release. This release resolves some memory and thread leaks found in the prior 3.4.x releases having to do with Connection sh</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.5+Release">ActiveMQ-CPP 3.4.5 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a patch release of ActiveMQ-CPP that fixes several issues found since the v3.4.4 release. This release contains fixes for memory leaks that can occur when a socket connection is broken during a message marshal or unmarshal as we</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.5.0+Release">ActiveMQ-CPP 3.5.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new Major release of ActiveMQ-CPP with several new APIs and internal changes meant to improve overall stability of the C++ client. Besides a large amount of bug fixing and memory fixing this release also features a lot of new </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.6.0+Release">ActiveMQ-CPP 3.6.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new Major release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.5.0 release which should reduce memory consumption and improve overall stability. NOTE: Compatible with ActiveMQ Broker versions in the</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.7.0+Release">ActiveMQ-CPP 3.7.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new Major release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.6.0 release which should reduce memory consumption and improve overall stability. Some new features have been added as well. Added supp</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.7.1+Release">ActiveMQ-CPP 3.7.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new patch release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.7.0 release which should reduce memory consumption and improve overall stability. Several compilation fixes were made as well so things</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.0+Release">ActiveMQ-CPP 3.8.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new major release of ActiveMQ-CPP, a few bugs have been fixed that were found in the v3.7.0 and v3.7.1 releases which should reduce memory consumption and improve overall stability. Several compilation fixes were made as well </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.1+Release">ActiveMQ-CPP 3.8.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new patch release that resolves a memory leak issue found in the 3.8.0 and 3.7.x releases. If you are running an older release you are strongly advised to upgrade (you can work around the leak by disabling message audit in you</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.2+Release">ActiveMQ-CPP 3.8.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new patch release that resolves some issues that have been found since the last patch release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 3.2 API. Check out th</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.3+Release">ActiveMQ-CPP 3.8.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new patch release that resolves some issues that have been found since the last patch release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 3.2 API. Check out th</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.4+Release">ActiveMQ-CPP 3.8.4 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new patch release that resolves some issues that have been found since the last patch release. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 3.2 API. Check out th</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.9.0+Release">ActiveMQ-CPP 3.9.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a new major release that resolves a number of issues found since the 3.8.x series was released.  The client has been updated to include many of the same fixes that were placed into the ActiveMQ JMS client.  Additional fixes for </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.9.1+Release">ActiveMQ-CPP 3.9.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor bugfix release of the ActiveMQ-CPP library that fixes a segfault that can occur when running against the latest ActiveMQ Artemis release along with a couple other minor fixes. NOTE: Compatible with ActiveMQ Broker versio</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.9.2+Release">ActiveMQ-CPP 3.9.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with the way the STOMP protocol handles composite destinations. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is b</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.9.3+Release">ActiveMQ-CPP 3.9.3 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with producer create no waiting for a response from the broker before returning which can lead to missed error on create situations. NOTE: Compatible with Act</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.9.4+Release">ActiveMQ-CPP 3.9.4 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor patch release of the ActiveMQ-CPP library that fixes an issue in the Failover handling. NOTE: Compatible with ActiveMQ Broker versions in the 4.X and 5.X family API This release is based on the CMS 3.2 API. Check out the</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+product+version+number">ActiveMQ-CPP product version number</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">This is a DRAFT proposal and has not been adopted as official policy by this project. In order to facilitate the correct use of libtool and the preparation of binary packages for distribution on Debian, Red Hat, etc, it is beneficial to have a written pol</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+Stomp">ActiveMQ-CPP Stomp</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP Stomp Support Stomp 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, go here </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+Usage+FAQs">ActiveMQ-CPP Usage FAQs</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">This section covers general questions on how to use various feature of the ActiveMQ-CPP Library</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP%2C+libtool+and+packaging+notes">ActiveMQ-CPP, libtool and packaging notes</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP, libtool and packaging notes Introduction This page attempts to summarise information to be considered when configuring libtool when packaging ActiveMQ for distribution on Debian, Red Hat, Solaris. Concepts Product version numbers Please see </div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/API">API</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP API ActiveMQ-CPP 3.6.x http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html/ ActiveMQ-CPP 3.9.x http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html/</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Are+there+more+FAQ+Entries">Are there more FAQ Entries</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Are there more FAQ Entries? Yes, see the ActiveMQ Main FAQ http://activemq.apache.org/faq.html</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-B"></a>B</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Banner">Banner</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">&lt;div id="asf_logo"&gt; &lt;div id="activemq_logo"&gt; &lt;a style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/"&gt;ActiveMQ&lt;/a&gt; &lt;a style="float:ri</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Building">Building</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Dependencies libuuid On *nix sytems, the build requires the libuuid library that is part of the e2fsprogs package and is available from http://e2fsprogs.sourceforge.net/ http://e2fsprogs.sourceforge.net/ which is not always installed by default. On Fedora</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Building+FAQs">Building FAQs</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">These are general hints and tips on Building the Library on various platforms etc.</div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-C"></a>C</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+1.0+Release">CMS API 1.0 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is the first official release of the C++ Messaging Service (CMS)!! CMS provides the following: JMS-like API (all pure-virtual classes) for messaging from C++ applications! Fairly mature API, having grown up under activemq-cpp Vendo</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+1.1+Release">CMS API 1.1 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release of the C++ Messaging Service (CMS). This release is was done as part of releasing ActiveMQ-CPP 2.1 and contains the following updates: Removed dependency on the ActiveMQ-CPP Properties class Added support for exp</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+1.2+Release">CMS API 1.2 Release</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">New and Noteworthy This is a minor release of the C++ Messaging Service (CMS). This release is was done as part of releasing ActiveMQ-CPP 2.1.1 and contains the following updates: Made read methods of BytesMessage const so that asynchronous consumers (onM</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+Overview">CMS API Overview</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">What is CMS? The CMS API is a C++ corollary to the JMS API in Java which is used to send and receive messages from clients spread out across a network or located on the same machine.  In CMS we've made every attempt to maintain as much parity with the JMS</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Community">Community</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px"></div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Configuring">Configuring</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Configuring ActiveMQ-CPP The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP. All configuration is achieved via URI-encoded parameters, either on the connection or destinations. Through the URIs, you can conf</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Connectivity">Connectivity</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP has been designed to have a pluggable connector architecture. Out of the box, it comes with support for the following protocols: Stomp OpenWire</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Creating+Distributions">Creating Distributions</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Creating a Distribution of ActiveMQ-CPP This should give you an idea of the steps involved with creating a new distribution of ActiveMQ-CPP. This content was extracted from http://www.apache.org/dev/mirror-guide-bodewig.html http://www.apache.org/dev/mirr</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-D"></a>D</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Developers">Developers</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px"></div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Discussion+Forums">Discussion Forums</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Before posting you might want to read the Tips for getting help. Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at Nabble forums http://www.nabble.com/ActiveMQ-f</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Download">Download</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Download ActiveMQ-CPP Latest Releases The current stable release of the code is the ActiveMQ-CPP 3.9.4 Release. All Releases</div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-E"></a>E</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Enable+OpenSSL+support+with+autotools">Enable OpenSSL support with autotools</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">When you build the ActiveMQ-CPP library using the GNU AutoTools the Configure script will automatically search for OpenSSL on your system and enable support for it in the code if its found. The search might fail if you have installed OpenSSL in a non-stan</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">On Solaris 10 the libstdc++.la file is empty which causes the build to fail. In order to fix this you must fill in the libstdc++.la file with the correct information. There are two versions, one for 32 bit and one for 64 bit. The following listings show t</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">If you get errors when building on solaris that indicate that there is no rule to make a target file one thing to check is if the file is really in your build tree. If you extracted the source archive with the sun Tar command then you may be missing files</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Example">Example</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP in Action In the example below we create two classes HolloWorldConsumer and HelloWorldProducer each of which runs in its own thread. The Producer sends TextMessage objects via a MessageProducer instance to the ActiveMQ broker. The Consumer re</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-F"></a>F</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/FAQ">FAQ</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">FAQ Here are a list of commonly asked questions and answers. If you have any questions which are not on this list, please talk to us on the forums. We welcome contributions and this entire website is a wiki that you can edit so please join in and help us </div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-G"></a>G</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/General">General</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">General Questions about ActiveMQ's CMS client.</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/General+Build+Issues">General Build Issues</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Error during configure: "error: libpthread not found!" Getting an error about libpthread not found even though its installed, in many cases indicates that the tool chain required to build the library isn't fully installed.  One good place to start checkin</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Getting+Started">Getting Started</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Getting Started Guide Start off by getting a Download or by grabbing the Source and Building it.</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-H"></a>H</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Handling+Advisory+Messages">Handling Advisory Messages</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ supports advisory messages which allows you to watch the system using regular CMS messages. A few things that you can currently do with advisory messages are: See consumers, producers and connections starting and stopping See temporary destinatio</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/How+do+I+prevent+autoconf+from+enabling+OpenSSL+support">How do I prevent autoconf from enabling OpenSSL support</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">In some cases you may not want to build in support for OpenSSL, since the Autotools script do this automatically we have provided a means to disable this, just add the disable-ssl options to your configure and no SSL support will be added: ./configure --d</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/How+do+I+use+the+SSL+Transport">How do I use the SSL Transport</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">The first thing you need to do in order to use the SSL Transport in ActiveMQ-CPP is to build the library with SSL support enabled, for that see the Build FAQs. Once you have a build that supports the SSL protocol then its pretty simple, just replace the u</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/How+to+enable+SSL+support+on+Windows">How to enable SSL support on Windows</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">To enable support for SSL on Windows you first need to obtain a build of the OpenSSL libraries for Windows (See the OpenSSL site for details). Once you have the OpenSSL package for Windows installed you need to add the HAVE_OPENSSL preprocessor directive </div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-I"></a>I</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-homepage" title="Home page">Home page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Index">Index</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">CMS (stands for C++ Messaging Service) is a JMS-like API for C++ for interfacing with Message Brokers such as Apache ActiveMQ http://activemq.apache.org. CMS helps to make your C++ client code much neater and easier to follow. To get a better feel for CMS</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-J"></a>J</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-K"></a>K</h4>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-L"></a>L</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-M"></a>M</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Mailing+Lists">Mailing Lists</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">The following mailing lists are available. Before posting you might want to read the Tips for getting help. Apache Mailing Lists List Name Subscribe Unsubscribe Archive Nabble (Online Forums) activemq User List Subscribe mailto:users-subscribe@activemq.ap</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-N"></a>N</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Navigation">Navigation</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Overview Index News Getting Started Tutorials API FAQ Download Connectivity Stomp OpenWire Using ActiveMQ-CPP Getting Started CMS API Overview Example Configuring Search &lt;DIV&gt; &lt;FORM action="http://www.google.com/search" method="get" style="font-size: 10px</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/News">News</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP News</div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-O"></a>O</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/OpenSSL+Support">OpenSSL Support</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">This section covers building the ActiveMQ-CPP Library with support for SSL using the OpenSSL library</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/OpenWire+Support">OpenWire Support</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP OpenWire Support OpenWire http://activemq.apache.org/openwire.html is the native protocol used by the ActiveMQ http://activemq.apache.org/. As of version 2.0, ActiveMQ-CPP supports the OpenWire protocol, with a few exceptions. ObjectMessage -</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Overview">Overview</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Overview of ActiveMQ-CPP ActiveMQ CPP ships with a JMS 1.1-like API, called CMS. This helps to make your C++ client code much neater and easier to follow. In addition to CMS, ActiveMQ-CPP also provides a robust set of classes that support things such as t</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-P"></a>P</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Privacy+Policy">Privacy Policy</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following: The IP address from which you access the website; The type of browser and operating system you use</div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-Q"></a>Q</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/QuickLinks">QuickLinks</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Download | API | Source | Forums http://activemq.apache.org/discussion-forums.html | Support</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-R"></a>R</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-S"></a>S</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Site">Site</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px"></div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/SiteIndex">SiteIndex</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">{index}{index}</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/SiteMap">SiteMap</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Index</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Solaris+Platform">Solaris Platform</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Information specific to builds on Solaris</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Source">Source</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">The ActiveMQ-CPP client code is maintained in a Git repository. Web Browsing of Git To browse via the web: https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git Checking out from Git git clon</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Stomp+Support">Stomp Support</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">ActiveMQ-CPP Stomp Support Stomp http://stomp.codehaus.org 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 th</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Support">Support</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Getting Help If you are experiencing problems using ActiveMQ then please first try the FAQ. If you cannot find your issue then report your problem to our Issue Tracker http://issues.apache.org/activemq/browse/AMQCPP You may also find it useful to discuss </div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-T"></a>T</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Tutorials">Tutorials</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Tutorials This section lists the various tutorials and articles that cover how to use the ActiveMQ-CPP client.  Handling Advisory Messages</div>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-U"></a>U</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Using+ActiveMQ-CPP">Using ActiveMQ-CPP</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">Using ActiveMQ-CPP Getting Started CMS API Overview Example Configuring</div>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/Using+the+Solaris+CC+compiler">Using the Solaris CC compiler</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">This Entry only applies to the Sun Studio 11 and above compiler. The Sun Workshop compiler does not seem to support building this library. In order to use the Solaris compiler you must set some environment variables and then run the autogen.sh and configu</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-V"></a>V</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-W"></a>W</h4>
-                             <span class="icon aui-icon aui-icon-small aui-iconfont-page-default" title="Page">Page:</span>                 <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/What+is+ActiveMQ+CPP">What is ActiveMQ CPP</a>
-        <br clear="none">
-             <div class="smalltext" style="margin: 0 0 0 36px">What is Apache ActiveMQ CPP? Apache ActiveMQ CPP is the C++ client for accessing the ActiveMQ http://activemq.apache.org/ message broker.</div>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-X"></a>X</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-Y"></a>Y</h4>
-        </td></tr><tr valign="top"><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-Z"></a>Z</h4>
-        </td><td colspan="1" rowspan="1"><h4 style="margin-top: 0px"><a shape="rect" name="index-%21@%23%24"></a>!@#$</h4>
-        </td></tr></table>
-</p></div>
+<structured-macro ac:macro-id="84416491-aa9f-4fb6-8f22-ed119beb626a" ac:name="unmigrated-inline-wiki-markup" ac:schema-version="1"><plain-text-body>{index}{index}</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/sitemap.xml
----------------------------------------------------------------------
diff --git a/cms/sitemap.xml b/cms/sitemap.xml
index 2738b44..6a812b5 100644
--- a/cms/sitemap.xml
+++ b/cms/sitemap.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-stomp.xml">ActiveMQ-CPP Stomp</a></li><li><a shape="rect" href="community.xml">Community</a><ul class="childpages-macro"><li><a shape="rect" href="faq.xml">FAQ</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-usage-faqs.xml">ActiveMQ-CPP Usage FAQs</a><ul class="childpages-macro"><li><a shape="rect" href="how-do-i-use-the-ssl-transport.xml">How do I use the SSL Transport</a></li></ul></li><li><a shape="rect" href="building-faqs.xml">Building FAQs</a><ul class="childpages-macro"><li><a shape="rect" href="general-build-issues.xml">General Build Issues</a></li><li><a shape="rect" href="openssl-support.xml">OpenSSL Support</a><ul class="childpages-macro"><li><a shape="rect" href="enable-openssl-support-with-autotools.xml">Enable OpenSSL support with autotools</a></li><li><a shape="rect" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.xml">How do I
  prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.xml">How to enable SSL support on Windows</a></li></ul></li><li><a shape="rect" href="solaris-platform.xml">Solaris Platform</a><ul class="childpages-macro"><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-the-solaris-cc-compiler.xml">Using the Solaris CC compiler</a></li></ul></li></ul></li><li><a shape="rect" href="discussion-forums.xml">Discussion Forums</a><ul class="childpages-macro"><li><a shape="rect" href="mailing-lists.xml">Mailing Lists</a></li></ul></li><li><a shape="rect" href="general.xml">General</a><ul class="childpages-macro"><li><a shape="rect" href="are-there-more-faq-entries.xml">Are there more F
 AQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.xml">What is ActiveMQ CPP</a></li></ul></li></ul></li><li><a shape="rect" href="privacy-policy.xml">Privacy Policy</a></li></ul></li><li><a shape="rect" href="configuring.xml">Configuring</a></li><li><a shape="rect" href="developers.xml">Developers</a><ul class="childpages-macro"><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="creating-distributions.xml">Creating Distributions</a></li><li><a shape="rect" href="source.xml">Source</a></li></ul></li><li><a shape="rect" href="example.xml">Example</a></li><li><a shape="rect" href="overview.xml">Overview</a><ul class="childpages-macro"><li><a shape="rect" href="cms-api-overview.xml">CMS API Overview</a></li><li><a shape="rect" href="download.xml">Download</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-22-release.xml">ActiveMQ CPP 2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-10-release.xml">ActiveMQ-CPP
  1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-11-release.xml">ActiveMQ-CPP 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-201-release.xml">ActiveMQ-CPP 2.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-20-release.xml">ActiveMQ-CPP 2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-211-release.xml">ActiveMQ-CPP 2.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-212-release.xml">ActiveMQ-CPP 2.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-213-release.xml">ActiveMQ-CPP 2.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-221-release.xml">ActiveMQ-CPP 2.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-222-release.xml">ActiveMQ-CPP 2.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-223-release.xml">ActiveMQ-CPP 2.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-224-release.xml">ActiveMQ-CPP 2.2.4 
 Release</a></li><li><a shape="rect" href="activemq-cpp-225-release.xml">ActiveMQ-CPP 2.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-226-release.xml">ActiveMQ-CPP 2.2.6 Release</a></li><li><a shape="rect" href="activemq-cpp-301-release.xml">ActiveMQ-CPP 3.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-30-release.xml">ActiveMQ-CPP 3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-310-release.xml">ActiveMQ-CPP 3.1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-311-release.xml">ActiveMQ-CPP 3.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-312-release.xml">ActiveMQ-CPP 3.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-313-release.xml">ActiveMQ-CPP 3.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-320-release.xml">ActiveMQ-CPP 3.2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-321-release.xml">ActiveMQ-CPP 3.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-322-release.xml">ActiveMQ-CPP 3.2.2
  Release</a></li><li><a shape="rect" href="activemq-cpp-323-release.xml">ActiveMQ-CPP 3.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-324-release.xml">ActiveMQ-CPP 3.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-325-release.xml">ActiveMQ-CPP 3.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-330-release.xml">ActiveMQ-CPP 3.3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-340-release.xml">ActiveMQ-CPP 3.4.0 Release</a></li><li><a shape="rect" href="activemq-cpp-341-release.xml">ActiveMQ-CPP 3.4.1 Release</a></li><li><a shape="rect" href="activemq-cpp-342-release.xml">ActiveMQ-CPP 3.4.2 Release</a></li><li><a shape="rect" href="activemq-cpp-343-release.xml">ActiveMQ-CPP 3.4.3 Release</a></li><li><a shape="rect" href="activemq-cpp-344-release.xml">ActiveMQ-CPP 3.4.4 Release</a></li><li><a shape="rect" href="activemq-cpp-345-release.xml">ActiveMQ-CPP 3.4.5 Release</a></li><li><a shape="rect" href="activemq-cpp-350-release.xml">ActiveMQ-CPP 3
 .5.0 Release</a></li><li><a shape="rect" href="activemq-cpp-360-release.xml">ActiveMQ-CPP 3.6.0 Release</a></li><li><a shape="rect" href="activemq-cpp-370-release.xml">ActiveMQ-CPP 3.7.0 Release</a></li><li><a shape="rect" href="activemq-cpp-371-release.xml">ActiveMQ-CPP 3.7.1 Release</a></li><li><a shape="rect" href="activemq-cpp-380-release.xml">ActiveMQ-CPP 3.8.0 Release</a></li><li><a shape="rect" href="activemq-cpp-381-release.xml">ActiveMQ-CPP 3.8.1 Release</a></li><li><a shape="rect" href="activemq-cpp-382-release.xml">ActiveMQ-CPP 3.8.2 Release</a></li><li><a shape="rect" href="activemq-cpp-383-release.xml">ActiveMQ-CPP 3.8.3 Release</a></li><li><a shape="rect" href="activemq-cpp-384-release.xml">ActiveMQ-CPP 3.8.4 Release</a></li><li><a shape="rect" href="activemq-cpp-390-release.xml">ActiveMQ-CPP 3.9.0 Release</a></li><li><a shape="rect" href="activemq-cpp-391-release.xml">ActiveMQ-CPP 3.9.1 Release</a></li><li><a shape="rect" href="activemq-cpp-392-release.xml">ActiveMQ-C
 PP 3.9.2 Release</a></li><li><a shape="rect" href="activemq-cpp-393-release.xml">ActiveMQ-CPP 3.9.3 Release</a></li><li><a shape="rect" href="activemq-cpp-394-release.xml">ActiveMQ-CPP 3.9.4 Release</a></li><li><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.xml">ActiveMQ-CPP, libtool and packaging notes</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-cpp-product-version-number.xml">ActiveMQ-CPP product version number</a></li></ul></li><li><a shape="rect" href="cms-api-10-release.xml">CMS API 1.0 Release</a></li><li><a shape="rect" href="cms-api-11-release.xml">CMS API 1.1 Release</a></li><li><a shape="rect" href="cms-api-12-release.xml">CMS API 1.2 Release</a></li></ul></li><li><a shape="rect" href="getting-started.xml">Getting Started</a></li><li><a shape="rect" href="tutorials.xml">Tutorials</a><ul class="childpages-macro"><li><a shape="rect" href="handling-advisory-messages.xml">Handling Advisory Messages</a></li></ul></li></ul></li><li><a shape
 ="rect" href="site.xml">Site</a><ul class="childpages-macro"><li><a shape="rect" href="banner.xml">Banner</a></li><li><a shape="rect" href="navigation.xml">Navigation</a><ul class="childpages-macro"><li><a shape="rect" href="api.xml">API</a></li><li><a shape="rect" href="connectivity.xml">Connectivity</a></li><li><a shape="rect" href="news.xml">News</a></li><li><a shape="rect" href="openwire-support.xml">OpenWire Support</a></li><li><a shape="rect" href="stomp-support.xml">Stomp Support</a></li><li><a shape="rect" href="support.xml">Support</a></li><li><a shape="rect" href="using-activemq-cpp.xml">Using ActiveMQ-CPP</a></li></ul></li><li><a shape="rect" href="quicklinks.xml">QuickLinks</a></li><li><a shape="rect" href="siteindex.xml">SiteIndex</a></li><li><a shape="rect" href="sitemap.xml">SiteMap</a></li></ul></li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="402b6cdf-a16e-41b8-9406-a92393c21df8" ac:name="children" ac:schema-version="1"><parameter ac:name="all">true</parameter><parameter ac:name="page"><link><page ri:content-title="Index"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/solaris-platform.xml
----------------------------------------------------------------------
diff --git a/cms/solaris-platform.xml b/cms/solaris-platform.xml
index 8719c09..5b2092e 100644
--- a/cms/solaris-platform.xml
+++ b/cms/solaris-platform.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent"><p>Information specific to builds on Solaris</p>
-<ul class="childpages-macro"><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-the-solaris-cc-compiler.xml">Using the Solaris CC compiler</a></li></ul></div>
+<structured-macro ac:macro-id="95832b65-f0ee-4342-afe7-4cd88d8f0dde" 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/cms/source.xml
----------------------------------------------------------------------
diff --git a/cms/source.xml b/cms/source.xml
index 6ab40e4..10d6ac1 100644
--- a/cms/source.xml
+++ b/cms/source.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ-CPP client code is maintained in a Git repository.</p><h2 id="Source-WebBrowsingofGit">Web Browsing of Git</h2><p>To browse via the web:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git">https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git</a></p>
-</div></div><h2 id="Source-CheckingoutfromGit">Checking out from Git</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a></p>
-</div></div><p>Only project developers can commit to the Git tree via this method.</p><h3 id="Source-Branches">Branches</h3><p>We use the master for the next main release; then we use a branch for any bug fixes on the previous major release. You can look at a specific branch in Git.</p><h2 id="Source-Buildingthecode">Building the code</h2><p>To then build the code see <a shape="rect" href="building.xml">Building</a>.</p><p>&#160;</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ-CPP client code is maintained in a Git repository.</p><h2>Web Browsing of Git</h2><p>To browse via the web:</p><structured-macro ac:macro-id="1b43b591-29a9-491b-92b9-5597664298ce" ac:name="panel" ac:schema-version="1"><rich-text-body><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git">https://git-wip-us.apache.org/repos/asf?p=activemq-cpp.git</a></p></rich-text-body></structured-macro><h2>Checking out from Git</h2><structured-macro ac:macro-id="54ada66d-3766-48f1-a812-ced14197f814" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a></p></rich-text-body></structured-macro><p>Only project developers can commit to the Git tree via this method.</p><h3>Branches</h3><p>We use the master for the next main re
 lease; then we use a branch for any bug fixes on the previous major release. You can look at a specific branch in Git.</p><h2>Building the code</h2><p>To then build the code see <link><page ri:content-title="Building"></page></link>.</p><p>&#160;</p></div>
 


[37/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-performance-module-users-manual.xml
----------------------------------------------------------------------
diff --git a/activemq-performance-module-users-manual.xml b/activemq-performance-module-users-manual.xml
index ec6f47f..05bb3a7 100644
--- a/activemq-performance-module-users-manual.xml
+++ b/activemq-performance-module-users-manual.xml
@@ -1,23 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQPerformanceModuleUsersManual-RunningMaven2PerformanceTest">Running Maven 2 Performance Test</h2><p>This <a shape="rect" class="external-link" href="http://maven.apache.org">Maven 2</a> plugin allows you to run performance tests easily using the Maven command line or run tests automatically in <a shape="rect" class="external-link" href="http://maven.apache.org/continuum/">Continuum</a></p><h3 id="ActiveMQPerformanceModuleUsersManual-Prerequisites">Prerequisites</h3><p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself. Start with a complete build of Apache ActiveMQ and then do</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[cd activemq-tooling
+<div class="wiki-content maincontent"><h2>Running Maven 2 Performance Test</h2><p>This <a shape="rect" href="http://maven.apache.org">Maven 2</a> plugin allows you to run performance tests easily using the Maven command line or run tests automatically in <a shape="rect" href="http://maven.apache.org/continuum/">Continuum</a></p><h3>Prerequisites</h3><p>Starting with ActiveMQ 5.5 and above the plugin can be obtained from maven or if you download the src from SVN you can build it yourself. Start with a complete build of Apache ActiveMQ and then do</p><structured-macro ac:macro-id="c6fb7f0e-3ec4-4bc2-99f8-73981b4a2632" ac:name="code" ac:schema-version="1"><plain-text-body>cd activemq-tooling
 mvn clean install
-]]></script>
-</div></div><p>To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin.</p><h3 id="ActiveMQPerformanceModuleUsersManual-Gettingstarted">Getting started</h3><p>To get started, switch to the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/sandbox/activemq-perftest/">activemq-perftest directory from the sandbox repo,</a> or to a directory containing your own Maven POM with the following plugin defined:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;plugin&gt;
+</plain-text-body></structured-macro><p>To run the following Maven goals make sure you are inside a Maven2 project directory where its POM is enabled with the Maven2 plugin.</p><h3>Getting started</h3><p>To get started, switch to the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/sandbox/activemq-perftest/">activemq-perftest directory from the sandbox repo,</a> or to a directory containing your own Maven POM with the following plugin defined:</p><structured-macro ac:macro-id="2c15fc65-ce23-493b-be3c-8ea36a92b396" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;plugin&gt;
   &lt;groupId&gt;org.apache.activemq.tooling&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-perf-maven-plugin&lt;/artifactId&gt;
   &lt;version&gt;${activemq-version}&lt;/version&gt;
-&lt;/plugin&gt;]]></script>
-</div></div><p>In ActiveMQ versions prior to 5.8, the artifactId was <code>maven-activemq-perf-plugin</code>.</p><p>Type the following commands into separate shells (the broker line here is optional if you have a preconfigured one running):</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[mvn activemq-perf:broker -Durl=broker:tcp://localhost:61616
+&lt;/plugin&gt;</plain-text-body></structured-macro><p>In ActiveMQ versions prior to 5.8, the artifactId was <code>maven-activemq-perf-plugin</code>.</p><p>Type the following commands into separate shells (the broker line here is optional if you have a preconfigured one running):</p><structured-macro ac:macro-id="8fc512ad-245c-443a-a654-bdaac2c57077" ac:name="code" ac:schema-version="1"><plain-text-body>mvn activemq-perf:broker -Durl=broker:tcp://localhost:61616
 mvn activemq-perf:consumer
 mvn activemq-perf:producer
-]]></script>
-</div></div><p>If you run the broker on a different machine then change the producer and consumer commands to</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[mvn activemq-perf:consumer -Dfactory.brokerURL=tcp://host:port
+</plain-text-body></structured-macro><p>If you run the broker on a different machine then change the producer and consumer commands to</p><structured-macro ac:macro-id="1ba10e61-a093-4898-a871-9d2804bc9b79" ac:name="code" ac:schema-version="1"><plain-text-body>mvn activemq-perf:consumer -Dfactory.brokerURL=tcp://host:port
 mvn activemq-perf:producer -Dfactory.brokerURL=tcp://host:port
-]]></script>
-</div></div><p>where you switch host:port with the actual values.</p><p>When you run the producer &amp; consumer, it generates an XML performance report in the current directory, so that you can graph and chart the results etc. See the <a shape="rect" href="sample-report.xml">sample report</a></p><h3 id="ActiveMQPerformanceModuleUsersManual-Mavengoals">Maven goals</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-perf:broker</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Starts broker using the activemq configuration file located in "src\main\resources\broker-conf" where the default config is activemq.xml. <br clear="none" class="atl-forced-newline"> Parameters: <br clear="none" class="atl-forced-newline"> &#160;1. -DconfigType - specifies the typ
 e of configuration to use. Its value must be one of the filename in the "..\broker-config" directory (e.g. -DconfigType=kaha). <br clear="none" class="atl-forced-newline"> &#160;2. -DconfigFile - path to config file other than those in "src\..\broker-config".e.g -DconfigFile=c:\dir\activemq.xml)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-perf:consumer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Starts the consumer's performance testing. The generated report file can be found in the directory specified in the parameter "sysTest.reportDir".</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>activemq-perf:producer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Starts the producer's performance testing. The generated report file can be found in the directory specified in the parameter "sysTest.reportDir".</p></td></tr></tbody></table></div><p><sup>1</sup> <strong>Note</strong>:The parameters for both consu
 mer and producers are described in the next section. (<a shape="rect" href="sample-report.xml">sample report</a>)</p><h3 id="ActiveMQPerformanceModuleUsersManual-ConfigurationforrunningasystemofJMSClients(Producer/Consumer)">Configuration for running a system of JMS Clients (Producer/Consumer)</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.propsConfigFile</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Use properties specified externally in a key=value properties file</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.clientPrefix</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p>JmsConsumer or JmsProducer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the client name prefix that will be use for each system. By default it will use JmsConsumer for consumer systems, and JmsProducer for producer systems.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.numClients</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the number of JMS Clients to start.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.totalDests</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the total number of destinations to use for the whole system test.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.destDistro</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>all</p></td><td colspan="1" rowspan="1
 " class="confluenceTd"><p>Specifies how to distribute the destinations to the clients. Available values are (Invalid value will result to using the default value 'all')<sup>1</sup>:</p><ul><li>'all' - All clients will send/receive to all destinations. i.e. if there are 2 producers and 5 destinations, each producer will send a message to each individual destination.</li><li>'equal' - Clients will equally divide the destinations among themselves. i.e. if there are 2 producers and 5 destinations, each producer will send messages to 2 destinations. The fifth destination will not be used.</li><li>'divide' - Clients will divide the destinations among themselves regardless of equality. i.e. if there are 2 producers and 5 destinations, producer 1 will send to 3 destinations, while producer 2 will send to 2 destinations.</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.reportDir</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>./</p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p>The directory where the sampler report will be saved.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.reportName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The default filename the sampler report will be saved us. There is usually no need to set this setting as the default value will create either JmsProducer_numClients#<em>numDests#</em>&lt;Dest Distro&gt;.xml and JmsConsumer_numClients#_numDests#_&lt;Dest Distro&gt;.xml, where # represents the number of clients and destinations set for that system, and &lt;Dest Distro&gt; specifies the destination distribution for the system.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.reportType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the manner of generating the perform
 ance report. Available values are:</p><ul><li>'xml' - Write the performance report into an xml file. Specified by reportDirectory and reportName. A verbose summary will also be displayed at the end of the test.</li><li>'verbose' - All information will be written to the standard output, which includes settings, sampler data, and performance summary.</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.samplers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tp,cpu</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the samplers that will be started. To use enable more than one sampler, separate the values by commas without spaces. Available values are:</p><ul><li>'tp' - Throughput sampler</li><li>'cpu' - CPU Usage sampler</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>sysTest.spiClass</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>org.apache.activemq.tool.spi.ActiveMQClassLoaderSPI</p
 ></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The service provider interface class that allows the client to create a generic connection factory. Current available SPI classes include:</p><ol><li>'org.apache.activemq.tool.ActiveMQPojoSPI'</li><li>'org.apache.activemq.tool.ActiveMQClassLoaderSPI'</li></ol></td></tr></tbody></table></div><p><sup>1</sup> <strong>Note</strong>: If the number of destinations is less than the number of clients and the distribution type is either 'equal' or 'divide', each client will send/receive from only one destination, distributing the destinations among the clients. i.e. if there are 5 producers and 2 destinations, 3 producers will send to destination 1, and 2 producers will send to destination 2. Also, a consumer can only receive from a single destination, unless composite destination is supported and specified.</p><h3 id="ActiveMQPerformanceModuleUsersManual-ConfigurationforrunningaJMSProducer">Configuration for running a JMS Producer</h
 3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.sessTransacted</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies if the session created will be transacted or not. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.sessAckMode</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>autoAck</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specified the acknowledge mode of the session. See the JMS Specifications for more details. Available values are:</p><ol><li>'autoAck' - Session.AUTO_ACKNOWLEDGE</li><li>'
 clientAck' - Session.CLIENT_ACKNOWLEDGE</li><li>'dupsAck' - Session.DUPS_OK_ACKNOWLEDGE</li><li>'transacted' - Session.TRANSACTED</li></ol></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.commitAfterXMsgs</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Commit transaction after the specified amount of messages. Only used in conjunction with a transacted JMS Session (producer.sessTransacted=true and producer.sessAckMode=transacted)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.destName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>TEST.FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The prefix of the destination name to use. To specify a queue, prefix the destination name with 'queue://', for topics, prefix the destination with 'topic://'. If no prefix is specified, a topic will be created.</p></td></tr><tr><td colspan="1" ro
 wspan="1" class="confluenceTd"><p>producer.destComposite</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If there are more than one destination, and destComposite=true, the destinations will be merged into one. This assumes that the provider supports composite destinations.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.deliveryMode</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>nonpersistent</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The message delivery mode that will be used for each producer. Available values are:</p><ol><li>'nonpersistent' - use non-persistent delivery mode. javax.jms.DeliveryMode.NON_PERSISTENT.</li><li>'persistent' - use persistent delivery mode. javax.jms.DeliveryMode.PERSISTENT.</li></ol></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.messageSize</p></td><td colspan="1" rowspan="1" class="confl
 uenceTd"><p>1024 bytes</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The size of each text message to send.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.msgFileName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If you want to send a fixed message from a particular file. The file needs to be a text file. The entire content of the file will be sent as message body. Specifying a file containing the message to be sent makes the producer ignore the property producer.messageSize. Use relative or full path. Example: -Dproducer.msgFileName=../message.xml</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.createNewMsg</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, each send will create a new JMS Message with the specified message size with incrementing te
 xt messages (i.e. Text Message 1, Text Message 2, ...). If false, only one message will be created before the send loop, and this message will be sent over and over again.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.sendDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0 ms</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Pause producer for sendDelay milliseconds after each message (allows producer throttling).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.sendType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>time</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Send either time-based or message-count-based. Available values are:</p><ol><li>'time' - keep sending messages until a specific interval of time elapses.</li><li>'count' - keep sending messages until N messages has been sent.</li></ol></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer
 .sendCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000000 msgs <br clear="none" class="atl-forced-newline"> (1 million)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If sendType=count, send this number of messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.sendDuration</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>300000 ms <br clear="none" class="atl-forced-newline"> (5 mins)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If sendType=time, send messages for this number of milliseconds.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>producer.header</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>none</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specify message headers to be set on all messages. Headers use name=value syntax and can be separated using ':'. More than one header can be set on a single producer.header line, e.g. producer.head
 er="JMSType=car:MyHeader=MyValue" (no spaces). Only one producer.header line is allowed!</p></td></tr></tbody></table></div><h3 id="ActiveMQPerformanceModuleUsersManual-ConfigurationforrunningaJMSConsumer">Configuration for running a JMS Consumer</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.sessTransacted</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies if the session created will be transacted or not. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.sessAckMode</p></td><td colspan="1" rowspan="1" class="conflue
 nceTd"><p>autoAck</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specified the acknowledge mode of the session. See the JMS Specifications for more details. Available values are:</p><ol><li>'autoAck' - Session.AUTO_ACKNOWLEDGE</li><li>'clientAck' - Session.CLIENT_ACKNOWLEDGE</li><li>'dupsAck' - Session.DUPS_OK_ACKNOWLEDGE</li><li>'transacted' - Session.TRANSACTED</li></ol></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.commitAfterXMsgs</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Commit transaction after the specified amount of messages. Only used in conjunction with a transacted JMS Session (consumer.sessTransacted=true and consumer.sessAckMode=transacted)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.destName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>TEST.FOO</p></td><td colspan="1" rowspan="1" class="confluenceTd"><
 p>The prefix of the destination name to use. To specify a queue, prefix the destination name with 'queue://', for topics, prefix the destination with 'topic://'. If no prefix is specified, a topic will be created.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.destComposite</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If there are more than one destination, and destComposite=true, the destinations will be merged into one. This assumes that the provider supports composite destinations.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.durable</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, create a durable subscriber, otherwise create a message consumer. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceT
 d"><p>consumer.asyncRecv</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, asynchronously receive messages using the onMessage() method, otherwise use the receive() method.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.recvDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0 ms</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Pause consumer for recvDelay milliseconds with each message (allows consumer throttling).</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.recvType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>time</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Receive either time-based or message-count-based. Available values are:</p><ol><li>'time' - keep receiving messages until a specific time interval has elapsed.</li><li>'count' - keep receiving until N messages has been receiv
 ed.</li></ol></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.recvCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000000 msgs <br clear="none" class="atl-forced-newline"> (1 million)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If recvType=count, receive this much messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.recvDuration</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>300000 ms <br clear="none" class="atl-forced-newline"> (5 mins)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If recvType=time, receive messages for this specific time duration.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.messageSelector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>none</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specify <a shape="rect" class="external-link" href="http://activemq.apache.org/selectors.html">messa
 ge selector</a> for all consumers. E.g. consumer.messageSelector="MyHeader = 'MyValue' AND JMSType = 'car'"</p></td></tr></tbody></table></div><p><strong>Note</strong>: If you have more than one consumer receiving from multiple destinations, it is a good idea to change the sysTest.destDistro to 'equal', since by default it uses 'all' and a consumer can only receive from a single destination, hence all consumers will receive from the first destination in the list only.</p><h3 id="ActiveMQPerformanceModuleUsersManual-ConfigurationforSPIConnectionFactory:org.apache.activemq.tool.spi.ActiveMQPojoSPI">Configuration for SPI Connection Factory: org.apache.activemq.tool.spi.ActiveMQPojoSPI</h3><p><strong>Description:</strong> This provides details in configuring the JMS Connection Factory created by ActiveMQPojoSPI. Default values are based from the default values of the service provider org.apache.activemq.ActiveMQConnectionFactory.</p><div class="table-wrap"><table class="confluenceTable"
 ><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.brokerURL</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>tcp://localhost:61616</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The url of the broker the client will connect to.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.userName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Username on the connection to use.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Password on the connection to use
 .</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.clientID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Client ID the connection will use. If none is specified, it will be automatically generated.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.asyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, asynchronously send messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.asyncDispatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, asynchronously dispatch messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.asyncSession</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" 
 rowspan="1" class="confluenceTd"><p>If true, session will dispatch messages asynchronously.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.closeTimeout</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>15000 ms</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.copyMsgOnSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, creates a copy of the message to be sent.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.disableTimestamp</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, disable the setting of the JMSTimestamp.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.deferObjSerial</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluen
 ceTd"><p>If true, defer the serialization of message objects.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.optimAck</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, optimizes the acknowledgement of messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.optimDispatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, optimizes the dispatching of messages.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchQueue</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000 messages</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number of messages a queue consumer will cache in RAM before processing it.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchTopic</p></td><td cols
 pan="1" rowspan="1" class="confluenceTd"><p>32766 messages</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Number of messages a topic consumer will cache in RAM before processing it.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.useCompression</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, compress message data.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.useRetroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, make consumers retroactive.</p></td></tr></tbody></table></div><h3 id="ActiveMQPerformanceModuleUsersManual-ConfigurationforSPIConnectionFactory:org.apache.activemq.tool.spi.ActiveMQClassLoaderSPI">Configuration for SPI Connection Factory: org.apache.activemq.tool.spi.ActiveMQClassLoaderSPI</h3><p><strong>Description:</stro
 ng> This provides details in configuring the JMS Connection Factory created by ActiveMQClassLoaderSPI. Default values are based from the default values of the service provider org.apache.activemq.ActiveMQConnectionFactory.</p><p>ActiveMQClassLoaderSPI loads from the classpath "org.apache.activemq.ActiveMQConnectionFactory" and configures it using reflection. Configuration is generally based on the API of the class loaded. General format is factory.YYY or factory.XXX.YYY, where the last variable (YYY) is the property to set and everything in between is the getter of the class to use to set (YYY). For example:</p><ol><li>To set the value for asyncSend in ActiveMQConnectionFactory, use:<br clear="none"> <code>factory.useAsyncSend=true</code>, which is equivalent to calling <code>factory.setUseAsyncSend(true)</code></li></ol><ol><li>To set the queue prefetch for ActiveMQConnectionFactory, use:<br clear="none"> <code>factory.prefetchPolicy.queuePrefetch=1</code>, which is equivalent to c
 alling <code>factory.getPrefetchPolicy().setQueuePrefetch(1)</code></li></ol><p>It should be noted that the loaded class should implement the appropriate getter and setter methods. Nested objects should also be properly instantiated. For more information on configuring this SPI, refer to the specific provider API manual.</p><p>As of ActiveMQ 4.0.1, these are the available fields and default values:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.optimizeDurableTopicPrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.durableTopicPrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>100</p></td></tr><tr><t
 d colspan="1" rowspan="1" class="confluenceTd"><p>factory.password</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.queueBrowserPrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>500</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.useCompression</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.disableTimeStampsByDefault</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.optimizedMessageDispatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.useRetroactiveConsumer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspa
 n="1" rowspan="1" class="confluenceTd"><p>factory.alwaysSessionAsync</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.copyMessageOnSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.topicPrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>32766</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.useAsyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.redeliveryPolicy.backOffMultiplier</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.inputStreamPrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>100</p></td></tr><tr><td cols
 pan="1" rowspan="1" class="confluenceTd"><p>factory.closeTimeout</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>15000</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.userName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.optimizeAcknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.clientID</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.objectMessageSerializationDefered</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.asyncDispatch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><
 p>factory.redeliveryPolicy.initialRedeliveryDelay</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.queuePrefetch</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.redeliveryPolicy.maximumRedeliveries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.redeliveryPolicy.useCollisionAvoidance</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.prefetchPolicy.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>factory.redeliveryPolicy.useExponentialBackOff</p></td><td colspan="1" rowspan="1" class="confluenceTd"
 ><p>false</p></td></tr></tbody></table></div><h3 id="ActiveMQPerformanceModuleUsersManual-Configurationforsamplers">Configuration for samplers</h3><p>There are two samplers built into the perfomance test tool. Both are configured with the same configuration keys, only prefixed with different sampler names.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Sampler</th><th colspan="1" rowspan="1" class="confluenceTh"><em>samplerName</em></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Throughput Sampler</td><td colspan="1" rowspan="1" class="confluenceTd">tpSampler</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">CPU Sampler</td><td colspan="1" rowspan="1" class="confluenceTd">cpuSampler</td></tr></tbody></table></div><p>For example, it is possible to configure the two samplers differently for a single test run, using the prefixes above as follows:</p><div class="code panel pdl" style="borde
 r-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[mvn activemq-perf:producer -DtpSampler.duration=10000 -DcpuSampler.duration=15000]]></script>
-</div></div><p>By default, both samplers are used within a test run. This however, can be overridden through the use of the <code>sysTest.samplers</code> property.</p><h4 id="ActiveMQPerformanceModuleUsersManual-BeforeActiveMQ5.11">Before ActiveMQ 5.11</h4><p>Sampler configurations are not tied in to the test run, so it is possible for the sampler to run for longer than the actual test itself. For short run durations, the sampler may not even have ramped up before the test completes.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.duration</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>300000</p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p>The total duration (in ms) the sampler will run, including ramp up and ramp down time.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.rampUpTime</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The ramp up time of the sampler, sampling will only start after the ramp up time.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.rampDownTime</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>30000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The ramp down time of the sampler, sampling will stop when the sampler has executed for (duration - rampUpTime - rampDownTime) ms.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.interval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The interval (
 in ms), the sampler will sample for data.</p></td></tr></tbody></table></div><h4 id="ActiveMQPerformanceModuleUsersManual-FromActiveMQ5.11">From ActiveMQ 5.11</h4><p>Sampler run duration is tied directly to the behavior of the client (producer/consumer). Due to the non-deterministic nature of count-based tests (where consumer.recvType or producer.sendType are set to <code>count</code>), duration, ramp up and ramp down times are ignored; the samplers are shut down when the client completes.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Configuration Key</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.duration</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>For time-based tests, matches the consumer or producer dur
 ation.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The total duration (in ms) the sampler will run, including ramp up and ramp down time.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.rampUpTime</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null; defers to rampUpPercent.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The ramp up time of the sampler, sampling will only start after the ramp up time.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.rampDownTime</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>null; defers to rampDownPercent.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The ramp down time of the sampler, sampling will stop when the sampler has executed for (duration - rampUpTime - ra
 mpDownTime) ms.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><em>samplerName</em>.rampUpPercent</td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1" class="confluenceTd">The percentage of the overall run duration that the sampler should use to ramp up (0-100). Overridden by rampUpTime.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><em>samplerName</em>.rampDownPercent</td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1" class="confluenceTd">The percentage of the overall run duration that the sampler should use to ramp down (0-99). Overridden by rampDownTime.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><em>samplerName</em>.interval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Th
 e interval (in ms), the sampler will sample for data.</p></td></tr></tbody></table></div><p>The time taken to ramp up and ramp down, whether defined through milliseconds or as a percentage cannot exceed the total duration.</p></div>
+</plain-text-body></structured-macro><p>where you switch host:port with the actual values.</p><p>When you run the producer &amp; consumer, it generates an XML performance report in the current directory, so that you can graph and chart the results etc. See the <link><page ri:content-title="sample report"></page></link></p><h3>Maven goals</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Goal</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>activemq-perf:broker</p></td><td colspan="1" rowspan="1"><p>Starts broker using the activemq configuration file located in "src\main\resources\broker-conf" where the default config is activemq.xml. <br clear="none" class="atl-forced-newline"> Parameters: <br clear="none" class="atl-forced-newline"> &#160;1. -DconfigType - specifies the type of configuration to use. Its value must be one of the filename in the "..\broker-config" directory (e.g. -DconfigType=kaha). <br clear="none" class="atl-forc
 ed-newline"> &#160;2. -DconfigFile - path to config file other than those in "src\..\broker-config".e.g -DconfigFile=c:\dir\activemq.xml)</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-perf:consumer</p></td><td colspan="1" rowspan="1"><p>Starts the consumer's performance testing. The generated report file can be found in the directory specified in the parameter "sysTest.reportDir".</p></td></tr><tr><td colspan="1" rowspan="1"><p>activemq-perf:producer</p></td><td colspan="1" rowspan="1"><p>Starts the producer's performance testing. The generated report file can be found in the directory specified in the parameter "sysTest.reportDir".</p></td></tr></tbody></table><p><sup>1</sup> <strong>Note</strong>:The parameters for both consumer and producers are described in the next section. (<link><page ri:content-title="sample report"></page></link>)</p><h3>Configuration for running a system of JMS Clients (Producer/Consumer)</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Conf
 iguration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>sysTest.propsConfigFile</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>Use properties specified externally in a key=value properties file</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.clientPrefix</p></td><td colspan="1" rowspan="1"><p>JmsConsumer or JmsProducer</p></td><td colspan="1" rowspan="1"><p>Specifies the client name prefix that will be use for each system. By default it will use JmsConsumer for consumer systems, and JmsProducer for producer systems.</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.numClients</p></td><td colspan="1" rowspan="1"><p>1</p></td><td colspan="1" rowspan="1"><p>Specifies the number of JMS Clients to start.</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.totalDests</p></td><td colspan="1" rowspan="1"><p>1</p></td><td colspan=
 "1" rowspan="1"><p>Specifies the total number of destinations to use for the whole system test.</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.destDistro</p></td><td colspan="1" rowspan="1"><p>all</p></td><td colspan="1" rowspan="1"><p>Specifies how to distribute the destinations to the clients. Available values are (Invalid value will result to using the default value 'all')<sup>1</sup>:</p><ul><li>'all' - All clients will send/receive to all destinations. i.e. if there are 2 producers and 5 destinations, each producer will send a message to each individual destination.</li><li>'equal' - Clients will equally divide the destinations among themselves. i.e. if there are 2 producers and 5 destinations, each producer will send messages to 2 destinations. The fifth destination will not be used.</li><li>'divide' - Clients will divide the destinations among themselves regardless of equality. i.e. if there are 2 producers and 5 destinations, producer 1 will send to 3 destinations, 
 while producer 2 will send to 2 destinations.</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.reportDir</p></td><td colspan="1" rowspan="1"><p>./</p></td><td colspan="1" rowspan="1"><p>The directory where the sampler report will be saved.</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.reportName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>The default filename the sampler report will be saved us. There is usually no need to set this setting as the default value will create either JmsProducer_numClients#<em>numDests#</em>&lt;Dest Distro&gt;.xml and JmsConsumer_numClients#_numDests#_&lt;Dest Distro&gt;.xml, where # represents the number of clients and destinations set for that system, and &lt;Dest Distro&gt; specifies the destination distribution for the system.</p></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.reportType</p></td><td colspan="1" rowspan="1"><p>xml</p></td><td colspan="1" rowspan="1"><p>Specifies the ma
 nner of generating the performance report. Available values are:</p><ul><li>'xml' - Write the performance report into an xml file. Specified by reportDirectory and reportName. A verbose summary will also be displayed at the end of the test.</li><li>'verbose' - All information will be written to the standard output, which includes settings, sampler data, and performance summary.</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.samplers</p></td><td colspan="1" rowspan="1"><p>tp,cpu</p></td><td colspan="1" rowspan="1"><p>Specifies the samplers that will be started. To use enable more than one sampler, separate the values by commas without spaces. Available values are:</p><ul><li>'tp' - Throughput sampler</li><li>'cpu' - CPU Usage sampler</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>sysTest.spiClass</p></td><td colspan="1" rowspan="1"><p>org.apache.activemq.tool.spi.ActiveMQClassLoaderSPI</p></td><td colspan="1" rowspan="1"><p>The service provider interface class t
 hat allows the client to create a generic connection factory. Current available SPI classes include:</p><ol><li>'org.apache.activemq.tool.ActiveMQPojoSPI'</li><li>'org.apache.activemq.tool.ActiveMQClassLoaderSPI'</li></ol></td></tr></tbody></table><p><sup>1</sup> <strong>Note</strong>: If the number of destinations is less than the number of clients and the distribution type is either 'equal' or 'divide', each client will send/receive from only one destination, distributing the destinations among the clients. i.e. if there are 5 producers and 2 destinations, 3 producers will send to destination 1, and 2 producers will send to destination 2. Also, a consumer can only receive from a single destination, unless composite destination is supported and specified.</p><h3>Configuration for running a JMS Producer</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th
 ></tr><tr><td colspan="1" rowspan="1"><p>producer.sessTransacted</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Specifies if the session created will be transacted or not. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.sessAckMode</p></td><td colspan="1" rowspan="1"><p>autoAck</p></td><td colspan="1" rowspan="1"><p>Specified the acknowledge mode of the session. See the JMS Specifications for more details. Available values are:</p><ol><li>'autoAck' - Session.AUTO_ACKNOWLEDGE</li><li>'clientAck' - Session.CLIENT_ACKNOWLEDGE</li><li>'dupsAck' - Session.DUPS_OK_ACKNOWLEDGE</li><li>'transacted' - Session.TRANSACTED</li></ol></td></tr><tr><td colspan="1" rowspan="1"><p>producer.commitAfterXMsgs</p></td><td colspan="1" rowspan="1"><p>1</p></td><td colspan="1" rowspan="1"><p>Commit transaction after the specified amount of messages. Only used in conjunction with a transacted JMS Session (producer.ses
 sTransacted=true and producer.sessAckMode=transacted)</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.destName</p></td><td colspan="1" rowspan="1"><p>TEST.FOO</p></td><td colspan="1" rowspan="1"><p>The prefix of the destination name to use. To specify a queue, prefix the destination name with 'queue://', for topics, prefix the destination with 'topic://'. If no prefix is specified, a topic will be created.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.destComposite</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If there are more than one destination, and destComposite=true, the destinations will be merged into one. This assumes that the provider supports composite destinations.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.deliveryMode</p></td><td colspan="1" rowspan="1"><p>nonpersistent</p></td><td colspan="1" rowspan="1"><p>The message delivery mode that will be used for each producer. Available values are:</p><ol
 ><li>'nonpersistent' - use non-persistent delivery mode. javax.jms.DeliveryMode.NON_PERSISTENT.</li><li>'persistent' - use persistent delivery mode. javax.jms.DeliveryMode.PERSISTENT.</li></ol></td></tr><tr><td colspan="1" rowspan="1"><p>producer.messageSize</p></td><td colspan="1" rowspan="1"><p>1024 bytes</p></td><td colspan="1" rowspan="1"><p>The size of each text message to send.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.msgFileName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>If you want to send a fixed message from a particular file. The file needs to be a text file. The entire content of the file will be sent as message body. Specifying a file containing the message to be sent makes the producer ignore the property producer.messageSize. Use relative or full path. Example: -Dproducer.msgFileName=../message.xml</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.createNewMsg</p></td><td colspan="1" rowspan="1"><p>false</
 p></td><td colspan="1" rowspan="1"><p>If true, each send will create a new JMS Message with the specified message size with incrementing text messages (i.e. Text Message 1, Text Message 2, ...). If false, only one message will be created before the send loop, and this message will be sent over and over again.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.sendDelay</p></td><td colspan="1" rowspan="1"><p>0 ms</p></td><td colspan="1" rowspan="1"><p>Pause producer for sendDelay milliseconds after each message (allows producer throttling).</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.sendType</p></td><td colspan="1" rowspan="1"><p>time</p></td><td colspan="1" rowspan="1"><p>Send either time-based or message-count-based. Available values are:</p><ol><li>'time' - keep sending messages until a specific interval of time elapses.</li><li>'count' - keep sending messages until N messages has been sent.</li></ol></td></tr><tr><td colspan="1" rowspan="1"><p>producer.sendCou
 nt</p></td><td colspan="1" rowspan="1"><p>1000000 msgs <br clear="none" class="atl-forced-newline"> (1 million)</p></td><td colspan="1" rowspan="1"><p>If sendType=count, send this number of messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.sendDuration</p></td><td colspan="1" rowspan="1"><p>300000 ms <br clear="none" class="atl-forced-newline"> (5 mins)</p></td><td colspan="1" rowspan="1"><p>If sendType=time, send messages for this number of milliseconds.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.header</p></td><td colspan="1" rowspan="1"><p>none</p></td><td colspan="1" rowspan="1"><p>Specify message headers to be set on all messages. Headers use name=value syntax and can be separated using ':'. More than one header can be set on a single producer.header line, e.g. producer.header="JMSType=car:MyHeader=MyValue" (no spaces). Only one producer.header line is allowed!</p></td></tr></tbody></table><h3>Configuration for running a JMS Consumer</h3><table><t
 body><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>consumer.sessTransacted</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Specifies if the session created will be transacted or not. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.sessAckMode</p></td><td colspan="1" rowspan="1"><p>autoAck</p></td><td colspan="1" rowspan="1"><p>Specified the acknowledge mode of the session. See the JMS Specifications for more details. Available values are:</p><ol><li>'autoAck' - Session.AUTO_ACKNOWLEDGE</li><li>'clientAck' - Session.CLIENT_ACKNOWLEDGE</li><li>'dupsAck' - Session.DUPS_OK_ACKNOWLEDGE</li><li>'transacted' - Session.TRANSACTED</li></ol></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.commitAfterXMsgs</p></td><td colspan="1" rowspan="1"><p
 >1</p></td><td colspan="1" rowspan="1"><p>Commit transaction after the specified amount of messages. Only used in conjunction with a transacted JMS Session (consumer.sessTransacted=true and consumer.sessAckMode=transacted)</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.destName</p></td><td colspan="1" rowspan="1"><p>TEST.FOO</p></td><td colspan="1" rowspan="1"><p>The prefix of the destination name to use. To specify a queue, prefix the destination name with 'queue://', for topics, prefix the destination with 'topic://'. If no prefix is specified, a topic will be created.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.destComposite</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If there are more than one destination, and destComposite=true, the destinations will be merged into one. This assumes that the provider supports composite destinations.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.durable</p></td><td colspan
 ="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, create a durable subscriber, otherwise create a message consumer. See the JMS Specifications for more details.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.asyncRecv</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true, asynchronously receive messages using the onMessage() method, otherwise use the receive() method.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.recvDelay</p></td><td colspan="1" rowspan="1"><p>0 ms</p></td><td colspan="1" rowspan="1"><p>Pause consumer for recvDelay milliseconds with each message (allows consumer throttling).</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.recvType</p></td><td colspan="1" rowspan="1"><p>time</p></td><td colspan="1" rowspan="1"><p>Receive either time-based or message-count-based. Available values are:</p><ol><li>'time' - keep receiving messages until a specific time interval has elapsed.</li><l
 i>'count' - keep receiving until N messages has been received.</li></ol></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.recvCount</p></td><td colspan="1" rowspan="1"><p>1000000 msgs <br clear="none" class="atl-forced-newline"> (1 million)</p></td><td colspan="1" rowspan="1"><p>If recvType=count, receive this much messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.recvDuration</p></td><td colspan="1" rowspan="1"><p>300000 ms <br clear="none" class="atl-forced-newline"> (5 mins)</p></td><td colspan="1" rowspan="1"><p>If recvType=time, receive messages for this specific time duration.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.messageSelector</p></td><td colspan="1" rowspan="1"><p>none</p></td><td colspan="1" rowspan="1"><p>Specify <a shape="rect" href="http://activemq.apache.org/selectors.html">message selector</a> for all consumers. E.g. consumer.messageSelector="MyHeader = 'MyValue' AND JMSType = 'car'"</p></td></tr></tbody></table><p><strong>Note
 </strong>: If you have more than one consumer receiving from multiple destinations, it is a good idea to change the sysTest.destDistro to 'equal', since by default it uses 'all' and a consumer can only receive from a single destination, hence all consumers will receive from the first destination in the list only.</p><h3>Configuration for SPI Connection Factory: org.apache.activemq.tool.spi.ActiveMQPojoSPI</h3><p><strong>Description:</strong> This provides details in configuring the JMS Connection Factory created by ActiveMQPojoSPI. Default values are based from the default values of the service provider org.apache.activemq.ActiveMQConnectionFactory.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>factory.brokerURL</p></td><td colspan="1" rowspan="1"><p>tcp://localhost:61616</p></td><td colspan="1" rowspan="1"><p
 >The url of the broker the client will connect to.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.userName</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>Username on the connection to use.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.password</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>Password on the connection to use.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.clientID</p></td><td colspan="1" rowspan="1"><p>null</p></td><td colspan="1" rowspan="1"><p>Client ID the connection will use. If none is specified, it will be automatically generated.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.asyncSend</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, asynchronously send messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.asyncDispatch</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"
 ><p>If true, asynchronously dispatch messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.asyncSession</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true, session will dispatch messages asynchronously.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.closeTimeout</p></td><td colspan="1" rowspan="1"><p>15000 ms</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.copyMsgOnSend</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true, creates a copy of the message to be sent.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.disableTimestamp</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, disable the setting of the JMSTimestamp.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.deferObjSerial</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, defer the serialization of message objects.</p></t
 d></tr><tr><td colspan="1" rowspan="1"><p>factory.optimAck</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true, optimizes the acknowledgement of messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.optimDispatch</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true, optimizes the dispatching of messages.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchQueue</p></td><td colspan="1" rowspan="1"><p>1000 messages</p></td><td colspan="1" rowspan="1"><p>Number of messages a queue consumer will cache in RAM before processing it.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchTopic</p></td><td colspan="1" rowspan="1"><p>32766 messages</p></td><td colspan="1" rowspan="1"><p>Number of messages a topic consumer will cache in RAM before processing it.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.useCompression</p></td><td colspan="1" rowspan="1"><p>false</p></td><
 td colspan="1" rowspan="1"><p>If true, compress message data.</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.useRetroactive</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, make consumers retroactive.</p></td></tr></tbody></table><h3>Configuration for SPI Connection Factory: org.apache.activemq.tool.spi.ActiveMQClassLoaderSPI</h3><p><strong>Description:</strong> This provides details in configuring the JMS Connection Factory created by ActiveMQClassLoaderSPI. Default values are based from the default values of the service provider org.apache.activemq.ActiveMQConnectionFactory.</p><p>ActiveMQClassLoaderSPI loads from the classpath "org.apache.activemq.ActiveMQConnectionFactory" and configures it using reflection. Configuration is generally based on the API of the class loaded. General format is factory.YYY or factory.XXX.YYY, where the last variable (YYY) is the property to set and everything in between is the getter of the class t
 o use to set (YYY). For example:</p><ol><li>To set the value for asyncSend in ActiveMQConnectionFactory, use:<br clear="none"> <code>factory.useAsyncSend=true</code>, which is equivalent to calling <code>factory.setUseAsyncSend(true)</code></li></ol><ol><li>To set the queue prefetch for ActiveMQConnectionFactory, use:<br clear="none"> <code>factory.prefetchPolicy.queuePrefetch=1</code>, which is equivalent to calling <code>factory.getPrefetchPolicy().setQueuePrefetch(1)</code></li></ol><p>It should be noted that the loaded class should implement the appropriate getter and setter methods. Nested objects should also be properly instantiated. For more information on configuring this SPI, refer to the specific provider API manual.</p><p>As of ActiveMQ 4.0.1, these are the available fields and default values:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th></tr><tr><td colspan="1" rowspan="1"><p>factory.pr
 efetchPolicy.optimizeDurableTopicPrefetch</p></td><td colspan="1" rowspan="1"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchPolicy.durableTopicPrefetch</p></td><td colspan="1" rowspan="1"><p>100</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.password</p></td><td colspan="1" rowspan="1"><p>null</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchPolicy.queueBrowserPrefetch</p></td><td colspan="1" rowspan="1"><p>500</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.useCompression</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.disableTimeStampsByDefault</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.optimizedMessageDispatch</p></td><td colspan="1" rowspan="1"><p>true</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.useRetroactiveConsumer</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspa
 n="1"><p>factory.alwaysSessionAsync</p></td><td colspan="1" rowspan="1"><p>true</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.copyMessageOnSend</p></td><td colspan="1" rowspan="1"><p>true</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchPolicy.topicPrefetch</p></td><td colspan="1" rowspan="1"><p>32766</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.useAsyncSend</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.redeliveryPolicy.backOffMultiplier</p></td><td colspan="1" rowspan="1"><p>5</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchPolicy.inputStreamPrefetch</p></td><td colspan="1" rowspan="1"><p>100</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.closeTimeout</p></td><td colspan="1" rowspan="1"><p>15000</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.userName</p></td><td colspan="1" rowspan="1"><p>null</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.optimizeAc
 knowledge</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.clientID</p></td><td colspan="1" rowspan="1"><p>null</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.objectMessageSerializationDefered</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.asyncDispatch</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.redeliveryPolicy.initialRedeliveryDelay</p></td><td colspan="1" rowspan="1"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.prefetchPolicy.queuePrefetch</p></td><td colspan="1" rowspan="1"><p>1000</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.redeliveryPolicy.maximumRedeliveries</p></td><td colspan="1" rowspan="1"><p>5</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.redeliveryPolicy.useCollisionAvoidance</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr><tr><td colspan="1" rowspan
 ="1"><p>factory.prefetchPolicy.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1"><p>0</p></td></tr><tr><td colspan="1" rowspan="1"><p>factory.redeliveryPolicy.useExponentialBackOff</p></td><td colspan="1" rowspan="1"><p>false</p></td></tr></tbody></table><h3>Configuration for samplers</h3><p>There are two samplers built into the perfomance test tool. Both are configured with the same configuration keys, only prefixed with different sampler names.</p><table><tbody><tr><th colspan="1" rowspan="1">Sampler</th><th colspan="1" rowspan="1"><em>samplerName</em></th></tr><tr><td colspan="1" rowspan="1">Throughput Sampler</td><td colspan="1" rowspan="1">tpSampler</td></tr><tr><td colspan="1" rowspan="1">CPU Sampler</td><td colspan="1" rowspan="1">cpuSampler</td></tr></tbody></table><p>For example, it is possible to configure the two samplers differently for a single test run, using the prefixes above as follows:</p><structured-macro ac:macro-id="201b85f5-de18-40d6-b623-52da8b125
 0dc" ac:name="code" ac:schema-version="1"><plain-text-body>mvn activemq-perf:producer -DtpSampler.duration=10000 -DcpuSampler.duration=15000</plain-text-body></structured-macro><p>By default, both samplers are used within a test run. This however, can be overridden through the use of the <code>sysTest.samplers</code> property.</p><h4>Before ActiveMQ 5.11</h4><p>Sampler configurations are not tied in to the test run, so it is possible for the sampler to run for longer than the actual test itself. For short run durations, the sampler may not even have ramped up before the test completes.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.duration</p></td><td colspan="1" rowspan="1"><p>300000</p></td><td colspan="1" rowspan="1"><p>The total duration (in ms) the sampler will run, including ramp up 
 and ramp down time.</p></td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.rampUpTime</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The ramp up time of the sampler, sampling will only start after the ramp up time.</p></td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.rampDownTime</p></td><td colspan="1" rowspan="1"><p>30000</p></td><td colspan="1" rowspan="1"><p>The ramp down time of the sampler, sampling will stop when the sampler has executed for (duration - rampUpTime - rampDownTime) ms.</p></td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.interval</p></td><td colspan="1" rowspan="1"><p>1000</p></td><td colspan="1" rowspan="1"><p>The interval (in ms), the sampler will sample for data.</p></td></tr></tbody></table><h4>From ActiveMQ 5.11</h4><p>Sampler run duration is tied directly to the behavior of the client (producer/consumer). Due to the non-deterministic nature of count-based tests (where consu
 mer.recvType or producer.sendType are set to <code>count</code>), duration, ramp up and ramp down times are ignored; the samplers are shut down when the client completes.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Configuration Key</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.duration</p></td><td colspan="1" rowspan="1"><p>For time-based tests, matches the consumer or producer duration.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1"><p>The total duration (in ms) the sampler will run, including ramp up and ramp down time.</p></td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.rampUpTime</p></td><td colspan="1" rowspan="1"><p>null; defers to rampUpPercent.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1"><p>The ramp up time of the sampler, sampling will only start after
  the ramp up time.</p></td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.rampDownTime</p></td><td colspan="1" rowspan="1"><p>null; defers to rampDownPercent.</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1"><p>The ramp down time of the sampler, sampling will stop when the sampler has executed for (duration - rampUpTime - rampDownTime) ms.</p></td></tr><tr><td colspan="1" rowspan="1"><em>samplerName</em>.rampUpPercent</td><td colspan="1" rowspan="1"><p>0</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1">The percentage of the overall run duration that the sampler should use to ramp up (0-100). Overridden by rampUpTime.</td></tr><tr><td colspan="1" rowspan="1"><em>samplerName</em>.rampDownPercent</td><td colspan="1" rowspan="1"><p>0</p><p><em>Ignored for count-based tests.</em></p></td><td colspan="1" rowspan="1">The percentage of the overall run duration that the sampler should use to ramp down (0-99). Ove
 rridden by rampDownTime.</td></tr><tr><td colspan="1" rowspan="1"><p><em>samplerName</em>.interval</p></td><td colspan="1" rowspan="1"><p>1000</p></td><td colspan="1" rowspan="1"><p>The interval (in ms), the sampler will sample for data.</p></td></tr></tbody></table><p>The time taken to ramp up and ramp down, whether defined through milliseconds or as a percentage cannot exceed the total duration.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-real-time.xml
----------------------------------------------------------------------
diff --git a/activemq-real-time.xml b/activemq-real-time.xml
index a2e35de..29757cb 100644
--- a/activemq-real-time.xml
+++ b/activemq-real-time.xml
@@ -12,9 +12,9 @@
 
 <p>To enable cross-language support ,enable versioning of the wire format, and aid fast throughput - Apache ActiveBlaze is built on top of the Google's protobuf - a framework for efficiently encoding extensible data structures.</p>
 
-<h2 id="ActiveMQRealTime-lowlatencyreliablemulticast">low latency reliable multicast</h2>
+<h2>low latency reliable multicast</h2>
 
-<h2 id="ActiveMQRealTime-Groupmembership">Group membership</h2>
+<h2>Group membership</h2>
 
 <p>Support for dynamic joining and leaving of groups, membership notifications and true point to point and queue messaging:</p>
 <ul><li>Dynamic membership information</li><li>broadcast messaging</li><li>point-to-point</li><li>in boxes</li><li>configurable heartbeats</li></ul>
@@ -22,13 +22,13 @@
 
 
 
-<h2 id="ActiveMQRealTime-Clustermanagement">Cluster management</h2>
+<h2>Cluster management</h2>
 
 <p>A distributed state map, with the following:</p>
 <ul><li>Distributed state (Map)</li><li>Map change listeners</li><li>write locks</li><li>lock expiration</li><li>optional state and lock removal when a member leaves</li><li>automatic state and lock replication and failover</li></ul>
 
 
-<h2 id="ActiveMQRealTime-Inmoredetail...">In more detail ...</h2>
+<h2>In more detail ...</h2>
 
-<ul class="childpages-macro"><li><a shape="rect" href="broadcasting.xml">Broadcasting</a></li><li><a shape="rect" href="group-membership.xml">Group Membership</a></li><li><a shape="rect" href="life-cycle.xml">Life Cycle</a></li><li><a shape="rect" href="the-activeblaze-message-type.xml">The ActiveBlaze Message type</a></li></ul></div>
+<structured-macro ac:macro-id="91ae2935-d0f6-4b85-ba65-3c2a8ae9d156" ac:name="children" ac:schema-version="1"></structured-macro></div>
 


[45/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5122-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5122-release.xml b/activemq-5122-release.xml
index 9bbd7d9..8d44cda 100644
--- a/activemq-5122-release.xml
+++ b/activemq-5122-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.12.2Release-ActiveMQ5.12.2Release">ActiveMQ 5.12.2 Release</h2><p>Apache ActiveMQ 5.12.2 includes several improvements and resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">&#160;issues</a></p><h3 id="ActiveMQ5.12.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/apache-activemq-5.12.2-bin.zip">apache-activ
 emq-5.12.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz">apache-activemq-5.12.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.tar
 .gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.12.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent pan
 elContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.12.2Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.12.2 Release</h2><p>Apache ActiveMQ 5.12.2 includes several improvements and resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333269">&#160;issues</a></p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" h
 ref="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/apache-activemq-5.12.2-bin.zip">apache-activemq-5.12.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz">apache-activemq-5.12.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/ap
 ache-activemq-5.12.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.12.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.12.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.12.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip">activemq-parent-5.12.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.12.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.2</a></p><h2 id="ActiveMQ5.12.2Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333874">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-er
 ror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5121-release.xml">ActiveMQ 5.12.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip">activemq-parent-5.12.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/act
 ivemq-parent-5.12.2-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.12.2</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12333874">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rec
 t" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="bc75a322-bf74-4b0c-a476-77cb4c068f65" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.12.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5130-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5130-release.xml b/activemq-5130-release.xml
index 7f1ff27..f05ed94 100644
--- a/activemq-5130-release.xml
+++ b/activemq-5130-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.13.0Release-ActiveMQ5.13.0Release">ActiveMQ 5.13.0 Release</h2><p>Apache ActiveMQ 5.13.0 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329848">&#160;issues</a> as well as new features such as the new&#160;<a shape="rect" href="auto.xml">auto transport</a>&#160;protocol,&#160;<a shape="rect" href="networks-of-brokers.xml#NetworksofBrokers-virtualconsumers">dynamic network support for virtual destinations</a>, and much more.</p><h3 id="ActiveMQ5.13.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" cl
 ass="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip">apache-activemq-5.13.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-acti
 vemq-5.13.0-bin.tar.gz">apache-activemq-5.13.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.13.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li
 >Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.13.0Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.13.0 Release</h2><p>Apache ActiveMQ 5.13.0 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329848">&#160;issues</a> as well as new features such as the new&#160;<link><page ri:content-title="AUTO"></page><plain-text-link-body>auto transport</plain-text-link-body></link>&#160;protocol,&#160;<link ac:anchor="virtualconsumers"><page ri:content-title="Networks of Brokers"></page><plain-text-link-body>dynamic network support for virtual destinations</plain-text-link-body>
 </link>, and much more.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip">apache-activemq-5.13.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="re
 ct" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz">apache-activemq-5.13.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.0/apache-activemq-5.13.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introdu
 ction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.13.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.13.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.13.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip">activemq-parent-5.13.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.13.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.0</a></p><h2 id="ActiveMQ5.13.0Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329848">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-er
 ror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5121-release.xml">ActiveMQ 5.12.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip">activemq-parent-5.13.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.13.0/act
 ivemq-parent-5.13.0-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.0/activemq-parent-5.13.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.0</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329848">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rec
 t" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="d7263b8f-20fb-40fd-b3cf-7d4f3152769a" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.12.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5131-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5131-release.xml b/activemq-5131-release.xml
index ede92b6..bef26d8 100644
--- a/activemq-5131-release.xml
+++ b/activemq-5131-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.13.1Release-ActiveMQ5.13.1Release">ActiveMQ 5.13.1 Release</h2><p>Apache ActiveMQ 5.13.1 includes over 40 resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334251">&#160;issues</a>&#160;and improvements.</p><h3 id="ActiveMQ5.13.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip">apache-activemq-5
 .13.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz">apache-activemq-5.13.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar
 .gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.13.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.13.1Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.13.1 Release</h2><p>Apache ActiveMQ 5.13.1 includes over 40 resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334251">&#160;issues</a>&#160;and improvements.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="r
 ect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip">apache-activemq-5.13.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz">apache-activemq-5.13.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.
 1/apache-activemq-5.13.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.1/apache-activemq-5.13.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.13.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.13.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.13.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip">activemq-parent-5.13.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.13.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.1</a></p><h2 id="ActiveMQ5.13.1Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334251">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-er
 ror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5130-release.xml">ActiveMQ 5.13.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip">activemq-parent-5.13.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.13.1/act
 ivemq-parent-5.13.1-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.1/activemq-parent-5.13.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.1</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334251">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rec
 t" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="a09acd51-e00b-45ea-b58d-d9689ac2f7ac" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.13.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5132-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5132-release.xml b/activemq-5132-release.xml
index f963e69..597ad29 100644
--- a/activemq-5132-release.xml
+++ b/activemq-5132-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.13.2Release-ActiveMQ5.13.2Release">ActiveMQ 5.13.2 Release</h2><p>Apache ActiveMQ 5.13.2 includes over 15 resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334774">&#160;issues</a>&#160;and improvements.</p><h3 id="ActiveMQ5.13.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip">apache-activemq-5
 .13.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz">apache-activemq-5.13.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz.asc"
 >ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.13.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent pan
 elContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.13.2Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.13.2 Release</h2><p>Apache ActiveMQ 5.13.2 includes over 15 resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334774">&#160;issues</a>&#160;and improvements.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="r
 ect" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip">apache-activemq-5.13.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz">apache-activemq-5.13.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.2/apache
 -activemq-5.13.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.2/apache-activemq-5.13.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.13.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.13.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.13.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip">activemq-parent-5.13.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip.asc">ASC</a>, <a shape="rect" class="externa
 l-link" href="https://www.apache.org/dist/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.13.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.2</a></p><h2 id="ActiveMQ5.13.2Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334774">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-er
 ror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5131-release.xml">ActiveMQ 5.13.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip">activemq-parent-5.13.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.13.2/act
 ivemq-parent-5.13.2-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://www.apache.org/dist/activemq/5.13.2/activemq-parent-5.13.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.2</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334774">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="rec
 t" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="1fd75519-317d-4f14-a7d7-58e7120af6f8" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.13.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5133-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5133-release.xml b/activemq-5133-release.xml
index 35a16a7..bb80dee 100644
--- a/activemq-5133-release.xml
+++ b/activemq-5133-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.13.3Release-ActiveMQ5.13.3Release">ActiveMQ 5.13.3 Release</h2><p>Apache ActiveMQ 5.13.3 includes over 25 resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12335045">&#160;issues</a>&#160;and improvements.</p><h3 id="ActiveMQ5.13.3Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip">apache-activemq-5
 .13.3-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz">apache-activemq-5.13.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar
 .gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.13.3Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeCon
 tent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.13.3Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.13.3 Release</h2><p>Apache ActiveMQ 5.13.3 includes over 25 resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12335045">&#160;issues</a>&#160;and improvements.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="r
 ect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip">apache-activemq-5.13.3-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz">apache-activemq-5.13.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.
 3/apache-activemq-5.13.3-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/apache-activemq-5.13.3-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.13.3&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.13.3Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.13.3Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip">activemq-parent-5.13.3-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.13.3Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.3</a></p><h2 id="ActiveMQ5.13.3Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12335045">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5132-release.xml">ActiveMQ 5.13.2 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip">activemq-parent-5.13.3-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-p
 arent-5.13.3-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.3/activemq-parent-5.13.3-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.3</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12335045">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="e6b9ae45-2a20-4d8a-b2b7-90c1feecb76a" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.13.2 Release"></page></link></p></div>
 


[30/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/clustering.xml
----------------------------------------------------------------------
diff --git a/clustering.xml b/clustering.xml
index b111792..ea6155d 100644
--- a/clustering.xml
+++ b/clustering.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Clustering is a large topic and often means different things to different people. We'll try to list the various aspects of clustering and how they relate to ActiveMQ</p><h2 id="Clustering-Queueconsumerclusters">Queue consumer clusters</h2><p>ActiveMQ supports reliable high performance load balancing of messages on a queue across consumers. In enterprise integration, this scenario is known as the&#160;<a shape="rect" class="external-link" href="http://www.eaipatterns.com/CompetingConsumers.html" rel="nofollow">competing consumers</a> pattern. The following figure illustrates the concept:</p><p><span class="confluence-embedded-file-wrapper image-center-wrapper"><img class="confluence-embedded-image image-center" src="clustering.data/competing-consumers.png" data-image-src="/confluence/download/attachments/35981/competing-consumers.png?version=1&amp;modificationDate=1410121265000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource
 -id="46301416" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="competing-consumers.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35981" data-linked-resource-container-version="26"></span></p><p><span style="line-height: 1.4285715;">This solution receives the messages sent by the producers, enqueues them and distributes them between all the registered consumers. This has a number of benefits:</span></p><ul><li><span style="line-height: 1.4285715;">The load is distributed in a very dynamic fashion. Additional consumers could be provisioned and attached to the queue in high load periods, without modifying any configuration in the queue, as the new consumer would behave as just another competing consumer.</span></li><li><span style="line-height: 1.4285715;">Better availability than systems using a load balancer. Load balancers usually re
 ly on a monitorization system to find out which real-servers are unavailable. With competing consumers, a failed consumer won't be competing for messages and therefore messages won't be delivered to it even without monitorization.</span></li><li>High reliability, if a consumer fails, any unacknowledged messages are redelivered to other consumers on the queue.</li></ul><p>On the downside, this pattern might not be ideal in systems where the order processing is required. To mitigate this problem while maintaining the benefits, the competing consumers pattern should be used in conjunction with other ActiveMQ&#160;<a shape="rect" href="features.xml">features</a>&#160;like the <a shape="rect" href="exclusive-consumer.xml">exclusive consumers</a> and the <a shape="rect" href="message-groups.xml">message groups</a>&#160;as stated in the <a shape="rect" href="how-do-i-preserve-order-of-messages.xml">ActiveMQ's FAQ</a>.</p><h2 id="Clustering-Brokerclusters">Broker clusters</h2><p>The most co
 mmon mental model of clustering in a JMS context is that there is a collection of JMS brokers and a JMS client will connect to one of them; then if the JMS broker goes down, it will auto-reconnect to another broker.</p><p>We implement this using the <strong>failover://</strong> protocol in the JMS client. See the <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a> page for details of how to configure the failover protocol. <em>Note:</em> The reliable:// protocol in ActiveMQ 3.x has now been changed to the failover:// protocol</p><p>If we just run multiple brokers on a network and tell the clients about them using either <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>, then clients can easily failover from one broker to an
 other. However, stand alone brokers don't know about consumers on other brokers; so if there are no consumers on a certain broker, messages could just pile up without being consumed. We have an outstanding <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-816">feature request</a> to tackle this on the client side - but currently the solution to this problem is to create a Network of brokers to store and forward messages between brokers.</p><h2 id="Clustering-Discoveryofbrokers">Discovery of brokers</h2><p>We support <a shape="rect" href="discovery.xml">auto-discovery</a> of brokers using <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>,&#160;so clients can automatically detect and connect to a broker out of a logical gro
 up of brokers as well for brokers to discover and connect to other brokers to form large networks.</p><h2 id="Clustering-Networksofbrokers">Networks of brokers</h2><p>If you are using <a shape="rect" href="topologies.xml">client/server or hub/spoke style topology</a> and you have many clients and many brokers, there is a chance that one broker has producers but no consumers, so that messages pile up without being processed. To avoid this, ActiveMQ supports a <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a> which provides <em>store and forward</em> to move messages from brokers with producers to brokers with consumers which allows us to support <a shape="rect" href="how-do-distributed-queues-work.xml">distributed queues and topics</a> across a network of brokers.</p><p>This allows a client to connect to any broker - and fail over to another broker if there is a failure - providing a cluster of brokers&#160;from the clients perspective.</p><p>Networks of brokers 
 also allows us to scale up to a massive number of clients in a network as we can run as many brokers as we need.</p><p>You can think of this as a cluster of clients connecting with a cluster of brokers with auto-failover and discovery, making a simple and easy to use messaging fabric.</p><h2 id="Clustering-MasterSlave">Master Slave</h2><p>The problem with running lots of stand alone brokers or brokers in a network is that messages are owned by a single physical broker at any point in time. If that broker goes down, you have to wait for it to be restarted before the message can be delivered. (If you are using non-persistent messaging and a broker goes down you generally lose your message).</p><p>The idea behind <a shape="rect" href="masterslave.xml">MasterSlave</a> is that messages are replicated to a slave broker so that even if you have a catastrophic hardware failure of the master's machine, file system or data centre, you get immediate failover to the slave with no message loss.<
 /p><h2 id="Clustering-ReplicatedMessageStores">Replicated Message Stores</h2><p>An alternative to <a shape="rect" href="masterslave.xml">MasterSlave</a> is to have some way to replicate the message store; so for the disk files to be shared in some way. For example using a SAN or shared network drive you can share the files of a broker so that if it fails another broker can take over straight away.</p><p>So by supporting a <a shape="rect" href="replicated-message-store.xml">Replicated Message Store</a> you can reduce the risk of message loss to provide either a HA backup or a full <a shape="rect" href="dr.xml">DR</a> solution capable of surviving a data centre failure.</p></div>
+<div class="wiki-content maincontent"><p>Clustering is a large topic and often means different things to different people. We'll try to list the various aspects of clustering and how they relate to ActiveMQ</p><h2>Queue consumer clusters</h2><p>ActiveMQ supports reliable high performance load balancing of messages on a queue across consumers. In enterprise integration, this scenario is known as the&#160;<a shape="rect" href="http://www.eaipatterns.com/CompetingConsumers.html">competing consumers</a> pattern. The following figure illustrates the concept:</p><p><image ac:align="center"><attachment ri:filename="competing-consumers.png"></attachment></image></p><p><span style="line-height: 1.4285715;">This solution receives the messages sent by the producers, enqueues them and distributes them between all the registered consumers. This has a number of benefits:</span></p><ul><li><span style="line-height: 1.4285715;">The load is distributed in a very dynamic fashion. Additional consumers
  could be provisioned and attached to the queue in high load periods, without modifying any configuration in the queue, as the new consumer would behave as just another competing consumer.</span></li><li><span style="line-height: 1.4285715;">Better availability than systems using a load balancer. Load balancers usually rely on a monitorization system to find out which real-servers are unavailable. With competing consumers, a failed consumer won't be competing for messages and therefore messages won't be delivered to it even without monitorization.</span></li><li>High reliability, if a consumer fails, any unacknowledged messages are redelivered to other consumers on the queue.</li></ul><p>On the downside, this pattern might not be ideal in systems where the order processing is required. To mitigate this problem while maintaining the benefits, the competing consumers pattern should be used in conjunction with other ActiveMQ&#160;<link><page ri:content-title="Features"></page><plain-te
 xt-link-body>features</plain-text-link-body></link>&#160;like the <link><page ri:content-title="Exclusive Consumer"></page><plain-text-link-body>exclusive consumers</plain-text-link-body></link> and the <link><page ri:content-title="Message Groups"></page><plain-text-link-body>message groups</plain-text-link-body></link>&#160;as stated in the <link><page ri:content-title="How do I preserve order of messages"></page><plain-text-link-body>ActiveMQ's FAQ</plain-text-link-body></link>.</p><h2>Broker clusters</h2><p>The most common mental model of clustering in a JMS context is that there is a collection of JMS brokers and a JMS client will connect to one of them; then if the JMS broker goes down, it will auto-reconnect to another broker.</p><p>We implement this using the <strong>failover://</strong> protocol in the JMS client. See the <link><page ri:content-title="Failover Transport Reference"></page></link> page for details of how to configure the failover protocol. <em>Note:</em> The 
 reliable:// protocol in ActiveMQ 3.x has now been changed to the failover:// protocol</p><p>If we just run multiple brokers on a network and tell the clients about them using either <a shape="rect" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>, then clients can easily failover from one broker to another. However, stand alone brokers don't know about consumers on other brokers; so if there are no consumers on a certain broker, messages could just pile up without being consumed. We have an outstanding <a shape="rect" href="http://issues.apache.org/activemq/browse/AMQ-816">feature request</a> to tackle this on the client side - but currently the solution to this problem is to create a Network of brokers to store and forward messages between brokers.</p><h2>Discovery of brokers</h2><p>We support <link><page ri:content-
 title="Discovery"></page><plain-text-link-body>auto-discovery</plain-text-link-body></link> of brokers using <a shape="rect" href="http://incubator.apache.org/activemq/static-transport-reference.html">static discovery</a> or <a shape="rect" href="http://incubator.apache.org/activemq/discovery-transport-reference.html">dynamic discovery</a>,&#160;so clients can automatically detect and connect to a broker out of a logical group of brokers as well for brokers to discover and connect to other brokers to form large networks.</p><h2>Networks of brokers</h2><p>If you are using <link><page ri:content-title="Topologies"></page><plain-text-link-body>client/server or hub/spoke style topology</plain-text-link-body></link> and you have many clients and many brokers, there is a chance that one broker has producers but no consumers, so that messages pile up without being processed. To avoid this, ActiveMQ supports a <link><page ri:content-title="Networks of Brokers"></page></link> which provides 
 <em>store and forward</em> to move messages from brokers with producers to brokers with consumers which allows us to support <link><page ri:content-title="How do distributed queues work"></page><plain-text-link-body>distributed queues and topics</plain-text-link-body></link> across a network of brokers.</p><p>This allows a client to connect to any broker - and fail over to another broker if there is a failure - providing a cluster of brokers&#160;from the clients perspective.</p><p>Networks of brokers also allows us to scale up to a massive number of clients in a network as we can run as many brokers as we need.</p><p>You can think of this as a cluster of clients connecting with a cluster of brokers with auto-failover and discovery, making a simple and easy to use messaging fabric.</p><h2>Master Slave</h2><p>The problem with running lots of stand alone brokers or brokers in a network is that messages are owned by a single physical broker at any point in time. If that broker goes dow
 n, you have to wait for it to be restarted before the message can be delivered. (If you are using non-persistent messaging and a broker goes down you generally lose your message).</p><p>The idea behind <link><page ri:content-title="MasterSlave"></page></link> is that messages are replicated to a slave broker so that even if you have a catastrophic hardware failure of the master's machine, file system or data centre, you get immediate failover to the slave with no message loss.</p><h2>Replicated Message Stores</h2><p>An alternative to <link><page ri:content-title="MasterSlave"></page></link> is to have some way to replicate the message store; so for the disk files to be shared in some way. For example using a SAN or shared network drive you can share the files of a broker so that if it fails another broker can take over straight away.</p><p>So by supporting a <link><page ri:content-title="Replicated Message Store"></page></link> you can reduce the risk of message loss to provide eith
 er a HA backup or a full <link><page ri:content-title="DR"></page></link> solution capable of surviving a data centre failure.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/04/18/activemq-cpp-11-released.xml
----------------------------------------------------------------------
diff --git a/cms/2007/04/18/activemq-cpp-11-released.xml b/cms/2007/04/18/activemq-cpp-11-released.xml
index 1912286..4eb6f0c 100644
--- a/cms/2007/04/18/activemq-cpp-11-released.xml
+++ b/cms/2007/04/18/activemq-cpp-11-released.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ-CPP 1.1 release is now official! You can download the source distribution <a shape="rect" href="../../../../cms/download.xml">here</a>.</p>
+<div class="wiki-content maincontent"><p>The ActiveMQ-CPP 1.1 release is now official! You can download the source distribution <link><page ri:content-title="Download"></page><link-body>here</link-body></link>.</p>
 
 <p>There are several bug fixes and enhancements that you might want to pick up if you're currently using 1.0. This is our last patch release before 2.0, which will have full openwire support ... and we're almost there, so stay tuned!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/04/18/activemq-cpp-20-rc1-now-available.xml
----------------------------------------------------------------------
diff --git a/cms/2007/04/18/activemq-cpp-20-rc1-now-available.xml b/cms/2007/04/18/activemq-cpp-20-rc1-now-available.xml
index a144be8..6cc6950 100644
--- a/cms/2007/04/18/activemq-cpp-20-rc1-now-available.xml
+++ b/cms/2007/04/18/activemq-cpp-20-rc1-now-available.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>We've finally got OpenWire 2.0 Support! Download the Release candidate <a shape="rect" href="../../../../cms/download.xml">here</a></p></div>
+<div class="wiki-content maincontent"><p>We've finally got OpenWire 2.0 Support! Download the Release candidate <link><page ri:content-title="Download"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/04/20/activemq-cpp-20-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/04/20/activemq-cpp-20-release.xml b/cms/2007/04/20/activemq-cpp-20-release.xml
index ddf92f7..07a9860 100644
--- a/cms/2007/04/20/activemq-cpp-20-release.xml
+++ b/cms/2007/04/20/activemq-cpp-20-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Version 2.0 is now official.  Download it from <a shape="rect" href="../../../../cms/activemq-cpp-20-release.xml">here</a></p></div>
+<div class="wiki-content maincontent"><p>Version 2.0 is now official.  Download it from <link ac:tooltip="ActiveMQ-CPP 2.0 Release"><page ri:content-title="ActiveMQ-CPP 2.0 Release"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/04/30/activemq-cpp-201-rc1-now-available.xml
----------------------------------------------------------------------
diff --git a/cms/2007/04/30/activemq-cpp-201-rc1-now-available.xml b/cms/2007/04/30/activemq-cpp-201-rc1-now-available.xml
index 4ec46a7..151fa6d 100644
--- a/cms/2007/04/30/activemq-cpp-201-rc1-now-available.xml
+++ b/cms/2007/04/30/activemq-cpp-201-rc1-now-available.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.0.1 RC1 is now available.  This is a bug fix release that addresses some issues that were found in the 2.0 release.  Download it from&#160; the <a shape="rect" href="../../../../cms/activemq-cpp-201-release.xml">ActiveMQ-CPP 2.0.1 Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.0.1 RC1 is now available.  This is a bug fix release that addresses some issues that were found in the 2.0 release.  Download it from&#160; the <link><page ri:content-title="ActiveMQ-CPP 2.0.1 Release"></page></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/04/30/cms-api-10-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/04/30/cms-api-10-release.xml b/cms/2007/04/30/cms-api-10-release.xml
index ba88587..f008493 100644
--- a/cms/2007/04/30/cms-api-10-release.xml
+++ b/cms/2007/04/30/cms-api-10-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>We've finally released version 1.0 of the CMS (C++ Messaging Service) API.  This is the JMS-like API for C++ applications implemented by ActiveMQ-CPP.  The hope is that more and more C++ application will start moving toward a common API for messaging.  You can download CMS 1.0 <a shape="rect" href="../../../../cms/cms-api-10-release.xml">here</a></p></div>
+<div class="wiki-content maincontent"><p>We've finally released version 1.0 of the CMS (C++ Messaging Service) API.  This is the JMS-like API for C++ applications implemented by ActiveMQ-CPP.  The hope is that more and more C++ application will start moving toward a common API for messaging.  You can download CMS 1.0 <link><page ri:content-title="CMS API 1.0 Release"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/05/09/activemq-cpp-201-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/05/09/activemq-cpp-201-release.xml b/cms/2007/05/09/activemq-cpp-201-release.xml
index 0b66a40..08f835e 100644
--- a/cms/2007/05/09/activemq-cpp-201-release.xml
+++ b/cms/2007/05/09/activemq-cpp-201-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Version 2.0.1 is now official. Download it from <a shape="rect" href="../../../../cms/activemq-cpp-201-release.xml">here </a></p></div>
+<div class="wiki-content maincontent"><p>Version 2.0.1 is now official. Download it from <link ac:tooltip="ActiveMQ-CPP 2.0.1 Release"><page ri:content-title="ActiveMQ-CPP 2.0.1 Release"></page><link-body>here </link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/07/24/cms-api-11-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/07/24/cms-api-11-release.xml b/cms/2007/07/24/cms-api-11-release.xml
index 8274219..da48c5b 100644
--- a/cms/2007/07/24/cms-api-11-release.xml
+++ b/cms/2007/07/24/cms-api-11-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1, we're releasin version 1.1 of the CMS (C++ Messaging Service) API.  This has a few tweaks to decouple the API from ActiveMQ-CPP and to support exporting symbols from a shared library.  You can download CMS 1.1 <a shape="rect" href="../../../../cms/cms-api-11-release.xml">here</a></p></div>
+<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1, we're releasin version 1.1 of the CMS (C++ Messaging Service) API.  This has a few tweaks to decouple the API from ActiveMQ-CPP and to support exporting symbols from a shared library.  You can download CMS 1.1 <link><page ri:content-title="CMS API 1.1 Release"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/07/25/activemq-cpp-21-rc1-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/07/25/activemq-cpp-21-rc1-release.xml b/cms/2007/07/25/activemq-cpp-21-rc1-release.xml
index df125c4..d7e7ad3 100644
--- a/cms/2007/07/25/activemq-cpp-21-rc1-release.xml
+++ b/cms/2007/07/25/activemq-cpp-21-rc1-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features the ability to build both static and shared libraries, as well as bug fixes and performance improvements.  Download it from the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features the ability to build both static and shared libraries, as well as bug fixes and performance improvements.  Download it from the <link><page ri:content-title="ActiveMQ-CPP 2.1 Release"></page></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/07/26/activemq-cpp-21-rc1-now-available.xml
----------------------------------------------------------------------
diff --git a/cms/2007/07/26/activemq-cpp-21-rc1-now-available.xml b/cms/2007/07/26/activemq-cpp-21-rc1-now-available.xml
index e2a0658..eeaca66 100644
--- a/cms/2007/07/26/activemq-cpp-21-rc1-now-available.xml
+++ b/cms/2007/07/26/activemq-cpp-21-rc1-now-available.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features many bug fixes along with several performance  improvements.  See the <a shape="rect" href="../../../../cms/activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 2.1 RC1 is now available. This release features many bug fixes along with several performance  improvements.  See the <link><page ri:content-title="ActiveMQ-CPP 2.1 Release"></page><link-body>ActiveMQ-CPP 2.1</link-body></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/08/07/activemq-cpp-21-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/08/07/activemq-cpp-21-release.xml b/cms/2007/08/07/activemq-cpp-21-release.xml
index a05abbc..f2ffc42 100644
--- a/cms/2007/08/07/activemq-cpp-21-release.xml
+++ b/cms/2007/08/07/activemq-cpp-21-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1 is now official.  You can find out what was fixed and get the latest src archives on the&#160;<a shape="rect" href="../../../../cms/activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1 is now official.  You can find out what was fixed and get the latest src archives on the&#160;<link><page ri:content-title="ActiveMQ-CPP 2.1 Release"></page></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/10/28/cms-api-12-release.xml
----------------------------------------------------------------------
diff --git a/cms/2007/10/28/cms-api-12-release.xml b/cms/2007/10/28/cms-api-12-release.xml
index 5fd541b..cef638d 100644
--- a/cms/2007/10/28/cms-api-12-release.xml
+++ b/cms/2007/10/28/cms-api-12-release.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1.1, we're releasing version 1.2 of the CMS (C++ Messaging Service) API.  The main change in this release is that the readXXX() methods in BytesMessage were made const so that they may be used from within the MessageListener's onMessage method.  You can download CMS 1.2 <a shape="rect" href="../../../../cms/cms-api-12-release.xml">here</a></p></div>
+<div class="wiki-content maincontent"><p>In preparation for the soon-to-be-released ActiveMQ-CPP 2.1.1, we're releasing version 1.2 of the CMS (C++ Messaging Service) API.  The main change in this release is that the readXXX() methods in BytesMessage were made const so that they may be used from within the MessageListener's onMessage method.  You can download CMS 1.2 <link><page ri:content-title="CMS API 1.2 Release"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/11/05/activemq-cpp-211-released.xml
----------------------------------------------------------------------
diff --git a/cms/2007/11/05/activemq-cpp-211-released.xml b/cms/2007/11/05/activemq-cpp-211-released.xml
index 08d2eae..bce167c 100644
--- a/cms/2007/11/05/activemq-cpp-211-released.xml
+++ b/cms/2007/11/05/activemq-cpp-211-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.1 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-211-release.xml">ActiveMQ-CPP 2.1.1 Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.1 is now official. You can find out what was fixed and get the latest src archives on the <link><page ri:content-title="ActiveMQ-CPP 2.1.1 Release"></page></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/11/26/solaris-platform.xml
----------------------------------------------------------------------
diff --git a/cms/2007/11/26/solaris-platform.xml b/cms/2007/11/26/solaris-platform.xml
index eeea9b1..d54bdf8 100644
--- a/cms/2007/11/26/solaris-platform.xml
+++ b/cms/2007/11/26/solaris-platform.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="error"><span class="error">Unable to render {children}.</span> Can only find children for a page, this is a blogpost.</div></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="8ac3e1a2-e372-4fce-8fb2-facd210a99ad" 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/cms/2007/11/28/activemq-cpp-212-released.xml
----------------------------------------------------------------------
diff --git a/cms/2007/11/28/activemq-cpp-212-released.xml b/cms/2007/11/28/activemq-cpp-212-released.xml
index bd140c5..3bf5603 100644
--- a/cms/2007/11/28/activemq-cpp-212-released.xml
+++ b/cms/2007/11/28/activemq-cpp-212-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.2 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-212-release.xml">ActiveMQ-CPP 2.1.2 Release</a> Release page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.2 is now official. You can find out what was fixed and get the latest src archives on the <link><page ri:content-title="ActiveMQ-CPP 2.1.2 Release"></page></link> Release page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2007/12/10/activemq-cpp-213-released.xml
----------------------------------------------------------------------
diff --git a/cms/2007/12/10/activemq-cpp-213-released.xml b/cms/2007/12/10/activemq-cpp-213-released.xml
index bfecea5..129ebcd 100644
--- a/cms/2007/12/10/activemq-cpp-213-released.xml
+++ b/cms/2007/12/10/activemq-cpp-213-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.3 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-213-release.xml">Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.1.3 is now official. You can find out what was fixed and get the latest src archives on the <link><page ri:content-title="ActiveMQ-CPP 2.1.3 Release"></page><link-body>Release</link-body></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2008/06/22/activemq-cpp-22-released.xml
----------------------------------------------------------------------
diff --git a/cms/2008/06/22/activemq-cpp-22-released.xml b/cms/2008/06/22/activemq-cpp-22-released.xml
index bc05fdb..10067b2 100644
--- a/cms/2008/06/22/activemq-cpp-22-released.xml
+++ b/cms/2008/06/22/activemq-cpp-22-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.2 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-22-release.xml">Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.2 is now official. You can find out what was fixed and get the latest src archives on the <link><page ri:content-title="ActiveMQ CPP 2.2 Release"></page><link-body>Release</link-body></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2008/09/10/activemq-cpp-221-released.xml
----------------------------------------------------------------------
diff --git a/cms/2008/09/10/activemq-cpp-221-released.xml b/cms/2008/09/10/activemq-cpp-221-released.xml
index 064c749..6b57dbf 100644
--- a/cms/2008/09/10/activemq-cpp-221-released.xml
+++ b/cms/2008/09/10/activemq-cpp-221-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.2.1 is now official. You can find out what was fixed and get the latest src archives on the <a shape="rect" href="../../../../cms/activemq-cpp-221-release.xml">Release</a> page.</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP V2.2.1 is now official. You can find out what was fixed and get the latest src archives on the <link><page ri:content-title="ActiveMQ-CPP 2.2.1 Release"></page><link-body>Release</link-body></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2008/11/24/activemq-cpp-222-released.xml
----------------------------------------------------------------------
diff --git a/cms/2008/11/24/activemq-cpp-222-released.xml b/cms/2008/11/24/activemq-cpp-222-released.xml
index 31f5244..8b4ee55 100644
--- a/cms/2008/11/24/activemq-cpp-222-released.xml
+++ b/cms/2008/11/24/activemq-cpp-222-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added.  See the <a shape="rect" href="../../../../cms/activemq-cpp-222-release.xml">Release</a> page for more info.</p></div>
+<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added.  See the <link><page ri:content-title="ActiveMQ-CPP 2.2.2 Release"></page><link-body>Release</link-body></link> page for more info.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/01/12/activemq-cpp-223-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/01/12/activemq-cpp-223-released.xml b/cms/2009/01/12/activemq-cpp-223-released.xml
index 44447e9..a714086 100644
--- a/cms/2009/01/12/activemq-cpp-223-released.xml
+++ b/cms/2009/01/12/activemq-cpp-223-released.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent">
 
-<p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <a shape="rect" href="../../../../cms/activemq-cpp-223-release.xml">Release</a> page for more info.</p></div>
+<p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <link><page ri:content-title="ActiveMQ-CPP 2.2.3 Release"></page><link-body>Release</link-body></link> page for more info.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/02/21/activemq-cpp-224-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/02/21/activemq-cpp-224-released.xml b/cms/2009/02/21/activemq-cpp-224-released.xml
index 7355215..0770574 100644
--- a/cms/2009/02/21/activemq-cpp-224-released.xml
+++ b/cms/2009/02/21/activemq-cpp-224-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <a shape="rect" href="../../../../cms/activemq-cpp-224-release.xml">Release</a> page for more info.</p></div>
+<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <link><page ri:content-title="ActiveMQ-CPP 2.2.4 Release"></page><link-body>Release</link-body></link> page for more info.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/03/25/activemq-cpp-225-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/03/25/activemq-cpp-225-released.xml b/cms/2009/03/25/activemq-cpp-225-released.xml
index cd328e5..5b73932 100644
--- a/cms/2009/03/25/activemq-cpp-225-released.xml
+++ b/cms/2009/03/25/activemq-cpp-225-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <a shape="rect" href="../../../../cms/activemq-cpp-225-release.xml">Release</a> page for more info.</p></div>
+<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <link><page ri:content-title="ActiveMQ-CPP 2.2.5 Release"></page><link-body>Release</link-body></link> page for more info.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/05/17/activemq-cpp-226-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/05/17/activemq-cpp-226-released.xml b/cms/2009/05/17/activemq-cpp-226-released.xml
index 59df355..da0d39f 100644
--- a/cms/2009/05/17/activemq-cpp-226-released.xml
+++ b/cms/2009/05/17/activemq-cpp-226-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <a shape="rect" href="../../../../cms/activemq-cpp-226-release.xml">Release</a> page for more info.</p></div>
+<div class="wiki-content maincontent"><p>The newest version of the CPP library has been released, lots of good bug fixes added. See the <link><page ri:content-title="ActiveMQ-CPP 2.2.6 Release"></page><link-body>Release</link-body></link> page for more info.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/06/12/activemq-cpp-30-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/06/12/activemq-cpp-30-released.xml b/cms/2009/06/12/activemq-cpp-30-released.xml
index 2607433..538d1b5 100644
--- a/cms/2009/06/12/activemq-cpp-30-released.xml
+++ b/cms/2009/06/12/activemq-cpp-30-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.0 is now officially released, check out the <a shape="rect" href="../../../../cms/activemq-cpp-30-release.xml">Release</a> page for a list of what's changed and to download the source bundle now!</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.0 is now officially released, check out the <link><page ri:content-title="ActiveMQ-CPP 3.0 Release"></page><link-body>Release</link-body></link> page for a list of what's changed and to download the source bundle now!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/07/03/activemq-cpp-301-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/07/03/activemq-cpp-301-released.xml b/cms/2009/07/03/activemq-cpp-301-released.xml
index e761c84..daa4685 100644
--- a/cms/2009/07/03/activemq-cpp-301-released.xml
+++ b/cms/2009/07/03/activemq-cpp-301-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.0.1 is now officially released, check out the <a shape="rect" href="../../../../cms/activemq-cpp-301-release.xml">Release page</a> for a list of what's changed and to download the source bundle now!</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.0.1 is now officially released, check out the <link><page ri:content-title="ActiveMQ-CPP 3.0.1 Release"></page><link-body>Release page</link-body></link> for a list of what's changed and to download the source bundle now!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2009/12/20/activemq-cpp-310-officially-released.xml
----------------------------------------------------------------------
diff --git a/cms/2009/12/20/activemq-cpp-310-officially-released.xml b/cms/2009/12/20/activemq-cpp-310-officially-released.xml
index 86d8485..75db81e 100644
--- a/cms/2009/12/20/activemq-cpp-310-officially-released.xml
+++ b/cms/2009/12/20/activemq-cpp-310-officially-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.1.0 is now officially released, check out the <a shape="rect" href="../../../../cms/activemq-cpp-310-release.xml">Release</a> page for a list of what's changed and to download the source bundle now!</p></div>
+<div class="wiki-content maincontent"><p>ActiveMQ-CPP 3.1.0 is now officially released, check out the <link><page ri:content-title="ActiveMQ-CPP 3.1.0 Release"></page><link-body>Release</link-body></link> page for a list of what's changed and to download the source bundle now!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/03/27/activemq-cpp-312-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/03/27/activemq-cpp-312-released.xml b/cms/2010/03/27/activemq-cpp-312-released.xml
index 9cf61fb..b46aadb 100644
--- a/cms/2010/03/27/activemq-cpp-312-released.xml
+++ b/cms/2010/03/27/activemq-cpp-312-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Version 3.1.2 just released, fixes for a few important issues that caused segfaults have been added. Get your copy <a shape="rect" href="../../../../cms/activemq-cpp-312-release.xml">here</a>:</p></div>
+<div class="wiki-content maincontent"><p>Version 3.1.2 just released, fixes for a few important issues that caused segfaults have been added. Get your copy <link><page ri:content-title="ActiveMQ-CPP 3.1.2 Release"></page><link-body>here</link-body></link>:</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/06/18/activemq-cpp-320-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/06/18/activemq-cpp-320-released.xml b/cms/2010/06/18/activemq-cpp-320-released.xml
index 3407e4c..137323d 100644
--- a/cms/2010/06/18/activemq-cpp-320-released.xml
+++ b/cms/2010/06/18/activemq-cpp-320-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Version 3.2.0 of ActiveMQ-CPP has now been officially released which include support for SSL along with QueueBrowser and Message body compression.  Download the source bundle from the <a shape="rect" href="../../../../cms/activemq-cpp-320-release.xml">Release Page</a>.</p></div>
+<div class="wiki-content maincontent"><p>Version 3.2.0 of ActiveMQ-CPP has now been officially released which include support for SSL along with QueueBrowser and Message body compression.  Download the source bundle from the <link><page ri:content-title="ActiveMQ-CPP 3.2.0 Release"></page><link-body>Release Page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/07/03/activemq-cpp-v321-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/07/03/activemq-cpp-v321-released.xml b/cms/2010/07/03/activemq-cpp-v321-released.xml
index df55be6..194db9d 100644
--- a/cms/2010/07/03/activemq-cpp-v321-released.xml
+++ b/cms/2010/07/03/activemq-cpp-v321-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-321-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.2.1 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/09/16/activemq-cpp-v322-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/09/16/activemq-cpp-v322-released.xml b/cms/2010/09/16/activemq-cpp-v322-released.xml
index 069d5ad..dab7a36 100644
--- a/cms/2010/09/16/activemq-cpp-v322-released.xml
+++ b/cms/2010/09/16/activemq-cpp-v322-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-322-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.2.2 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/09/16/activemq-cpp-v323-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/09/16/activemq-cpp-v323-released.xml b/cms/2010/09/16/activemq-cpp-v323-released.xml
index 4a20797..4ed4e9a 100644
--- a/cms/2010/09/16/activemq-cpp-v323-released.xml
+++ b/cms/2010/09/16/activemq-cpp-v323-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-323-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.2.3 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2010/12/10/activemq-cpp-v324-released.xml
----------------------------------------------------------------------
diff --git a/cms/2010/12/10/activemq-cpp-v324-released.xml b/cms/2010/12/10/activemq-cpp-v324-released.xml
index 9b91171..f4d3315 100644
--- a/cms/2010/12/10/activemq-cpp-v324-released.xml
+++ b/cms/2010/12/10/activemq-cpp-v324-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-324-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.2.4 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2011/03/05/activemq-cpp-v325-released.xml
----------------------------------------------------------------------
diff --git a/cms/2011/03/05/activemq-cpp-v325-released.xml b/cms/2011/03/05/activemq-cpp-v325-released.xml
index 982963b..fac6b48 100644
--- a/cms/2011/03/05/activemq-cpp-v325-released.xml
+++ b/cms/2011/03/05/activemq-cpp-v325-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-325-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest patch release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.2.5 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2011/04/15/activemq-cpp-v330-released.xml
----------------------------------------------------------------------
diff --git a/cms/2011/04/15/activemq-cpp-v330-released.xml b/cms/2011/04/15/activemq-cpp-v330-released.xml
index b7f1eeb..cbbbd17 100644
--- a/cms/2011/04/15/activemq-cpp-v330-released.xml
+++ b/cms/2011/04/15/activemq-cpp-v330-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-330-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.3.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2011/04/29/activemq-cpp-v340-released.xml
----------------------------------------------------------------------
diff --git a/cms/2011/04/29/activemq-cpp-v340-released.xml b/cms/2011/04/29/activemq-cpp-v340-released.xml
index 0f8b8f8..4fa7871 100644
--- a/cms/2011/04/29/activemq-cpp-v340-released.xml
+++ b/cms/2011/04/29/activemq-cpp-v340-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-340-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2011/12/18/activemq-cpp-version-341-released.xml
----------------------------------------------------------------------
diff --git a/cms/2011/12/18/activemq-cpp-version-341-released.xml b/cms/2011/12/18/activemq-cpp-version-341-released.xml
index 7cf7919..5a81732 100644
--- a/cms/2011/12/18/activemq-cpp-version-341-released.xml
+++ b/cms/2011/12/18/activemq-cpp-version-341-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-341-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.1 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2012/04/27/activemq-cpp-version-342-released.xml
----------------------------------------------------------------------
diff --git a/cms/2012/04/27/activemq-cpp-version-342-released.xml b/cms/2012/04/27/activemq-cpp-version-342-released.xml
index 48a5f51..5875d28 100644
--- a/cms/2012/04/27/activemq-cpp-version-342-released.xml
+++ b/cms/2012/04/27/activemq-cpp-version-342-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="../../../../cms/index.xml">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-342-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <link><page ri:content-title="Index"></page><link-body>ActiveMQ-CPP</link-body></link> is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.2 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2012/06/02/activemq-cpp-version-343-released.xml
----------------------------------------------------------------------
diff --git a/cms/2012/06/02/activemq-cpp-version-343-released.xml b/cms/2012/06/02/activemq-cpp-version-343-released.xml
index ad3542d..296735f 100644
--- a/cms/2012/06/02/activemq-cpp-version-343-released.xml
+++ b/cms/2012/06/02/activemq-cpp-version-343-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="../../../../cms/index.xml">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-343-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <link><page ri:content-title="Index"></page><link-body>ActiveMQ-CPP</link-body></link> is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.3 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2012/06/29/activemq-cpp-version-344-released.xml
----------------------------------------------------------------------
diff --git a/cms/2012/06/29/activemq-cpp-version-344-released.xml b/cms/2012/06/29/activemq-cpp-version-344-released.xml
index 8482788..3c37f0b 100644
--- a/cms/2012/06/29/activemq-cpp-version-344-released.xml
+++ b/cms/2012/06/29/activemq-cpp-version-344-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="../../../../cms/activemq-cpp-344-release.xml">ActiveMQ-CPP</a> is out, you can download the source bundles here.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <link><page ri:content-title="ActiveMQ-CPP 3.4.4 Release"></page><link-body>ActiveMQ-CPP</link-body></link> is out, you can download the source bundles here.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2012/10/12/activemq-cpp-v345-released.xml
----------------------------------------------------------------------
diff --git a/cms/2012/10/12/activemq-cpp-v345-released.xml b/cms/2012/10/12/activemq-cpp-v345-released.xml
index 9cbd46f..2a99373 100644
--- a/cms/2012/10/12/activemq-cpp-v345-released.xml
+++ b/cms/2012/10/12/activemq-cpp-v345-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can <a shape="rect" href="../../../../cms/activemq-cpp-345-release.xml">download</a> the source bundles here.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can <link><page ri:content-title="ActiveMQ-CPP 3.4.5 Release"></page><link-body>download</link-body></link> the source bundles here.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2012/12/20/activemq-cpp-version-350-released.xml
----------------------------------------------------------------------
diff --git a/cms/2012/12/20/activemq-cpp-version-350-released.xml b/cms/2012/12/20/activemq-cpp-version-350-released.xml
index adb4bff..6f83d4a 100644
--- a/cms/2012/12/20/activemq-cpp-version-350-released.xml
+++ b/cms/2012/12/20/activemq-cpp-version-350-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../../cms/activemq-cpp-350-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.5.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2013/03/08/activemq-cpp-v360-released.xml
----------------------------------------------------------------------
diff --git a/cms/2013/03/08/activemq-cpp-v360-released.xml b/cms/2013/03/08/activemq-cpp-v360-released.xml
index 6f6f804..752b162 100644
--- a/cms/2013/03/08/activemq-cpp-v360-released.xml
+++ b/cms/2013/03/08/activemq-cpp-v360-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes.  Download your copy from <a shape="rect" href="../../../../cms/activemq-cpp-360-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes.  Download your copy from <link><page ri:content-title="ActiveMQ-CPP 3.6.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2013/05/19/activemq-cpp-v370-released.xml
----------------------------------------------------------------------
diff --git a/cms/2013/05/19/activemq-cpp-v370-released.xml b/cms/2013/05/19/activemq-cpp-v370-released.xml
index e1c96a0..519a000 100644
--- a/cms/2013/05/19/activemq-cpp-v370-released.xml
+++ b/cms/2013/05/19/activemq-cpp-v370-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes. Download your copy from <a shape="rect" href="../../../../cms/activemq-cpp-370-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes. Download your copy from <link><page ri:content-title="ActiveMQ-CPP 3.7.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2013/09/07/activemq-cpp-v380-released.xml
----------------------------------------------------------------------
diff --git a/cms/2013/09/07/activemq-cpp-v380-released.xml b/cms/2013/09/07/activemq-cpp-v380-released.xml
index b81da79..1d16921 100644
--- a/cms/2013/09/07/activemq-cpp-v380-released.xml
+++ b/cms/2013/09/07/activemq-cpp-v380-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes and a few new features. Download your copy from <a shape="rect" href="../../../../cms/activemq-cpp-380-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes and a few new features. Download your copy from <link><page ri:content-title="ActiveMQ-CPP 3.8.0 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2013/09/19/activemq-cpp-v381-released.xml
----------------------------------------------------------------------
diff --git a/cms/2013/09/19/activemq-cpp-v381-released.xml b/cms/2013/09/19/activemq-cpp-v381-released.xml
index 13898fe..8ff3cdb 100644
--- a/cms/2013/09/19/activemq-cpp-v381-released.xml
+++ b/cms/2013/09/19/activemq-cpp-v381-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="../../../../cms/activemq-cpp-381-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <link><page ri:content-title="ActiveMQ-CPP 3.8.1 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2013/12/10/activemq-cpp-v382-released.xml
----------------------------------------------------------------------
diff --git a/cms/2013/12/10/activemq-cpp-v382-released.xml b/cms/2013/12/10/activemq-cpp-v382-released.xml
index 98f0d46..e34b4af 100644
--- a/cms/2013/12/10/activemq-cpp-v382-released.xml
+++ b/cms/2013/12/10/activemq-cpp-v382-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="../../../../cms/activemq-cpp-382-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <link><page ri:content-title="ActiveMQ-CPP 3.8.2 Release"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2015/08/16/activemq-cpp-v390-released.xml
----------------------------------------------------------------------
diff --git a/cms/2015/08/16/activemq-cpp-v390-released.xml b/cms/2015/08/16/activemq-cpp-v390-released.xml
index 45a9154..c30a142 100644
--- a/cms/2015/08/16/activemq-cpp-v390-released.xml
+++ b/cms/2015/08/16/activemq-cpp-v390-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-390-release.html">here</a>.</p></div></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="http://activemq.apache.org/cms/activemq-cpp-390-release.html">here</a>.</p></div></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2015/12/04/activemq-cpp-v391-released.xml
----------------------------------------------------------------------
diff --git a/cms/2015/12/04/activemq-cpp-v391-released.xml b/cms/2015/12/04/activemq-cpp-v391-released.xml
index 4f58f26..1da6e6c 100644
--- a/cms/2015/12/04/activemq-cpp-v391-released.xml
+++ b/cms/2015/12/04/activemq-cpp-v391-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-391-release.html">here</a>.</p></div></div></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="http://activemq.apache.org/cms/activemq-cpp-391-release.html">here</a>.</p></div></div></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2016/02/09/activemq-cpp-v392-released.xml
----------------------------------------------------------------------
diff --git a/cms/2016/02/09/activemq-cpp-v392-released.xml b/cms/2016/02/09/activemq-cpp-v392-released.xml
index e17917a..26feb0f 100644
--- a/cms/2016/02/09/activemq-cpp-v392-released.xml
+++ b/cms/2016/02/09/activemq-cpp-v392-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small STOMP protocol fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-392-release.html">here</a>.</p></div></div></div></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small STOMP protocol fix, grab the source bundle <a shape="rect" href="http://activemq.apache.org/cms/activemq-cpp-392-release.html">here</a>.</p></div></div></div></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2016/04/01/activemq-cpp-v393-released.xml
----------------------------------------------------------------------
diff --git a/cms/2016/04/01/activemq-cpp-v393-released.xml b/cms/2016/04/01/activemq-cpp-v393-released.xml
index c14096b..1d7f7a3 100644
--- a/cms/2016/04/01/activemq-cpp-v393-released.xml
+++ b/cms/2016/04/01/activemq-cpp-v393-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-393-release.html">here</a>.</p></div></div></div></div></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" href="http://activemq.apache.org/cms/activemq-cpp-393-release.html">here</a>.</p></div></div></div></div></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/2017/02/24/activemq-cpp-v394-released.xml
----------------------------------------------------------------------
diff --git a/cms/2017/02/24/activemq-cpp-v394-released.xml b/cms/2017/02/24/activemq-cpp-v394-released.xml
index 6109a5e..ac32058 100644
--- a/cms/2017/02/24/activemq-cpp-v394-released.xml
+++ b/cms/2017/02/24/activemq-cpp-v394-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-394-release.html">here</a>.</p></div></div></div></div></div></div></div>
+<div class="wiki-content maincontent"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" href="http://activemq.apache.org/cms/activemq-cpp-394-release.html">here</a>.</p></div></div></div></div></div></div></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-10-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-10-release.xml b/cms/activemq-cpp-10-release.xml
index 8be040e..6a53b06 100644
--- a/cms/activemq-cpp-10-release.xml
+++ b/cms/activemq-cpp-10-release.xml
@@ -1,31 +1,25 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP1.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is our first official release of ActiveMQ CPP.  Some of the included features are:</p>
 <ul><li>CMS - a JMS-like API</li><li>Implementation of the Stomp protocol (compatable with AMQ broker 4.0.2 and later)</li><li>Extensible architecture for supporting additional messaging protocols (focus on OpenWire for the next major release)</li><li>Robust, Java-like library providing streams, readers/writers, and even a synchronized macro</li><li>Build has been tested on win32, linux, solaris, and OSX</li></ul>
 
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p>
-</div></div>
+<structured-macro ac:macro-id="face4afb-579d-4e99-96b2-567d67cb49d1" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP1.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.0-src.zip">activemq-cpp-1.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.0-src.zip.asc">activemq-cpp-1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.0-src.tar.gz">activemq-cpp-1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.0-src.tar.gz.asc">activemq-cpp-1.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.0-src.zip">activemq-cpp-1.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.0-src.zip.asc">activemq-cpp-1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.0-src.tar.gz">activemq-cpp-1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq
 -cpp/source/activemq-cpp-1.0-src.tar.gz.asc">activemq-cpp-1.0-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP1.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="c09f0cd6-d916-43ea-8bb4-5a064372c881" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-1.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP1.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11803&amp;styleName=Html&amp;projectId=11000&amp;Create=Create">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11803&amp;styleName=Html&amp;projectId=11000&amp;Create=Create">release notes</a><br clear="none">
+<structured-macro ac:macro-id="1f8ba1b4-ba3b-4934-ba70-f6dded5c4d2a" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=11000&amp;fixfor=11803&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-11-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-11-release.xml b/cms/activemq-cpp-11-release.xml
index 97a7928..e1c7759 100644
--- a/cms/activemq-cpp-11-release.xml
+++ b/cms/activemq-cpp-11-release.xml
@@ -1,32 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version fixes several bugs and adds a few new features.</p>
 <ul><li>Updated interface for cms::BytesMessage - more JMS-like.</li><li>Updated the MessageProducer interface to add multiple versions of the send method</li><li>Fixed several memory leaks</li><li>Now run on linux, win32, OS X, and Solaris</li><li>Persistence is fixed</li><li>Fixed deadlocks when closing a connection</li><li>Fixed message expiration</li></ul>
 
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p>
-</div></div>
+<structured-macro ac:macro-id="751ce70c-ec16-43c2-9cc3-1bc085b2811f" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP1.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip">activemq-cpp-1.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip.asc">activemq-cpp-1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.tar.gz">activemq-cpp-1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.1-src.tar.gz.asc">activemq-cpp-1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip">activemq-cpp-1.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-1.1-src.zip.asc">activemq-cpp-1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-1.1-src.tar.gz">activemq-cpp-1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq
 -cpp/source/activemq-cpp-1.1-src.tar.gz.asc">activemq-cpp-1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP1.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="5c279de2-8e3a-4059-bd0d-8a36fd206506" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-1.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP1.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11804">release notes</a></p>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11804">release notes</a></p>
 
-<p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p><structured-macro ac:macro-id="6908fa2d-b0d3-4024-8da6-8a2bbb018361" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="https://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=11000&amp;fixfor=11804&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-20-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-20-release.xml b/cms/activemq-cpp-20-release.xml
index 311e620..5a2856f 100644
--- a/cms/activemq-cpp-20-release.xml
+++ b/cms/activemq-cpp-20-release.xml
@@ -1,31 +1,25 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version fixes several bugs and adds a few new features.</p>
 <ul><li>Full OpenWire v2 support!</li><li>You can switch between openwire and stomp via the connection URL</li><li>Temporary destinations when using OpenWire</li><li>Added support for asynchronous send</li><li>Fixed client acknowledge</li><li>Resolved some memory leaks</li><li>Sessions are now single threaded</li></ul>
 
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p>
-</div></div>
+<structured-macro ac:macro-id="dc658eb4-f767-4c44-88cb-8673bb2a3fe5" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0-src.zip">activemq-cpp-2.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0-src.zip.asc">activemq-cpp-2.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd">
 <p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0-src.tar.gz">activemq-cpp-2.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0-src.tar.gz.asc">activemq-cpp-2.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0-src.zip">activemq-cpp-2.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0-src.zip.asc">activemq-cpp-2.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0-src.tar.gz">activemq-cpp-2.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq
 -cpp/source/activemq-cpp-2.0-src.tar.gz.asc">activemq-cpp-2.0-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="99a489ff-8129-4cef-94b2-314d477609ed" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11805">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11805">release notes</a><br clear="none">
+<structured-macro ac:macro-id="fac6a6d0-eb70-469e-9a51-c77c4fcbf9c7" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=11000&amp;fixfor=11805&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-201-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-201-release.xml b/cms/activemq-cpp-201-release.xml
index 67e8f0b..824df64 100644
--- a/cms/activemq-cpp-201-release.xml
+++ b/cms/activemq-cpp-201-release.xml
@@ -1,33 +1,27 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP2.0.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This version fixes several small bugs that made their way into the 2.0 release.</p>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p>
-</div></div>
+<structured-macro ac:macro-id="16db8a88-bafc-43da-aed1-f0a26197dd37" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatable with ActiveMQ Broker version &gt;= 4.0.2</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.0.1Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.0.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-2.0.1">here</a></p>
 
-<h2 id="ActiveMQ-CPP2.0.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.zip">activemq-cpp-2.0.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.zip.asc">activemq-cpp-2.0.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.tar.gz">activemq-cpp-2.0.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.tar.gz.asc">activemq-cpp-2.0.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.zip">activemq-cpp-2.0.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.zip.asc">activemq-cpp-2.0.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-2.0.1-src.tar.gz">activemq-cpp-2.0.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activ
 emq/activemq-cpp/source/activemq-cpp-2.0.1-src.tar.gz.asc">activemq-cpp-2.0.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP2.0.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="258be818-0486-4330-a8f9-e6d75badd8a2" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP2.0.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11823">release notes</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=11823">release notes</a><br clear="none">
+<structured-macro ac:macro-id="07df0cb6-257b-4d1a-a3d5-527fddb745d2" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=11000&amp;fixfor=11823&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>&#160;</p></div>
 


[20/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configurable-ioexception-handling.xml
----------------------------------------------------------------------
diff --git a/configurable-ioexception-handling.xml b/configurable-ioexception-handling.xml
index 259577a..fda6c6c 100644
--- a/configurable-ioexception-handling.xml
+++ b/configurable-ioexception-handling.xml
@@ -1,20 +1,16 @@
-<div class="wiki-content maincontent"><p>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2 id="ConfigurableIOExceptionHandling-DefaultIOExceptionhandler">Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messa
 ges). All file-based persistent stores are capable of surviving these kind of errors.</p><h3 id="ConfigurableIOExceptionHandling-ConfiguringDefaultIOExceptionhandler">Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;bean id=&quot;ioExceptionHandler&quot; class=&quot;org.apache.activemq.util.DefaultIOExceptionHandler&quot;&gt;
-        &lt;property name=&quot;ignoreAllErrors&quot;&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
+<div class="wiki-content maincontent"><p>Starting with 5.3.1, ActiveMQ provides configurable IOException handling for its file-based message stores. From version 5.5 the handler is also invoked when the JDBC persistence adapter gets a failure on <code>getConnection()</code>.</p><h2>Default IOException handler</h2><p>ActiveMQ comes with a default IOException handler, which does the following. When some of the file-based message stores encounter IOException it can be one of the two things: either the disk is unavailable of there's no more space on the disk.</p><p>The first case is usually encountered when disk fails or network disk is disconnected. These errors are not "recoverable" and we usually want to shutdown the broker until problems with the disk are solved.</p><p>When there's no more space on the disk, we usually want to wait that some space is reclaimed and continue what we have been doing before (exchanging messages). All file-based persistent stores are capable of surviving
  these kind of errors.</p><h3>Configuring Default IOException handler</h3><p>There are a couple of properties you can use to tune the behavior of the <code>DefaultIOExceptionHandler</code>. First, instantiate the exception handler as a bean. Then configure the broker to use the exception handler by setting the broker's <code>ioExceptionHandler</code> property.</p><p>Example:</p><structured-macro ac:macro-id="225b34f9-76e5-47c3-8046-3b66e7ace910" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>    &lt;bean id="ioExceptionHandler" class="org.apache.activemq.util.DefaultIOExceptionHandler"&gt;
+        &lt;property name="ignoreAllErrors"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
 
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; ioExceptionHandler=&quot;#ioExceptionHandler&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" ioExceptionHandler="#ioExceptionHandler"&gt;
       ...
     &lt;/broker&gt;
-]]></script>
-</div></div><p>Handler configuration properties:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property</p></th><th colspan="1" rowspan="1" class="confluenceTh">Since</th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreAllErrors</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>true</code> all errors are ignored and the broker remains running.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ignoreNoSpaceErrors</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p><
 /td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>false</code> 'no disk space' errors are treated the same as other errors causing the broker to be stopped.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>noSpaceMessage</code></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.4</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>space</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The string used to match against the exception's message. When matched a 'no disk space' error results.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>ignoreSQLExceptions</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If <code>true</code> all SQLExceptions are ignored by the handler allowing them to be han
 dled by the persistence adapter's locker. When <code>false</code> the exception handler processes the exception.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>sqlExceptionMessage</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>""</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The SQLException phrase to match when ignoring SQLExceptions. Only matched exceptions are ignored. All SQLExceptions match the default empty string.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>stopStartConnectors</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When <code>true</code> transport connectors are stopped (clien
 t connections are refused), however, the broker will remain running. The transport connectors will be restarted following a successful persistence adapter checkpoint. All exceptions are ignored whilst the transport connectors are stopped. This option ensures that the broker does not need to be manually restarted in the event of a DB restart, for example.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);"><code>resumeCheckSleepPeriod</code></span></p></td><td colspan="1" rowspan="1" class="confluenceTd">5.5</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>5sec</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The interval between persistence adapter checkpoints. Typically used in conjunction with <code>stopStartConnectors</code>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(0,0,0);">systemExitOnShutdown</span></p></td><td colspan="1" rowspan="1" class="conf
 luenceTd">5.13</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd"><span style="color: rgb(0,0,0);">before stopping the broker, set the broker attribute <span style="line-height: 1.42857;">systemExitOnShutdown to this value to potentially force a jvm exit. </span></span></td></tr></tbody></table></div><p><span style="color: rgb(0,0,0);">The default configuration will try to find a specified string in the exception message to determine whether it is a 'no disk space' error. On most platforms (at least those we have tested), you'll find the word 'space' in it. Of course, you can customize this to your platform by using <code style="line-height: 1.42857;">noSpaceMessage</code> property.</span></p><p>Note: as of ActiveMQ 5.11 the <code>JDBCIOExceptionHandler</code> has been deprecated. It has been replaced by the <code>org.apache.activemq.util.LeaseLockerIOExceptionHandler</code> that will work with any persistence adapter that
  supports pluggable storage lockers whether or not a locker is in use.</p><p><span style="color: rgb(102,0,51);">Writing your own handler</span></p><p>In case this handler doesn't work for you, you can write your own. For example you might want to change the way how you detect full disk and execute some external command, like <code>df</code> on Linux to be sure.</p><p>All you have to do is implement the <code>org.apache.activemq.util.IOExceptionHandler</code> interface then configure the broker to use it:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;bean id=&quot;ioExceptionHandler&quot; class=&quot;com.mycompany.MyIOExceptionHandler&quot;&gt;
-        &lt;property name=&quot;ignoreAllErrors&quot;&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
+</plain-text-body></structured-macro><p>Handler configuration properties:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Property</p></th><th colspan="1" rowspan="1">Since</th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ignoreAllErrors</code></p></td><td colspan="1" rowspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When <code>true</code> all errors are ignored and the broker remains running.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ignoreNoSpaceErrors</code></p></td><td colspan="1" rowspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>When <code>false</code> 'no disk space' errors are treated the same as other errors causing the broker to be stopped.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>noSpaceMessage</code></p></td><td colspan="1" r
 owspan="1">5.4</td><td colspan="1" rowspan="1"><p><code>space</code></p></td><td colspan="1" rowspan="1"><p>The string used to match against the exception's message. When matched a 'no disk space' error results.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>ignoreSQLExceptions</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>If <code>true</code> all SQLExceptions are ignored by the handler allowing them to be handled by the persistence adapter's locker. When <code>false</code> the exception handler processes the exception.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>sqlExceptionMessage</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>""</code></p></td><td colspan="1" rowspan="1"><p>The SQLException phrase to match when ignoring SQLExceptions. Only matched exce
 ptions are ignored. All SQLExceptions match the default empty string.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>stopStartConnectors</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p>When <code>true</code> transport connectors are stopped (client connections are refused), however, the broker will remain running. The transport connectors will be restarted following a successful persistence adapter checkpoint. All exceptions are ignored whilst the transport connectors are stopped. This option ensures that the broker does not need to be manually restarted in the event of a DB restart, for example.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);"><code>resumeCheckSleepPeriod</code></span></p></td><td colspan="1" rowspan="1">5.5</td><td colspan="1" rowspan="1"><p><code>5sec</code></p></td><td colspan="1" rowspan="1"><
 p>The interval between persistence adapter checkpoints. Typically used in conjunction with <code>stopStartConnectors</code>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><span style="color: rgb(0,0,0);">systemExitOnShutdown</span></p></td><td colspan="1" rowspan="1">5.13</td><td colspan="1" rowspan="1">false</td><td colspan="1" rowspan="1"><span style="color: rgb(0,0,0);">before stopping the broker, set the broker attribute <span style="line-height: 1.42857;">systemExitOnShutdown to this value to potentially force a jvm exit. </span></span></td></tr></tbody></table><p><span style="color: rgb(0,0,0);">The default configuration will try to find a specified string in the exception message to determine whether it is a 'no disk space' error. On most platforms (at least those we have tested), you'll find the word 'space' in it. Of course, you can customize this to your platform by using <code style="line-height: 1.42857;">noSpaceMessage</code> property.</span></p><p>Note: as of ActiveM
 Q 5.11 the <code>JDBCIOExceptionHandler</code> has been deprecated. It has been replaced by the <code>org.apache.activemq.util.LeaseLockerIOExceptionHandler</code> that will work with any persistence adapter that supports pluggable storage lockers whether or not a locker is in use.</p><p><span style="color: rgb(102,0,51);">Writing your own handler</span></p><p>In case this handler doesn't work for you, you can write your own. For example you might want to change the way how you detect full disk and execute some external command, like <code>df</code> on Linux to be sure.</p><p>All you have to do is implement the <code>org.apache.activemq.util.IOExceptionHandler</code> interface then configure the broker to use it:</p><structured-macro ac:macro-id="dc77904e-f88b-45af-a7ba-f3356f7f0c7c" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>    &lt;bean id="ioExceptionHandler" class="com.mycompany.MyIOExceptionHandler"&gt;
+        &lt;property name="ignoreAllErrors"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
 
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; ioExceptionHandler=&quot;#ioExceptionHandler&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" ioExceptionHandler="#ioExceptionHandler"&gt;
       ...
     &lt;/broker&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuration.xml
----------------------------------------------------------------------
diff --git a/configuration.xml b/configuration.xml
index eb26111..4fe0acb 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -3,5 +3,5 @@
 
 <p>Questions on configuring ActiveMQ's JMS client or the Message Broker</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="how-can-i-enable-detailed-logging.xml">How can I enable detailed logging</a></li><li><a shape="rect" href="how-does-xbean-compare-to-spring-2.xml">How does XBean compare to Spring 2</a></li><li><a shape="rect" href="how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml">How do I configure 10s of 1000s of Queues in a single broker</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml">How do I configure ActiveMQ to hold 100s of millions of Queue Messages</a></li><li><a shape="rect" href="how-do-i-configure-activemq-to-use-aio-server-transport.xml">How do I configure ActiveMQ to use AIO server transport</a></li><li><a shape="rect" href="how-do-i-configure-automatic-reconnection.xml">How do I configure automatic reconnection</a></li><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.xml">How do I configure distributed queues or topics</a></li><
 li><a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml">How do I define a local address and local port for TCP or SSL</a></li><li><a shape="rect" href="how-do-i-disable-persistence.xml">How do I disable persistence</a></li><li><a shape="rect" href="how-do-i-run-activemq-under-the-kaffe-jvm.xml">How do I run ActiveMQ under the Kaffe JVM</a></li><li><a shape="rect" href="how-to-configure-a-new-database.xml">How to configure a new database</a></li><li><a shape="rect" href="how-to-deploy-activemq-ra-versionrar-to-weblogic.xml">How to deploy activemq-ra-version.rar to weblogic</a></li><li><a shape="rect" href="how-to-disable-multicast-discovery.xml">How to disable multicast discovery</a></li></ul></div>
+<structured-macro ac:macro-id="4be0647a-0a3a-460c-b754-4e9757b58610" 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/configure-startup-destinations.xml
----------------------------------------------------------------------
diff --git a/configure-startup-destinations.xml b/configure-startup-destinations.xml
index dcd4263..de224c8 100644
--- a/configure-startup-destinations.xml
+++ b/configure-startup-destinations.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>Typically in Apache ActiveMQ we <a shape="rect" href="how-do-i-create-new-destinations.xml">create destinations on demand</a> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a>.</p><parameter ac:name="title">4.1 Feature</parameter><rich-text-body><p>Note this feature is available from 4.1 onwards. If you try this XML on older versions of ActiveMQ you will get an exception about the 'destinations' property not being writable.</p></rich-text-body><h3 id="ConfigureStartupDestinations-Example">Example</h3><p>The following <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml">example</a> shows how you can configure a number of destinations to be available at
  startup.<plain-text-body>
+<div class="wiki-content maincontent"><p>Typically in Apache ActiveMQ we <link><page ri:content-title="How do I create new destinations"></page><plain-text-link-body>create destinations on demand</plain-text-link-body></link> as clients start to use them. However sometimes users want to be able to configure which destinations are available on startup explicitly in the <link><page ri:content-title="Xml Configuration"></page></link>.</p><parameter ac:name="title">4.1 Feature</parameter><rich-text-body><p>Note this feature is available from 4.1 onwards. If you try this XML on older versions of ActiveMQ you will get an exception about the 'destinations' property not being writable.</p></rich-text-body><h3>Example</h3><p>The following <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml">example</a> shows how you can configure a number of destinations to be available at startup
 .<plain-text-body>
 &lt;broker xmlns="http://activemq.apache.org/schema/core"&gt;
 
     &lt;destinations&gt;

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configure-version-5-brokers.xml
----------------------------------------------------------------------
diff --git a/configure-version-5-brokers.xml b/configure-version-5-brokers.xml
index 2db2822..39437a9 100644
--- a/configure-version-5-brokers.xml
+++ b/configure-version-5-brokers.xml
@@ -1,28 +1,27 @@
-<div class="wiki-content maincontent"><h3 id="Configureversion5Brokers-Overview">Overview</h3><p>There is an updates XML syntax for configuring message brokers - <a shape="rect" class="external-link" href="http://activemq.apache.org/schema/core/activemq-core-5.0-SNAPSHOT.xsd">see here</a></p><p>So we decided that using XML would make this configuration much easier. we use <a shape="rect" class="external-link" href="http://xbean.org/" rel="nofollow">XBean</a> to perform the XML configuration.</p><p>For details of the XML see the <a shape="rect" href="xml-reference.xml">Xml Reference</a></p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful with broker names and URIs</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape
 ="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html" rel="nofollow">do not allow things like underscores</a> in them etc.</p></div></div><h2 id="Configureversion5Brokers-Examples">Examples</h2><p>The default ActiveMQ configuration: <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">current default config</a>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans
-  xmlns=&quot;http://www.springframework.org/schema/beans&quot;
-  xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-  xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd&quot;&gt;
+<div class="wiki-content maincontent"><h3>Overview</h3><p>There is an updates XML syntax for configuring message brokers - <a shape="rect" href="http://activemq.apache.org/schema/core/activemq-core-5.0-SNAPSHOT.xsd">see here</a></p><p>So we decided that using XML would make this configuration much easier. we use <a shape="rect" href="http://xbean.org/">XBean</a> to perform the XML configuration.</p><p>For details of the XML see the <link><page ri:content-title="Xml Reference"></page></link></p><structured-macro ac:macro-id="8bc30f12-46ab-4d0b-b5a7-c915427e4b4b" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Be careful with broker names and URIs</parameter><rich-text-body><p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html">do not allow things like underscores</a> in them etc.</p></rich-text-body></structured-macro><h2>Examples
 </h2><p>The default ActiveMQ configuration: <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">current default config</a>.</p><structured-macro ac:macro-id="79ddd82e-0753-4eaf-87e4-2f3d0904296c" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
     &lt;!-- Allows us to use system properties as variables in this configuration file --&gt;
-    &lt;bean class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;&gt;
-        &lt;property name=&quot;locations&quot;&gt;
+    &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
+        &lt;property name="locations"&gt;
             &lt;value&gt;file:${activemq.conf}/credentials.properties&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
    &lt;!-- Allows accessing the server log --&gt;
-    &lt;bean id=&quot;logQuery&quot; class=&quot;io.fabric8.insight.log.log4j.Log4jLogQuery&quot;
-          lazy-init=&quot;false&quot; scope=&quot;singleton&quot;
-          init-method=&quot;start&quot; destroy-method=&quot;stop&quot;&gt;
+    &lt;bean id="logQuery" class="io.fabric8.insight.log.log4j.Log4jLogQuery"
+          lazy-init="false" scope="singleton"
+          init-method="start" destroy-method="stop"&gt;
     &lt;/bean&gt;
     &lt;!--
         The &lt;broker&gt; element is used to configure the ActiveMQ broker.
     --&gt;
-    &lt;broker xmlns=&quot;http://activemq.apache.org/schema/core&quot; brokerName=&quot;localhost&quot; dataDirectory=&quot;${activemq.data}&quot;&gt;
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}"&gt;
         &lt;destinationPolicy&gt;
             &lt;policyMap&gt;
               &lt;policyEntries&gt;
-                &lt;policyEntry topic=&quot;&gt;&quot; &gt;
+                &lt;policyEntry topic="&gt;" &gt;
                     &lt;!-- The constantPendingMessageLimitStrategy is used to prevent
                          slow topic consumers to block producers and affect other consumers
                          by limiting the number of messages that are retained
@@ -30,7 +29,7 @@
                          http://activemq.apache.org/slow-consumer-handling.html
                     --&gt;
                   &lt;pendingMessageLimitStrategy&gt;
-                    &lt;constantPendingMessageLimitStrategy limit=&quot;1000&quot;/&gt;
+                    &lt;constantPendingMessageLimitStrategy limit="1000"/&gt;
                   &lt;/pendingMessageLimitStrategy&gt;
                 &lt;/policyEntry&gt;
               &lt;/policyEntries&gt;
@@ -44,7 +43,7 @@
             http://activemq.apache.org/jmx.html
         --&gt;
         &lt;managementContext&gt;
-            &lt;managementContext createConnector=&quot;false&quot;/&gt;
+            &lt;managementContext createConnector="false"/&gt;
         &lt;/managementContext&gt;
         &lt;!--
             Configure message persistence for the broker. The default persistence
@@ -53,7 +52,7 @@
             http://activemq.apache.org/persistence.html
         --&gt;
         &lt;persistenceAdapter&gt;
-            &lt;kahaDB directory=&quot;${activemq.data}/kahadb&quot;/&gt;
+            &lt;kahaDB directory="${activemq.data}/kahadb"/&gt;
         &lt;/persistenceAdapter&gt;
 
           &lt;!--
@@ -64,13 +63,13 @@
           &lt;systemUsage&gt;
             &lt;systemUsage&gt;
                 &lt;memoryUsage&gt;
-                    &lt;memoryUsage percentOfJvmHeap=&quot;70&quot; /&gt;
+                    &lt;memoryUsage percentOfJvmHeap="70" /&gt;
                 &lt;/memoryUsage&gt;
                 &lt;storeUsage&gt;
-                    &lt;storeUsage limit=&quot;100 gb&quot;/&gt;
+                    &lt;storeUsage limit="100 gb"/&gt;
                 &lt;/storeUsage&gt;
                 &lt;tempUsage&gt;
-                    &lt;tempUsage limit=&quot;50 gb&quot;/&gt;
+                    &lt;tempUsage limit="50 gb"/&gt;
                 &lt;/tempUsage&gt;
             &lt;/systemUsage&gt;
         &lt;/systemUsage&gt;
@@ -81,15 +80,15 @@
         --&gt;
         &lt;transportConnectors&gt;
             &lt;!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB --&gt;
-            &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;amqp&quot; uri=&quot;amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;stomp&quot; uri=&quot;stomp://0.0.0.0:61613?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;mqtt&quot; uri=&quot;mqtt://0.0.0.0:1883?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
-            &lt;transportConnector name=&quot;ws&quot; uri=&quot;ws://0.0.0.0:61614?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600&quot;/&gt;
+            &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="stomp" uri="stomp://0.0.0.0:61613?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="mqtt" uri="mqtt://0.0.0.0:1883?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="ws" uri="ws://0.0.0.0:61614?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
         &lt;/transportConnectors&gt;
         &lt;!-- destroy the spring context on shutdown to stop jetty --&gt;
         &lt;shutdownHooks&gt;
-            &lt;bean xmlns=&quot;http://www.springframework.org/schema/beans&quot; class=&quot;org.apache.activemq.hooks.SpringContextHook&quot; /&gt;
+            &lt;bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" /&gt;
         &lt;/shutdownHooks&gt;
     &lt;/broker&gt;
     &lt;!--
@@ -97,9 +96,8 @@
         The web consoles requires by default login, you can disable this in the jetty.xml file
         Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
     --&gt;
-    &lt;import resource=&quot;jetty.xml&quot;/&gt;
+    &lt;import resource="jetty.xml"/&gt;
 &lt;/beans&gt;
 
-]]></script>
-</div></div><p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p></div>
+</plain-text-body></structured-macro><p>From the binary distributionthere is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/configuring-activemq-cpp.xml b/configuring-activemq-cpp.xml
index 5c4127b..8d4cf8b 100644
--- a/configuring-activemq-cpp.xml
+++ b/configuring-activemq-cpp.xml
@@ -1,49 +1,46 @@
 <div class="wiki-content maincontent"><p>The configuration of ActiveMQ is so slick, we decided to take a similar approach with ActiveMQ-CPP.  All configuration is achieved via URI-encoded parameters, either on the connection or destinations.  Through the URIs, you can configure virtually every facet of your ActiveMQ-CPP client.  The tables below show the comprehensive set of parameters.</p>
 
 
-<h2 id="ConfiguringActiveMQCPP-ConnectionURIParameters"><strong>Connection URI Parameters</strong></h2>
+<h2><strong>Connection URI Parameters</strong></h2>
 
-<h4 id="ConfiguringActiveMQCPP-ExampleConfiguration">Example Configuration</h4>
+<h4>Example Configuration</h4>
 
-<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="f8ac92f6-d75e-4a5f-8c13-6ae42fd8a7c3" ac:name="code" ac:schema-version="1"><plain-text-body>
 cf = new ActiveMQConnectionFactory(
-    &quot;tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true&quot;);
-]]></script>
-</div></div>
+    "tcp://localhost:61616?wireFormat=openwire&amp;wireFormat.tightEncodingEnabled=true");
+</plain-text-body></structured-macro>
 
 
-<h3 id="ConfiguringActiveMQCPP-SocketOptions"><strong>Socket Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>inputBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of bytes in the buffered input stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>outputBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>10000</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The number of bytes in the buffered output stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soLinger</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="conf
 luenceTd"><p>Socket SOLinger value</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soKeepAlive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket SOKeepAlive value</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soReceiveBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket receive buffer. If -1, use OS default.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>soSendBufferSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Socket send buffer. If -1, use OS default.</p></td></tr></tbody></table></div>
+<h3><strong>Socket Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>inputBufferSize</p></td><td colspan="1" rowspan="1"><p>10000</p></td><td colspan="1" rowspan="1"><p>The number of bytes in the buffered input stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1"><p>outputBufferSize</p></td><td colspan="1" rowspan="1"><p>10000</p></td><td colspan="1" rowspan="1"><p>The number of bytes in the buffered output stream's buffer</p></td></tr><tr><td colspan="1" rowspan="1"><p>soLinger</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>Socket SOLinger value</p></td></tr><tr><td colspan="1" rowspan="1"><p>soKeepAlive</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Socket SOKeepAlive value</p></td></tr><tr><td colspan="1" rowspan="1"><p>soReceiveBufferSize</p></td><td colspan="1" rows
 pan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Socket receive buffer. If -1, use OS default.</p></td></tr><tr><td colspan="1" rowspan="1"><p>soSendBufferSize</p></td><td colspan="1" rowspan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Socket send buffer. If -1, use OS default.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-TransportOptions"><strong>Transport Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>commandTracingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, enables tracing of incoming and outgoing transport commands</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tcpTracingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true, enables tracing of raw network IO (in hex)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useAsyncSend</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rows
 pan="1" class="confluenceTd"><p>If true, enables asynchronous sending of messages.</p></td></tr></tbody></table></div>
+<h3><strong>Transport Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>commandTracingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables tracing of incoming and outgoing transport commands</p></td></tr><tr><td colspan="1" rowspan="1"><p>tcpTracingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables tracing of raw network IO (in hex)</p></td></tr><tr><td colspan="1" rowspan="1"><p>useAsyncSend</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>If true, enables asynchronous sending of messages.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-TransactionOptions"><strong>Transaction Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>transaction.maxRedeliveryCount</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum number of redelivery attempts.</p></td></tr></tbody></table></div>
+<h3><strong>Transaction Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>transaction.maxRedeliveryCount</p></td><td colspan="1" rowspan="1"><p>5</p></td><td colspan="1" rowspan="1"><p>Maximum number of redelivery attempts.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-WireFormatProtocolOptions"><strong>Wire Format Protocol Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>openwire</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Selects the wire format to use.  Out of the box, can be either stomp or openwire.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.stackTraceEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.cacheEnabled</p
 ></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.tcpNoDelayEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>wireFormat.sizePrefixDisabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should serialized messages include a payload length prefix?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluence
 Td"><p>wireFormat.tightEncodingEnabled</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should wire size be optimized over CPU usage? Only used by the openwire protocol.</p></td></tr></tbody></table></div>
+<h3><strong>Wire Format Protocol Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>wireFormat</p></td><td colspan="1" rowspan="1"><p>openwire</p></td><td colspan="1" rowspan="1"><p>Selects the wire format to use.  Out of the box, can be either stomp or openwire.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.stackTraceEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should the stack trace of exception that occur on the broker be sent to the client?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.cacheEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should commonly repeated values be cached so that less marshalling occurs? Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.tcpNoDelay
 Enabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Does not affect the wire format, but provides a hint to the peer that TCP nodelay should be enabled on the communications Socket. Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.sizePrefixDisabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should serialized messages include a payload length prefix?  Only used by openwire protocol.</p></td></tr><tr><td colspan="1" rowspan="1"><p>wireFormat.tightEncodingEnabled</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Should wire size be optimized over CPU usage? Only used by the openwire protocol.</p></td></tr></tbody></table>
 
 
-<h2 id="ConfiguringActiveMQCPP-DestinationURIParameters"><strong>Destination URI Parameters</strong></h2>
+<h2><strong>Destination URI Parameters</strong></h2>
 
-<h4 id="ConfiguringActiveMQCPP-ExampleConfiguration.1">Example Configuration</h4>
+<h4>Example Configuration</h4>
 
-<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[
-d = session-&gt;createTopic(&quot;com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true&quot;);
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="60e75886-3975-4e30-af58-247e9b0a740f" ac:name="code" ac:schema-version="1"><plain-text-body>
+d = session-&gt;createTopic("com.foo?consumer.prefetchSize=2000&amp;consumer.noLocal=true");
+</plain-text-body></structured-macro>
 
-<h3 id="ConfiguringActiveMQCPP-GeneralOptions"><strong>General Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.prefetchSize</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 1000 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The number of message the consumer will <a shape="rect" href="what-is-the-prefetch-limit-for.xml">prefetch</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Use to control if messages are dropped if a <a shape="rect" href="slow-consumer-handling.xml">slow consumer</a> situation exists.</p></td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd"><p>consumer.noLocal </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Same as the noLocal flag on a Topic consumer.  Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.dispatchAsync </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Should the broker <a shape="rect" href="consumer-dispatch-async.xml">dispatch messages asynchronously</a>  to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Is this a <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>con
 sumer.selector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> null </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JMS Selector used with the consumer.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.exclusive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Is this an <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.priority</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 0 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Allows you to configure a <a shape="rect" href="consumer-priority.xml">Consumer Priority</a>.</p></td></tr></tbody></table></div>
+<h3><strong>General Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>consumer.prefetchSize</p></td><td colspan="1" rowspan="1"><p> 1000 </p></td><td colspan="1" rowspan="1"><p> The number of message the consumer will <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>prefetch</link-body></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.maximumPendingMessageLimit</p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Use to control if messages are dropped if a <link><page ri:content-title="Slow Consumer Handling"></page><link-body>slow consumer</link-body></link> situation exists.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.noLocal </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Same as the noLocal flag on a Topic consumer.
   Exposed here so that it can be used with a queue.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.dispatchAsync </p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Should the broker <link><page ri:content-title="Consumer Dispatch Async"></page><link-body>dispatch messages asynchronously</link-body></link>  to the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1"><p> false</p></td><td colspan="1" rowspan="1"><p> Is this a <link><page ri:content-title="Retroactive Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.selector</p></td><td colspan="1" rowspan="1"><p> null </p></td><td colspan="1" rowspan="1"><p> JMS Selector used with the consumer.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.exclusive</p></td><td colspan="1" rowspan="1"><p> false </p></td><td colspan="1" rowspan="1"><p> Is this an <link><page ri:content-title="Exclusiv
 e Consumer"></page></link>.</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.priority</p></td><td colspan="1" rowspan="1"><p> 0 </p></td><td colspan="1" rowspan="1"><p> Allows you to configure a <link><page ri:content-title="Consumer Priority"></page></link>.</p></td></tr></tbody></table>
 
 
-<h3 id="ConfiguringActiveMQCPP-OpenWire-onlyOptions"><strong>OpenWire-only Options</strong></h3>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Option Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.browser</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.networkSubscription</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.optimizedAcknowledge</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Enables an optimised acknowledgement mode where mes
 sages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.noRangeAcks</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd
 "><p>producer.dispatchAsyc</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
+<h3><strong>OpenWire-only Options</strong></h3>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Option Name</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>consumer.browser</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.networkSubscription</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.optimizedAcknowledge</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p> Enables an optimised acknowledgement mode where messages are acknowledged in batches rather than individually. Alternatively, you could use Session.DUPS_OK_ACKNOWLEDGE acknowledgement mode for the consumers which can often be faster. <strong>WARNING</strong> enabling this issue could cause some issues with auto-acknowledgement on reconnection</p></t
 d></tr><tr><td colspan="1" rowspan="1"><p>consumer.noRangeAcks</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>consumer.retroactive</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>Sets whether or not retroactive consumers are enabled. Retroactive consumers allow non-durable topic subscribers to receive old messages that were published before the non-durable subscriber started.</p></td></tr><tr><td colspan="1" rowspan="1"><p>producer.dispatchAsyc</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr></tbody></table>
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/configuring-brokers.xml
----------------------------------------------------------------------
diff --git a/configuring-brokers.xml b/configuring-brokers.xml
index 5744e7e..dc656cd 100644
--- a/configuring-brokers.xml
+++ b/configuring-brokers.xml
@@ -1,42 +1,40 @@
 <div class="wiki-content maincontent">
-<h3 id="ConfiguringBrokers-Overview">Overview</h3>
+<h3>Overview</h3>
 
 <p>In ActiveMQ 4, we are using a new xml format to configure the broker.</p>
 
 
-<h3 id="ConfiguringBrokers-Syntax">Syntax</h3>
+<h3>Syntax</h3>
 
 <p>The following xsd describes the syntax of the broker configuration file.</p>
 
-<p><a shape="rect" href="configuring-brokers.data/activemq-4.0.xsd?version=1&amp;modificationDate=1133701454000&amp;api=v2" data-linked-resource-id="3253" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-4.0.xsd" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="36158" data-linked-resource-container-version="6">activemq-4.0.xsd</a></p>
+<p><link><attachment ri:filename="activemq-4.0.xsd"></attachment></link></p>
 
 <p>And here is the reference documentation for that xsd file.</p>
 
-<p><a shape="rect" href="configuring-brokers.data/activemq-4.0.xsd.html?version=1&amp;modificationDate=1133701442000&amp;api=v2" data-linked-resource-id="3286" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-4.0.xsd.html" data-nice-type="HTML Document" data-linked-resource-content-type="text/html" data-linked-resource-container-id="36158" data-linked-resource-container-version="6">activemq-4.0.xsd.html</a></p>
+<p><link><attachment ri:filename="activemq-4.0.xsd.html"></attachment></link></p>
 
-<h3 id="ConfiguringBrokers-Example">Example</h3>
+<h3>Example</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[
-&lt;beans xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
+<structured-macro ac:macro-id="678b9187-119f-47cf-ada5-eb85cee61646" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
 
-  &lt;broker useJmx=&quot;true&quot;&gt;
+  &lt;broker useJmx="true"&gt;
   
     &lt;persistenceAdapter&gt;
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;../data&quot;/&gt;
+      &lt;journaledJDBC journalLogFiles="5" dataDirectory="../data"/&gt;
     &lt;/persistenceAdapter&gt;
   
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;discovery:tcp://localhost:61616&quot;/&gt;
+      &lt;transportConnector uri="discovery:tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
     
     &lt;networkConnectors&gt;
-      &lt;networkConnector uri=&quot;multicast&quot;/&gt;
+      &lt;networkConnector uri="multicast"/&gt;
     &lt;/networkConnectors&gt;
     
   &lt;/broker&gt;
   
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

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


[05/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jboss-integration.xml
----------------------------------------------------------------------
diff --git a/jboss-integration.xml b/jboss-integration.xml
index afc19be..16c619e 100644
--- a/jboss-integration.xml
+++ b/jboss-integration.xml
@@ -1,811 +1,2 @@
-<div class="wiki-content maincontent"><h1 id="JBossIntegration-IntegratingApacheActiveMQwithJBoss">Integrating Apache ActiveMQ with JBoss</h1>
-
-<p>Integration with application servers is a common scenario in the enterprise Java world, especially when it comes to messaging. <a shape="rect" class="external-link" href="http://activemq.org/" rel="nofollow">ActiveMQ</a> is a JMS 1.1 compliant, open source, Apache Licensed, message oriented middleware (MOM) with <a shape="rect" class="external-link" href="http://activemq.org/site/changes-in-40.html" rel="nofollow">many</a>, <a shape="rect" class="external-link" href="http://activemq.org/site/new-features-in-41.html" rel="nofollow">many</a> features far beyond the JMS specification. ActiveMQ offers many different <a shape="rect" class="external-link" href="http://activemq.org/site/connectivity.html" rel="nofollow">points of connectivity</a>, many <a shape="rect" class="external-link" href="http://activemq.org/site/cross-language-clients.html" rel="nofollow">cross language clients</a> and many <a shape="rect" class="external-link" href="http://activemq.org/site/protocols.html" rel=
 "nofollow">pluggable transport protocols</a> including integration with any J2EE 1.4 application server.</p>
-
-<p>One of the application servers in the open source world is JBoss. A very common requirement is to configure ActiveMQ as the messaging infrastructure within JBoss. Although there is <a shape="rect" class="external-link" href="http://www.activemq.org/site/jboss-integration.html" rel="nofollow">a bit of documentation</a> on this integration, this article seeks to provide much more detail and explanation. So if you have a need to integrate ActiveMQ with JBoss, this article is for you.</p>
-
-<p>This article explains how to configure JBoss to start up ActiveMQ as part of its lifecycle and how to configure the ActiveMQ resource adapter to handle the messaging and transactionality between ActiveMQ and JBoss.</p>
-
-<h2 id="JBossIntegration-Requirements">Requirements</h2>
-
-<p>Below are the software requirements for this article with links to download each:</p>
-<ul><li><a shape="rect" class="external-link" href="http://activemq.org/site/download.html" rel="nofollow">Apache ActiveMQ 4.0.1+</a></li><li><a shape="rect" class="external-link" href="http://sourceforge.net/project/showfiles.php?group_id=22866&amp;package_id=16942&amp;release_id=416591" rel="nofollow">JBoss 4.0.4+</a></li><li><a shape="rect" class="external-link" href="http://www.java.com/en/download/index.jsp" rel="nofollow">Sun Java 1.5+</a></li><li><a shape="rect" class="external-link" href="http://ant.apache.org/bindownload.cgi">Apache Ant 1.6+</a></li></ul>
-
-
-<p>Though this article is using Unix, the installation and integration will work on any platform running Sun Java. It is recommended that each piece of software be downloaded before working through the steps is this article. Once each piece of software has been downloaded, proceed to the first step.</p>
-
-<h2 id="JBossIntegration-InstalltheJ2SE1.5">Install the J2SE 1.5</h2>
-
-<p>The first step in this process is to install Java 1.5 and verify that it runs correctly. Using the link above, find, download and install the correct version of Java for your platform. Once Java is installed and in the PATH, test it to see that it runs correctly using the following command:</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 -version
-java version &quot;1.5.0_06&quot;
-Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_06-112)
-Java HotSpot(TM) Client VM (build 1.5.0_06-64, mixed mode, sharing)
-]]></script>
-</div></div>
-<p>Depending upon your platform and the exact build number of Java 1.5, your output may vary slightly. As long as it's Java 1.5 and the version information is output, you should be ready to proceed to the next step.</p>
-
-<h2 id="JBossIntegration-InstallApacheAnt">Install Apache Ant</h2>
-
-<p>The second step is to install Apache Ant. Simply download it using the link above, expand somewhere on your hard drive and place the <code>bin</code> directory in the PATH. This will allow you to test it quickly using the commands below:</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[
-$ ant -version
-Apache Ant version 1.6.2 compiled on July 16 2004
-]]></script>
-</div></div>
-<p>As long as you see the version output above, Ant should be usable. If you did not see the version output or received an error, consult the Ant documentation or mailing list archives to work out the issue. Please note that Ant is not used until the end of this whole exercise to test the integration.</p>
-
-<h2 id="JBossIntegration-InstalltheJBossApplicationServer">Install the JBoss Application Server</h2>
-
-<p>The third step in this process is to install JBoss and make sure it runs correctly before installing and configuring ActiveMQ. Upon downloading JBoss-4.0.4, expand it in a place where it can create a directory. Next, run the server using the following commands:</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[
-$ cd jboss-4.0.4.GA
-$ ./bin/run.sh -c default
-=========================================================================
-
-  JBoss Bootstrap Environment
-
-  JBOSS_HOME: /opt/jboss-4.0.4.GA
-
-  JAVA: java
-
-  JAVA_OPTS: -server -Xms128m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 
--Dsun.rmi.dgc.server.gcInterval=3600000 -Dprogram.name=run.sh
-
-  CLASSPATH: /opt/jboss-4.0.4.GA/bin/run.jar:/lib/tools.jar
-
-=========================================================================
-
-15:34:47,999 INFO  [Server] Starting JBoss (MX MicroKernel)...
-15:34:48,001 INFO  [Server] Release ID: JBoss [Zion] 4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)
-15:34:48,004 INFO  [Server] Home Dir: /opt/jboss-4.0.4.GA
-15:34:48,005 INFO  [Server] Home URL: file:/opt/jboss-4.0.4.GA/
-15:34:48,007 INFO  [Server] Patch URL: null
-15:34:48,007 INFO  [Server] Server Name: default
-15:34:48,007 INFO  [Server] Server Home Dir: /opt/jboss-4.0.4.GA/server/default
-15:34:48,011 INFO  [Server] Server Home URL: file:/opt/jboss-4.0.4.GA/server/default/
-15:34:48,012 INFO  [Server] Server Log Dir: /opt/jboss-4.0.4.GA/server/default/log
-15:34:48,017 INFO  [Server] Server Temp Dir: /opt/jboss-4.0.4.GA/server/default/tmp
-15:34:48,022 INFO  [Server] Root Deployment Filename: jboss-service.xml
-...
-15:35:17,360 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
-Started in 22s:238ms
-]]></script>
-</div></div>
-<p>The first few lines of output from the JBoss startup indicates the configuration being used but the last line is the most important one. It tells you that JBoss has been started successfully on your system. For an extra measure of assurance, visit <a shape="rect" class="external-link" href="http://localhost:8080/web-console/" rel="nofollow">http://localhost:8080/web-console/</a> in a web browser to make sure you are able to see the JBoss web console. If you can see this console, everything should be ready to go.</p>
-
-<p>As a side note, the left-hand side of the web-console requires that the <a shape="rect" class="external-link" href="http://java.sun.com/products/plugin/" rel="nofollow">Java plugin</a> be properly installed. This is supposed to take place when installing the J2SE, so if it did not work correctly for you, I suggest that you consult some documentation about any errors you may be seeing. The Java plugin is not required for JBoss or ActiveMQ to function properly, it is simply for the JBoss web-console.</p>
-
-<p>Once JBoss is installed properly, shut it down using either the shutdown script or by simply typing ctrl-c to activate the shutdown hook. Once it is shut down, proceed to the next step.</p>
-
-<h2 id="JBossIntegration-PrepareforIntegratingApacheActiveMQwiththeJBossApplicationServer">Prepare for Integrating Apache ActiveMQ with the JBoss Application Server</h2>
-
-<p>The fourth step is to prepare your environment for integrating ActiveMQ with JBoss. If you haven't done so already, download Apache ActiveMQ using the link above. As of the writing of this article, the latest released version is 4.0.2-RC4. Upon downloading this archive, expand it in a place where it can create a directory, preferably in the same location where JBoss was expanded. Verify that the ActiveMQ RAR file is included using the following commands:</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[
-$ cd ./incubator-activemq-4.0.2.tar.gz
-$ jar tvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
-     0 Mon Sep 25 19:00:50 MDT 2006 META-INF/
-   399 Mon Sep 25 19:00:48 MDT 2006 META-INF/MANIFEST.MF
-   523 Mon Sep 25 13:07:40 MDT 2006 META-INF/DISCLAIMER.txt
- 11359 Mon Sep 25 13:07:40 MDT 2006 META-INF/LICENSE.txt
- 20305 Mon Sep 25 13:07:40 MDT 2006 META-INF/ra.xml
-  2334 Mon Sep 25 13:07:40 MDT 2006 broker-config.xml
- 70023 Mon Sep 25 19:00:48 MDT 2006 activemq-ra-4.0.2.jar
-1351744 Mon Sep 25 19:00:14 MDT 2006 activemq-core-4.0.2.jar
-232107 Mon Sep 25 18:22:48 MDT 2006 activeio-core-3.0-beta4.jar
-2143211 Tue Aug 01 11:44:50 MDT 2006 derby-10.1.1.0.jar
-1901653 Tue Aug 01 11:47:08 MDT 2006 spring-1.2.6.jar
- 94713 Tue Aug 01 11:47:22 MDT 2006 xbean-spring-2.2.jar
- 52915 Tue Aug 01 12:22:16 MDT 2006 commons-logging-1.1.jar
- 16030 Tue Aug 01 12:22:32 MDT 2006 geronimo-j2ee-management_1.0_spec-1.0.jar
-329586 Tue Aug 01 12:22:54 MDT 2006 backport-util-concurrent-2.1.jar
-358085 Tue Aug 01 12:23:26 MDT 2006 log4j-1.2.12.jar
-   523 Mon Sep 25 19:00:50 MDT 2006 META-INF/DISCLAIMER.txt
- 11359 Mon Sep 25 19:00:50 MDT 2006 META-INF/LICENSE.txt
-]]></script>
-</div></div>
-<p>This is simply a table of contents of the RAR file. There should only be one reason that this will fail - an incomplete download of the ActiveMQ tarball or zip file. Beyond that, depending on the version you download, some of the library versions may be slightly different.</p>
-
-<p>Now go back to the JBoss installation and create a directory for ActiveMQ in the JBoss deploy directory for the default JBoss context. Below are the commands to achieve this task:</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[
-$ mkdir /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-$ cd /opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-$ pwd
-/opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-]]></script>
-</div></div>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> The creation of a directory is not required but is the easiest way to set up the ActiveMQ RAR when you're just getting started. This is due to the flexibility it affords during the development phase for the configuration to be changed very easily. The alternative is to JAR up the directory as a RAR file once the configuration is solid enough that it no longer needs to be changed. But leaving everything in a directory during development is the easiest path.</p>
-</div></div>
-<p>Now expand the activemq-ra-4.0.2.rar into the current working 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[
-jar xvf /opt/incubator-activemq-4.0.2/lib/optional/activemq-ra-4.0.2.rar
-  created: META-INF/
- inflated: META-INF/MANIFEST.MF
- inflated: META-INF/DISCLAIMER.txt
- inflated: META-INF/LICENSE.txt
- inflated: META-INF/ra.xml
- inflated: broker-config.xml
- inflated: activemq-ra-4.0.2.jar
- inflated: activemq-core-4.0.2.jar
- inflated: activeio-core-3.0-beta4.jar
- inflated: derby-10.1.1.0.jar
- inflated: spring-1.2.6.jar
- inflated: xbean-spring-2.2.jar
- inflated: commons-logging-1.1.jar
- inflated: geronimo-j2ee-management_1.0_spec-1.0.jar
- inflated: backport-util-concurrent-2.1.jar
- inflated: log4j-1.2.12.jar
- inflated: META-INF/DISCLAIMER.txt
- inflated: META-INF/LICENSE.txt
-]]></script>
-</div></div>
-<p>Below is a quick listing of the contents of that 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[
-$ ls -l
-total 12848
-drwxr-xr-x   6 bsnyder  bsnyder      204 Oct 16 16:27 META-INF
--rw-r--r--   1 bsnyder  bsnyder   232107 Oct 16 16:27 activeio-core-3.0-beta4.jar
--rw-r--r--   1 bsnyder  bsnyder  1351744 Oct 16 16:27 activemq-core-4.0.2.jar
--rw-r--r--   1 bsnyder  bsnyder    70023 Oct 16 16:27 activemq-ra-4.0.2.jar
--rw-r--r--   1 bsnyder  bsnyder   329586 Oct 16 16:27 backport-util-concurrent-2.1.jar
--rw-r--r--   1 bsnyder  bsnyder     2334 Oct 16 16:27 broker-config.xml
--rw-r--r--   1 bsnyder  bsnyder    52915 Oct 16 16:27 commons-logging-1.1.jar
--rw-r--r--   1 bsnyder  bsnyder  2143211 Oct 16 16:27 derby-10.1.1.0.jar
--rw-r--r--   1 bsnyder  bsnyder    16030 Oct 16 16:27 geronimo-j2ee-management_1.0_spec-1.0.jar
--rw-r--r--   1 bsnyder  bsnyder   358085 Oct 16 16:27 log4j-1.2.12.jar
--rw-r--r--   1 bsnyder  bsnyder  1901653 Oct 16 16:27 spring-1.2.6.jar
--rw-r--r--   1 bsnyder  bsnyder    94713 Oct 16 16:27 xbean-spring-2.2.jar
-]]></script>
-</div></div>
-<p>Now it's time to configure ActiveMQ.</p>
-
-<h2 id="JBossIntegration-ConfiguringApacheActiveMQ">Configuring Apache ActiveMQ</h2>
-
-<p>The fifth step is to actually configure ActiveMQ for integration with JBoss. Remember that you should be sitting in the following 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[
-/opt/jboss-4.0.4.GA/server/default/deploy/activemq-ra.rar
-]]></script>
-</div></div>
-<p>You may or may not have installed JBoss in <code>/opt</code>, that doesn't particularly matter. What does matter is that you're sitting in the directory that was created above to hold the contents of the expanded ActiveMQ RAR file.</p>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> A RAR file is a Resource adapter ARchive (RAR). Resource adapters are a concept from the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">J2EE Connector Architecture (JCA)</a> and are used to interface with Enterprise Information Systems (EIS), i.e., systems external to the application server (e.g., relational databases, mainframes, MOMs, accounting systems, etc.). Resource adapters are often referred to as J2EE connectors and are very similar to the concept of a device driver for, say, a printer in that they contain information specific to connecting to a particular system. The difference with JCA is that that connection has been formalized in specification for Java. So the overall concepts of JCA is for connection to any EIS, but what does that mean? JCA 1.5 provides connectivity and more via the following contracts:</p>
-
-<p>Version 1.0 Contracts</p>
-
-<p>In version 1.0 of the Connector Architecture, three contracts are defined to address the functions mentioned above:</p>
-<ul><li>Connection Management Contract: Lets applications connect to an EIS through the resource adapter. It also allows the application server to pool connection requests to the EIS.</li><li>Transaction Management Contract: Allows an application to manage and perform transactional access across one-to-many EIS resource managers.</li><li>Security Contract: Provides support for secure access to the EIS.</li></ul>
-
-
-<p>New Contracts in Version 1.5</p>
-
-<p>In version 1.5 of the J2EE Connector Architecture, there are more contracts that a resource adapter must support, as new functionality and features made their way into the specification. A resource adapter can support these four new contracts by implementing the required interfaces defined in the specification for each contract.</p>
-<ul><li>Lifecycle Management Contract: Lets the application server manage the lifecycle &#8211; that is, the startup and shutdown functionality &#8211; of the resource adapter.</li><li>Work Management Contract: Allows the resource adapter to do work by submitting it to an application server for execution. Since the application server does the work for the resource adapter, the resource adapter needn't worry about thread management. Instead, the application server manages this aspect efficiently and can use thread pooling if necessary. Although the work management contract is not required (the resource adapter can choose to manage its own thread for work), it is definitely recommended.</li><li>Transaction Inflow Contract: Allows a resource adapter to propagate an imported transaction to an application server, as well as flow-in transaction completion and crash recovery initiated by an EIS.</li><li>Message Inflow Contract: Allows the resource adapter to synchronously or asynchronously
  deliver messages to endpoints in the application server, irrespective of message style, semantics, and infrastructure.</li></ul>
-
-
-<p><sub>Quoted from</sub> <sub><a shape="rect" class="external-link" href="http://java.sun.com/developer/technicalArticles/J2EE/connectorarch1_5/" rel="nofollow"><sub>What's New in the J2EE Connector Architecture 1.5</sub></a></sub></p>
-
-<p>For more information about JCA, please consult the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/index.jsp" rel="nofollow">J2EE Connector Architecture documentation</a>.</p>
-</div></div>
-<p>Open the <code>META-INF/ra.xml</code> file and look for the following section:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;config-property&gt;
-    &lt;description&gt;
-      The URL to the ActiveMQ server that you want this connection to connect to.  If using
-      an embedded broker, this value should be &#39;vm://localhost&#39;.
-    &lt;/description&gt;
-    &lt;config-property-name&gt;ServerUrl&lt;/config-property-name&gt;
-    &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
-    &lt;config-property-value&gt;tcp://localhost:61616&lt;/config-property-value&gt;
-&lt;!-- &lt;config-property-value&gt;vm://localhost&lt;/config-property-value&gt; --&gt;
-  &lt;/config-property&gt;
-]]></script>
-</div></div>
-<p>The section above is used to tell the ActiveMQ RAR where ActiveMQ is located. By default, the in-VM protocol is commented out in favor of the tcp protocol. This will find ActiveMQ running on any interface on the localhost on port 61616. It's ok to just leave this alone if you don't mind the inefficiency of communicating within the JVM via TCP. However, it is recommended that <code>vm://</code> transport be used for an embedded broker, so comment out the <code>tcp://</code> transport and uncomment the <code>vm://</code> transport. Below is an example of this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;config-property&gt;
-    &lt;description&gt;
-      The URL to the ActiveMQ server that you want this connection to connect to.  If using
-      an embedded broker, this value should be &#39;vm://localhost&#39;.
-    &lt;/description&gt;
-    &lt;config-property-name&gt;ServerUrl&lt;/config-property-name&gt;
-    &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
-    &lt;!-- &lt;config-property-value&gt;tcp://localhost:61616&lt;/config-property-value&gt; --&gt;
-    &lt;config-property-value&gt;vm://localhost&lt;/config-property-value&gt;
-  &lt;/config-property&gt;
-]]></script>
-</div></div>
-<p>Because we're embedding ActiveMQ inside of JBoss, it is more efficient to use the <code>vm://</code> transport, rather than to perform messaging over the <code>tcp://</code> transport.</p>
-
-<p>Now look further down the <code>META-INF/ra.xml</code> file and locate the following section:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;config-property&gt;
-    &lt;description&gt;
-      Sets the XML configuration file used to configure the embedded ActiveMQ broker via
-      Spring if using embedded mode.
-
-      BrokerXmlConfig is the filename which is assumed to be on the classpath unless
-      a URL is specified. So a value of foo/bar.xml would be assumed to be on the
-      classpath whereas file:dir/file.xml would use the file system.
-      Any valid URL string is supported.
-    &lt;/description&gt;
-    &lt;config-property-name&gt;BrokerXmlConfig&lt;/config-property-name&gt;
-    &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
-    &lt;config-property-value&gt;&lt;/config-property-value&gt;
-    &lt;!--
-    &lt;config-property-value&gt;xbean:broker-config.xml&lt;/config-property-value&gt;
-    --&gt;
-  &lt;/config-property&gt;
-]]></script>
-</div></div>
-<p>The section above needs to be changed to uncomment the second to last line and remove/replace the empty element that is above it. Below is an example of how this should be changed:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>META-INF/ra.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;config-property&gt;
-    &lt;description&gt;
-      Sets the XML configuration file used to configure the embedded ActiveMQ broker via
-      Spring if using embedded mode.
-
-      BrokerXmlConfig is the filename which is assumed to be on the classpath unless
-      a URL is specified. So a value of foo/bar.xml would be assumed to be on the
-      classpath whereas file:dir/file.xml would use the file system.
-      Any valid URL string is supported.
-    &lt;/description&gt;
-    &lt;config-property-name&gt;BrokerXmlConfig&lt;/config-property-name&gt;
-    &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
-    &lt;config-property-value&gt;xbean:broker-config.xml&lt;/config-property-value&gt;
-  &lt;/config-property&gt;
-]]></script>
-</div></div>
-<p>This change tells the ActiveMQ RAR to read a configuration file named <code>broker-config.xml</code> (the <code>xbean:</code> that proceeds the filename is simply a hint to class doing the reading of the configuration file) which is located on the CLASSPATH. In this case, the <code>broker-config.xml</code> file is located in the <code>activemq-ra.rar</code> directory. Save the changes to that file and then open the <code>broker-config.xml</code> file.</p>
-
-<p>The <code>broker-config.xml</code> file <em>is</em> the ActiveMQ configuration file. This is the file used to configure ActiveMQ. The default contents of this file are usable, but should be customized to suit your environment. There are several items of note about this configuration. The most prominent sections to note in this file are the <code>&lt;persistenceAdapter&gt;</code> element and the <code>&lt;transportConnectors&gt;</code> and <code>&lt;networkConnectors&gt;</code> elements as seen below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>broker-config.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;beans xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
-
-  &lt;broker useJmx=&quot;true&quot;&gt;
-  ...
-    &lt;persistenceAdapter&gt;
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;activemq-data&quot;/&gt;
-      &lt;!-- To use a different datasource, use th following syntax : --&gt;
-      &lt;!--
-      &lt;journaledJDBC journalLogFiles=&quot;5&quot; dataDirectory=&quot;../data&quot; dataSource=&quot;#postgres-ds&quot;/&gt;
-       --&gt;
-    &lt;/persistenceAdapter&gt;
-
-    &lt;transportConnectors&gt;
-      &lt;!-- prefixing a connector with discovery: causes the connector to be advertiesed over rendezvous --&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
-    &lt;/transportConnectors&gt;
-
-    &lt;networkConnectors&gt;
-      &lt;!-- by default just auto discover the other brokers --&gt;
-      &lt;networkConnector uri=&quot;multicast://default&quot;/&gt;
-      &lt;!--
-      &lt;networkConnector uri=&quot;static://(tcp://host1:61616,tcp://host2:61616)&quot;/&gt;
-      --&gt;
-    &lt;/networkConnectors&gt;
-
-  &lt;/broker&gt;
-
-&lt;/beans&gt;
-]]></script>
-</div></div>
-<p>The first change to this file is to add the brokerName attribute to the broker element and provide a name:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;broker useJmx=&quot;true&quot; brokerName=&quot;bruce.broker1&quot;&gt;
-]]></script>
-</div></div>
-<p>In addition, this same name is used further down the configuration to provide a name for the <code>&lt;transportConnector&gt;</code> element:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;transportConnector name=&quot;bruce.broker1&quot; uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
-]]></script>
-</div></div>
-<p>Now we'll tell ActiveMQ not to initialize JMX because we'll use the existing one that JBoss has:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;!-- put the following as the first child of the broker tag --&gt;
-&lt;managementContext&gt;&lt;!-- we&#39;ll use an existing one (JBoss) instead of creating one --&gt;
-  &lt;managementContext createConnector=&quot;false&quot;/&gt;
-&lt;/managementContext&gt;
-]]></script>
-</div></div>
-<p>The <code>&lt;persistenceAdapter&gt;</code> element should be reconfigured to store its data in an appropriate place.  On JBoss, that's most likely within the "data" directory of the server configuration you're using.  We're going to set this dynamically using an XBean and Spring feature that allows us to inject system properties values into the configuration. First this needs to be enabled:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;!-- put the following as the first child of the beans element --&gt;
-&lt;bean xmlns=&quot;&quot; class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;/&gt;
-]]></script>
-</div></div>
-<p>Now, modify the <code>dataDirectory</code> attribute of the <code>journaledJDBC</code> element to be the following: <code>${jboss.server.data.dir}/activemq</code>.</p>
-
-<p>The <code>&lt;transportConnectors&gt;</code> element is used to advertise the ActiveMQ broker for client-to-broker communications and the <code>&lt;networkConnectors&gt;</code> element advertises the ActiveMQ broker for broker-to-broker communications. The default configuration is to use the ActiveMQ <a shape="rect" class="external-link" href="http://www.activemq.org/site/multicast-transport-reference.html" rel="nofollow">multicast transport</a> for both. This is simply an easy configuration under which to get ActiveMQ up and running, so we'll just leave it at that for the time being.</p>
-<div class="panel" style="background-color: #ccccff;border-width: 1px;"><div class="panelContent" style="background-color: #ccccff;">
-<p><strong><em>NOTE:</em></strong> There are far more configuration options available for ActiveMQ than are noted here. The configuration above is only enough to just get ActiveMQ up and running, nothing more. For more information on the ActiveMQ configuration, see the <a shape="rect" class="external-link" href="http://www.activemq.org/site/xbean-xml-reference-41.html" rel="nofollow">ActiveMQ 4.1 XML Reference</a>.</p>
-</div></div>
-<p>Now we just need to start up JBoss to assure that it comes up correctly without error using the same commands we used previously to start JBoss:</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[
-$ cd jboss-4.0.4.GA
-$ ./bin/run.sh -c default
-=========================================================================
-
-  JBoss Bootstrap Environment
-
-  JBOSS_HOME: /opt/jboss-4.0.4.GA
-
-  JAVA: java
-
-  JAVA_OPTS: -server -Xms128m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 
--Dsun.rmi.dgc.server.gcInterval=3600000 -Dprogram.name=run.sh
-
-  CLASSPATH: /opt/jboss-4.0.4.GA/bin/run.jar:/lib/tools.jar
-
-=========================================================================
-
-15:34:47,999 INFO  [Server] Starting JBoss (MX MicroKernel)...
-15:34:48,001 INFO  [Server] Release ID: JBoss [Zion] 4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)
-15:34:48,004 INFO  [Server] Home Dir: /opt/jboss-4.0.4.GA
-15:34:48,005 INFO  [Server] Home URL: file:/opt/jboss-4.0.4.GA/
-15:34:48,007 INFO  [Server] Patch URL: null
-15:34:48,007 INFO  [Server] Server Name: default
-15:34:48,007 INFO  [Server] Server Home Dir: /opt/jboss-4.0.4.GA/server/default
-15:34:48,011 INFO  [Server] Server Home URL: file:/opt/jboss-4.0.4.GA/server/default/
-15:34:48,012 INFO  [Server] Server Log Dir: /opt/jboss-4.0.4.GA/server/default/log
-15:34:48,017 INFO  [Server] Server Temp Dir: /opt/jboss-4.0.4.GA/server/default/tmp
-15:34:48,022 INFO  [Server] Root Deployment Filename: jboss-service.xml
-...
-15:35:17,360 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
-Started in 28s:576ms
-]]></script>
-</div></div>
-<p>As long as JBoss comes up without error, you're ready to move on to the next step.</p>
-
-<h2 id="JBossIntegration-ConfiguringJBoss">Configuring JBoss</h2>
-
-<p>The sixth step is to configure JBoss to initialize and start ActiveMQ whenever JBoss starts up. This is accomplished using an XML file that abides by the <a shape="rect" class="external-link" href="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd" rel="nofollow">JBoss JCA DTD</a> for data sources. Like most other Java application servers on the market, the JBoss architecture uses the J2EE Connector Architecture to manage connections of any kind including JDBC, JMS, etc. and the JBoss JCA DTD denotes the allowed contents for creating an XML data source instance to configure JBoss JCA. Below is an example XML data source instance for use with JBoss:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq-jms-ds.xml</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-
-&lt;!DOCTYPE connection-factories
-    PUBLIC &quot;-//JBoss//DTD JBOSS JCA Config 1.5//EN&quot;
-    &quot;http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd&quot;&gt;
-
-&lt;connection-factories&gt;
-
-   &lt;tx-connection-factory&gt;
-      &lt;jndi-name&gt;activemq/QueueConnectionFactory&lt;/jndi-name&gt;
-      &lt;xa-transaction/&gt;
-      &lt;track-connection-by-tx/&gt;
-      &lt;rar-name&gt;activemq-ra.rar&lt;/rar-name&gt;
-      &lt;connection-definition&gt;javax.jms.QueueConnectionFactory&lt;/connection-definition&gt;
-      &lt;ServerUrl&gt;vm://localhost&lt;/ServerUrl&gt;
-      &lt;!--
-      &lt;UserName&gt;sa&lt;/UserName&gt;
-      &lt;Password&gt;&lt;/Password&gt;
-      --&gt;
-      &lt;min-pool-size&gt;1&lt;/min-pool-size&gt;
-      &lt;max-pool-size&gt;200&lt;/max-pool-size&gt;
-      &lt;blocking-timeout-millis&gt;30000&lt;/blocking-timeout-millis&gt;
-      &lt;idle-timeout-minutes&gt;3&lt;/idle-timeout-minutes&gt;
-   &lt;/tx-connection-factory&gt;
-
-   &lt;tx-connection-factory&gt;
-      &lt;jndi-name&gt;activemq/TopicConnectionFactory&lt;/jndi-name&gt;
-      &lt;xa-transaction/&gt;
-      &lt;track-connection-by-tx/&gt;
-      &lt;rar-name&gt;activemq-ra.rar&lt;/rar-name&gt;
-      &lt;connection-definition&gt;javax.jms.TopicConnectionFactory&lt;/connection-definition&gt;
-      &lt;ServerUrl&gt;vm://localhost&lt;/ServerUrl&gt;
-      &lt;!--
-      &lt;UserName&gt;sa&lt;/UserName&gt;
-      &lt;Password&gt;&lt;/Password&gt;
-      --&gt;
-      &lt;min-pool-size&gt;1&lt;/min-pool-size&gt;
-      &lt;max-pool-size&gt;200&lt;/max-pool-size&gt;
-      &lt;blocking-timeout-millis&gt;30000&lt;/blocking-timeout-millis&gt;
-      &lt;idle-timeout-minutes&gt;3&lt;/idle-timeout-minutes&gt;
-   &lt;/tx-connection-factory&gt;
-
-   &lt;mbean code=&quot;org.jboss.resource.deployment.AdminObject&quot; name=&quot;activemq.queue:name=outboundQueue&quot;&gt;
-      &lt;attribute name=&quot;JNDIName&quot;&gt;activemq/queue/outbound&lt;/attribute&gt;
-      &lt;depends optional-attribute-name=&quot;RARName&quot;&gt;jboss.jca:service=RARDeployment,name=&#39;activemq-ra.rar&#39;&lt;/depends&gt;
-      &lt;attribute name=&quot;Type&quot;&gt;javax.jms.Queue&lt;/attribute&gt;
-      &lt;attribute name=&quot;Properties&quot;&gt;PhysicalName=queue.outbound&lt;/attribute&gt;
-   &lt;/mbean&gt;
-
-   &lt;mbean code=&quot;org.jboss.resource.deployment.AdminObject&quot; name=&quot;activemq.topic:name=inboundTopic&quot;&gt;
-      &lt;attribute name=&quot;JNDIName&quot;&gt;activemq/topic/inbound&lt;/attribute&gt;
-      &lt;depends optional-attribute-name=&quot;RARName&quot;&gt;jboss.jca:service=RARDeployment,name=&#39;activemq-ra.rar&#39;&lt;/depends&gt;
-      &lt;attribute name=&quot;Type&quot;&gt;javax.jms.Topic&lt;/attribute&gt;
-      &lt;attribute name=&quot;Properties&quot;&gt;PhysicalName=topic.inbound&lt;/attribute&gt;
-   &lt;/mbean&gt;
-
-&lt;/connection-factories&gt;
-]]></script>
-</div></div>
-<p>This XML instance configures a JMS <code>QueueConnectionFactory</code> and a JMS <code>TopicConnectionFactory</code> and makes them available via JNDI. Also defined in this file are some {{AdminObject}}s which are used to specify a topic and a queue. This file should be dropped into the JBoss deploy directory. Its name (*-ds.xml) will cause it to be picked up by the JBoss deployer upon startup. Speaking of which, once this file is in place, a quick smoke test can be performed by simply starting up the JBoss server. Below is an example of the output that should be seen:</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[
-=========================================================================
-
-  JBoss Bootstrap Environment
-
-  JBOSS_HOME: /opt/jboss
-
-  JAVA: java
-
-  JAVA_OPTS: -server -Xms128m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 
--Dsun.rmi.dgc.server.gcInterval=3600000 -Dprogram.name=run.sh
-
-  CLASSPATH: /opt/jboss/bin/run.jar:/lib/tools.jar
-
-=========================================================================
-
-22:55:48,686 INFO  [Server] Starting JBoss (MX MicroKernel)...
-22:55:48,688 INFO  [Server] Release ID: JBoss [Zion] 4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)
-22:55:48,690 INFO  [Server] Home Dir: /opt/jboss-4.0.4.GA
-22:55:48,692 INFO  [Server] Home URL: file:/opt/jboss-4.0.4.GA/
-22:55:48,695 INFO  [Server] Patch URL: null
-22:55:48,697 INFO  [Server] Server Name: default
-22:55:48,698 INFO  [Server] Server Home Dir: /opt/jboss-4.0.4.GA/server/default
-22:55:48,701 INFO  [Server] Server Home URL: file:/opt/jboss-4.0.4.GA/server/default/
-22:55:48,702 INFO  [Server] Server Log Dir: /opt/jboss-4.0.4.GA/server/default/log
-22:55:48,704 INFO  [Server] Server Temp Dir: /opt/jboss-4.0.4.GA/server/default/tmp
-22:55:48,706 INFO  [Server] Root Deployment Filename: jboss-service.xml
-22:55:49,092 INFO  [ServerInfo] Java version: 1.5.0_06,Apple Computer, Inc.
-22:55:49,101 INFO  [ServerInfo] Java VM: Java HotSpot(TM) Server VM 1.5.0_06-64,&quot;Apple Computer, Inc.&quot;
-22:55:49,102 INFO  [ServerInfo] OS-System: Mac OS X 10.4.8,i386
-22:55:49,803 INFO  [Server] Core system initialized
-22:55:53,379 INFO  [WebService] Using RMI server codebase: http://rattlesnake:8083/
-22:55:53,400 INFO  [Log4jService$URLWatchTimerTask] Configuring from URL: resource:log4j.xml
-22:55:54,034 INFO  [NamingService] JNDI bootstrap JNP=/0.0.0.0:1099, RMI=/0.0.0.0:1098, backlog=50, 
-no client SocketFactory, Server SocketFactory=class
-org.jboss.net.sockets.DefaultSocketFactory
-22:55:58,475 INFO  [Embedded] Catalina naming disabled
-22:55:58,566 INFO  [ClusterRuleSetFactory] Unable to find a cluster rule set in the classpath. 
-Will load the default rule set.
-22:55:58,569 INFO  [ClusterRuleSetFactory] Unable to find a cluster rule set in the classpath. 
-Will load the default rule set.
-22:55:59,110 INFO  [Http11BaseProtocol] Initializing Coyote HTTP/1.1 on http-0.0.0.0-8080
-22:55:59,114 INFO  [Catalina] Initialization processed in 545 ms
-22:55:59,116 INFO  [StandardService] Starting service jboss.web
-22:55:59,121 INFO  [StandardEngine] Starting Servlet Engine: Apache Tomcat/5.5.17
-22:55:59,179 INFO  [StandardHost] XML validation disabled
-22:55:59,221 INFO  [Catalina] Server startup in 105 ms
-22:55:59,600 INFO  [TomcatDeployer] deploy, ctxPath=/invoker, warUrl=.../deploy/http-invoker.sar/invoker.war/
-22:55:59,874 INFO  [WebappLoader] Dual registration of jndi stream handler: factory already defined
-22:56:00,899 INFO  [TomcatDeployer] deploy, ctxPath=/, warUrl=.../deploy/jbossweb-tomcat55.sar/ROOT.war/
-22:56:01,700 INFO  [TomcatDeployer] deploy, ctxPath=/jbossws, warUrl=.../tmp/deploy/tmp60528jbossws-exp.war/
-22:56:01,891 INFO  [SubscriptionManager] Bound event dispatcher to java:/EventDispatcher
-22:56:02,203 INFO  [TomcatDeployer] deploy, ctxPath=/jbossmq-httpil, 
-warUrl=.../deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/
-22:56:04,546 INFO  [TomcatDeployer] deploy, ctxPath=/web-console, 
-warUrl=.../deploy/management/console-mgr.sar/web-console.war/
-22:56:05,690 INFO  [MailService] Mail Service bound to java:/Mail
-22:56:07,215 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/activemq-ra.rar/
-22:56:07,452 INFO  [XBeanXmlBeanDefinitionReader] Loading XML bean definitions from class 
-path resource [broker-config.xml]
-22:56:07,750 INFO  [ClassPathXmlApplicationContext] Bean factory for application context 
-[org.apache.xbean.spring.context.ClassPathXmlApplicationContext;hashCode=13887543]:
-org.springframework.beans.factory.support.DefaultListableBeanFactory defining
-beans [org.apache.activemq.xbean.XBeanBrokerService]; root of BeanFactory hierarchy
-22:56:07,765 INFO  [ClassPathXmlApplicationContext] 1 beans defined in application context
-[org.apache.xbean.spring.context.ClassPathXmlApplicationContext;hashCode=13887543]
-22:56:07,773 INFO  [CollectionFactory] JDK 1.4+ collections available
-22:56:07,778 INFO  [ClassPathXmlApplicationContext] Unable to locate MessageSource with name 
-&#39;messageSource&#39;: using default
-[org.springframework.context.support.DelegatingMessageSource@5fee96]
-22:56:07,781 INFO  [ClassPathXmlApplicationContext] Unable to locate ApplicationEventMulticaster 
-with name &#39;applicationEventMulticaster&#39;: using default
-[org.springframework.context.event.SimpleApplicationEventMulticaster@78c714]
-22:56:07,783 INFO  [DefaultListableBeanFactory] Pre-instantiating singletons in factory
- [org.springframework.beans.factory.support.DefaultListableBeanFactory
-defining beans [org.apache.activemq.xbean.XBeanBrokerService]; root of BeanFactory hierarchy]
-22:56:08,181 INFO  [BrokerService] ActiveMQ 4.0.2 JMS Message Broker (bruce.broker1) is starting
-22:56:08,181 INFO  [BrokerService] For help or more information please see: 
-http://incubator.apache.org/activemq/
-22:56:09,989 INFO  [JDBCPersistenceAdapter] Database driver recognized: 
-[apache_derby_embedded_jdbc_driver]
-22:56:11,026 INFO  [JournalPersistenceAdapter] Journal Recovery Started from: Active Journal: 
-using 5 x 20.0 Megs at: /opt/jboss-4.0.4.GA/activemq-data/journal
-22:56:11,169 INFO  [JournalPersistenceAdapter] Journal Recovered: 0 message(s) in transactions recovered.
-22:56:11,489 INFO  [TransportServerThreadSupport] Listening for connections at: tcp://rattlesnake:61616
-22:56:11,491 WARN  [MulticastDiscoveryAgent] brokerName not set
-22:56:11,519 INFO  [TransportConnector] Connector bruce.broker1 Started
-22:56:11,522 INFO  [NetworkConnector] Network Connector bridge Started
-22:56:11,522 INFO  [BrokerService] ActiveMQ JMS Message Broker 
-(bruce.broker1, ID:rattlesnake-59052-1161060967859-1:0) started
-22:56:11,556 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/jboss-ha-local-jdbc.rar
-22:56:11,599 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/jboss-ha-xa-jdbc.rar
-22:56:11,623 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/jboss-local-jdbc.rar
-22:56:11,647 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/jboss-xa-jdbc.rar
-22:56:11,737 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/jms/jms-ra.rar
-22:56:11,847 INFO  [RARDeployment] Required license terms exist, view META-INF/ra.xml in 
-.../deploy/mail-ra.rar
-22:56:12,251 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory&#39; to
-JNDI name &#39;java:activemq/QueueConnectionFactory&#39;
-22:56:12,258 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=activemq/TopicConnectionFactory&#39; to
-JNDI name &#39;java:activemq/TopicConnectionFactory&#39;
-22:56:12,265 INFO  [AdminObject] Bound admin object &#39;org.apache.activemq.command.ActiveMQQueue&#39; 
-at &#39;activemq/queue/outbound&#39;
-22:56:12,330 INFO  [AdminObject] Bound admin object &#39;org.apache.activemq.command.ActiveMQTopic&#39; 
-at &#39;activemq/topic/inbound&#39;
-22:56:13,246 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=DataSourceBinding,name=DefaultDS&#39; to JNDI name &#39;java:DefaultDS&#39;
-22:56:13,842 INFO  [A] Bound to JNDI name: queue/A
-22:56:13,845 INFO  [B] Bound to JNDI name: queue/B
-22:56:13,846 INFO  [C] Bound to JNDI name: queue/C
-22:56:13,848 INFO  [D] Bound to JNDI name: queue/D
-22:56:13,850 INFO  [ex] Bound to JNDI name: queue/ex
-22:56:13,876 INFO  [testTopic] Bound to JNDI name: topic/testTopic
-22:56:13,879 INFO  [securedTopic] Bound to JNDI name: topic/securedTopic
-22:56:13,880 INFO  [testDurableTopic] Bound to JNDI name: topic/testDurableTopic
-22:56:13,883 INFO  [testQueue] Bound to JNDI name: queue/testQueue
-22:56:13,994 INFO  [UILServerILService] JBossMQ UIL service available at : /0.0.0.0:8093
-22:56:14,055 INFO  [DLQ] Bound to JNDI name: queue/DLQ
-22:56:14,375 INFO  [ConnectionFactoryBindingService] Bound ConnectionManager 
-&#39;jboss.jca:service=ConnectionFactoryBinding,name=JmsXA&#39; to JNDI name &#39;java:JmsXA&#39;
-22:56:14,525 INFO  [TomcatDeployer] deploy, ctxPath=/jmx-console, warUrl=.../deploy/jmx-console.war/
-22:56:14,991 INFO  [Http11BaseProtocol] Starting Coyote HTTP/1.1 on http-0.0.0.0-8080
-22:56:15,071 INFO  [ChannelSocket] JK: ajp13 listening on /0.0.0.0:8009
-22:56:15,082 INFO  [JkMain] Jk running ID=0 time=0/25  config=null
-22:56:15,108 INFO  [Server] JBoss (MX MicroKernel) [4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)] 
-Started in 26s:398ms
-]]></script>
-</div></div>
-<p>Note the startup messages from both ActiveMQ and from the <code>AdminObject}}s creating an {{ActiveMQQueue</code> and an <code>ActiveMQTopic</code>. These are good indications that the configuration is correct, but needs to be verified a bit further. This is covered in the next section.</p>
-
-<h2 id="JBossIntegration-TestingtheIntegration">Testing the Integration</h2>
-
-<p>The seventh and final step is to perform a slightly more comprehensive smoke test of the integration. This can be accomplished using Apache Ant via the examples that come with the ActiveMQ binary distribution. An Ant build.xml file is included which provides easy access to a simple consumer and a simple producer. The producer will be used to send messages that are received by the consumer. To proceed with this testing, just follow the steps below:</p>
-<ol><li>In the first terminal, start up JBoss. The same startup script can be used here as was used above.</li><li>In the second terminal, use the commands below to run the ActiveMQ consumer:
-<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[
-$ cd /opt/incubator-activemq-4.0.2/examples    #note in activemq v5 the directory is just &quot;example&quot; not &quot;examples&quot;
-$ ant consumer
-Buildfile: build.xml
-
-init:
-    [mkdir] Created dir: /opt/incubator-activemq-4.0.2/example/target/classes
-    [mkdir] Created dir: /opt/incubator-activemq-4.0.2/example/src/ddl
-
-compile:
-    [javac] Compiling 6 source files to /opt/incubator-activemq-4.0.2/example/target/classes
-
-consumer:
-     [echo] Running consumer against server at $url = tcp://localhost:61616 for subject $subject = TEST.FOO
-     [java] Connecting to URL: tcp://localhost:61616
-     [java] Consuming queue: TEST.FOO
-     [java] Using non-durable subscription
-     [java] We are about to wait until we consume: 10 message(s) then we will shutdown
-]]></script>
-</div></div></li><li>In the third terminal, use the commands below to run the ActiveMQ producer:
-<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[
-$ cd /opt/incubator-activemq-4.0.2/examples
-$ ant producer
-Buildfile: build.xml
-
-init:
-
-compile:
-
-producer:
-     [echo] Running producer against server at $url = tcp://localhost:61616 for subject $subject = TEST.FOO
-     [java] Connecting to URL: tcp://localhost:61616
-     [java] Publishing a Message with size 1000 to queue: TEST.FOO
-     [java] Using non-durable publishing
-     [java] Sleeping between publish 0 ms
-     [java] Sending message: Message: 0 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 1 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 2 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 3 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 4 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 5 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 6 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 7 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 8 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Sending message: Message: 9 sent at: Mon Oct 16 23:21:08 MDT 2006  ...
-     [java] Done.
-     [java] connection {
-     [java]   session {
-     [java]     messageCount{ count: 10 unit: count startTime: 1161062468001 lastSampleTime: 
-1161062468340 description: Number of messages exchanged }
-     [java]     messageRateTime{ count: 10 maxTime: 142 minTime: 1 totalTime: 315 averageTime: 31.5 
-averageTimeExMinMax: 21.5 averagePerSecond: 31.746031746031747
-averagePerSecondExMinMax: 46.51162790697674 unit: millis startTime: 1161062468002 lastSampleTime: 
-1161062468340 description: Time taken to process a message (thoughtput rate) }
-     [java]     pendingMessageCount{ count: 0 unit: count startTime: 1161062468001 lastSampleTime: 
-1161062468001 description: Number of pending messages }
-     [java]     expiredMessageCount{ count: 0 unit: count startTime: 1161062468001 lastSampleTime: 
-1161062468001 description: Number of expired messages }
-     [java]     messageWaitTime{ count: 0 maxTime: 0 minTime: 0 totalTime: 0 averageTime: 0.0 
-averageTimeExMinMax: 0.0 averagePerSecond: 0.0
-averagePerSecondExMinMax: 0.0 unit: millis startTime: 1161062468002 lastSampleTime: 1161062468002 
-description: Time spent by a message before being delivered }
-     [java]     durableSubscriptionCount{ count: 0 unit: count startTime: 1161062468002 lastSampleTime: 
-1161062468002 description: The number of durable
-subscriptions }
-
-     [java]     producers {
-     [java]       producer queue://TEST.FOO {
-     [java]         messageCount{ count: 10 unit: count startTime: 1161062468025 lastSampleTime: 
-1161062468340 description: Number of messages processed }
-     [java]         messageRateTime{ count: 10 maxTime: 142 minTime: 1 totalTime: 315 averageTime: 
-31.5 averageTimeExMinMax: 21.5 averagePerSecond:
-31.746031746031747 averagePerSecondExMinMax: 46.51162790697674 unit: millis startTime: 1161062468025 
-lastSampleTime: 1161062468340 description: Time taken to
-process a message (thoughtput rate) }
-     [java]         pendingMessageCount{ count: 0 unit: count startTime: 1161062468025 lastSampleTime: 
-1161062468025 description: Number of pending messages }
-     [java]         messageRateTime{ count: 10 maxTime: 142 minTime: 1 totalTime: 315 averageTime: 31.5 
-averageTimeExMinMax: 21.5 averagePerSecond:
-31.746031746031747 averagePerSecondExMinMax: 46.51162790697674 unit: millis startTime: 1161062468025 
-lastSampleTime: 1161062468340 description: Time taken to
-process a message (thoughtput rate) }
-     [java]         expiredMessageCount{ count: 0 unit: count startTime: 1161062468025 lastSampleTime: 
-1161062468025 description: Number of expired messages }
-     [java]         messageWaitTime{ count: 0 maxTime: 0 minTime: 0 totalTime: 0 averageTime: 0.0 
-averageTimeExMinMax: 0.0 averagePerSecond: 0.0
-averagePerSecondExMinMax: 0.0 unit: millis startTime: 1161062468025 lastSampleTime: 1161062468025 
-description: Time spent by a message before being delivered }
-     [java]       }
-     [java]     }
-     [java]     consumers {
-     [java]     }
-     [java]   }
-     [java] }
-]]></script>
-</div></div></li></ol>
-
-
-<p>Step 1 above just starts up JBoss. Step 2 above starts up a simple message consumer that comes with ActiveMQ. Step 3 above starts up a simple message producer that comes with ActiveMQ. Though the message consumer and message producer are simple utilities, the each one accepts many parameters making them extremely useful for testing ActiveMQ configurations.</p>
-
-<p>To paraphrase, what just happened was that the message producer sent 10 messages to the TEST.FOO destination and the message consumer received 10 messages from the TEST.FOO destination. Despite being a simple test, it does utilize the ActiveMQ broker, albeit only on a single machine. The next logical step is to set up a full network of ActiveMQ brokers.</p>
-
-<p>After setting up one broker within one instance of JBoss, setting up another is made much easier, but requires another machine or operating system instance. But that's a whole separate article and something to address another day.</p>
-
-<h2 id="JBossIntegration-Conclusion">Conclusion</h2>
-
-<p>What has been demonstrated here is the integration of ActiveMQ with the JBoss application server. This integration is quite common and performed by many enterprises. I hope that this was helpful to people interested in the integration of ActiveMQ with JBoss application server. If you have any questions or are interested in consulting services surrounding ActiveMQ, please <a shape="rect" class="external-link" href="http://www.logicblaze.com/contact.jsp" rel="nofollow">contact us</a> for more information.</p>
-
-<h3 id="JBossIntegration-Resources">Resources</h3>
-
-<p>Below are the configurations for use with both Spring 1.x and Spring 2.x:</p>
-
-
-    
-
-<div class="plugin_attachments_container">
-    <div class="plugin_attachments_table_container">
-        <fieldset class="hidden">
-            <input type="hidden" class="plugin_attachments_macro_render_param" name="pageId" value="67786">
-            <input type="hidden" name="deleteConfirmMessage" value="Are you sure you want to send the attached file " _0="_0" to="to" the="the" trash="trash" only="only" a="a" space="space" administrator="administrator" can="can" undo="undo" this="this" action.="action.">
-                                                    <input type="hidden" name="outputType" value="display">
-        </fieldset>
-                
-
-
-
-
-
-
-    
-
-
-
-<table class="attachments aui"><thead><tr><th colspan="1" rowspan="1" class="expand-column attachment-summary-toggle">&#160;</th><th colspan="1" rowspan="1" class="filename-column">            <a shape="rect" href="integrating-apache-activemq-with-jboss.xml?sortBy=name&amp;sortOrder=ascending">File</a>
-        </th><th colspan="1" rowspan="1" class="modified-column">            <span class="propersortedby $sortOrder"><a shape="rect" href="integrating-apache-activemq-with-jboss.xml?sortBy=date&amp;sortOrder=descending">Modified</a></span>
-        </th></tr></thead><tbody><tr class="attachment-row" id="attachment-59670763" data-attachment-id="59670763" data-attachment-idx="1"><td colspan="1" rowspan="1" class="attachment-summary-toggle">
-                    <span class="icon icon-section-closed" title="Show more info"></span>
-                </td><td colspan="1" rowspan="1" class="filename-column">
-                    
-
-    
-
-
-<span class="icon icon-file-unknown" title="File">File</span>                    <a shape="rect" class="filename" href="jboss-integration.data/amq-spring-1.2.6.tgz?api=v2" title="Download" data-filename="amq-spring-1.2.6.tgz" data-type="application/x-tar" data-linked-resource-container-id="67786">
-                        amq-spring-1.2.6.tgz
-                    </a>
-                                    </td><td colspan="1" rowspan="1" class="attachment-created modified-column">
-                    <span>Oct 03, 2007</span>
-                    <span>by</span>
-                        <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a>                </td></tr><tr class="attachment-summary attachment-summary-59670763 hidden" data-attachment-id="59670763" data-attachment-filename="amq-spring-1.2.6.tgz"><td colspan="1" rowspan="1" class="attachment-summary-toggle"></td><td colspan="2" rowspan="1" class="attachment-details-wrapper">
-
-                    
-                                        <p class="attachment-labels">Labels</p>
-                    
-<div class="labels-section-content content-column" entityid="59670763" entitytype="attachment">
-	<div class="labels-content">
-		
-    <ul class="label-list  has-pen"><li class="no-labels-message">
-            No labels
-        </li><li class="labels-edit-container">
-            <a shape="rect" class="show-labels-editor" href="#" title="Edit Labels">
-                <span class="aui-icon aui-icon-small aui-iconfont-edit-small">Edit Labels</span>
-            </a>
-        </li></ul>
-
-    </div>
-</div>
-
-                                            <div class="attachment-history-wrapper"></div>
-                    
-                                            <div class="attachment-buttons">
-                                                            <a shape="rect" class="aui-button previewAttachmentLink" data-filename="amq-spring-1.2.6.tgz" data-file-src="/confluence/download/attachments/67786/amq-spring-1.2.6.tgz?api=v2" data-linked-resource-default-alias="amq-spring-1.2.6.tgz" data-mime-type="application/x-tar" data-linked-resource-container-id="67786" data-linked-resource-id="59670763">Preview</a>
-                            
-                                                    </div>
-                                    </td></tr><tr class="attachment-row" id="attachment-59670764" data-attachment-id="59670764" data-attachment-idx="2"><td colspan="1" rowspan="1" class="attachment-summary-toggle">
-                    <span class="icon icon-section-closed" title="Show more info"></span>
-                </td><td colspan="1" rowspan="1" class="filename-column">
-                    
-
-    
-
-
-<span class="icon icon-file-unknown" title="File">File</span>                    <a shape="rect" class="filename" href="jboss-integration.data/amq-spring-2.0.tgz?api=v2" title="Download" data-filename="amq-spring-2.0.tgz" data-type="application/x-tar" data-linked-resource-container-id="67786">
-                        amq-spring-2.0.tgz
-                    </a>
-                                    </td><td colspan="1" rowspan="1" class="attachment-created modified-column">
-                    <span>Oct 03, 2007</span>
-                    <span>by</span>
-                        <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a>                </td></tr><tr class="attachment-summary attachment-summary-59670764 hidden" data-attachment-id="59670764" data-attachment-filename="amq-spring-2.0.tgz"><td colspan="1" rowspan="1" class="attachment-summary-toggle"></td><td colspan="2" rowspan="1" class="attachment-details-wrapper">
-
-                    
-                                        <p class="attachment-labels">Labels</p>
-                    
-<div class="labels-section-content content-column" entityid="59670764" entitytype="attachment">
-	<div class="labels-content">
-		
-    <ul class="label-list  has-pen"><li class="no-labels-message">
-            No labels
-        </li><li class="labels-edit-container">
-            <a shape="rect" class="show-labels-editor" href="#" title="Edit Labels">
-                <span class="aui-icon aui-icon-small aui-iconfont-edit-small">Edit Labels</span>
-            </a>
-        </li></ul>
-
-    </div>
-</div>
-
-                                            <div class="attachment-history-wrapper"></div>
-                    
-                                            <div class="attachment-buttons">
-                                                            <a shape="rect" class="aui-button previewAttachmentLink" data-filename="amq-spring-2.0.tgz" data-file-src="/confluence/download/attachments/67786/amq-spring-2.0.tgz?api=v2" data-linked-resource-default-alias="amq-spring-2.0.tgz" data-mime-type="application/x-tar" data-linked-resource-container-id="67786" data-linked-resource-id="59670764">Preview</a>
-                            
-                                                    </div>
-                                    </td></tr></tbody></table>
-    </div>
-    <div class="plugin_attachments_upload_container">
-            </div>
-
-    <div>
-                    <a shape="rect" class="download-all-link" href="/confluence/pages/downloadallattachments.action?pageId=67786" title="Download all the latest versions of attachments on this page as single zip file.">Download All</a>
-            </div>
-</div></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="bbc703bb-67f6-445e-be5e-58cf87290290" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Integrating Apache ActiveMQ with JBoss"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jca-container.xml
----------------------------------------------------------------------
diff --git a/jca-container.xml b/jca-container.xml
index 1973feb..260b5b3 100644
--- a/jca-container.xml
+++ b/jca-container.xml
@@ -1,22 +1,22 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">The JCA Container is moving</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="16f901d0-bd02-4fa3-9c19-e0c3ae27f48b" ac:name="info" ac:schema-version="1"><parameter ac:name="title">The JCA Container is moving</parameter><rich-text-body>
 <p>We will continune to support the ActiveMQ JCA Container up until ActiveMQ 3.1.</p>
 
-<p>After that point we will be moving to <a shape="rect" class="external-link" href="http://jencks.codehaus.org/" rel="nofollow">Jencks</a> which is a migration of the ActiveMQ codebase together with code <a shape="rect" class="external-link" href="http://geronimo.apache.org">Geronimo</a> and from some other contributors.</p>
+<p>After that point we will be moving to <a shape="rect" href="http://jencks.codehaus.org/">Jencks</a> which is a migration of the ActiveMQ codebase together with code <a shape="rect" href="http://geronimo.apache.org">Geronimo</a> and from some other contributors.</p>
 
 <p>Jencks is completely logically equivalent to the ActiveMQ JCA Container and migrating to it is pretty simple (mostly just a class name change for the JCA container) - though the benefits of Jencks are that it supports full XA recovery and works well with Geronimo's TransactionManager and WorkManager.</p>
 
-<p>So we do recommend you migrate to <a shape="rect" class="external-link" href="http://jencks.codehaus.org/" rel="nofollow">Jencks</a> whenever its easy for you to do so; projects such as <a shape="rect" class="external-link" href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a> and <a shape="rect" class="external-link" href="http://servicemix.org/" rel="nofollow">ServiceMix</a> already have and it was an easy migration.</p></div></div>
+<p>So we do recommend you migrate to <a shape="rect" href="http://jencks.codehaus.org/">Jencks</a> whenever its easy for you to do so; projects such as <a shape="rect" href="http://lingo.codehaus.org/">Lingo</a> and <a shape="rect" href="http://servicemix.org/">ServiceMix</a> already have and it was an easy migration.</p></rich-text-body></structured-macro>
 <p>We have a lightweight, easily embeddable Spring based JCA container which allows us to provide MDB like functionality inside any Java application without requiring a full EJB container.</p>
 
 <p>This allows us to support <em>message driven pojos</em> using dependency injection for efficient JMS consumption together with pooling of the pojos using lightweight containers rather than relying on EJB.</p>
 
 <p>The JCA container also makes it easy to programatically at runtime create new message driven pojos rather than relying on the fixed deployment-time only option with EJB.</p>
 
-<h2 id="JCAContainer-Example">Example</h2>
+<h2>Example</h2>
 
-<p>Here is <a shape="rect" class="external-link" href="http://docs.codehaus.org/download/attachments/23776/spring.xml" rel="nofollow">an example</a> of the Spring XML to deploy a pojo (EchoBean) on an inbound JMS subscription, on a topic in this particular example.</p>
+<p>Here is <a shape="rect" href="http://docs.codehaus.org/download/attachments/23776/spring.xml">an example</a> of the Spring XML to deploy a pojo (EchoBean) on an inbound JMS subscription, on a topic in this particular example.</p>
 
-<p>Firstly we can create as many JCAContainer instances as we need; currently we create one per JCA <a shape="rect" href="resource-adapter.xml">Resource Adapter</a> (i.e. JMS provider). The JCAContainer also uses a WorkManager which is JCA speak for a bunch of thread pools. We can share the WorkManager across JCAContainer instances or create one per JCAContainer.</p>
+<p>Firstly we can create as many JCAContainer instances as we need; currently we create one per JCA <link><page ri:content-title="Resource Adapter"></page></link> (i.e. JMS provider). The JCAContainer also uses a WorkManager which is JCA speak for a bunch of thread pools. We can share the WorkManager across JCAContainer instances or create one per JCAContainer.</p>
 
 <p>Once we have a JCAContainer we can add as many JCAConnector instances to it, via the <strong>addConnector</strong> factory method, each one representing a JMS subscription and providing a pool of POJOs to process the message. The subscription details are specified by an activationSpec property which is a bean typically dependent on the JMS provider; this allows providers to add new extensions while leaving your application code pure JMS.</p>
 
@@ -24,19 +24,19 @@
 
 <p><strong>Note</strong> you must set the <strong>singleton</strong> flag to false for the POJOs if they are not thread safe.</p>
 
-<h2 id="JCAContainer-Requirements">Requirements</h2>
+<h2>Requirements</h2>
 
 <p>To be able to use the JCA container, you just need the following jars on your classpath</p>
-<ul><li><a shape="rect" href="initial-configuration.xml">required ActiveMQ jars</a> if you are using ActiveMQ as your JMS provider - or your provider's jars if not</li><li>activemq-container.jar</li><li>spring.jar</li><li>J2EE.jar (for the JCA APIs). If you are inside Tomcat, it doesn't like j2ee.jar on the classpath, so use the individual jars from Geronimo - e.g. geronimo-spec-j2ee-connector-*.jar for the JCA APIs</li><li>commons-collections.jar</li><li>commons-pool.jar</li><li>aopalliance.jar (a temporary dependency introduced by Spring's use of the TargetSource, we should be able to remove this dependency later on).</li></ul>
+<ul><li><link><page ri:content-title="Initial Configuration"></page><link-body>required ActiveMQ jars</link-body></link> if you are using ActiveMQ as your JMS provider - or your provider's jars if not</li><li>activemq-container.jar</li><li>spring.jar</li><li>J2EE.jar (for the JCA APIs). If you are inside Tomcat, it doesn't like j2ee.jar on the classpath, so use the individual jars from Geronimo - e.g. geronimo-spec-j2ee-connector-*.jar for the JCA APIs</li><li>commons-collections.jar</li><li>commons-pool.jar</li><li>aopalliance.jar (a temporary dependency introduced by Spring's use of the TargetSource, we should be able to remove this dependency later on).</li></ul>
 
 
 <p><strong>Note</strong> the classes and resources in activemq-container.jar are not included in activemq.jar</p>
 
 <p>To use the JCA Container please use the 2.x code release. Several problems were found and fixed with the 1.x branch of code.</p>
 
-<h2 id="JCAContainer-Thingstowatch">Things to watch</h2>
+<h2>Things to watch</h2>
 
-<p>By default the ActiveMQ <a shape="rect" href="resource-adapter.xml">Resource Adapter</a>  will try to connect to a remote broker (ie. tcp://localhost:61616).  Also if you want to set how the broker is configured via XML then try the <em>brokerXmlConfig</em> property.</p>
+<p>By default the ActiveMQ <link><page ri:content-title="Resource Adapter"></page></link>  will try to connect to a remote broker (ie. tcp://localhost:61616).  Also if you want to set how the broker is configured via XML then try the <em>brokerXmlConfig</em> property.</p>
 
 <p><em>Note:</em> In AMQ 3.x the default behavior is the ActiveMQ resource adapter will create an embedded broker</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jdbc-master-slave.xml
----------------------------------------------------------------------
diff --git a/jdbc-master-slave.xml b/jdbc-master-slave.xml
index 721ea9a..3054e0a 100644
--- a/jdbc-master-slave.xml
+++ b/jdbc-master-slave.xml
@@ -1,60 +1,57 @@
-<div class="wiki-content maincontent"><h2 id="JDBCMasterSlave-JDBCMasterSlave">JDBC Master Slave</h2>
+<div class="wiki-content maincontent"><h2>JDBC Master Slave</h2>
 
 <p>First supported in ActiveMQ version 4.1</p>
 
 <p>If you are using pure JDBC and not using the high performance journal then you are generally relying on your database as your single point of failure and persistence engine. If you do not have really high performance requirements this approach can make a lot of sense as you have a single persistence engine to backup and manage etc.</p>
 
-<h3 id="JDBCMasterSlave-Startup">Startup</h3>
+<h3>Startup</h3>
 
 <p>When using just JDBC as the data source you can use a Master Slave approach, running as many brokers as you wish as this diagram shows. On startup one master grabs an exclusive lock in the broker database - all other brokers are slaves and pause waiting for the exclusive lock.</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="jdbc-master-slave.data/Startup.png" data-image-src="/confluence/download/attachments/35908/Startup.png?version=1&amp;modificationDate=1153463898000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="3244" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="Startup.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35908" data-linked-resource-container-version="19"></span></p>
+<p><image><attachment ri:filename="Startup.png"></attachment></image></p>
 
-<p>Clients should be using the <a shape="rect" href="failover-transport-reference.xml">Failover Transport</a> to connect to the available brokers. e.g. using a URL something like the following</p>
+<p>Clients should be using the <link><page ri:content-title="Failover Transport Reference"></page><link-body>Failover Transport</link-body></link> to connect to the available brokers. e.g. using a URL something like 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="db1beb4a-1c76-4570-a616-b7c6c06728ba" ac:name="code" ac:schema-version="1"><plain-text-body>
 failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Only the master broker starts up its transport connectors and so the clients can only connect to the master.</p>
 
-<h3 id="JDBCMasterSlave-Masterfailure">Master failure</h3>
+<h3>Master failure</h3>
 
 <p>If the master looses connection to the database or looses the exclusive lock then it immediately shuts down. If a master shuts down or fails, one of the other slaves will grab the lock and so the topology switches to the following diagram</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="jdbc-master-slave.data/MasterFailed.png" data-image-src="/confluence/download/attachments/35908/MasterFailed.png?version=1&amp;modificationDate=1153463898000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="3264" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="MasterFailed.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35908" data-linked-resource-container-version="19"></span></p>
+<p><image><attachment ri:filename="MasterFailed.png"></attachment></image></p>
 
 <p>One of the other other slaves immediately grabs the exclusive lock on the database to them commences becoming the master, starting all of its transport connectors.</p>
 
 <p>Clients loose connection to the stopped master and then the failover transport tries to connect to the available brokers - of which the only one available is the new master.</p>
 
-<h3 id="JDBCMasterSlave-Masterrestart">Master restart</h3>
+<h3>Master restart</h3>
 
 <p>At any time you can restart other brokers which join the cluster and start as slaves waiting to become a master if the master is shutdown or a failure occurs. So the following topology is created after a restart of an old master...</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="jdbc-master-slave.data/MasterRestarted.png" data-image-src="/confluence/download/attachments/35908/MasterRestarted.png?version=1&amp;modificationDate=1153463898000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="3252" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="MasterRestarted.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35908" data-linked-resource-container-version="19"></span></p>
+<p><image><attachment ri:filename="MasterRestarted.png"></attachment></image></p>
 
-<h3 id="JDBCMasterSlave-ConfiguringJDBCMasterSlave">Configuring JDBC Master Slave</h3>
+<h3>Configuring JDBC Master Slave</h3>
 
 <p>By default if you use the <strong>&lt;jdbcPersistenceAdapter/&gt;</strong> to avoid the high performance journal you will be using JDBC Master Slave by default. You just need to run more than one broker and point the client side URIs to them to get master/slave. This works because they both try an acquire an exclusive lock on a shared table in the database and only one will succeed.</p>
 
 <p>The following example shows how to configure the ActiveMQ broker in JDBC Master Slave mode</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="19af32e7-f11e-422b-be63-ffa96eff017b" ac:name="code" ac:schema-version="1"><plain-text-body>
 &lt;beans&gt;
 
   &lt;!-- Allows us to use 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.apache.org/schema/core&quot;&gt;
+  &lt;broker xmlns="http://activemq.apache.org/schema/core"&gt;
 
     &lt;destinationPolicy&gt;
       &lt;policyMap&gt;&lt;policyEntries&gt;
         
-          &lt;policyEntry topic=&quot;FOO.&gt;&quot;&gt;
+          &lt;policyEntry topic="FOO.&gt;"&gt;
             &lt;dispatchPolicy&gt;
               &lt;strictOrderDispatchPolicy /&gt;
             &lt;/dispatchPolicy&gt;
@@ -68,15 +65,15 @@ failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)
   
   
     &lt;persistenceAdapter&gt;
-        &lt;jdbcPersistenceAdapter dataDirectory=&quot;${activemq.base}/activemq-data&quot;/&gt;
+        &lt;jdbcPersistenceAdapter dataDirectory="${activemq.base}/activemq-data"/&gt;
 
         &lt;!-- 
-        &lt;jdbcPersistenceAdapter dataDirectory=&quot;activemq-data&quot; dataSource=&quot;#oracle-ds&quot;/&gt;
+        &lt;jdbcPersistenceAdapter dataDirectory="activemq-data" dataSource="#oracle-ds"/&gt;
         --&gt; 
     &lt;/persistenceAdapter&gt;
   
     &lt;transportConnectors&gt;
-       &lt;transportConnector name=&quot;default&quot; uri=&quot;tcp://localhost:61616&quot;/&gt;
+       &lt;transportConnector name="default" uri="tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
     
   &lt;/broker&gt;
@@ -85,50 +82,50 @@ failover:(tcp://broker1:61616,tcp://broker2:61616,tcp://broker3:61616)
   
   &lt;!-- Postgres DataSource Sample Setup --&gt;
   &lt;!-- 
-  &lt;bean id=&quot;postgres-ds&quot; class=&quot;org.postgresql.ds.PGPoolingDataSource&quot;&gt;
-    &lt;property name=&quot;serverName&quot; value=&quot;localhost&quot;/&gt;
-    &lt;property name=&quot;databaseName&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;portNumber&quot; value=&quot;0&quot;/&gt;
-    &lt;property name=&quot;user&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;password&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;dataSourceName&quot; value=&quot;postgres&quot;/&gt;
-    &lt;property name=&quot;initialConnections&quot; value=&quot;1&quot;/&gt;
-    &lt;property name=&quot;maxConnections&quot; value=&quot;10&quot;/&gt;
+  &lt;bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource"&gt;
+    &lt;property name="serverName" value="localhost"/&gt;
+    &lt;property name="databaseName" value="activemq"/&gt;
+    &lt;property name="portNumber" value="0"/&gt;
+    &lt;property name="user" value="activemq"/&gt;
+    &lt;property name="password" value="activemq"/&gt;
+    &lt;property name="dataSourceName" value="postgres"/&gt;
+    &lt;property name="initialConnections" value="1"/&gt;
+    &lt;property name="maxConnections" value="10"/&gt;
   &lt;/bean&gt;
   --&gt;
   
   &lt;!-- MySql DataSource Sample Setup --&gt;
   &lt;!-- 
-  &lt;bean id=&quot;mysql-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-    &lt;property name=&quot;driverClassName&quot; value=&quot;com.mysql.jdbc.Driver&quot;/&gt;
-    &lt;property name=&quot;url&quot; value=&quot;jdbc:mysql://localhost/activemq?relaxAutoCommit=true&quot;/&gt;
-    &lt;property name=&quot;username&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;password&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;poolPreparedStatements&quot; value=&quot;true&quot;/&gt;
+  &lt;bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+    &lt;property name="driverClassName" value="com.mysql.jdbc.Driver"/&gt;
+    &lt;property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/&gt;
+    &lt;property name="username" value="activemq"/&gt;
+    &lt;property name="password" value="activemq"/&gt;
+    &lt;property name="poolPreparedStatements" value="true"/&gt;
   &lt;/bean&gt;
   --&gt;  
    
   &lt;!-- Oracle DataSource Sample Setup --&gt;
   &lt;!--
-  &lt;bean id=&quot;oracle-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-    &lt;property name=&quot;driverClassName&quot; value=&quot;oracle.jdbc.driver.OracleDriver&quot;/&gt;
-    &lt;property name=&quot;url&quot; value=&quot;jdbc:oracle:thin:@localhost:1521:AMQDB&quot;/&gt;
-    &lt;property name=&quot;username&quot; value=&quot;scott&quot;/&gt;
-    &lt;property name=&quot;password&quot; value=&quot;tiger&quot;/&gt;
-    &lt;property name=&quot;poolPreparedStatements&quot; value=&quot;true&quot;/&gt;
+  &lt;bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+    &lt;property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/&gt;
+    &lt;property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/&gt;
+    &lt;property name="username" value="scott"/&gt;
+    &lt;property name="password" value="tiger"/&gt;
+    &lt;property name="poolPreparedStatements" value="true"/&gt;
   &lt;/bean&gt;
   --&gt;
       
   &lt;!-- Embedded Derby DataSource Sample Setup --&gt;
   &lt;!-- 
-  &lt;bean id=&quot;derby-ds&quot; class=&quot;org.apache.derby.jdbc.EmbeddedDataSource&quot;&gt;
-    &lt;property name=&quot;databaseName&quot; value=&quot;derbydb&quot;/&gt;
-    &lt;property name=&quot;createDatabase&quot; value=&quot;create&quot;/&gt;
+  &lt;bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource"&gt;
+    &lt;property name="databaseName" value="derbydb"/&gt;
+    &lt;property name="createDatabase" value="create"/&gt;
   &lt;/bean&gt;
   --&gt;  
 
 &lt;/beans&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
+
 </div>
 


[38/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

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

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-inactivitymonitor.xml
----------------------------------------------------------------------
diff --git a/activemq-inactivitymonitor.xml b/activemq-inactivitymonitor.xml
index cd8dd7b..aac3672 100644
--- a/activemq-inactivitymonitor.xml
+++ b/activemq-inactivitymonitor.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><h1 id="ActiveMQInactivityMonitor-ActiveMQInactivityMonitor">ActiveMQ InactivityMonitor</h1><p>The ActiveMQ InactivityMonitor is an active thread that checks the connection is still active and if it suspects the connection is not functioning correctly, it closes the connection.</p><p>Connections are monitored by:</p><ul><li>Ensuring data is read from the connection during the specified time period (Max Inactivity Duration).</li><li>Writing a&#160;<strong><code>KeepAliveInfo</code></strong> message to the connection if no <strong>normal</strong> activemq traffic is sent across the connection during the specified time period.</li></ul><p>Each connection has two InactivityMonitors associated, one on each end of the connection. The InactivityMonitor expects to receive data on the connection during a specified time period. If <strong>normal</strong> ActiveMQ traffic has not been sent across the connection during that period, it expects to receive a&#
 160;<strong><code>KeepAliveInfo</code></strong> message sent by the InactivityMonitor on the other end of the connection.</p><p>Using the default values; if no data has been written or read from the connection for 30 seconds, the InactivityMonitor kicks in. The InactivityMonitor throws an&#160;<strong><code>InactivityIOException</code></strong> and shuts down the transport associated with the connection. This results in the following&#160;<strong><code>DEBUG</code></strong> logging:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>2012-06-26 17:13:55,712 | DEBUG | 30000 ms elapsed since last read check. | org.apache.activemq.transport.AbstractInactivityMonitor | InactivityMonitor ReadCheck
+<div class="wiki-content maincontent"><h1>ActiveMQ InactivityMonitor</h1><p>The ActiveMQ InactivityMonitor is an active thread that checks the connection is still active and if it suspects the connection is not functioning correctly, it closes the connection.</p><p>Connections are monitored by:</p><ul><li>Ensuring data is read from the connection during the specified time period (Max Inactivity Duration).</li><li>Writing a&#160;<strong><code>KeepAliveInfo</code></strong> message to the connection if no <strong>normal</strong> activemq traffic is sent across the connection during the specified time period.</li></ul><p>Each connection has two InactivityMonitors associated, one on each end of the connection. The InactivityMonitor expects to receive data on the connection during a specified time period. If <strong>normal</strong> ActiveMQ traffic has not been sent across the connection during that period, it expects to receive a&#160;<strong><code>KeepAliveInfo</code></strong> message s
 ent by the InactivityMonitor on the other end of the connection.</p><p>Using the default values; if no data has been written or read from the connection for 30 seconds, the InactivityMonitor kicks in. The InactivityMonitor throws an&#160;<strong><code>InactivityIOException</code></strong> and shuts down the transport associated with the connection. This results in the following&#160;<strong><code>DEBUG</code></strong> logging:</p><structured-macro ac:macro-id="db114f31-fb57-4d2d-8f2d-390f5a254728" ac:name="noformat" ac:schema-version="1"><plain-text-body>2012-06-26 17:13:55,712 | DEBUG | 30000 ms elapsed since last read check. | org.apache.activemq.transport.AbstractInactivityMonitor | InactivityMonitor ReadCheck
 2012-06-26 17:13:55,712 | DEBUG | No message received since last read check for tcp:///127.0.0.1:52659! Throwing InactivityIOException. | org.apache.activemq.transport.AbstractInactivityMonitor | InactivityMonitor ReadCheck
 2012-06-26 17:13:55,714 | DEBUG | Transport Connection to: tcp://127.0.0.1:52659 failed: 
 org.apache.activemq.transport.InactivityIOException: Channel was inactive for too (&gt;30000) long: tcp://127.0.0.1:52659 |
@@ -10,11 +9,8 @@ org.apache.activemq.transport.InactivityIOException: Channel was inactive for to
     at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
     at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
     at java.lang.Thread.run(Thread.java:680)
-</pre>
-</div></div><h3 id="ActiveMQInactivityMonitor-AdvancedInactivityMonitorConfiguration">Advanced InactivityMonitor Configuration</h3><p>There are some configuration options to further fine tune the <code>InactivityMonitor</code>. Note, for most use cases the default values are just fine.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Parameter</th><th colspan="1" rowspan="1" class="confluenceTh">Default Value</th><th colspan="1" rowspan="1" class="confluenceTh">Description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>wireFormat.maxInactivityDuration</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>30000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Timeout, in milliseconds, after which the connection is closed by the broker if no data has been received.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>wireFormat.maxInac
 tivityDurationInitalDelay</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>10000</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Specifies the maximum delay, in milliseconds, before connection inactivity monitoring is started.</p><p>This can prove useful if a broker is under load with many connections being created concurrently.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>transport.useInactivityMonitor</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A value of&#160;<strong><code>false</code></strong> disables the&#160;<code>InactivityMonitor</code> completely and connections will never time out.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>transport.useKeepAlive</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" clas
 s="confluenceTd"><p>Determines if a&#160;<strong><code>KeepAliveInfo</code></strong> message should be sent on an idle connection to prevent it from timing out.</p><p>Disabling the keep alive will still make connections time out when no data was received on the connection for the specified amount of time.</p></td></tr></tbody></table></div><p>&#160;</p><p>These parameters can be specified directly on the client side connection URL, e.g. <strong><code>tcp://localhost:61616?wireFormat.maxInactivityDuration=30000</code>, </strong>or on the broker's transport connector URL:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;transportConnectors&gt;
-  &lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://0.0.0.0:61616?wireFormat.maxInactivityDuration=30000&amp;amp;wireFormat.maxInactivityDurationInitalDelay=10000&quot;/&gt;
+</plain-text-body></structured-macro><h3>Advanced InactivityMonitor Configuration</h3><p>There are some configuration options to further fine tune the <code>InactivityMonitor</code>. Note, for most use cases the default values are just fine.</p><table><tbody><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Default Value</th><th colspan="1" rowspan="1">Description</th></tr><tr><td colspan="1" rowspan="1"><p><code>wireFormat.maxInactivityDuration</code></p></td><td colspan="1" rowspan="1"><p><code>30000</code></p></td><td colspan="1" rowspan="1"><p>Timeout, in milliseconds, after which the connection is closed by the broker if no data has been received.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>wireFormat.maxInactivityDurationInitalDelay</code></p></td><td colspan="1" rowspan="1"><p><code>10000</code></p></td><td colspan="1" rowspan="1"><p>Specifies the maximum delay, in milliseconds, before connection inactivity monitoring is started.</p><p>This c
 an prove useful if a broker is under load with many connections being created concurrently.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>transport.useInactivityMonitor</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>A value of&#160;<strong><code>false</code></strong> disables the&#160;<code>InactivityMonitor</code> completely and connections will never time out.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>transport.useKeepAlive</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p>Determines if a&#160;<strong><code>KeepAliveInfo</code></strong> message should be sent on an idle connection to prevent it from timing out.</p><p>Disabling the keep alive will still make connections time out when no data was received on the connection for the specified amount of time.</p></td></tr></tbody></table><p>&#160;</p><p>These parameters can be specified directly on the client
  side connection URL, e.g. <strong><code>tcp://localhost:61616?wireFormat.maxInactivityDuration=30000</code>, </strong>or on the broker's transport connector URL:</p><structured-macro ac:macro-id="71606cd5-86b4-43fd-b0e4-3a4b7af305b4" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;transportConnectors&gt;
+  &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616?wireFormat.maxInactivityDuration=30000&amp;amp;wireFormat.maxInactivityDurationInitalDelay=10000"/&gt;
 &lt;/transportConnectors&gt;
-]]></script>
-</div></div><h3 id="ActiveMQInactivityMonitor-WhathappensifthemaxInactivityDurationandmaxInactivityDurationInitalDelayaresettodifferentvaluesoneithersideofthesameconnection?">What happens if the&#160;<code>maxInactivityDuration</code> and <code>maxInactivityDurationInitalDelay</code> are set to different values on either side of the same connection?</h3><p>At startup the InactivityMonitor negotiates the appropriate&#160;<strong><code>maxInactivityDuration</code></strong> and&#160;<strong><code>maxInactivityDurationInitalDelay</code></strong>. The shortest duration is taken for the connection.</p><h3 id="ActiveMQInactivityMonitor-CantheInactivityMonitoronaconnectionbedisabled?">Can the InactivityMonitor on a connection be disabled?</h3><p>Setting <strong><code>transport.useInactivityMonitor=false</code></strong> will disable the InactivityMonitor<strong>. </strong>Configuring <strong><code>wireFormat.maxInactivityDuration=0</code></strong> will achieve the same result.</p><h3 id="Act
 iveMQInactivityMonitor-PotentialIssues">Potential Issues</h3><p><a shape="rect" href="slow-networks-drop-large-messages.xml">slow-networks-drop-large-messages</a></p><p>&#160;</p></div>
+</plain-text-body></structured-macro><h3>What happens if the&#160;<code>maxInactivityDuration</code> and <code>maxInactivityDurationInitalDelay</code> are set to different values on either side of the same connection?</h3><p>At startup the InactivityMonitor negotiates the appropriate&#160;<strong><code>maxInactivityDuration</code></strong> and&#160;<strong><code>maxInactivityDurationInitalDelay</code></strong>. The shortest duration is taken for the connection.</p><h3>Can the InactivityMonitor on a connection be disabled?</h3><p>Setting <strong><code>transport.useInactivityMonitor=false</code></strong> will disable the InactivityMonitor<strong>. </strong>Configuring <strong><code>wireFormat.maxInactivityDuration=0</code></strong> will achieve the same result.</p><h3>Potential Issues</h3><p><link><page ri:content-title="Slow networks drop large messages"></page><plain-text-link-body>slow-networks-drop-large-messages</plain-text-link-body></link></p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-message-properties.xml
----------------------------------------------------------------------
diff --git a/activemq-message-properties.xml b/activemq-message-properties.xml
index bbd7c3c..a672753 100644
--- a/activemq-message-properties.xml
+++ b/activemq-message-properties.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>ActiveMQ Messages support the following default message properties:</strong></p><h2 id="ActiveMQMessageProperties-MessageAttributesAccessedasProperties:">Message Attributes Accessed as Properties:</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSDestination</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>javax.jms.Destination</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><em>Set by the producer</em></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Destination used by the producer.</p></td></tr><tr><td colspan=
 "1" rowspan="1" class="confluenceTd"><p><code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>javax.jms.Destination</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSType</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><code>""</code></td><td colspan="1" rowspan="1" class="confluenceTd"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSDeliveryMode</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>DeliveryMode.PERSISTENT</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Indicator if messages should be persisted
 .</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSPriority</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>4</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Value from <code>0-9</code>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSMessageID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>unique</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Unique identifier for the message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSTimestamp</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><em>Time the message was sent</em></p></td><td colspan="1" rowspan="1" class=
 "confluenceTd"><p>Time in milliseconds.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSCorrelationID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSExpiration</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Time in milliseconds to expire the message. A value of <code>0</code> means never expire.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSRedelivered</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>boolean</code></p></td><td colspan="1" rowspan="1" class="conflu
 enceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code> if the message is being resent to the consumer, persisted via <u><a shape="rect" href="per-destination-policies.xml">persistJMSRedelivered</a></u></p></td></tr></tbody></table></div><h2 id="ActiveMQMessageProperties-JMSDefined:">JMS Defined:</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXDeliveryCount</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confl
 uenceTd"><p>Number of attempts to send the message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXGroupID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Identity of the message group.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXGroupSeq</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>int</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Sequence number of the message.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSXProducerTXID</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></t
 d><td colspan="1" rowspan="1" class="confluenceTd"><p>Transaction identifier.</p></td></tr></tbody></table></div><h2 id="ActiveMQMessageProperties-ActiveMQDefined:">ActiveMQ Defined:</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>JMSActiveMQBrokerInTime</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Time stamp (in milliseconds) for when the message arrived at the broker.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>
 JMSActiveMQBrokerOutTime</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>long</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>0</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Time stamp (in milliseconds) for when the message left the broker.</p></td></tr></tbody></table></div></div>
+<div class="wiki-content maincontent"><p><strong>ActiveMQ Messages support the following default message properties:</strong></p><h2>Message Attributes Accessed as Properties:</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Type</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>JMSDestination</code></p></td><td colspan="1" rowspan="1"><p><code>javax.jms.Destination</code></p></td><td colspan="1" rowspan="1"><p><em>Set by the producer</em></p></td><td colspan="1" rowspan="1"><p>Destination used by the producer.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSReplyTo</code></p></td><td colspan="1" rowspan="1"><p><code>javax.jms.Destination</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSTy
 pe</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><code>""</code></td><td colspan="1" rowspan="1"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSDeliveryMode</code></p></td><td colspan="1" rowspan="1"><p><code>int</code></p></td><td colspan="1" rowspan="1"><p><code>DeliveryMode.PERSISTENT</code></p></td><td colspan="1" rowspan="1"><p>Indicator if messages should be persisted.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSPriority</code></p></td><td colspan="1" rowspan="1"><p><code>int</code></p></td><td colspan="1" rowspan="1"><p><code>4</code></p></td><td colspan="1" rowspan="1"><p>Value from <code>0-9</code>.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSMessageID</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p><code>unique</code></p></td><td colspan="1" rowspan="1"><p>Unique identifier for the message.</p></td></tr><tr><t
 d colspan="1" rowspan="1"><p><code>JMSTimestamp</code></p></td><td colspan="1" rowspan="1"><p><code>long</code></p></td><td colspan="1" rowspan="1"><p><em>Time the message was sent</em></p></td><td colspan="1" rowspan="1"><p>Time in milliseconds.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSCorrelationID</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>User defined.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSExpiration</code></p></td><td colspan="1" rowspan="1"><p><code>long</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Time in milliseconds to expire the message. A value of <code>0</code> means never expire.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSRedelivered</code></p></td><td colspan="1" rowspan="1"><p><code>boolean</code></p></td><td colspan="1" rowspan="1"><p><code>false</
 code></p></td><td colspan="1" rowspan="1"><p><code>true</code> if the message is being resent to the consumer, persisted via <u><link><page ri:content-title="Per Destination Policies"></page><plain-text-link-body>persistJMSRedelivered</plain-text-link-body></link></u></p></td></tr></tbody></table><h2>JMS Defined:</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Type</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>JMSXDeliveryCount</code></p></td><td colspan="1" rowspan="1"><p><code>int</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Number of attempts to send the message.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSXGroupID</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><t
 d colspan="1" rowspan="1"><p>Identity of the message group.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSXGroupSeq</code></p></td><td colspan="1" rowspan="1"><p><code>int</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Sequence number of the message.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSXProducerTXID</code></p></td><td colspan="1" rowspan="1"><p><code>String</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p>Transaction identifier.</p></td></tr></tbody></table><h2>ActiveMQ Defined:</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Type</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>JMSActiveMQBrokerInTime</code></p></td><td colspan="1" rowspan="1"><p><code>long</code></p></td><td colsp
 an="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Time stamp (in milliseconds) for when the message arrived at the broker.</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>JMSActiveMQBrokerOutTime</code></p></td><td colspan="1" rowspan="1"><p><code>long</code></p></td><td colspan="1" rowspan="1"><p><code>0</code></p></td><td colspan="1" rowspan="1"><p>Time stamp (in milliseconds) for when the message left the broker.</p></td></tr></tbody></table></div>
 


[26/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-391-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-391-release.xml b/cms/activemq-cpp-391-release.xml
index 0d6f0bd..a94172c 100644
--- a/cms/activemq-cpp-391-release.xml
+++ b/cms/activemq-cpp-391-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.9.1Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a minor bugfix release of the ActiveMQ-CPP library that fixes a segfault that can occur when running against the latest ActiveMQ Artemis release along with a couple other minor fixes.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.9.1Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2 id="ActiveMQ-CPP3.9.1Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip">activemq-cpp-library-3.9.1-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip.asc">activemq-cpp-library-3.9.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz">activemq-cpp-library-3.9.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz.asc">activemq-cpp-library-3.9.1-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2">activemq-cpp-library-3.9.1-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2.asc">activemq-cpp-library-3.9.1-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.9.1Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.1</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.9.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12333244">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a minor bugfix release of the ActiveMQ-CPP library that fixes a segfault that can occur when running against the latest ActiveMQ Artemis release along with a couple other minor fixes.</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></
 td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip">activemq-cpp-library-3.9.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip.asc">activemq-cpp-library-3.9.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz">activemq-cpp-library-3.9.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz.asc">activemq-cpp-library-3.9.1-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1">
 <p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2">activemq-cpp-library-3.9.1-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2.asc">activemq-cpp-library-3.9.1-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.1</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="h
 ttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12333244">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-392-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-392-release.xml b/cms/activemq-cpp-392-release.xml
index 8f908b5..2fd156b 100644
--- a/cms/activemq-cpp-392-release.xml
+++ b/cms/activemq-cpp-392-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.9.2Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with the way the STOMP protocol handles composite destinations.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.9.2Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2 id="ActiveMQ-CPP3.9.2Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.zip">activemq-cpp-library-3.9.2-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.zip.asc">activemq-cpp-library-3.9.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.gz">activemq-cpp-library-3.9.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.gz.asc">activemq-cpp-library-3.9.2-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.bz2">activemq-cpp-library-3.9.2-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.bz2.asc">activemq-cpp-library-3.9.2-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.9.2Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.2</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.9.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;version=12334243">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with the way the STOMP protocol handles composite destinations.</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" 
 href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.zip">activemq-cpp-library-3.9.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.zip.asc">activemq-cpp-library-3.9.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.gz">activemq-cpp-library-3.9.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.gz.asc">activemq-cpp-library-3.9.2-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.or
 g/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.bz2">activemq-cpp-library-3.9.2-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.2/activemq-cpp-library-3.9.2-src.tar.bz2.asc">activemq-cpp-library-3.9.2-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.2</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.j
 spa?projectId=12311207&amp;version=12334243">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-393-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-393-release.xml b/cms/activemq-cpp-393-release.xml
index 4b967e4..1b427fa 100644
--- a/cms/activemq-cpp-393-release.xml
+++ b/cms/activemq-cpp-393-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.9.3Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with producer create no waiting for a response from the broker before returning which can lead to missed error on create situations.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.9.3Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2 id="ActiveMQ-CPP3.9.3Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.zip">activemq-cpp-library-3.9.3-src.zip</a></p></td><td colspan="1" rowspan="1" 
 class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.zip.asc">activemq-cpp-library-3.9.3-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.gz">activemq-cpp-library-3.9.3-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.gz.asc">activemq-cpp-library-3.9.3-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.bz2">activemq-cpp-library-3.9.3-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.bz2.asc">activemq-cpp-library-3.9.3.src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.9.3Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.3</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.9.3Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;version=12334845">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue with producer create no waiting for a response from the broker before returning which can lead to missed error on create situations.</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source cod
 e for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.zip">activemq-cpp-library-3.9.3-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.zip.asc">activemq-cpp-library-3.9.3-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.gz">activemq-cpp-library-3.9.3-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.gz.asc">activemq-cpp-library-3.9.3-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colsp
 an="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.bz2">activemq-cpp-library-3.9.3-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.3/activemq-cpp-library-3.9.3-src.tar.bz2.asc">activemq-cpp-library-3.9.3.src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.3</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a s
 hape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;version=12334845">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-394-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-394-release.xml b/cms/activemq-cpp-394-release.xml
index 42d9c57..66d9ac9 100644
--- a/cms/activemq-cpp-394-release.xml
+++ b/cms/activemq-cpp-394-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.9.4Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue in the Failover handling.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.9.4Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2 id="ActiveMQ-CPP3.9.4Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.zip">activemq-cpp-library-3.9.4.src.zip</a></p></td><td colspan="1" rowspan="1" 
 class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.zip.asc">activemq-cpp-library-3.9.4-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.gz">activemq-cpp-library-3.9.4-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.gz.asc">activemq-cpp-library-3.9.4-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.bz2">activemq-cpp-library-3.9.4-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.bz2.asc">activemq-cpp-library-3.9.4.src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.9.4Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.4</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.9.4Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;version=12335498">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a minor patch release of the ActiveMQ-CPP library that fixes an issue in the Failover handling.</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer
 .lua/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.zip">activemq-cpp-library-3.9.4.src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.zip.asc">activemq-cpp-library-3.9.4-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.gz">activemq-cpp-library-3.9.4-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.gz.asc">activemq-cpp-library-3.9.4-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.lua/activemq/activemq-cpp/3.9.
 4/activemq-cpp-library-3.9.4-src.tar.bz2">activemq-cpp-library-3.9.4-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.bz2.asc">activemq-cpp-library-3.9.4.src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.4</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;version=123
 35498">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-libtool-and-packaging-notes.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-libtool-and-packaging-notes.xml b/cms/activemq-cpp-libtool-and-packaging-notes.xml
index dc733db..ec8d0ae 100644
--- a/cms/activemq-cpp-libtool-and-packaging-notes.xml
+++ b/cms/activemq-cpp-libtool-and-packaging-notes.xml
@@ -1,15 +1,15 @@
-<div class="wiki-content maincontent"><h1 id="ActiveMQ-CPP,libtoolandpackagingnotes-ActiveMQ-CPP,libtoolandpackagingnotes">ActiveMQ-CPP, libtool and packaging notes</h1>
+<div class="wiki-content maincontent"><h1>ActiveMQ-CPP, libtool and packaging notes</h1>
 
-<h3 id="ActiveMQ-CPP,libtoolandpackagingnotes-Introduction">Introduction</h3>
+<h3>Introduction</h3>
 
 <p>This page attempts to summarise information to be considered</p>
 <ul><li>when configuring libtool</li><li>when packaging ActiveMQ for distribution on Debian, Red Hat, Solaris.</li></ul>
 
 
-<h3 id="ActiveMQ-CPP,libtoolandpackagingnotes-Concepts">Concepts</h3>
+<h3>Concepts</h3>
 
 <p>Product version numbers</p>
-<ul><li>Please see the notes on <a shape="rect" href="activemq-cpp-product-version-number.xml">ActiveMQ-CPP product version number</a></li></ul>
+<ul><li>Please see the notes on <link><page ri:content-title="ActiveMQ-CPP product version number"></page></link></li></ul>
 
 
 <p>SONAME</p>
@@ -29,5 +29,6 @@
 <p>Debian package name</p>
 <ul><li>The package name includes the following from libtool: release number and interface number</li><li>for example, if interface version = 4, then the package name = libactivemq-cpp4</li><li>The product version number is not part of the Debian package name - it is used elsewhere in Debian's control files</li></ul>
 
+
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-product-version-number.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-product-version-number.xml b/cms/activemq-cpp-product-version-number.xml
index 3da16c4..1aca88d 100644
--- a/cms/activemq-cpp-product-version-number.xml
+++ b/cms/activemq-cpp-product-version-number.xml
@@ -4,7 +4,7 @@
 
 <p>In order to facilitate the correct use of libtool and the preparation of binary packages for distribution on Debian, Red Hat, etc, it is beneficial to have a written policy on version numbers.</p>
 
-<h3 id="ActiveMQ-CPPproductversionnumber-Productversionnumber">Product version number</h3>
+<h3>Product version number</h3>
 
 <p>These numbers represent the release of the product.  E.g. 2.1.2</p>
 
@@ -17,7 +17,7 @@
 <ul><li>may choose to have more than one major version installed on the same system concurrently (e.g. 2.1.2 and 3.4.5)</li><li>may only have one variation of each major version installed (e.g. it is not intended to have 2.1.2 and 2.3.0 concurrently)</li></ul>
 
 
-<h3 id="ActiveMQ-CPPproductversionnumber-libtoolABIversionnumber">libtool ABI version number</h3>
+<h3>libtool ABI version number</h3>
 
 <p>This number represents an ABI version.  It is an integer, e.g., the number 5.</p>
 
@@ -27,5 +27,6 @@
 <ul><li>any new structs, classes or function prototypes are added</li><li>the definition of any structs, classes or function prototypes are modified</li><li>any structs, classes or function prototypes are removed</li></ul>
 
 
-<p>Note that in the first case above, binary compatibility with existing applications is maintained.  In the second and third case, binary compatibility is lost, and the libtool `age' variable must also be changed.</p></div>
+<p>Note that in the first case above, binary compatibility with existing applications is maintained.  In the second and third case, binary compatibility is lost, and the libtool `age' variable must also be changed.</p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-stomp.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-stomp.xml b/cms/activemq-cpp-stomp.xml
index 694b5d7..d075a3d 100644
--- a/cms/activemq-cpp-stomp.xml
+++ b/cms/activemq-cpp-stomp.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPPStomp-ActiveMQ-CPPStompSupport">ActiveMQ-CPP Stomp Support</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ-CPP Stomp Support</h2>
 
-<p>Stomp 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, go <a shape="rect" class="external-link" href="http://stomp.codehaus.org" rel="nofollow">here</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>Stomp 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, go <a shape="rect" href="http://stomp.codehaus.org">here</a>.  Also, you can see ActiveMQ extensions <a shape="rect" href="http://www.activemq.org/site/stomp.html">here</a>.</p>
 
 <p>The 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, openwire.  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="ActiveMQ-CPPStomp-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,11 +12,11 @@
 
 <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="ActiveMQ-CPPStomp-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="ActiveMQ-CPPStomp-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></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-usage-faqs.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-usage-faqs.xml b/cms/activemq-cpp-usage-faqs.xml
index fab5cc3..e8e1e96 100644
--- a/cms/activemq-cpp-usage-faqs.xml
+++ b/cms/activemq-cpp-usage-faqs.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent"><p>This section covers general questions on how to use various feature of the ActiveMQ-CPP Library</p>
-<ul class="childpages-macro"><li><a shape="rect" href="how-do-i-use-the-ssl-transport.xml">How do I use the SSL Transport</a></li></ul> </div>
+<structured-macro ac:macro-id="a7447724-ad89-4df5-b4a0-fef59223e9bb" 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/cms/api.xml
----------------------------------------------------------------------
diff --git a/cms/api.xml b/cms/api.xml
index 10fe06f..216adcc 100644
--- a/cms/api.xml
+++ b/cms/api.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="API-ActiveMQ-CPPAPI">ActiveMQ-CPP API</h2><p><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html/">ActiveMQ-CPP 3.6.x</a></p><p><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html/">ActiveMQ-CPP 3.9.x</a></p></div>
+<div class="wiki-content maincontent"><h2>ActiveMQ-CPP API</h2><p><a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html/">ActiveMQ-CPP 3.6.x</a></p><p><a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html/">ActiveMQ-CPP 3.9.x</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/are-there-more-faq-entries.xml
----------------------------------------------------------------------
diff --git a/cms/are-there-more-faq-entries.xml b/cms/are-there-more-faq-entries.xml
index c0751ef..23ef201 100644
--- a/cms/are-there-more-faq-entries.xml
+++ b/cms/are-there-more-faq-entries.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="AretheremoreFAQEntries-AretheremoreFAQEntries?">Are there more FAQ Entries?</h2>
+<div class="wiki-content maincontent"><h2>Are there more FAQ Entries?</h2>
 
-<p>Yes, see the <a shape="rect" class="external-link" href="http://activemq.apache.org/faq.html">ActiveMQ Main FAQ</a></p></div>
+<p>Yes, see the <a shape="rect" href="http://activemq.apache.org/faq.html">ActiveMQ Main FAQ</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/banner.xml
----------------------------------------------------------------------
diff --git a/cms/banner.xml b/cms/banner.xml
index 2698171..5fc45ca 100644
--- a/cms/banner.xml
+++ b/cms/banner.xml
@@ -1,9 +1,9 @@
-<div class="wiki-content maincontent"><p>
-	</p><div id="asf_logo">
-	<div id="activemq_logo">
-            <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/">ActiveMQ</a>
-            <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org">ASF</a>
-	</div>
-        </div>
-<p></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="63011488-69a4-45f4-9190-112a11eaa0e7" ac:name="html" ac:schema-version="1"><parameter ac:name="output">html</parameter><parameter ac:name="noPanel">true</parameter><plain-text-body>
+	&lt;div id="asf_logo"&gt;
+	&lt;div id="activemq_logo"&gt;
+            &lt;a style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org/"&gt;ActiveMQ&lt;/a&gt;
+            &lt;a style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org"&gt;ASF&lt;/a&gt;
+	&lt;/div&gt;
+        &lt;/div&gt;
+</plain-text-body></structured-macro></p><p></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/building-faqs.xml
----------------------------------------------------------------------
diff --git a/cms/building-faqs.xml b/cms/building-faqs.xml
index c9b9f8d..903ef4f 100644
--- a/cms/building-faqs.xml
+++ b/cms/building-faqs.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent"><p>These are general hints and tips on Building the Library on various platforms etc.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="general-build-issues.xml">General Build Issues</a></li><li><a shape="rect" href="openssl-support.xml">OpenSSL Support</a><ul class="childpages-macro"><li><a shape="rect" href="enable-openssl-support-with-autotools.xml">Enable OpenSSL support with autotools</a></li><li><a shape="rect" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.xml">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.xml">How to enable SSL support on Windows</a></li></ul></li><li><a shape="rect" href="solaris-platform.xml">Solaris Platform</a><ul class="childpages-macro"><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.xml">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.xml">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-t
 he-solaris-cc-compiler.xml">Using the Solaris CC compiler</a></li></ul></li></ul> </div>
+<structured-macro ac:macro-id="694559c3-67c0-4fe6-ada1-c8b55a3656ac" 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/cms/building.xml
----------------------------------------------------------------------
diff --git a/cms/building.xml b/cms/building.xml
index 6611dd9..a85db73 100644
--- a/cms/building.xml
+++ b/cms/building.xml
@@ -1,36 +1,14 @@
-<div class="wiki-content maincontent"><h2 id="Building-Dependencies">Dependencies</h2><h3 id="Building-libuuid">libuuid</h3><p>On *nix sytems, the build requires the libuuid library that is part of the e2fsprogs package and is available from <a shape="rect" class="external-link" href="http://e2fsprogs.sourceforge.net/" rel="nofollow">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p><p>On Fedora/Red Hat/openSUSE, you should install the e2fsprogs and e2fsprogs-devel packages. On Debian/Ubuntu, you should install uuid and uuid-dev packages.</p><h3 id="Building-CppUnit">CppUnit</h3><p>The package contains a complete set of CppUnit tests. In order for you to build an run the tests, you will need to download and install the CppUnit library. See <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki" rel="nofollow">http://cppunit.sourceforge.net/cppunit-wiki</a></p><p>On Fedora/Red Hat/openSUSE, you should install the cppun
 it and cppunit-devel packages. On Debian/Ubuntu, you should install the build-essential, libcppunit and libcppunit-dev packages.</p><p>Make sure that the paths to the installed CppUnit library and includes are visible in your current shell before you try building the tests.</p><p>Windows users will need to build the CppUnit library using the CppUnit MSVC project files. A discussion of the build process can be found on the CppUnit wiki under <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1" rel="nofollow">CppUnit build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p><h3 id="Building-APR">APR</h3><p>With versions of ActiveMQ-CPP 2.2 and later, we have a dependency on the <a shape="rect" class="external-link" href="http://apr.apache.org">Apache Portable Runtime</a> project. You'll need to install APR on your system before you'll be able to build ActiveMQ-CPP.</p><div class="confluence-inf
 ormation-macro confluence-information-macro-note"><p class="title">Note to Windows Vista/MSVC++ 2008 Users</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The Vista SDK has introduced some build problems for APR. For a work-around, follow the instructions <a shape="rect" class="external-link" href="https://issues.apache.org/bugzilla/show_bug.cgi?id=40398">here</a>.</p></div></div><h2 id="Building-Buildingon*nix(Unix/Linux/OSX/Cygwin)">Building on *nix (Unix/Linux/OS X/Cygwin)</h2><h3 id="Building-GNUBuildSystem(forbuildingon*nix)">GNU Build System (for building on *nix)</h3><p>To Generate the ./configure script use to create the Makefiles, you need the following software installed:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Tool</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Recommended Ver
 sion</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>autoconf</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&gt;= 2.59</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>automake</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&gt;= 1.9.6</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>libtool</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&gt;= 1.5.22</p></td></tr></tbody></table></div><p>You can also install the Doxygen and Graphviz packages if you want to generate the API documentation in HTML format.</p><h3 id="Building-Building">Building</h3><p>This assumes you have all of the project dependencies installed. We're now ready to create the configure script. To do this, run:</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[./autogen.sh
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You may see the following warnings when running this command:</p><p>src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable, you should not override it;<br clear="none"> src/test-integration/Makefile.am:44: use `AM_CXXFLAGS' instead.<br clear="none"> src/test/Makefile.am:104: `CXXFLAGS' is a user variable, you should not override it;<br clear="none"> src/test/Makefile.am:104: use `AM_CXXFLAGS' instead.</p><p>These can be ignored. We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></div></div><p>This should be run the first time and anytime you change configure.ac or any of the Makefile.am files.</p><div class="confluence-information-macro confluence-information-macro-inf
 ormation"><p class="title">Solaris 10 Note</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>CppUnit might not build until you correct the file libstdc++.la to contain the correct data, see this discussion.</p><p><a shape="rect" class="external-link" href="http://forum.sun.com/jive/thread.jspa?threadID=73150" rel="nofollow">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></div></div><p>The configure script will customize the way the software is built and installed into your system along with detecting the available libraries that have been installed. To use the default configuration just run:</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[./configure
-]]></script>
-</div></div><p>For more help on how to customize the build configuration, run:</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[./configure --help
-]]></script>
-</div></div><p>Once the configure script has run successfully, you are ready to build. Run:</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[make
-]]></script>
-</div></div><p>This will build all of the core ActiveMQ CPP source code. To build and install the code into the system directories, run:</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[make install
-]]></script>
-</div></div><p>You will have to become the superuser in order to be able to install the files.</p><h3 id="Building-Doxygen">Doxygen</h3><p>To generate the doxygen documentation for the project, just run:</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[make doxygen-run
-]]></script>
-</div></div><h3 id="Building-RunningTests">Running Tests</h3><h3 id="Building-UnitTests">Unit Tests</h3><p>In order to build and run the suite of unit tests, run:</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[make check
-]]></script>
-</div></div><p>This will verify that the library is functioning correctly on the target platform. In addition, it will generate the integration tests binary.</p><h3 id="Building-IntegrationTests">Integration Tests</h3><p>The library also contains a set of tests that are run against a real AMQ broker. These allow you to validate this distribution of ActiveMQ CPP against your broker. Running these without a broker will result in failed tests. The tests currently hard-code the broker url to be tcp://localhost:61613 for stomp and tcp://localhost:61616 for openwire.</p><p>The integration tests are built via "make check". To run them, first start a broker and then</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[cd src/test-integration
+<div class="wiki-content maincontent"><h2>Dependencies</h2><h3>libuuid</h3><p>On *nix sytems, the build requires the libuuid library that is part of the e2fsprogs package and is available from <a shape="rect" href="http://e2fsprogs.sourceforge.net/">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p><p>On Fedora/Red Hat/openSUSE, you should install the e2fsprogs and e2fsprogs-devel packages. On Debian/Ubuntu, you should install uuid and uuid-dev packages.</p><h3>CppUnit</h3><p>The package contains a complete set of CppUnit tests. In order for you to build an run the tests, you will need to download and install the CppUnit library. See <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki">http://cppunit.sourceforge.net/cppunit-wiki</a></p><p>On Fedora/Red Hat/openSUSE, you should install the cppunit and cppunit-devel packages. On Debian/Ubuntu, you should install the build-essential, libcppunit and libcppunit-dev packages.</p><p>Make sure 
 that the paths to the installed CppUnit library and includes are visible in your current shell before you try building the tests.</p><p>Windows users will need to build the CppUnit library using the CppUnit MSVC project files. A discussion of the build process can be found on the CppUnit wiki under <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1">CppUnit build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p><h3>APR</h3><p>With versions of ActiveMQ-CPP 2.2 and later, we have a dependency on the <a shape="rect" href="http://apr.apache.org">Apache Portable Runtime</a> project. You'll need to install APR on your system before you'll be able to build ActiveMQ-CPP.</p><structured-macro ac:macro-id="814f1ae0-dcb7-4d54-90fa-842fa65b55b2" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Note to Windows Vista/MSVC++ 2008 Users</parameter><rich-text-body><p>The Vista SDK has introduced some build probl
 ems for APR. For a work-around, follow the instructions <a shape="rect" href="https://issues.apache.org/bugzilla/show_bug.cgi?id=40398">here</a>.</p></rich-text-body></structured-macro><h2>Building on *nix (Unix/Linux/OS X/Cygwin)</h2><h3>GNU Build System (for building on *nix)</h3><p>To Generate the ./configure script use to create the Makefiles, you need the following software installed:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Tool</p></th><th colspan="1" rowspan="1"><p>Recommended Version</p></th></tr><tr><td colspan="1" rowspan="1"><p>autoconf</p></td><td colspan="1" rowspan="1"><p>&gt;= 2.59</p></td></tr><tr><td colspan="1" rowspan="1"><p>automake</p></td><td colspan="1" rowspan="1"><p>&gt;= 1.9.6</p></td></tr><tr><td colspan="1" rowspan="1"><p>libtool</p></td><td colspan="1" rowspan="1"><p>&gt;= 1.5.22</p></td></tr></tbody></table><p>You can also install the Doxygen and Graphviz packages if you want to generate the API documentation in HTML format.</p><h3>Building<
 /h3><p>This assumes you have all of the project dependencies installed. We're now ready to create the configure script. To do this, run:</p><structured-macro ac:macro-id="dc3ca860-74f7-4801-8a45-ec866e62c8a8" ac:name="code" ac:schema-version="1"><plain-text-body>./autogen.sh
+</plain-text-body></structured-macro><structured-macro ac:macro-id="06dcee5e-557a-43a7-bb5c-12d035fc94c5" ac:name="info" ac:schema-version="1"><rich-text-body><p>You may see the following warnings when running this command:</p><p>src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable, you should not override it;<br clear="none"> src/test-integration/Makefile.am:44: use `AM_CXXFLAGS' instead.<br clear="none"> src/test/Makefile.am:104: `CXXFLAGS' is a user variable, you should not override it;<br clear="none"> src/test/Makefile.am:104: use `AM_CXXFLAGS' instead.</p><p>These can be ignored. We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></rich-text-body></structured-macro><p>This should be run the first time and anytime you change configure.ac or any of the Makefile.am files.</p><structured-macro ac:macro-id="fbe6fd40-060e-4e7d-aeab-cefb37d4840e" ac:name="info" ac:schema-version="1"><parameter ac:name="tit
 le">Solaris 10 Note</parameter><rich-text-body><p>CppUnit might not build until you correct the file libstdc++.la to contain the correct data, see this discussion.</p><p><a shape="rect" href="http://forum.sun.com/jive/thread.jspa?threadID=73150">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></rich-text-body></structured-macro><p>The configure script will customize the way the software is built and installed into your system along with detecting the available libraries that have been installed. To use the default configuration just run:</p><structured-macro ac:macro-id="8001d5f7-b487-426e-9b95-edbeba7819a2" ac:name="code" ac:schema-version="1"><plain-text-body>./configure
+</plain-text-body></structured-macro><p>For more help on how to customize the build configuration, run:</p><structured-macro ac:macro-id="2155e25a-d425-4941-a99f-6a06dda59748" ac:name="code" ac:schema-version="1"><plain-text-body>./configure --help
+</plain-text-body></structured-macro><p>Once the configure script has run successfully, you are ready to build. Run:</p><structured-macro ac:macro-id="75f2735c-fb02-4ab6-b891-129aa1e81ca4" ac:name="code" ac:schema-version="1"><plain-text-body>make
+</plain-text-body></structured-macro><p>This will build all of the core ActiveMQ CPP source code. To build and install the code into the system directories, run:</p><structured-macro ac:macro-id="22203139-efff-4381-8396-4d5b8a296c40" ac:name="code" ac:schema-version="1"><plain-text-body>make install
+</plain-text-body></structured-macro><p>You will have to become the superuser in order to be able to install the files.</p><h3>Doxygen</h3><p>To generate the doxygen documentation for the project, just run:</p><structured-macro ac:macro-id="401f3159-64a0-4175-ac69-2ced43209ca7" ac:name="code" ac:schema-version="1"><plain-text-body>make doxygen-run
+</plain-text-body></structured-macro><h3>Running Tests</h3><h3>Unit Tests</h3><p>In order to build and run the suite of unit tests, run:</p><structured-macro ac:macro-id="29f84f58-9bc9-403c-adf6-736f5496b0d7" ac:name="code" ac:schema-version="1"><plain-text-body>make check
+</plain-text-body></structured-macro><p>This will verify that the library is functioning correctly on the target platform. In addition, it will generate the integration tests binary.</p><h3>Integration Tests</h3><p>The library also contains a set of tests that are run against a real AMQ broker. These allow you to validate this distribution of ActiveMQ CPP against your broker. Running these without a broker will result in failed tests. The tests currently hard-code the broker url to be tcp://localhost:61613 for stomp and tcp://localhost:61616 for openwire.</p><p>The integration tests are built via "make check". To run them, first start a broker and then</p><structured-macro ac:macro-id="29a5ea44-45fa-4d9b-848d-4e3e828ba93e" ac:name="code" ac:schema-version="1"><plain-text-body>cd src/test-integration
 ./activemq-test-integration
-]]></script>
-</div></div><p>This will take quite some time to complete, so be patient.</p><h3 id="Building-Example">Example</h3><p>There is an example application that ships with the distribution in src/examples. The example is compiled by default with the "make" command, but can easily be compiled manually using the command similar to the following (varies by platform).</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[g++ -o main -pthread -I ../main main.cpp ../../src/main/.libs/libactivemq-cpp.a -luuid -I /usr/include/apr-1.0/ -lssl -lcrypto -lapr-1
-]]></script>
-</div></div><h2 id="Building-BuildingonWindowswithMSVC">Building on Windows with MSVC</h2><p>We support using the GNU compiler on Windows, using the Cygwin package. However we also support using the MSVC compiler on Windows.</p><p>There are a couple or things that you will need to setup to ensure that the MSVC compile succeeds.</p><h3 id="Building-IncludingDependencies">Including Dependencies</h3><p>The Project files reference the libraries described in the <a shape="rect" href="#Building-Dependencies">#Dependencies</a> section. To build successfully, you must either place these libraries in a directory listed in the project settings, or add a new location for your library directories.</p><h3 id="Building-MSVC&gt;=2008">MSVC &gt;= 2008</h3><p>If you're using MSVC &gt;= 2008, it comes with the Windows SDK (so you don't need to download it separately).</p><p>For ActiveMQ-CPP &gt;= 2.2, you will have to follow some special instructions for building APR, duscussed <a shape="rect" href="
 #Building-APR">here</a>.</p><h3 id="Building-Non-Vista/MSVC&lt;2008">Non-Vista/MSVC &lt; 2008</h3><p>If you are using Visual C++ &lt; 2008, you need to download and install the Platform SDK if you don't have it installed already (the Platform SDK is called the "Windows SDK" since the release of Windows Vista). Once installed, do the following:</p><ul><li>Ensure that the path to your MSVC install is set in the PATH env variable. You can test this by typing cl.exe at the command line, if you get an error complaining that it is not found, then you'll need to fix your PATH. Alternatively, you can set up the necessary environment variables by running C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat.</li><li><p>Set the INCLUDE env variable to include the path to your MSVC includes, and the platform SDK includes. For 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[INCLUDE = D:\Program Files\Microsoft Visual Studio 8\VC\include;D:\Program Files\Microsoft Platform SDK\Include\*
-]]></script>
-</div></div></li><li><p>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For 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[LIB = D:\Program Files\Microsoft Visual Studio 8\VC\lib;D:\Program Files\Microsoft Platform SDK\Lib
-]]></script>
-</div></div></li></ul></div>
+</plain-text-body></structured-macro><p>This will take quite some time to complete, so be patient.</p><h3>Example</h3><p>There is an example application that ships with the distribution in src/examples. The example is compiled by default with the "make" command, but can easily be compiled manually using the command similar to the following (varies by platform).</p><structured-macro ac:macro-id="60253d7f-40cf-4e68-aa10-6812d50198a7" ac:name="code" ac:schema-version="1"><plain-text-body>g++ -o main -pthread -I ../main main.cpp ../../src/main/.libs/libactivemq-cpp.a -luuid -I /usr/include/apr-1.0/ -lssl -lcrypto -lapr-1
+</plain-text-body></structured-macro><h2>Building on Windows with MSVC</h2><p>We support using the GNU compiler on Windows, using the Cygwin package. However we also support using the MSVC compiler on Windows.</p><p>There are a couple or things that you will need to setup to ensure that the MSVC compile succeeds.</p><h3>Including Dependencies</h3><p>The Project files reference the libraries described in the <link ac:anchor="Dependencies"><plain-text-link-body>#Dependencies</plain-text-link-body></link> section. To build successfully, you must either place these libraries in a directory listed in the project settings, or add a new location for your library directories.</p><h3>MSVC &gt;= 2008</h3><p>If you're using MSVC &gt;= 2008, it comes with the Windows SDK (so you don't need to download it separately).</p><p>For ActiveMQ-CPP &gt;= 2.2, you will have to follow some special instructions for building APR, duscussed <link ac:anchor="APR"><plain-text-link-body>here</plain-text-link-bo
 dy></link>.</p><h3>Non-Vista/MSVC &lt; 2008</h3><p>If you are using Visual C++ &lt; 2008, you need to download and install the Platform SDK if you don't have it installed already (the Platform SDK is called the "Windows SDK" since the release of Windows Vista). Once installed, do the following:</p><ul><li>Ensure that the path to your MSVC install is set in the PATH env variable. You can test this by typing cl.exe at the command line, if you get an error complaining that it is not found, then you'll need to fix your PATH. Alternatively, you can set up the necessary environment variables by running C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat.</li><li><p>Set the INCLUDE env variable to include the path to your MSVC includes, and the platform SDK includes. For example:</p><structured-macro ac:macro-id="91677a7e-17d3-4b1d-9304-a1be2b117dc0" ac:name="code" ac:schema-version="1"><plain-text-body>INCLUDE = D:\Program Files\Microsoft Visual Studio 8\VC\include;D:\Pr
 ogram Files\Microsoft Platform SDK\Include\*
+</plain-text-body></structured-macro></li><li><p>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For example:</p><structured-macro ac:macro-id="d6b15ce1-20b3-4d30-becc-a721b3698e86" ac:name="code" ac:schema-version="1"><plain-text-body>LIB = D:\Program Files\Microsoft Visual Studio 8\VC\lib;D:\Program Files\Microsoft Platform SDK\Lib
+</plain-text-body></structured-macro></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/cms-api-10-release.xml
----------------------------------------------------------------------
diff --git a/cms/cms-api-10-release.xml b/cms/cms-api-10-release.xml
index 336e9da..e12a2d1 100644
--- a/cms/cms-api-10-release.xml
+++ b/cms/cms-api-10-release.xml
@@ -1,27 +1,25 @@
-<div class="wiki-content maincontent"><h2 id="CMSAPI1.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is the first official release of the C++ Messaging Service (CMS)!!  CMS provides the following:</p>
 <ul><li>JMS-like API (all pure-virtual classes) for messaging from C++ applications!</li><li>Fairly mature API, having grown up under activemq-cpp</li><li>Vendor-independent way of messaging in C++</li><li>Decoupled from the activemq-cpp library in order to promote more CMS implementations</li></ul>
 
 
-<h2 id="CMSAPI1.0Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/cms-1.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/cms-1.0">here</a></p>
 
-<h2 id="CMSAPI1.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.0-src.zip">cms-1.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.0-src.zip.asc">cms-1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-
 link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.0-src.tar.gz">cms-1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.0-src.tar.gz.asc">cms-1.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.0-src.zip">cms-1.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.0-src.zip.asc">cms-1.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.0-src.tar.gz">cms-1.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.0-src.tar.gz.asc">cms-1.0-src.tar.gz
 .asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="CMSAPI1.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="f6717f64-edb4-490a-aa9f-a065bf5e0e89" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/cms-1.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="CMSAPI1.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
 <p>No change log - this is the initial submission.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/cms-api-11-release.xml
----------------------------------------------------------------------
diff --git a/cms/cms-api-11-release.xml b/cms/cms-api-11-release.xml
index bd700a9..aef5a5e 100644
--- a/cms/cms-api-11-release.xml
+++ b/cms/cms-api-11-release.xml
@@ -1,31 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="CMSAPI1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release of the C++ Messaging Service (CMS).  This release is was done as part of releasing ActiveMQ-CPP 2.1 and contains the following updates:</p>
 <ul><li>Removed dependency on the ActiveMQ-CPP Properties class</li><li>Added support for exporting CMS interface symbols from shared libraries</li></ul>
 
 
-<h2 id="CMSAPI1.1Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/cms-1.1">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/cms-1.1">here</a></p>
 
-<h2 id="CMSAPI1.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.1-src.zip">cms-1.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.1-src.zip.asc">cms-1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-
 link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.1-src.tar.gz">cms-1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.1-src.tar.gz.asc">cms-1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.1-src.zip">cms-1.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.1-src.zip.asc">cms-1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.1-src.tar.gz">cms-1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.1-src.tar.gz.asc">cms-1.1-src.tar.gz
 .asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="CMSAPI1.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="6fcc2586-bb10-4a7c-b612-a1919dee4d5a" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/cms-1.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="CMSAPI1.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>The following issues were resolved as part of the <a shape="rect" href="activemq-cpp-21-release.xml">ActiveMQ-CPP 2.1 Release</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>The following issues were resolved as part of the <link><page ri:content-title="ActiveMQ-CPP 2.1 Release"></page></link><br clear="none">
+<structured-macro ac:macro-id="e8c94d3a-f5d0-4ee5-b469-c8232becc14d" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="https://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;query=dynamic+libraries&amp;summary=true&amp;type=3&amp;pid=11000&amp;fixfor=11812&amp;status=5&amp;tempMax=1000"></url></parameter></structured-macro>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/cms-api-12-release.xml
----------------------------------------------------------------------
diff --git a/cms/cms-api-12-release.xml b/cms/cms-api-12-release.xml
index 75cd2f1..1e69cc9 100644
--- a/cms/cms-api-12-release.xml
+++ b/cms/cms-api-12-release.xml
@@ -1,31 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="CMSAPI1.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor release of the C++ Messaging Service (CMS).  This release is was done as part of releasing ActiveMQ-CPP 2.1.1 and contains the following updates:</p>
 <ul><li>Made read methods of BytesMessage const so that asynchronous consumers (onMessage) don't have to use const_cast.</li></ul>
 
 
-<h2 id="CMSAPI1.2Release-API">API</h2>
+<h2>API</h2>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/cms-1.2">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/cms-1.2">here</a></p>
 
-<h2 id="CMSAPI1.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.2-src.zip">cms-1.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.2-src.zip.asc">cms-1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-
 link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.2-src.tar.gz">cms-1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.2-src.tar.gz.asc">cms-1.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.2-src.zip">cms-1.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.2-src.zip.asc">cms-1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/cms-1.2-src.tar.gz">cms-1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/cms-1.2-src.tar.gz.asc">cms-1.2-src.tar.gz
 .asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="CMSAPI1.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="df1960f7-5935-412f-ae2d-6938bc473fab" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/cms-1.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="CMSAPI1.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>The following issues were resolved as part of the <a shape="rect" href="activemq-cpp-211-release.xml">ActiveMQ-CPP 2.1.1 Release</a><br clear="none">
-</p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-&#160;</div>
+<p>The following issues were resolved as part of the <link><page ri:content-title="ActiveMQ-CPP 2.1.1 Release"></page></link><br clear="none">
+<structured-macro ac:macro-id="9770f5a1-0b54-46de-ab9e-1b6cc277e812" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;query=%22BytesMessage++readXXX+methods+as+const%22&amp;summary=true&amp;description=true&amp;body=true&amp;pid=11000&amp;fixfor=11848&amp;tempMax=1000"></url></parameter></structured-macro>&#160;</p></div>
 


[02/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jmx.xml
----------------------------------------------------------------------
diff --git a/jmx.xml b/jmx.xml
index d2520b1..c1048d7 100644
--- a/jmx.xml
+++ b/jmx.xml
@@ -1,37 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="JMX-JMX">JMX</h2><p>Apache ActiveMQ has extensive support for JMX to allow you to monitor and control the behavior of the broker via the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/package-summary.html">JMX MBeans</a>.</p><h3 id="JMX-UsingJMXtomonitorApacheActiveMQ">Using JMX to monitor Apache ActiveMQ</h3><p>You can enable/disable JMX support as follows...</p><p>1. <a shape="rect" href="run-broker.xml">Run a broker</a> setting the broker property useJmx to true (enabled by default) i.e.</p><p>For xbean configuration</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker useJmx=&quot;true&quot; brokerName=&quot;BROKER1&quot;&gt;
+<div class="wiki-content maincontent"><h2>JMX</h2><p>Apache ActiveMQ has extensive support for JMX to allow you to monitor and control the behavior of the broker via the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/package-summary.html">JMX MBeans</a>.</p><h3>Using JMX to monitor Apache ActiveMQ</h3><p>You can enable/disable JMX support as follows...</p><p>1. <link><page ri:content-title="Run Broker"></page><plain-text-link-body>Run a broker</plain-text-link-body></link> setting the broker property useJmx to true (enabled by default) i.e.</p><p>For xbean configuration</p><structured-macro ac:macro-id="ffdf8aca-7895-4a18-91a1-5d432b672168" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker useJmx="true" brokerName="BROKER1"&gt;
 ...
 &lt;/broker&gt;
-]]></script>
-</div></div><p>2. Run a JMX console</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[$ jconsole ]]></script>
-</div></div><p>3. The ActiveMQ broker should appear in the list of local connections, if you are running JConsole on the same host as ActiveMQ.</p><p><strong style="color: rgb(102,0,51);font-size: 16.0px;"><br clear="none"></strong></p><p><strong style="color: rgb(102,0,51);font-size: 16.0px;">JMX remote access</strong></p><p>Remote connections to JMX are not enabled by default in the activemq.xml for security reasons. Please refer to&#160;<a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html" rel="nofollow">Java Management guide</a>&#160;to configure the broker for remote management.</p><p>&#160;</p><p><span style="line-height: 1.4285715;">Using the Apache ActiveMQ version on OS X it appears as follows:</span></p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="jmx.data/activemq-jmx.png" data-image-src="/confluence/download/attachments/35976/activemq-jmx.png?version=1&amp;
 modificationDate=1181607318000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="4495" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-jmx.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35976" data-linked-resource-container-version="39"></span><br clear="none"> &#160;</p><h3 id="JMX-ActiveMQMBeansReference">ActiveMQ MBeans Reference</h3><p>For additional references provided below is a brief hierarchy of the mbeans and a listing of the properties, attributes, and operations of each mbeans.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;Mbean Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties / ObjectName&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Attributes&#160;</p></th><th colsp
 an="1" rowspan="1" class="confluenceTh"><p>Operations&#160;</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;Broker</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker identifier&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>BrokerId</li><li>TotalEnqueueCount</li><li>TotalDequeueCount</li><li>TotalConsumerCount</li><li>TotalMessageCount</li><li>TotalConnectionsCount</li><li>TotalConsumerCount</li><li>TotalProducerCount</li><li>MemoryLimit</li><li>MemoryPercentUsage</li><li>StoreLimit</li><li>StorePercentUsage</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>start</li><li>stop</li><li>terminateJVM</li><li>resetStatistics</li><li>gc</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;Destination</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><
 li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>destinationType</strong>=Queue|Topic</li><li><strong>destinationName</strong>=&lt;name&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>AverageEnqueueTime</li><li><span style="line-height: 1.4285715;">ConsumerCount</span></li><li><span style="line-height: 1.4285715;">DequeueCount</span></li><li>EnqueueCount</li><li>ExpiredCount</li><li>InFlightCount</li><li><span style="line-height: 1.4285715;">MemoryLimit</span></li><li>MemoryPercentUsage</li><li>Name</li><li><span style="line-height: 1.4285715;">QueueSize (queues only)</span></li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>browseMessages</li><li>gc</li><li>purge</li><li>resetStatistics</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;NetworkConnector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;
 name of broker&gt;</li><li><strong>connector</strong>=networkConnectors</li><li><strong>networkConnectorName</strong>=&lt;connector identifier&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>Name</li><li>Duplex</li><li>DynamicOnly</li><li>BridgeTempDestinations</li><li>ConduitSubscriptions</li><li>DecreaseNetworkConsumerPriority</li><li>DispatchAsync</li><li>DynamicOnly</li><li>NetworkTTL</li><li>Password</li><li>PrefetchSize</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>start</li><li>stop</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;Connector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>connector</strong>=clientConnectors</li><li><strong>ConnectorName</strong>=&lt;connector identifier&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>StatisticsEnabl
 ed</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>start</li><li>stop</li><li>resetStatistics</li><li>enableStatistics</li><li>disableStatistics</li><li>connectionCount</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;Connection</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>connectionViewType</strong>=clientId</li><li><strong>connectionName</strong>=&lt;connection identifier&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>DispatchQueueSize</li><li>Active</li><li>Blocked</li><li>Connected</li><li>Slow</li><li>Consumers</li><li>Producers</li><li>RemoteAddress</li><li>UserName</li><li>ClientId</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>start</li><li>stop</li><li>resetStatistics</li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160
 ; PersistenceAdapter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker name&gt;</li><li><strong>Service</strong>=PersistenceAdapter</li><li><strong>InstanceName</strong>=&lt;adapter identifier&gt;</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>Name</li><li>Size</li><li>Data</li><li>Transactions</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;Health</p></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker name&gt;</li><li><strong>Service</strong>=Health</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>CurrentStatus</li></ul></td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>health</li></ul></td></tr></tbody></table></div><p>Command line utilities are also av
 ailable to let you monitor ActiveMQ. Refer to <a shape="rect" href="activemq-command-line-tools-reference.xml">ActiveMQ Command Line Tools Reference</a> for usage information.</p><p>JMX API is also exposed via <a shape="rect" href="rest.xml#REST-RestManagement">REST management API </a></p><h3 id="JMX-PasswordProtectingtheJMXConnector">Password Protecting the JMX Connector</h3><p>(For Java 1.5+)</p><p>1. Make sure JMX is enabled, but tell ActiveMQ <strong>not</strong> create its own connector so that it will use the default JVM JMX connector.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker xmlns=&quot;http://activemq.org/config/1.0&quot; brokerName=&quot;localhost&quot;useJmx=&quot;true&quot;&gt;
+</plain-text-body></structured-macro><p>2. Run a JMX console</p><structured-macro ac:macro-id="171443e0-69a0-46f4-b507-386689ea89ad" ac:name="code" ac:schema-version="1"><plain-text-body>$ jconsole </plain-text-body></structured-macro><p>3. The ActiveMQ broker should appear in the list of local connections, if you are running JConsole on the same host as ActiveMQ.</p><p><strong style="color: rgb(102,0,51);font-size: 16.0px;"><br clear="none"></strong></p><p><strong style="color: rgb(102,0,51);font-size: 16.0px;">JMX remote access</strong></p><p>Remote connections to JMX are not enabled by default in the activemq.xml for security reasons. Please refer to&#160;<a shape="rect" href="http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html">Java Management guide</a>&#160;to configure the broker for remote management.</p><p>&#160;</p><p><span style="line-height: 1.4285715;">Using the Apache ActiveMQ version on OS X it appears as follows:</span></p><p><image><attachment
  ri:filename="activemq-jmx.png"></attachment></image><br clear="none"> &#160;</p><h3>ActiveMQ MBeans Reference</h3><p>For additional references provided below is a brief hierarchy of the mbeans and a listing of the properties, attributes, and operations of each mbeans.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>&#160;Mbean Type</p></th><th colspan="1" rowspan="1"><p>Properties / ObjectName&#160;</p></th><th colspan="1" rowspan="1"><p>Attributes&#160;</p></th><th colspan="1" rowspan="1"><p>Operations&#160;</p></th></tr><tr><td colspan="1" rowspan="1"><p>&#160;Broker</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>BrokerId</li><li>TotalEnqueueCount</li><li>TotalDequeueCount</li><li>TotalConsumerCount</li><li>TotalMessageCount</li><li>TotalConnectionsCount</li><li>TotalConsumerCount</li><li>TotalProducerCount</li><li>MemoryLimit</li><li>Memor
 yPercentUsage</li><li>StoreLimit</li><li>StorePercentUsage</li></ul></td><td colspan="1" rowspan="1"><ul><li>start</li><li>stop</li><li>terminateJVM</li><li>resetStatistics</li><li>gc</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;Destination</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>destinationType</strong>=Queue|Topic</li><li><strong>destinationName</strong>=&lt;name&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>AverageEnqueueTime</li><li><span style="line-height: 1.4285715;">ConsumerCount</span></li><li><span style="line-height: 1.4285715;">DequeueCount</span></li><li>EnqueueCount</li><li>ExpiredCount</li><li>InFlightCount</li><li><span style="line-height: 1.4285715;">MemoryLimit</span></li><li>MemoryPercentUsage</li><li>Name</li><li><span style="line-height: 1.4285715;">QueueSize (queues only)</span></li></ul></td><td colspan="1" rowspan="1"><ul><li>brow
 seMessages</li><li>gc</li><li>purge</li><li>resetStatistics</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;NetworkConnector</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>connector</strong>=networkConnectors</li><li><strong>networkConnectorName</strong>=&lt;connector identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>Name</li><li>Duplex</li><li>DynamicOnly</li><li>BridgeTempDestinations</li><li>ConduitSubscriptions</li><li>DecreaseNetworkConsumerPriority</li><li>DispatchAsync</li><li>DynamicOnly</li><li>NetworkTTL</li><li>Password</li><li>PrefetchSize</li></ul></td><td colspan="1" rowspan="1"><ul><li>start</li><li>stop</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;Connector</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>connector</strong>=clien
 tConnectors</li><li><strong>ConnectorName</strong>=&lt;connector identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>StatisticsEnabled</li></ul></td><td colspan="1" rowspan="1"><ul><li>start</li><li>stop</li><li>resetStatistics</li><li>enableStatistics</li><li>disableStatistics</li><li>connectionCount</li></ul></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;Connection</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;name of broker&gt;</li><li><strong>connectionViewType</strong>=clientId</li><li><strong>connectionName</strong>=&lt;connection identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>DispatchQueueSize</li><li>Active</li><li>Blocked</li><li>Connected</li><li>Slow</li><li>Consumers</li><li>Producers</li><li>RemoteAddress</li><li>UserName</li><li>ClientId</li></ul></td><td colspan="1" rowspan="1"><ul><li>start</li><li>stop</li><li>resetStatistics</li></ul></td></tr><tr><td colspan="1" r
 owspan="1"><p>&#160; PersistenceAdapter</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker name&gt;</li><li><strong>Service</strong>=PersistenceAdapter</li><li><strong>InstanceName</strong>=&lt;adapter identifier&gt;</li></ul></td><td colspan="1" rowspan="1"><ul><li>Name</li><li>Size</li><li>Data</li><li>Transactions</li></ul></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr><tr><td colspan="1" rowspan="1"><p>&#160;Health</p></td><td colspan="1" rowspan="1"><ul><li><strong>type</strong>=Broker</li><li><strong>brokerName</strong>=&lt;broker name&gt;</li><li><strong>Service</strong>=Health</li></ul></td><td colspan="1" rowspan="1"><ul><li>CurrentStatus</li></ul></td><td colspan="1" rowspan="1"><ul><li>health</li></ul></td></tr></tbody></table><p>Command line utilities are also available to let you monitor ActiveMQ. Refer to <link><page ri:content-title="ActiveMQ Command Line Tools Reference"></page></link> for 
 usage information.</p><p>JMX API is also exposed via <link ac:anchor="Rest Management"><page ri:content-title="REST"></page><plain-text-link-body>REST management API </plain-text-link-body></link></p><h3>Password Protecting the JMX Connector</h3><p>(For Java 1.5+)</p><p>1. Make sure JMX is enabled, but tell ActiveMQ <strong>not</strong> create its own connector so that it will use the default JVM JMX connector.</p><structured-macro ac:macro-id="8464c71e-56cc-4fb0-aec3-7d93bfb2ffe2" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;broker xmlns="http://activemq.org/config/1.0" brokerName="localhost"useJmx="true"&gt;
 
   ...
 
   &lt;managementContext&gt;
-     &lt;managementContext createConnector=&quot;false&quot;/&gt;
+     &lt;managementContext createConnector="false"/&gt;
   &lt;/managementContext&gt;
 
   ...
 
 &lt;/broker&gt;
-]]></script>
-</div></div><p>2. Create access and password files</p><p>conf/jmx.access:</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[# The &quot;monitorRole&quot; role has readonly access.
-# The &quot;controlRole&quot; role has readwrite access.
+</plain-text-body></structured-macro><p>2. Create access and password files</p><p>conf/jmx.access:</p><structured-macro ac:macro-id="f5545277-e779-4925-8de7-bf2a9c5b5fde" ac:name="code" ac:schema-version="1"><plain-text-body># The "monitorRole" role has readonly access.
+# The "controlRole" role has readwrite access.
 monitorRole readonly
 controlRole readwrite
-]]></script>
-</div></div><p>conf/jmx.password:</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[# The &quot;monitorRole&quot; role has password &quot;abc123&quot;.
-# The &quot;controlRole&quot; role has password &quot;abcd1234&quot;.
+</plain-text-body></structured-macro><p>conf/jmx.password:</p><structured-macro ac:macro-id="b0ea5924-d5f5-4ce1-98d3-0aebdcde6ff3" ac:name="code" ac:schema-version="1"><plain-text-body># The "monitorRole" role has password "abc123".
+# The "controlRole" role has password "abcd1234".
 monitorRole abc123
 controlRole abcd1234
-]]></script>
-</div></div><p>(Make sure both files are not world readable - more info can be find <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#auth" rel="nofollow">here</a> to protect files)</p><p>For more details you can see the <a shape="rect" class="external-link" href="http://tomcat.apache.org/tomcat-5.5-doc/monitoring.html">Monitoring Tomcat Document</a></p><p>3. Modify the "activemq" startup script (in bin) to enable the Java 1.5+ JMX connector</p><p>Find the "ACTIVEMQ_SUNJMX_START=" line and change it too the following: (note that in previous versions of ActiveMQ this property was called SUNJMX in some scripts. &#160;As of v5.12.0 all scripts use ACTIVEMQ_SUNJMX_START):</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[1. Windows
+</plain-text-body></structured-macro><p>(Make sure both files are not world readable - more info can be find <a shape="rect" href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#auth">here</a> to protect files)</p><p>For more details you can see the <a shape="rect" href="http://tomcat.apache.org/tomcat-5.5-doc/monitoring.html">Monitoring Tomcat Document</a></p><p>3. Modify the "activemq" startup script (in bin) to enable the Java 1.5+ JMX connector</p><p>Find the "ACTIVEMQ_SUNJMX_START=" line and change it too the following: (note that in previous versions of ActiveMQ this property was called SUNJMX in some scripts. &#160;As of v5.12.0 all scripts use ACTIVEMQ_SUNJMX_START):</p><structured-macro ac:macro-id="54f2c4ab-bea5-48aa-b626-9084c0f0c664" ac:name="code" ac:schema-version="1"><plain-text-body>1. Windows
 
   ACTIVEMQ_SUNJMX_START=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.ssl=false \
     -Dcom.sun.management.jmxremote.password.file=%ACTIVEMQ_BASE%/conf/jmx.password \
@@ -39,12 +28,10 @@ controlRole abcd1234
 
 2. Unix
 
-  ACTIVEMQ_SUNJMX_START=&quot;-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.ssl=false \
+  ACTIVEMQ_SUNJMX_START="-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.ssl=false \
     -Dcom.sun.management.jmxremote.password.file=${ACTIVEMQ_BASE}/conf/jmx.password \
-    -Dcom.sun.management.jmxremote.access.file=${ACTIVEMQ_BASE}/conf/jmx.access&quot;
-]]></script>
-</div></div><p>This could be set in /etc/activemq.conf instead (if you have root access):</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[1. Windows
+    -Dcom.sun.management.jmxremote.access.file=${ACTIVEMQ_BASE}/conf/jmx.access"
+</plain-text-body></structured-macro><p>This could be set in /etc/activemq.conf instead (if you have root access):</p><structured-macro ac:macro-id="2e3f12e0-d7a0-413f-98b2-efdc6d92f08f" ac:name="code" ac:schema-version="1"><plain-text-body>1. Windows
 
 ACTIVEMQ_HOME=DRIVE_LETTER:/where/ActiveMQ/is/installed
 ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
@@ -56,18 +43,13 @@ ACTIVEMQ_SUNJMX_START=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.managem
 
 ACTIVEMQ_HOME=DRIVE_LETTER:/where/ActiveMQ/is/installed
 ACTIVEMQ_BASE=${ACTIVEMQ_HOME}
-ACTIVEMQ_SUNJMX_START=&quot;-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.ssl=false \
+ACTIVEMQ_SUNJMX_START="-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.ssl=false \
     -Dcom.sun.management.jmxremote.password.file=${ACTIVEMQ_BASE}/conf/jmx.password \
-    -Dcom.sun.management.jmxremote.access.file=${ACTIVEMQ_BASE}/conf/jmx.access&quot;
-]]></script>
-</div></div><p>4. Start ActiveMQ</p><p>You should be able to connect to JMX on the JMX URL</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[service:jmx:rmi:///jndi/rmi://&lt;your hostname&gt;:1616/jmxrmi
-]]></script>
-</div></div><p>And you will be forced to login.</p><h3 id="JMX-SelectiveMBeanregistration">Selective MBean registration</h3><p>In situations where you need to scale your broker to large number of connections, destinations and consumers it can become very expensive to keep JMX MBeans for all those objects. Instead of turning off JMX completely, starting with 5.12.0, you can selectively suppress registration of some types of MBeans and thus help your broker scale, while still having a basic view of the broker state.</p><p>For example, the following configuration will exclude all dynamic producers, consumers, connections and advisory topics from registering their MBeans</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;managementContext&gt;
-&lt;managementContext 
-   suppressMBean=&quot;endpoint=dynamicProducer,endpoint=Consumer,connectionName=*,destinationName=ActiveMQ.Advisory.*&quot;
+    -Dcom.sun.management.jmxremote.access.file=${ACTIVEMQ_BASE}/conf/jmx.access"
+</plain-text-body></structured-macro><p>4. Start ActiveMQ</p><p>You should be able to connect to JMX on the JMX URL</p><structured-macro ac:macro-id="5703fa7f-962a-4044-87c8-41d1d828d15c" ac:name="code" ac:schema-version="1"><plain-text-body>service:jmx:rmi:///jndi/rmi://&lt;your hostname&gt;:1616/jmxrmi
+</plain-text-body></structured-macro><p>And you will be forced to login.</p><h3>Selective MBean registration</h3><p>In situations where you need to scale your broker to large number of connections, destinations and consumers it can become very expensive to keep JMX MBeans for all those objects. Instead of turning off JMX completely, starting with 5.12.0, you can selectively suppress registration of some types of MBeans and thus help your broker scale, while still having a basic view of the broker state.</p><p>For example, the following configuration will exclude all dynamic producers, consumers, connections and advisory topics from registering their MBeans</p><structured-macro ac:macro-id="72278916-ebd3-4827-b0d7-89db4f39b1be" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;managementContext&gt;
+&lt;managementContext&#160;
+   suppressMBean="endpoint=dynamicProducer,endpoint=Consumer,connectionName=*,destinationName=ActiveMQ.Advisory.*"
 /&gt;
-&lt;/managementContext&gt;]]></script>
-</div></div><p>&#160;</p><h4 id="JMX-ManagementContextPropertiesReference">ManagementContext Properties Reference</h4><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>useMBeanServer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If true then it avoids creating a new MBean server if a MBeanServer has already been created in the JVM</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>jmxDomainName</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>org.apache.activemq</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The jmx domain that all objects names will use</p></td></tr><tr><
 td colspan="1" rowspan="1" class="confluenceTd"><p>createMBeanServer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If we should create the MBeanServer is none is found.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>createConnector</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(119,119,119);"><span style="color: rgb(0,0,0);">Please refer to</span>&#160;</span><a shape="rect" class="external-link" href="http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html" rel="nofollow">Java Management guide</a><span style="color: rgb(119,119,119);">&#160;<span style="color: rgb(0,0,0);">to configure the server for remote management and lock down the endpoint serialisation with an appropriate <a shape="rect" class="external-link" href="http://openjdk.java.net/jeps/290" rel="no
 follow"> jdk.serialFilter</a></span></span></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectorPort</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>1099</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The port that the JMX connector will use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectorHost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>localhost</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The host that the JMX connector and RMI server (if rmiServerPort&gt;0) will use</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>rmiServerPort</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>0</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The RMI server port, handy if port usage needs to be restricted behind a firewall</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectorPath</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p>/jmxrmi</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The path that JMX connector will be registered under</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>findTigerMBeanServer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Enables/disables the searching for the Java 5 platform MBeanServer</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>suppressMBean</p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">List of MBean name patters to ignore</td></tr></tbody></table></div></div>
+&lt;/managementContext&gt;</plain-text-body></structured-macro><p>&#160;</p><h4>ManagementContext Properties Reference</h4><table><tbody><tr><th colspan="1" rowspan="1"><p>Property Name</p></th><th colspan="1" rowspan="1"><p>Default Value</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>useMBeanServer</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If true then it avoids creating a new MBean server if a MBeanServer has already been created in the JVM</p></td></tr><tr><td colspan="1" rowspan="1"><p>jmxDomainName</p></td><td colspan="1" rowspan="1"><p>org.apache.activemq</p></td><td colspan="1" rowspan="1"><p>The jmx domain that all objects names will use</p></td></tr><tr><td colspan="1" rowspan="1"><p>createMBeanServer</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>If we should create the MBeanServer is none is found.</p></td></tr><tr><td colspan="1" rowspan="1"><p
 >createConnector</p></td><td colspan="1" rowspan="1"><p>false</p></td><td colspan="1" rowspan="1"><p><span style="color: rgb(119,119,119);"><span style="color: rgb(0,0,0);">Please refer to</span>&#160;</span><a shape="rect" href="http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html">Java Management guide</a><span style="color: rgb(119,119,119);">&#160;<span style="color: rgb(0,0,0);">to configure the server for remote management and lock down the endpoint serialisation with an appropriate <a shape="rect" href="http://openjdk.java.net/jeps/290"> jdk.serialFilter</a></span></span></p></td></tr><tr><td colspan="1" rowspan="1"><p>connectorPort</p></td><td colspan="1" rowspan="1"><p>1099</p></td><td colspan="1" rowspan="1"><p>The port that the JMX connector will use</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectorHost</p></td><td colspan="1" rowspan="1"><p>localhost</p></td><td colspan="1" rowspan="1"><p>The host that the JMX connector and RMI server (if r
 miServerPort&gt;0) will use</p></td></tr><tr><td colspan="1" rowspan="1"><p>rmiServerPort</p></td><td colspan="1" rowspan="1"><p>0</p></td><td colspan="1" rowspan="1"><p>The RMI server port, handy if port usage needs to be restricted behind a firewall</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectorPath</p></td><td colspan="1" rowspan="1"><p>/jmxrmi</p></td><td colspan="1" rowspan="1"><p>The path that JMX connector will be registered under</p></td></tr><tr><td colspan="1" rowspan="1"><p>findTigerMBeanServer</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Enables/disables the searching for the Java 5 platform MBeanServer</p></td></tr><tr><td colspan="1" rowspan="1"><p>suppressMBean</p></td><td colspan="1" rowspan="1">&#160;</td><td colspan="1" rowspan="1">List of MBean name patters to ignore</td></tr></tbody></table></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/jndi-support.xml
----------------------------------------------------------------------
diff --git a/jndi-support.xml b/jndi-support.xml
index 9514884..68bd0e6 100644
--- a/jndi-support.xml
+++ b/jndi-support.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>ActiveMQ will work with any JNDI provider capable of storing Java objects. However it is common to require a JNDI initial context to be able to run many JMS example programs, like <a shape="rect" class="external-link" href="http://java.sun.com/products/jms/tutorial/1_3_1-fcs/doc/jms_tutorialTOC.html" rel="nofollow">Sun's JMS tutorial.</a></p><p>So we provide a simple JNDI&#160;<strong><code>InitialContextFactory</code></strong> which can be used to lookup JMS connection factory objects as well as Destination objects. For example if you place this <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/jndi.properties">jndi.properties</a> file on your classpath, you can look inside the&#160;<strong><code>InitialContext</code></strong> and lookup&#160;<strong><code>ConnectionFactory</code></strong> objects and&#160;<strong><code>Destinations</code></strong> etc.</p><plain
 -text-body>java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
+<div class="wiki-content maincontent"><p>ActiveMQ will work with any JNDI provider capable of storing Java objects. However it is common to require a JNDI initial context to be able to run many JMS example programs, like <a shape="rect" href="http://java.sun.com/products/jms/tutorial/1_3_1-fcs/doc/jms_tutorialTOC.html">Sun's JMS tutorial.</a></p><p>So we provide a simple JNDI&#160;<strong><code>InitialContextFactory</code></strong> which can be used to lookup JMS connection factory objects as well as Destination objects. For example if you place this <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/jndi.properties">jndi.properties</a> file on your classpath, you can look inside the&#160;<strong><code>InitialContext</code></strong> and lookup&#160;<strong><code>ConnectionFactory</code></strong> objects and&#160;<strong><code>Destinations</code></strong> etc.</p><plain-text-body>java.naming.factory.initial = org.apache.activem
 q.jndi.ActiveMQInitialContextFactory
 
 # Use the following property to configure the default connector
 java.naming.provider.url = vm://localhost
@@ -13,7 +13,7 @@ queue.MyQueue = example.MyQueue
 
 # Register some topics in JNDI using the form:
 #   topic.[jndiName] = [physicalName]
-topic.MyTopic = example.MyTopic</plain-text-body><p>You can edit the&#160;<strong><code>jndi.properties</code></strong> file to configure the <strong><code>ActiveMQConnectionFactory</code></strong>'s properties such as&#160;<strong><code>brokerURL</code></strong> and whether or not there should be an embedded broker etc. See <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">how to embed a broker in a connection</a> for more details.</p><h3 id="JNDISupport-ActiveMQJNDITutorial">ActiveMQ JNDI Tutorial</h3><p>This is a quick one page tutorial on how to setup and use JNDI to create a connection to ActiveMQ. The first thing is ActiveMQ does not provide a full JNDI server. This means JMS clients need to use properties files to create a JNDI <strong><code>IntialContextFactory</code></strong>. If you need an example properties file, you can look the source distribution <a shape="rect" class="external-link" href="https://github.com/apache/activemq/blob/master/activemq-un
 it-tests/src/test/resources/jndi.properties" rel="nofollow">https://github.com/apache/activemq/blob/master/activemq-unit-tests/src/test/resources/jndi.properties</a>. Before we proceed, here are the properties.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>java.naming.factory.initial</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>org.apache.activemq.jndi.ActiveMQInitialContextFactory</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>java.naming.provider.url</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tcp://hostname:61616</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>topic.MyTopic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p
 ><code>example.MyTopic</code></p></td></tr></tbody></table></div><p>Make sure to add&#160;<strong><code>activemq-<em>&lt;version&gt;</em>.jar</code></strong> and&#160;<strong><code>spring-1.x.jar</code></strong> to your classpath. If the libraries are not in the classpath, you will get a&#160;<strong><code>ClassNotFoundException</code></strong> at runtime. If you get <strong><code>ClassNotFoundException</code></strong>, try printing out the classpath and check it is present. You can also run ActiveMQ with&#160;<strong><code>-verbose</code></strong> option to verify the jar was loaded correctly.</p><p><strong>Sample Code</strong></p><parameter ac:name="language">java</parameter><plain-text-body>// Create a new intial context, which loads from jndi.properties file:
+topic.MyTopic = example.MyTopic</plain-text-body><p>You can edit the&#160;<strong><code>jndi.properties</code></strong> file to configure the <strong><code>ActiveMQConnectionFactory</code></strong>'s properties such as&#160;<strong><code>brokerURL</code></strong> and whether or not there should be an embedded broker etc. See <link><page ri:content-title="How do I embed a Broker inside a Connection"></page><plain-text-link-body>how to embed a broker in a connection</plain-text-link-body></link> for more details.</p><h3>ActiveMQ JNDI Tutorial</h3><p>This is a quick one page tutorial on how to setup and use JNDI to create a connection to ActiveMQ. The first thing is ActiveMQ does not provide a full JNDI server. This means JMS clients need to use properties files to create a JNDI <strong><code>IntialContextFactory</code></strong>. If you need an example properties file, you can look the source distribution <a shape="rect" href="https://github.com/apache/activemq/blob/master/activemq-uni
 t-tests/src/test/resources/jndi.properties">https://github.com/apache/activemq/blob/master/activemq-unit-tests/src/test/resources/jndi.properties</a>. Before we proceed, here are the properties.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Name</p></th><th colspan="1" rowspan="1"><p>Value</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>java.naming.factory.initial</code></p></td><td colspan="1" rowspan="1"><p><code>org.apache.activemq.jndi.ActiveMQInitialContextFactory</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>java.naming.provider.url</code></p></td><td colspan="1" rowspan="1"><p><code>tcp://hostname:61616</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>topic.MyTopic</code></p></td><td colspan="1" rowspan="1"><p><code>example.MyTopic</code></p></td></tr></tbody></table><p>Make sure to add&#160;<strong><code>activemq-<em>&lt;version&gt;</em>.jar</code></strong> and&#160;<strong><code>spring-1.x.jar</code></strong> to your classpath. If the 
 libraries are not in the classpath, you will get a&#160;<strong><code>ClassNotFoundException</code></strong> at runtime. If you get <strong><code>ClassNotFoundException</code></strong>, try printing out the classpath and check it is present. You can also run ActiveMQ with&#160;<strong><code>-verbose</code></strong> option to verify the jar was loaded correctly.</p><p><strong>Sample Code</strong></p><parameter ac:name="language">java</parameter><plain-text-body>// Create a new intial context, which loads from jndi.properties file:
 javax.naming.Context ctx = new javax.naming.InitialContext();
 
 // Lookup the connection factory:
@@ -30,14 +30,14 @@ javax.jms.TopicSession session = conn.createTopicSession(false,TopicSession.AUTO
 
 // Create a new subscriber to receive messages:
 javax.jms.TopicSubscriber subscriber = session.createSubscriber(mytopic);
-</plain-text-body><p>Notice the name of the topic in the sample is <strong><code>MyTopic</code></strong>. ActiveMQ will read the&#160;<strong><code>jndi.properties</code></strong> files and creates the topics and queues in a lazy fashion. The prefix topic and queue is stripped, so the JNDI name begins after the prefix.</p><p>Once you have the&#160;<strong><code>jndi.properties</code></strong> edited and ready, it needs to be accessible to your application. The easiest way is to add&#160;<strong><code>jndi.properties</code></strong> to a jar file. When&#160;<strong><code>new InitialContext()</code></strong> is called, it will scan the resources and find the file. If you get <strong><code>javax.naming.NamingException</code></strong>, it usually means the&#160;<strong><code>jndi.properties</code></strong> file is not accessible.</p><p>You can also try to create a new initial context using either an instance of properties file or a map. For example, the approach recommended by JMS speci
 fication will work just fine.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Example Recommended by Specification</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><parameter ac:name="language">java</parameter><plain-text-body>Properties props = new Properties();
+</plain-text-body><p>Notice the name of the topic in the sample is <strong><code>MyTopic</code></strong>. ActiveMQ will read the&#160;<strong><code>jndi.properties</code></strong> files and creates the topics and queues in a lazy fashion. The prefix topic and queue is stripped, so the JNDI name begins after the prefix.</p><p>Once you have the&#160;<strong><code>jndi.properties</code></strong> edited and ready, it needs to be accessible to your application. The easiest way is to add&#160;<strong><code>jndi.properties</code></strong> to a jar file. When&#160;<strong><code>new InitialContext()</code></strong> is called, it will scan the resources and find the file. If you get <strong><code>javax.naming.NamingException</code></strong>, it usually means the&#160;<strong><code>jndi.properties</code></strong> file is not accessible.</p><p>You can also try to create a new initial context using either an instance of properties file or a map. For example, the approach recommended by JMS speci
 fication will work just fine.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Example Recommended by Specification</p></th></tr><tr><td colspan="1" rowspan="1"><parameter ac:name="language">java</parameter><plain-text-body>Properties props = new Properties();
 props.setProperty(Context.INITIAL_CONTEXT_FACTORY,"org.apache.activemq.jndi.ActiveMQInitialContextFactory");
 props.setProperty(Context.PROVIDER_URL,"tcp://hostname:61616");
 javax.naming.Context ctx = new InitialContext(props);||
-</plain-text-body></td></tr></tbody></table></div><p>If ActiveMQ is embedded within an EJB container, you will need to look at the containers documentation for the correct JNDI values.</p><h3 id="JNDISupport-DynamicallyCreatingDestinations">Dynamically Creating Destinations</h3><p>For the easiest possible configuration with JNDI based programs, there are two dynamic contexts, namely:</p><ul><li><strong><code>dynamicQueues</code></strong></li><li><strong><code>dynamicTopics</code></strong></li></ul><p>These allow you to lookup queues and topics using JNDI without any configuration.</p><p>For example, if you use the following name to lookup into JNDI:</p><plain-text-body>dynamicQueues/FOO.BAR
-</plain-text-body><p>you will get back an&#160;<strong><code>ActiveMQQueue</code></strong> of the name <strong><code>FOO.BAR</code></strong>. This can be very handy if you can easily reconfigure the JNDI name to use to lookup something in JNDI, but don't want to have to double configure a&#160;<strong><code>jndi.properties</code></strong> to match.</p><h3 id="JNDISupport-WorkingWithEmbeddedBrokers">Working With Embedded Brokers</h3><p>It is often useful to use an embedded broker in the same JVM as the JMS client. For this see <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">How do I embed a Broker inside a Connection</a>.</p><p>If you want to use an embedded broker with your JNDI provider you can just use the <a shape="rect" href="vm-transport-reference.xml">VM Transport</a> to connect to the broker in your URL. e.g. to create a purely in JVM broker use this URI</p><plain-text-body>vm://locahost
+</plain-text-body></td></tr></tbody></table><p>If ActiveMQ is embedded within an EJB container, you will need to look at the containers documentation for the correct JNDI values.</p><h3>Dynamically Creating Destinations</h3><p>For the easiest possible configuration with JNDI based programs, there are two dynamic contexts, namely:</p><ul><li><strong><code>dynamicQueues</code></strong></li><li><strong><code>dynamicTopics</code></strong></li></ul><p>These allow you to lookup queues and topics using JNDI without any configuration.</p><p>For example, if you use the following name to lookup into JNDI:</p><plain-text-body>dynamicQueues/FOO.BAR
+</plain-text-body><p>you will get back an&#160;<strong><code>ActiveMQQueue</code></strong> of the name <strong><code>FOO.BAR</code></strong>. This can be very handy if you can easily reconfigure the JNDI name to use to lookup something in JNDI, but don't want to have to double configure a&#160;<strong><code>jndi.properties</code></strong> to match.</p><h3>Working With Embedded Brokers</h3><p>It is often useful to use an embedded broker in the same JVM as the JMS client. For this see <link><page ri:content-title="How do I embed a Broker inside a Connection"></page></link>.</p><p>If you want to use an embedded broker with your JNDI provider you can just use the <link><page ri:content-title="VM Transport Reference"></page><plain-text-link-body>VM Transport</plain-text-link-body></link> to connect to the broker in your URL. e.g. to create a purely in JVM broker use this URI</p><plain-text-body>vm://locahost
 </plain-text-body><p>If you want to customize the broker use something like this:</p><plain-text-body>vm:broker:(tcp://localhost:61616)
-</plain-text-body><p>More options are available in the <a shape="rect" href="vm-transport-reference.xml">VM Transport Reference</a></p><h3 id="JNDISupport-ExampleJavaCode">Example Java Code</h3><p>Once you have configured JNDI on the classpath you can run any normal JMS application such as the following <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java">example</a>. Notice that the Java code just uses pure JMS APIs and is not in any way ActiveMQ specific</p><parameter ac:name="language">java</parameter><plain-text-body>/**
+</plain-text-body><p>More options are available in the <link><page ri:content-title="VM Transport Reference"></page></link></p><h3>Example Java Code</h3><p>Once you have configured JNDI on the classpath you can run any normal JMS application such as the following <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java">example</a>. Notice that the Java code just uses pure JMS APIs and is not in any way ActiveMQ specific</p><parameter ac:name="language">java</parameter><plain-text-body>/**
  * The SimpleQueueSender class consists only of a main method,
  * which sends several messages to a queue.
  *

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/journal-is-already-opened-by-this-application.xml
----------------------------------------------------------------------
diff --git a/journal-is-already-opened-by-this-application.xml b/journal-is-already-opened-by-this-application.xml
index b03ca81..7b4637c 100644
--- a/journal-is-already-opened-by-this-application.xml
+++ b/journal-is-already-opened-by-this-application.xml
@@ -1,9 +1,8 @@
-<div class="wiki-content maincontent"><h3 id="Journalisalreadyopenedbythisapplication-Error">Error</h3>
+<div class="wiki-content maincontent"><h3>Error</h3>
 
 <p>You get something 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[
+<structured-macro ac:macro-id="775cffc6-08c3-4a76-9070-7f6a96b8d64e" ac:name="code" ac:schema-version="1"><plain-text-body>
 java.io.IOException: Journal is already opened by this application.
        at
 org.apache.activeio.journal.active.ControlFile.lock(ControlFile.java:71)
@@ -17,10 +16,9 @@ org.apache.activeio.journal.active.JournalImpl.&lt;init&gt;(JournalImpl.java:99)
 org.apache.activemq.store.DefaultPersistenceAdapterFactory.createJournal(DefaultPersistenceAdapterFactory.java:198)
        at
 org.apache.activemq.store.DefaultPersistenceAdapterFactory.getJournal(DefaultPersistenceAdapterFactory.java:134)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="Journalisalreadyopenedbythisapplication-Description">Description</h3>
+<h3>Description</h3>
 
 <p>Each broker needs to have its own directory to store its journal files etc. The error indicates that you have 2 brokers sharing the same files.</p>
 
@@ -28,8 +26,8 @@ org.apache.activemq.store.DefaultPersistenceAdapterFactory.getJournal(DefaultPer
 
 <p>Another cause of this problem is if you are using the vm://localhost style transport in a JMS client with the JMS connection starting before you have initialised your broker. If you create a vm transport connection, it will auto-create a broker if there is not one running already; so you can end up creating 2 brokers by accident. The work around is to make sure that the JMS connection factory you are using depends on the broker you are configuring (e.g. in Spring use a <strong>depends-on</strong> attribute on the connection factory to make it depend on the broker). This will ensure that the broker is initialized first before the connection factory.</p>
 
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Be careful with broker names and URIs</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html" rel="nofollow">do not allow things like underscores</a> in them etc.</p></div></div>
+<structured-macro ac:macro-id="04388450-4760-44b0-9ebe-9c4de4a6b01f" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Be careful with broker names and URIs</parameter><rich-text-body>
+<p>Make sure you do not use any strange characters in the names of brokers as they are converted to URIs which <a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/api/java/net/URI.html">do not allow things like underscores</a> in them etc.</p></rich-text-body></structured-macro>
 
-<p>This problem could also be caused by <a shape="rect" href="the-broker-will-not-start.xml">a bad OS and JVM combination</a></p></div>
+<p>This problem could also be caused by <link><page ri:content-title="The Broker will not start"></page><link-body>a bad OS and JVM combination</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/junit-reports.xml
----------------------------------------------------------------------
diff --git a/junit-reports.xml b/junit-reports.xml
index e45ede7..6adaaa3 100644
--- a/junit-reports.xml
+++ b/junit-reports.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The latest test reports are visible via the <a shape="rect" class="external-link" href="https://hudson.apache.org/hudson/job/ActiveMQ/">Hudson ActiveMQ continuous integration builds</a></p></div>
+<div class="wiki-content maincontent"><p>The latest test reports are visible via the <a shape="rect" href="https://hudson.apache.org/hudson/job/ActiveMQ/">Hudson ActiveMQ continuous integration builds</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/kaha-persistence.xml
----------------------------------------------------------------------
diff --git a/kaha-persistence.xml b/kaha-persistence.xml
index f036e7b..1cacdba 100644
--- a/kaha-persistence.xml
+++ b/kaha-persistence.xml
@@ -1,41 +1,37 @@
-<div class="wiki-content maincontent"><h2 id="KahaPersistence-KahaPersistence">Kaha Persistence</h2>
+<div class="wiki-content maincontent"><h2>Kaha Persistence</h2>
 
 <p>Kaha Peristence is a storage solution written especially for message persistence and is part of the ActiveMQ project. It's tuned to provide optimal performance for typical message usage patterns, which involves writing/reading and discarding messages that are persisted very quickly.</p>
 
 <p>Data stored in Kaha is appended to data logs - the log files are discarded once there is no longer interest in the data contained in the log.</p>
 
-<h3 id="KahaPersistence-ConfiguringKahaPersistence">Configuring Kaha Persistence</h3>
+<h3>Configuring Kaha Persistence</h3>
 
 <p>In the broker XML specify the persistence adaptor to be Kaha e.g.</p>
 
 <p>ActiveMQ 5.0 and 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[
- &lt;broker brokerName=&quot;broker&quot; persistent=&quot;true&quot; useShutdownHook=&quot;false&quot;&gt;
+<structured-macro ac:macro-id="f1210018-4a80-4011-a088-a6da3b1db3bc" ac:name="code" ac:schema-version="1"><plain-text-body>
+ &lt;broker brokerName="broker" persistent="true" useShutdownHook="false"&gt;
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61616&quot;/&gt;
+      &lt;transportConnector uri="tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
     &lt;persistenceAdapter&gt;
-      &lt;kahaPersistenceAdapter directory=&quot;activemq-data&quot; maxDataFileLength=&quot;33554432&quot;/&gt;
+      &lt;kahaPersistenceAdapter directory="activemq-data" maxDataFileLength="33554432"/&gt;
     &lt;/persistenceAdapter&gt;
   &lt;/broker&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
 <p>ActiveMQ 4.1 and earlier:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
- &lt;broker brokerName=&quot;broker&quot; persistent=&quot;true&quot; useShutdownHook=&quot;false&quot;&gt;
+<structured-macro ac:macro-id="a53390c5-5c6b-4155-b84d-be230563faf1" ac:name="code" ac:schema-version="1"><plain-text-body>
+ &lt;broker brokerName="broker" persistent="true" useShutdownHook="false"&gt;
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61616&quot;/&gt;
+      &lt;transportConnector uri="tcp://localhost:61616"/&gt;
     &lt;/transportConnectors&gt;
     &lt;persistenceAdapter&gt;
-      &lt;kahaPersistenceAdapter dir=&quot;activemq-data&quot; maxDataFileLength=&quot;33554432&quot;/&gt;
+      &lt;kahaPersistenceAdapter dir="activemq-data" maxDataFileLength="33554432"/&gt;
     &lt;/persistenceAdapter&gt;
   &lt;/broker&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/kahadb-replication-experimental.xml
----------------------------------------------------------------------
diff --git a/kahadb-replication-experimental.xml b/kahadb-replication-experimental.xml
index 0c5b898..0b306d3 100644
--- a/kahadb-replication-experimental.xml
+++ b/kahadb-replication-experimental.xml
@@ -1,3 +1,3 @@
-<div class="wiki-content maincontent"><parameter ac:name="title">Note</parameter><rich-text-body><p>This is under review - and not currently supported.</p></rich-text-body><h2 id="KahaDBReplication(Experimental)-Overview">Overview</h2><p>The new KahaDB store supports a very fast and flexible replication system. It features:</p><ul><li>Journal level replication (The translates into lower overhead to the master to replicate records).</li><li>Support for multiple slaves.</li><li>Support to dynamically add slaves at runtime.</li><li>Uses multiple concurrent data transfer sessions to do an initial slave synchronization.</li><li>Big slave synchronizations can be resumed so synchronization progress is not lost if a slave is restarted.</li><li>A configurable minimum number of replicas allows you to pause processing until the data has been guaranteed to be replicated enough times.</li></ul><h2 id="KahaDBReplication(Experimental)-MasterElection">Master Election</h2><p>KahaDB supports a plugga
 ble Master Election algorithm but the only current implementation is one based on <a shape="rect" class="external-link" href="http://hadoop.apache.org/zookeeper">ZooKeeper</a>.</p><p>ZooKeeper is used to implement the master election algorithm. ZooKeeper is a very fast, replicated, in memory database with features that make it easy to implement cluster control algorithms. It is an Apache project which you can <a shape="rect" class="external-link" href="http://hadoop.apache.org/zookeeper/releases.html">freely download</a>. You must installed and have at least one ZooKeeper server running before setting up a KahaDB Master Slave configuration.</p><h2 id="KahaDBReplication(Experimental)-ConfiguringaBroker:">Configuring a Broker:</h2><p>The ActiveMQ binary distribution includes a KahaDB HA broker configuration at <strong>$ACTIVEMQ_HOME/conf/ha.xml</strong>.</p><p>It it setup to look for a ZooKeeper 3.0.0 server on localhost at port 2181. Edit the configuration if this is not where you ar
 e running your ZooKeeper server.</p><p>Start the configuation up by running:</p><plain-text-body>prompt&gt; $ACTIVEMQ_HOME/bin/activemq xbean:ha.xml
-</plain-text-body><p>The actual contents of the configuration file follows:<plain-text-body>{snippet:lang=xml|id=example|url=activemq/trunk/assembly/src/release/conf/ha.xml}</plain-text-body></p><h2 id="KahaDBReplication(Experimental)-UnderstandingthekahadbReplicationXMLelement">Understanding the kahadbReplication XML element</h2><h3 id="KahaDBReplication(Experimental)-ThebrokerURIAttribute">The brokerURI Attribute</h3><p>Notice that the the brokerURI attribute points at another broker configuration file. The ha-broker.xml contains the actual broker configuration that the broker uses when the node take over as master. The ha-broker.xml configuration file is a standard broker configuration except in these aspects:</p><ul><li>It MUST set the start="false" attribute on the broker element.</li><li>It MUST not configure a persistenceAdapter.</li></ul><p>The above rules allows the replication system to inject the replicated KahaDB store into the Master when it's starting up.</p><h3 id="Ka
 haDBReplication(Experimental)-TheminimumReplicasAttribute">The minimumReplicas Attribute</h3><p>The minimumReplicas specifies how many copies of the database are required before synchronous update operations are deemed successful. Setting this to 0 allows a broker to continue operating even if there are no slaves attached. If the value is set to 1 or greater, and there are no slaves attached, the brokers persistent message processing will be suspended until the minimum number of slaves are attached and the data synchronized.</p><h3 id="KahaDBReplication(Experimental)-TheuriAttribute">The uri Attribute</h3><p>The uri attribute should always be configured with a <strong>kdbr://</strong> based URI. KDBR stands for 'KahaDB Replication' and this is the replication protocol used between the masters and the slaves. The master binds the specified port with slaves subsequently connect to and establish replication sessions. The host name in the uri MUST get updated to the actual machine's hos
 t name since this is also used to identify the nodes in the cluster.</p><h3 id="KahaDBReplication(Experimental)-ThedirectoryAttribute">The directory Attribute</h3><p>This is the data directory where the KahaDB will store it's persistence files.</p></div>
+<div class="wiki-content maincontent"><parameter ac:name="title">Note</parameter><rich-text-body><p>This is under review - and not currently supported.</p></rich-text-body><h2>Overview</h2><p>The new KahaDB store supports a very fast and flexible replication system. It features:</p><ul><li>Journal level replication (The translates into lower overhead to the master to replicate records).</li><li>Support for multiple slaves.</li><li>Support to dynamically add slaves at runtime.</li><li>Uses multiple concurrent data transfer sessions to do an initial slave synchronization.</li><li>Big slave synchronizations can be resumed so synchronization progress is not lost if a slave is restarted.</li><li>A configurable minimum number of replicas allows you to pause processing until the data has been guaranteed to be replicated enough times.</li></ul><h2>Master Election</h2><p>KahaDB supports a pluggable Master Election algorithm but the only current implementation is one based on <a shape="rect" 
 href="http://hadoop.apache.org/zookeeper">ZooKeeper</a>.</p><p>ZooKeeper is used to implement the master election algorithm. ZooKeeper is a very fast, replicated, in memory database with features that make it easy to implement cluster control algorithms. It is an Apache project which you can <a shape="rect" href="http://hadoop.apache.org/zookeeper/releases.html">freely download</a>. You must installed and have at least one ZooKeeper server running before setting up a KahaDB Master Slave configuration.</p><h2>Configuring a Broker:</h2><p>The ActiveMQ binary distribution includes a KahaDB HA broker configuration at <strong>$ACTIVEMQ_HOME/conf/ha.xml</strong>.</p><p>It it setup to look for a ZooKeeper 3.0.0 server on localhost at port 2181. Edit the configuration if this is not where you are running your ZooKeeper server.</p><p>Start the configuation up by running:</p><plain-text-body>prompt&gt; $ACTIVEMQ_HOME/bin/activemq xbean:ha.xml
+</plain-text-body><p>The actual contents of the configuration file follows:<plain-text-body>{snippet:lang=xml|id=example|url=activemq/trunk/assembly/src/release/conf/ha.xml}</plain-text-body></p><h2>Understanding the kahadbReplication XML element</h2><h3>The brokerURI Attribute</h3><p>Notice that the the brokerURI attribute points at another broker configuration file. The ha-broker.xml contains the actual broker configuration that the broker uses when the node take over as master. The ha-broker.xml configuration file is a standard broker configuration except in these aspects:</p><ul><li>It MUST set the start="false" attribute on the broker element.</li><li>It MUST not configure a persistenceAdapter.</li></ul><p>The above rules allows the replication system to inject the replicated KahaDB store into the Master when it's starting up.</p><h3>The minimumReplicas Attribute</h3><p>The minimumReplicas specifies how many copies of the database are required before synchronous update operatio
 ns are deemed successful. Setting this to 0 allows a broker to continue operating even if there are no slaves attached. If the value is set to 1 or greater, and there are no slaves attached, the brokers persistent message processing will be suspended until the minimum number of slaves are attached and the data synchronized.</p><h3>The uri Attribute</h3><p>The uri attribute should always be configured with a <strong>kdbr://</strong> based URI. KDBR stands for 'KahaDB Replication' and this is the replication protocol used between the masters and the slaves. The master binds the specified port with slaves subsequently connect to and establish replication sessions. The host name in the uri MUST get updated to the actual machine's host name since this is also used to identify the nodes in the cluster.</p><h3>The directory Attribute</h3><p>This is the data directory where the KahaDB will store it's persistence files.</p></div>
 


[34/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201504-april.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201504-april.xml b/apache-activemq-board-report-201504-april.xml
index 4d3a1cf..4fff13b 100644
--- a/apache-activemq-board-report-201504-april.xml
+++ b/apache-activemq-board-report-201504-april.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>TLP Description:<br clear="none">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.</p><p>Community:<br clear="none">* The development and user lists continue to stay active.<br clear="none">* Several ActiveMQ based presentation were given at Apachecon NA.<br clear="none">* The ActiveMQ community has voted to name the HortnetQ code donation ActiveMQ&#160;<span style="color: rgb(34,34,34);">Artemis.</span><br clear="none"><span style="color: rgb(34,34,34);line-height: 1.4285715;">* Apache board members&#160;</span><span style="color: rgb(34,34,34);">requested<span style="line-height: 1.4285715;">&#160;a special report to address what the plan is of the hornetq code&#160;</span>donation<span style="line-height: 1.4285715;">
 . &#160;There were some specific question what were directed at the PMC:</span></span></p><p><span style="color: rgb(34,34,34);"><span style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160; &#160; Q. Red Hat has a product, called HornetQ, which includes a website;</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; &#160;branding, etc.&#160;&#160;</span><a shape="rect" class="external-link" href="http://hornetq.jboss.org/" rel="nofollow">http://hornetq.jboss.org/</a><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; A. ActiveMQ PMC does not intend to use the HornetQ branding in any code,</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; docs or website. <span style="color: rgb(34,34,34);">The code donation has been updated to remove such</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; references.&#160;</span>The&#160;<spa
 n style="color: rgb(34,34,34);">HornetQ open source project is now considered a legacy <br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>project and the code is no longer maintained as the open source project<br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>HornetQ.</span></span><span style="color: rgb(34,34,34);">&#160;The ActiveMQ community is beginning to work together to&#160;<br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; develop a plan to take the donated code base forward and to develop <br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>community&#160;<span style="color: rgb(34,34,34);">around this code base</span>.&#160;</span></span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; Q. The ActiveMQ PMC needs to deliver a plan for:</span><br clear="none"><span style="color: rgb(34,34,34);"><span sty
 le="color: rgb(34,34,34);">&#160; &#160;&#160;</span>A. &#160;Apache ActiveMQ has multiple products with multiple versions:</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>&#160;a.&#160; ActiveMQ - (version 5.x.x)</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>&#160;b. &#160;ActiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;- (version 1.x.x)</span></span></span></p><p><span style="color: rgb(34,34,34);"><span style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160;</span>&#160; &#160; &#160; &#160; &#160; This means that we are not yet ready to declare that&#160;
 <span style="color: rgb(34,34,34);">ActiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;is the successor to ActiveMQ 5.x. &#160;We will wait until the product matures to make that decision.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>Q. The current chair has been the chair for *many* years and based on the</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160; &#160;</span>current&#160;</span><span style="color: rgb(34,34,34);">status and issues in the community, I would strongly suggest having</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160; &#160;</span>a plan for potentially replacing the chair of the project.</span></span></span></p><p><spa
 n style="color: rgb(34,34,34);"><span style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160; &#160; A. The PMC agrees.</span></span></span></p><p><span style="line-height: 1.4285715;">* The PMC has voted to give the code donation a code name so that it is not referred to as HornetQ anymore within ActiveMQ.<br clear="none">* IP clearance for the code donation is almost complete:&#160;<a shape="rect" class="external-link" href="http://incubator.apache.org/ip-clearance/hornetq.html">http://incubator.apache.org/ip-clearance/hornetq.html<br clear="none"></a></span><span style="line-height: 1.4285715;">*&#160;At least one member of the PMC, as well as several members of the community, feels strongly that disagreements and concerns are not getting addressed. &#160;They would rather have <span style="color: rgb(34,34,34);">Artemis go through the incubator.</span>&#160;<br clear="none"></span><span style="line-height: 1.4285715;">* PMC is in discussions looking for ways t
 o increase community diversity<br clear="none"></span><span style="line-height: 1.4285715;">* PMC has voted to appoint Bruce Snyder as the ActiveMQ PMC chair. &#160;The PMC requests that the board approve the the following resolution:</span></p><p><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">-----------------------------</span><span style="color: rgb(34,34,34);">-----------------------------</span></span></p><p><span style="color: rgb(34,34,34);">WHEREAS, the Board of Directors heretofore appointed Hiram Chirino to</span><br clear="none"><span style="color: rgb(34,34,34);">the office of Vice President, Apache ActiveMQ, and</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">WHEREAS, the Board of Directors is in receipt of the resignation</span><br clear="none"><span style="color: rgb(34,34,34);">of Hiram Chirino from the office of Vice President, Apache</span><br clear="none"><span style="color: rgb(34,34,34);">ActiveMQ, and</span><
 br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">WHEREAS, the Project Management Committee of the Apache ActiveMQ</span><br clear="none"><span style="color: rgb(34,34,34);">project has chosen by vote to recommend Bruce Snyder as the Successor</span><br clear="none"><span style="color: rgb(34,34,34);">to the post;</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">NOW, THEREFORE, BE IT RESOLVED, that Hiram Chirino is</span><br clear="none"><span style="color: rgb(34,34,34);">relieved and discharged from the duties and responsibilities of</span><br clear="none"><span style="color: rgb(34,34,34);">the office of Vice President, Apache ActiveMQ, and</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">BE IT FURTHER RESOLVED, that Bruce Snyder be and hereby</span><br clear="none"><span style="color: rgb(34,34,34);">is appointed to the office of Vice President, Apache ActiveMQ, to</span><br clear="none"><span style="color:
  rgb(34,34,34);">serve in accordance with and subject to the direction of the</span><br clear="none"><span style="color: rgb(34,34,34);">Board of Directors and the Bylaws of the Foundation until</span><br clear="none"><span style="color: rgb(34,34,34);">death, resignation, retirement, removal or disqualification, or</span><br clear="none"><span style="color: rgb(34,34,34);">until a successor is appointed.</span></p><p><span style="color: rgb(34,34,34);">-----------------------------<span style="color: rgb(34,34,34);">-----------------------------</span></span></p><p>Development:<br clear="none">* Development on ActiveMQ 5.12 is in progress.<br clear="none">* Development on ActiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;is in progress.</p><p>Trademark / Branding Status:<br clear="none">* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies<br clear="none">* Documentation and readme files will also be reviewed for compliance</p><p>Rele
 ases:<br clear="none"><span style="line-height: 1.4285715;">*&#160;</span><span style="color: rgb(34,34,34);">Apache ActiveMQ 5.11.1 - 2/17/15<br clear="none"></span><span style="line-height: 1.4285715;">*&#160;</span><span style="color: rgb(34,34,34);">Apache ActiveMQ 5.10.2 - 2/17/15<br clear="none">* Apache <span style="color: rgb(34,34,34);">ActiveMQ-CPP v3.8.4 - 2/19/15</span>&#160;</span></p><p><span style="color: rgb(34,34,34);">&#160;</span></p><div><span style="color: rgb(34,34,34);"><br clear="none"></span></div><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>&#160;</p></div>
+<div class="wiki-content maincontent"><p>TLP Description:<br clear="none">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols, comes with easy to use Enterprise Integration Patterns and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.</p><p>Community:<br clear="none">* The development and user lists continue to stay active.<br clear="none">* Several ActiveMQ based presentation were given at Apachecon NA.<br clear="none">* The ActiveMQ community has voted to name the HortnetQ code donation ActiveMQ&#160;<span style="color: rgb(34,34,34);">Artemis.</span><br clear="none"><span style="color: rgb(34,34,34);line-height: 1.4285715;">* Apache board members&#160;</span><span style="color: rgb(34,34,34);">requested<span style="line-height: 1.4285715;">&#160;a special report to address what the plan is of the hornetq code&#160;</span>donation<span style="line-height: 1.4285715;">
 . &#160;There were some specific question what were directed at the PMC:</span></span></p><p><span style="color: rgb(34,34,34);"><span style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160; &#160; Q. Red Hat has a product, called HornetQ, which includes a website;</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; &#160;branding, etc.&#160;&#160;</span><a shape="rect" href="http://hornetq.jboss.org/">http://hornetq.jboss.org/</a><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; A. ActiveMQ PMC does not intend to use the HornetQ branding in any code,</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; docs or website. <span style="color: rgb(34,34,34);">The code donation has been updated to remove such</span><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; references.&#160;</span>The&#160;<span style="color: rgb(34,34,34);">Horne
 tQ open source project is now considered a legacy <br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>project and the code is no longer maintained as the open source project<br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>HornetQ.</span></span><span style="color: rgb(34,34,34);">&#160;The ActiveMQ community is beginning to work together to&#160;<br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; develop a plan to take the donated code base forward and to develop <br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; &#160; &#160; </span>community&#160;<span style="color: rgb(34,34,34);">around this code base</span>.&#160;</span></span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">&#160; &#160; Q. The ActiveMQ PMC needs to deliver a plan for:</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#1
 60;&#160;</span>A. &#160;Apache ActiveMQ has multiple products with multiple versions:</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>&#160;a.&#160; ActiveMQ - (version 5.x.x)</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>&#160;b. &#160;ActiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;- (version 1.x.x)</span></span></span></p><p><span style="color: rgb(34,34,34);"><span style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160;</span>&#160; &#160; &#160; &#160; &#160; This means that we are not yet ready to declare that&#160;<span style="color: rgb(34,34,34);">A
 ctiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;is the successor to ActiveMQ 5.x. &#160;We will wait until the product matures to make that decision.</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span>Q. The current chair has been the chair for *many* years and based on the</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160; &#160;</span>current&#160;</span><span style="color: rgb(34,34,34);">status and issues in the community, I would strongly suggest having</span><br clear="none"><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">&#160; &#160;&#160;</span><span style="color: rgb(34,34,34);">&#160; &#160; &#160;</span>a plan for potentially replacing the chair of the project.</span></span></span></p><p><span style="color: rgb(34,34,34);"><span
  style="line-height: 1.4285715;"><span style="color: rgb(34,34,34);">&#160; &#160; A. The PMC agrees.</span></span></span></p><p><span style="line-height: 1.4285715;">* The PMC has voted to give the code donation a code name so that it is not referred to as HornetQ anymore within ActiveMQ.<br clear="none">* IP clearance for the code donation is almost complete:&#160;<a shape="rect" href="http://incubator.apache.org/ip-clearance/hornetq.html">http://incubator.apache.org/ip-clearance/hornetq.html<br clear="none"></a></span><span style="line-height: 1.4285715;">*&#160;At least one member of the PMC, as well as several members of the community, feels strongly that disagreements and concerns are not getting addressed. &#160;They would rather have <span style="color: rgb(34,34,34);">Artemis go through the incubator.</span>&#160;<br clear="none"></span><span style="line-height: 1.4285715;">* PMC is in discussions looking for ways to increase community diversity<br clear="none"></span><span
  style="line-height: 1.4285715;">* PMC has voted to appoint Bruce Snyder as the ActiveMQ PMC chair. &#160;The PMC requests that the board approve the the following resolution:</span></p><p><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">-----------------------------</span><span style="color: rgb(34,34,34);">-----------------------------</span></span></p><p><span style="color: rgb(34,34,34);">WHEREAS, the Board of Directors heretofore appointed Hiram Chirino to</span><br clear="none"><span style="color: rgb(34,34,34);">the office of Vice President, Apache ActiveMQ, and</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">WHEREAS, the Board of Directors is in receipt of the resignation</span><br clear="none"><span style="color: rgb(34,34,34);">of Hiram Chirino from the office of Vice President, Apache</span><br clear="none"><span style="color: rgb(34,34,34);">ActiveMQ, and</span><br clear="none"><br clear="none"><span style="color: rgb(34
 ,34,34);">WHEREAS, the Project Management Committee of the Apache ActiveMQ</span><br clear="none"><span style="color: rgb(34,34,34);">project has chosen by vote to recommend Bruce Snyder as the Successor</span><br clear="none"><span style="color: rgb(34,34,34);">to the post;</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">NOW, THEREFORE, BE IT RESOLVED, that Hiram Chirino is</span><br clear="none"><span style="color: rgb(34,34,34);">relieved and discharged from the duties and responsibilities of</span><br clear="none"><span style="color: rgb(34,34,34);">the office of Vice President, Apache ActiveMQ, and</span><br clear="none"><br clear="none"><span style="color: rgb(34,34,34);">BE IT FURTHER RESOLVED, that Bruce Snyder be and hereby</span><br clear="none"><span style="color: rgb(34,34,34);">is appointed to the office of Vice President, Apache ActiveMQ, to</span><br clear="none"><span style="color: rgb(34,34,34);">serve in accordance with and subject to th
 e direction of the</span><br clear="none"><span style="color: rgb(34,34,34);">Board of Directors and the Bylaws of the Foundation until</span><br clear="none"><span style="color: rgb(34,34,34);">death, resignation, retirement, removal or disqualification, or</span><br clear="none"><span style="color: rgb(34,34,34);">until a successor is appointed.</span></p><p><span style="color: rgb(34,34,34);">-----------------------------<span style="color: rgb(34,34,34);">-----------------------------</span></span></p><p>Development:<br clear="none">* Development on ActiveMQ 5.12 is in progress.<br clear="none">* Development on ActiveMQ <span style="color: rgb(34,34,34);">Artemis</span>&#160;is in progress.</p><p>Trademark / Branding Status:<br clear="none">* Sub-projects need to be reviewed to make sure they are also compliant /w TM policies<br clear="none">* Documentation and readme files will also be reviewed for compliance</p><p>Releases:<br clear="none"><span style="line-height: 1.4285715;"
 >*&#160;</span><span style="color: rgb(34,34,34);">Apache ActiveMQ 5.11.1 - 2/17/15<br clear="none"></span><span style="line-height: 1.4285715;">*&#160;</span><span style="color: rgb(34,34,34);">Apache ActiveMQ 5.10.2 - 2/17/15<br clear="none">* Apache <span style="color: rgb(34,34,34);">ActiveMQ-CPP v3.8.4 - 2/19/15</span>&#160;</span></p><p><span style="color: rgb(34,34,34);">&#160;</span></p><div><span style="color: rgb(34,34,34);"><br clear="none"></span></div><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201506-june.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201506-june.xml b/apache-activemq-board-report-201506-june.xml
index 20766e5..7de8fb8 100644
--- a/apache-activemq-board-report-201506-june.xml
+++ b/apache-activemq-board-report-201506-june.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>The May ASF board meeting already took place this week, so we will need to publish this report in time for next month's meeting.&#160;</strong></p></div></div><p><strong style="line-height: 1.4285715;">TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Community:&#160;</strong></p><p>*&#160;The development and user lists continue to remain active<br clear="none">* <span style="color: rgb(34,34,34);">Two resignations from the PMC, but upon furt
 her discussion and consideration, both have suspended the request</span><br clear="none">*&#160;<span style="color: rgb(34,34,34);">New mailing list created for JIRA issues, git pull requests, etc. named&#160;<a shape="rect" class="external-link" href="mailto:issues@activemq.apache.org" rel="nofollow">issues@activemq.apache.org</a> <br clear="none">* Donated code base renamed to ActiveMQ Artemis (based on a vote)</span> <br clear="none">* <span style="color: rgb(34,34,34);">Marc Sch&#246;chlin</span>&#160;voted in as a committer on 16 May 2015<br clear="none">*&#160;<span style="color: rgb(34,34,34);">Jeff Genender</span>&#160;voted in as a committer on 16 May 2015<br clear="none"> <span style="line-height: 1.4285715;">*&#160;Developing guidelines on what it takes to become a committer on the ActiveMQ project&#160;</span> <br clear="none">* Discussions have started around some of the differences between the processes of the ActiveMQ community and the Artemis developer workflow to ge
 t them aligned with the expectations of the entire community.</p><p><strong>Development:&#160;</strong></p><p>*&#160;Development on ActiveMQ 5.12 is in progress and remains very active <br clear="none">*&#160;Development on ActiveMQ Artemis 1.0.1 is in progress and is active<span style="color: rgb(34,34,34);"> <br clear="none">* Development on ActiveMQ Apollo seems to have stalled</span></p><p><strong>Trademark / Branding Status:</strong> <span style="line-height: 1.4285715;">&#160;</span></p><p>*&#160;Sub-projects need to be reviewed to make sure they are also compliant with trademark policies<br clear="none">* Documentation also being reviewed for compliance</p><p><strong>Releases:</strong></p><p>* ActiveMQ Artemis 1.0.0 released on May 29, 2015<br clear="none">* ActiveMQ 5.10.2 and ActiveMQ 5.11.1 released on February 17, 2015</p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="8556510b-fffc-4b9a-851e-2b1ce41784ac" ac:name="note" ac:schema-version="1"><rich-text-body><p><strong>The May ASF board meeting already took place this week, so we will need to publish this report in time for next month's meeting.&#160;</strong></p></rich-text-body></structured-macro><p><strong style="line-height: 1.4285715;">TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Community:&#160;</strong></p><p>*&#160;The development and user lists continue to remain active<br clear="none">* <span style="color: rgb(34,34,34);">Two resignations from the PMC, but upon further discussion and consideration, both have suspended the request</span><br c
 lear="none">*&#160;<span style="color: rgb(34,34,34);">New mailing list created for JIRA issues, git pull requests, etc. named&#160;<a shape="rect" href="mailto:issues@activemq.apache.org">issues@activemq.apache.org</a> <br clear="none">* Donated code base renamed to ActiveMQ Artemis (based on a vote)</span> <br clear="none">* <span style="color: rgb(34,34,34);">Marc Sch&#246;chlin</span>&#160;voted in as a committer on 16 May 2015<br clear="none">*&#160;<span style="color: rgb(34,34,34);">Jeff Genender</span>&#160;voted in as a committer on 16 May 2015<br clear="none"> <span style="line-height: 1.4285715;">*&#160;Developing guidelines on what it takes to become a committer on the ActiveMQ project&#160;</span> <br clear="none">* Discussions have started around some of the differences between the processes of the ActiveMQ community and the Artemis developer workflow to get them aligned with the expectations of the entire community.</p><p><strong>Development:&#160;</strong></p><p>*&#1
 60;Development on ActiveMQ 5.12 is in progress and remains very active <br clear="none">*&#160;Development on ActiveMQ Artemis 1.0.1 is in progress and is active<span style="color: rgb(34,34,34);"> <br clear="none">* Development on ActiveMQ Apollo seems to have stalled</span></p><p><strong>Trademark / Branding Status:</strong> <span style="line-height: 1.4285715;">&#160;</span></p><p>*&#160;Sub-projects need to be reviewed to make sure they are also compliant with trademark policies<br clear="none">* Documentation also being reviewed for compliance</p><p><strong>Releases:</strong></p><p>* ActiveMQ Artemis 1.0.0 released on May 29, 2015<br clear="none">* ActiveMQ 5.10.2 and ActiveMQ 5.11.1 released on February 17, 2015</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201508-august.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201508-august.xml b/apache-activemq-board-report-201508-august.xml
index d027b36..9bb18d9 100644
--- a/apache-activemq-board-report-201508-august.xml
+++ b/apache-activemq-board-report-201508-august.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Report:&#160;</strong></p><ul><li>HornetQ IP clearance has been completed 100%&#160;<ul><li>HornetQ code base migrated to ActiveMQ Artemis<br clear="none"><ul><li>Eliminated all HornetQ references&#160;</li><li>The code base is now 100% an ActiveMQ project</li></ul></li></ul></li><li>Discussion around development methodology differences between the 5.x code base and the ActiveMQ Artemis <br clear="none"><ul><li>Garnered fairly active participation from many committers</li><li>It did result in a good description of the commit then review process that was agreed upon on the mailing list which was then documented a
 t&#160;<strong style="text-align: center;"><a shape="rect" class="external-link" href="http://s.apache.org/zD7" style="text-decoration: underline;">http://s.apache.org/zD7</a></strong></li><li>There were also good discussions around code formatting setups to make working on the various codebases within ActiveMQ more consistent and easier to pull ideas and code back and forth</li></ul></li><li>ActiveMQ Artemis code base is now receiving contributions from a wider scope of people (beyond just the original HornetQ contributors)<ul><li>Long standing committers from the 5.x project are starting to contribute to ActiveMQ Artemis</li></ul></li><li>Active collaboration between 5.x development and ActiveMQ Artemis development is now taking place&#160;<ul><li>ActiveMQ 5.x features actively being migrated to Artemis&#160;<ul><li>Test framework from 5.x migrated ActiveMQ Artemis&#160;</li><li>Migration of the MQTT protocol from 5.x to ActiveMQ Artemis&#160;</li></ul></li><li>Also discussion is 
 taking place to improve the the 5.x code base with regard multi-protocol detection on a single socket based on ideas from Artemis and Apollo</li></ul></li><li>PMC is actively working toward diversifying the community by inviting more committers to the project<ul><li>Christopher Shannon was added this month</li><li>Three others added since May 2015</li></ul></li><li>Artemis 1.0 was successfully released&#160;<ul><li>Work is on-going for the 1.0.1 release</li></ul></li><li>Back in the April report, one PMC member voiced the following concern: <br clear="none"><em>"<span class="s1">At least one member of the PMC, as well as several members of the community, feels strongly that disagreements and concerns are not getting addressed in a manner that will move the community toward consensus.</span>"&#160;</em><ul><li>While this comment is true, the community member who was raising these concerns has gone silent</li></ul></li><li>Initiated discussion to address past issues from some communit
 y members as instructed by the board<ul><li>Result so far is zero replies</li></ul></li></ul></div>
+<div class="wiki-content maincontent"><p><strong>TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Report:&#160;</strong></p><ul><li>HornetQ IP clearance has been completed 100%&#160;<ul><li>HornetQ code base migrated to ActiveMQ Artemis<br clear="none"><ul><li>Eliminated all HornetQ references&#160;</li><li>The code base is now 100% an ActiveMQ project</li></ul></li></ul></li><li>Discussion around development methodology differences between the 5.x code base and the ActiveMQ Artemis <br clear="none"><ul><li>Garnered fairly active participation from many committers</li><li>It did result in a good description of the commit then review process that was agreed upon on the mailing list which was then documented a
 t&#160;<strong style="text-align: center;"><a shape="rect" href="http://s.apache.org/zD7" style="text-decoration: underline;">http://s.apache.org/zD7</a></strong></li><li>There were also good discussions around code formatting setups to make working on the various codebases within ActiveMQ more consistent and easier to pull ideas and code back and forth</li></ul></li><li>ActiveMQ Artemis code base is now receiving contributions from a wider scope of people (beyond just the original HornetQ contributors)<ul><li>Long standing committers from the 5.x project are starting to contribute to ActiveMQ Artemis</li></ul></li><li>Active collaboration between 5.x development and ActiveMQ Artemis development is now taking place&#160;<ul><li>ActiveMQ 5.x features actively being migrated to Artemis&#160;<ul><li>Test framework from 5.x migrated ActiveMQ Artemis&#160;</li><li>Migration of the MQTT protocol from 5.x to ActiveMQ Artemis&#160;</li></ul></li><li>Also discussion is taking place to improv
 e the the 5.x code base with regard multi-protocol detection on a single socket based on ideas from Artemis and Apollo</li></ul></li><li>PMC is actively working toward diversifying the community by inviting more committers to the project<ul><li>Christopher Shannon was added this month</li><li>Three others added since May 2015</li></ul></li><li>Artemis 1.0 was successfully released&#160;<ul><li>Work is on-going for the 1.0.1 release</li></ul></li><li>Back in the April report, one PMC member voiced the following concern: <br clear="none"><em>"<span class="s1">At least one member of the PMC, as well as several members of the community, feels strongly that disagreements and concerns are not getting addressed in a manner that will move the community toward consensus.</span>"&#160;</em><ul><li>While this comment is true, the community member who was raising these concerns has gone silent</li></ul></li><li>Initiated discussion to address past issues from some community members as instructe
 d by the board<ul><li>Result so far is zero replies</li></ul></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201510-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201510-october.xml b/apache-activemq-board-report-201510-october.xml
index 47cedf4..77c9d41 100644
--- a/apache-activemq-board-report-201510-october.xml
+++ b/apache-activemq-board-report-201510-october.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Activity:&#160;</strong></p><ul><li>ActiveMQ 5 saw two new releases this quarter one major release and an additional bug fix release.<ul><li>ActiveMQ 5.11.2 was released on Mon Aug 10 2015</li><li>ActiveMQ 5.12.0 was released on Thu Aug 13 2015</li></ul></li><li>Some discussion on the mailing list around when to release ActiveMQ 5.12.1 and what fixes should be included.&#160;</li><li>The ActiveMQ native clients also saw some releases this quarter and continue to see active development.<ul><li>ActiveMQ-CPP 3.9.0 was released on Sat Aug 15 2015</li><li>The Apache.NMS API&#160; v1.7.1 was released on Fri Sep 04 201
 5.</li><li>The Apache.NMS.ActiveMQ client library v1.7.1 was released on Mon Oct 05 2015.</li></ul></li><li>The Artemis project continues to see some very active development and discussion on the mailing lists.<ul><li>ActiveMQ Artemis 1.1.0 was released on Wed Sep 23 2015</li></ul></li></ul><p><strong>Health Report:</strong></p><ul><li><span style="color: rgb(34,34,34);">As the number and scope of the recent releases shows, there is a lot of development occurring throughout all of the ActiveMQ products&#160;</span></li><li><span style="color: rgb(34,34,34);">Many bugs are being raised, but they are being looked at fairly promptly&#160;</span></li><li><span style="color: rgb(34,34,34);">There were a couple of bugs raised that resulted in good &#8220;cross team&#8221; discussions as to whether the bug was, indeed, a bug or a desired change in behavior</span></li><li><span style="color: rgb(34,34,34);">While some of these discussions did hold up the creations of a patch release (5.12.1
 ), it was important for the team to reach a consensus on the outcome and plans are starting to finish the release</span></li></ul><p><strong><span style="color: rgb(34,34,34);">Issues:</span></strong></p><ul><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">There are no issues requiring board attention at this time</span></span></li></ul><p><strong>PMC changes: </strong></p><ul><li>Currently 20 PMC members.&#160;</li><li>No new PMC members added in the last 3 months&#160;</li></ul><p><strong>LDAP changes: </strong></p><ul><li>Currently 54 committers and 20 committee group members.&#160;</li><li>No new committee group members added in the last 3 months&#160;</li><li>Christopher L. Shannon was added as a committer on Thu Jul 30 2015&#160;</li></ul><p><strong>Releases: </strong></p><ul><li>ActiveMQ-CPP 3.9.0 was released on Fri Aug 14 2015&#160;</li><li>ActiveMQ Artemis 1.1.0 was released on Wed Sep 23 2015&#160;</li><li>5.11.2 was released on Mon Aug 10 2015&
 #160;</li><li>activemq-cpp-3.9.0 was released on Sat Aug 15 2015&#160;</li><li>5.12.0 was released on Wed Aug 12 2015&#160;</li><li>Apache.NMS.ActiveMQ v1.7.1 was released on Sun Oct 04 2015&#160;</li><li>Apache.NMS v1.7.1 was released on Thu Sep 03 2015&#160;</li></ul><p><strong>Mailing list activity: </strong></p><ul><li>users@activemq.apache.org:&#160;<ul><li>721 subscribers (up 20 in the last 3 months):&#160;</li><li>727 emails sent to list (815 in previous quarter)&#160;</li></ul></li><li>dev@activemq.apache.org:&#160;<ul><li>336 subscribers (up 9 in the last 3 months):&#160;</li><li>777 emails sent to list (1557 in previous quarter)&#160;</li></ul></li><li>issues@activemq.apache.org:&#160;<ul><li>27 subscribers (up 6 in the last 3 months):&#160;</li><li>1807 emails sent to list (1357 in previous quarter)&#160;</li></ul></li><li>announce@activemq.apache.org:&#160;<ul><li>8 subscribers (up 0 in the last 3 months)&#160;</li></ul></li></ul><p><strong>JIRA activity: </strong></p><u
 l><li>248 JIRA tickets created in the last 3 months&#160;</li><li>209 JIRA tickets closed/resolved in the last 3 months</li></ul><p>(Most of this information is pulled from&#160;<a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>TLP Description:</strong></p><p>Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</p><p><strong>Activity:&#160;</strong></p><ul><li>ActiveMQ 5 saw two new releases this quarter one major release and an additional bug fix release.<ul><li>ActiveMQ 5.11.2 was released on Mon Aug 10 2015</li><li>ActiveMQ 5.12.0 was released on Thu Aug 13 2015</li></ul></li><li>Some discussion on the mailing list around when to release ActiveMQ 5.12.1 and what fixes should be included.&#160;</li><li>The ActiveMQ native clients also saw some releases this quarter and continue to see active development.<ul><li>ActiveMQ-CPP 3.9.0 was released on Sat Aug 15 2015</li><li>The Apache.NMS API&#160; v1.7.1 was released on Fri Sep 04 201
 5.</li><li>The Apache.NMS.ActiveMQ client library v1.7.1 was released on Mon Oct 05 2015.</li></ul></li><li>The Artemis project continues to see some very active development and discussion on the mailing lists.<ul><li>ActiveMQ Artemis 1.1.0 was released on Wed Sep 23 2015</li></ul></li></ul><p><strong>Health Report:</strong></p><ul><li><span style="color: rgb(34,34,34);">As the number and scope of the recent releases shows, there is a lot of development occurring throughout all of the ActiveMQ products&#160;</span></li><li><span style="color: rgb(34,34,34);">Many bugs are being raised, but they are being looked at fairly promptly&#160;</span></li><li><span style="color: rgb(34,34,34);">There were a couple of bugs raised that resulted in good &#8220;cross team&#8221; discussions as to whether the bug was, indeed, a bug or a desired change in behavior</span></li><li><span style="color: rgb(34,34,34);">While some of these discussions did hold up the creations of a patch release (5.12.1
 ), it was important for the team to reach a consensus on the outcome and plans are starting to finish the release</span></li></ul><p><strong><span style="color: rgb(34,34,34);">Issues:</span></strong></p><ul><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">There are no issues requiring board attention at this time</span></span></li></ul><p><strong>PMC changes: </strong></p><ul><li>Currently 20 PMC members.&#160;</li><li>No new PMC members added in the last 3 months&#160;</li></ul><p><strong>LDAP changes: </strong></p><ul><li>Currently 54 committers and 20 committee group members.&#160;</li><li>No new committee group members added in the last 3 months&#160;</li><li>Christopher L. Shannon was added as a committer on Thu Jul 30 2015&#160;</li></ul><p><strong>Releases: </strong></p><ul><li>ActiveMQ-CPP 3.9.0 was released on Fri Aug 14 2015&#160;</li><li>ActiveMQ Artemis 1.1.0 was released on Wed Sep 23 2015&#160;</li><li>5.11.2 was released on Mon Aug 10 2015&
 #160;</li><li>activemq-cpp-3.9.0 was released on Sat Aug 15 2015&#160;</li><li>5.12.0 was released on Wed Aug 12 2015&#160;</li><li>Apache.NMS.ActiveMQ v1.7.1 was released on Sun Oct 04 2015&#160;</li><li>Apache.NMS v1.7.1 was released on Thu Sep 03 2015&#160;</li></ul><p><strong>Mailing list activity: </strong></p><ul><li>users@activemq.apache.org:&#160;<ul><li>721 subscribers (up 20 in the last 3 months):&#160;</li><li>727 emails sent to list (815 in previous quarter)&#160;</li></ul></li><li>dev@activemq.apache.org:&#160;<ul><li>336 subscribers (up 9 in the last 3 months):&#160;</li><li>777 emails sent to list (1557 in previous quarter)&#160;</li></ul></li><li>issues@activemq.apache.org:&#160;<ul><li>27 subscribers (up 6 in the last 3 months):&#160;</li><li>1807 emails sent to list (1357 in previous quarter)&#160;</li></ul></li><li>announce@activemq.apache.org:&#160;<ul><li>8 subscribers (up 0 in the last 3 months)&#160;</li></ul></li></ul><p><strong>JIRA activity: </strong></p><u
 l><li>248 JIRA tickets created in the last 3 months&#160;</li><li>209 JIRA tickets closed/resolved in the last 3 months</li></ul><p>(Most of this information is pulled from&#160;<a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201602-february.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201602-february.xml b/apache-activemq-board-report-201602-february.xml
index d44cbf5..6734827 100644
--- a/apache-activemq-board-report-201602-february.xml
+++ b/apache-activemq-board-report-201602-february.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><p><span style="color: rgb(0,0,0);">Apache.NMS added a new provider implementation </span><strong style="color: rgb(0,0,0);line-height: 1.42857;">Apache.NMS.XMS</strong><span style="color: rgb(0,0,0);"> for connecting to IBM WebSphere MQSeries. &#160;This was contributed by the user community, and based on the existing Apache.NMS provider implementation for TIBCO EMS. &#160;There are now eight NMS provider implementations.</span></p></li><li><span style="color: rgb(0,0,0);">ActiveMQ 5.x added several new
  features in version 5.13.0</span><ul><li><span style="color: rgb(0,0,0);">There is now support for automatic wire protocol detection (OpenWire, STOMP, MQTT, and AMQP) using the new&#160;<a shape="rect" href="auto.xml">auto transport</a>.</span></li><li><span style="color: rgb(0,0,0);">Improved metrics as the broker now keeps track of the memory size of pending messages.</span></li><li><span style="color: rgb(0,0,0);">A pure Java API for runtime configuration changes to the broker. &#160;Previously only changes could be done in XML.</span></li><li><span style="color: rgb(0,0,0);">There is now support for <a shape="rect" href="networks-of-brokers.xml#NetworksofBrokers-virtualconsumers">dynamic network demand</a>&#160;based on the existence of Virtual Consumers.</span></li><li><span style="color: rgb(0,0,0);">Support was added for sending scheduled message using message annotations when using AMQP.</span></li><li><span style="color: rgb(0,0,0);">The ability to dynamically shrink and r
 egrow the store size at runtime based on available disk space.</span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li><p>Currently 20 PMC members</p></li><li><p>New PMC members&#160;</p><ul><li><p>Christopher Shannon was added to the PMC on Sun Jan 24 2016</p></li><li><p>Jeff Genender was added to the PMC on Sun Jan 24 2016</p></li></ul></li></ul><p><strong>Committer base changes</strong></p><ul><li><p>Currently 56 committers</p></li><li><p>New commmitters</p><ul><li><p>Matt Richard Hogstrom was added as a committer on Thu Jan 28 2016 (not sure why he was added, got this info from&#160;<a shape="rect" class="external-link" href="http://reporter.apache.org">reporter.apache.org</a>)</p></li><li><p>John Robert Sisson was added as a committer on Thu Jan 28 2016&#160;(not sure why he was added, got this info from&#160;<a shape="rect" class="external-link" href="http://reporter.apache.org/">reporter.apache.org</a>)</p></li></ul></li></ul><p><strong>Releases</strong></p><ul><
 li><p>Activemq-CPP v3.9.1 was released on Thu Dec 03 2015</p></li><li><p>Activemq-CPP v3.9.2 was released on Thu Feb 08 2016</p></li><li><p>5.11.3 was released on Sun Nov 01 2015</p></li><li><p>5.12.1 was released on Wed Oct 14 2015</p></li><li><p>5.12.2 was released on Sun Jan 10 2016</p></li><li><p>5.13.0 was released on Wed Dec 02 2015</p></li><li>5.13.1 was released on Fri Feb 05 2016</li><li><p>ActiveMQ Artemis 1.2.0 was released on Thu Jan 07 2016</p></li></ul><p><strong>Mailing list activity</strong></p><ul><li><p><a shape="rect" class="external-link" href="mailto:users@activemq.apache.org" rel="nofollow">users@activemq.apache.org</a></p><ul><li>716 subscribers (down -5 in the last 3 months)</li><li>816 emails sent to list (712 in previous quarter)</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:dev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a></p><ul><li>344 subscribers (up 7 in the last 3 months)</li><li>837 emails sent to list (765
  in previous quarter)</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:issues@activemq.apache.org" rel="nofollow">issues@activemq.apache.org</a></p><ul><li>35 subscribers (up 4 in the last 3 months)</li><li>2045 emails sent to list (1763 in previous quarter)</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:announce@activemq.apache.org" rel="nofollow">announce@activemq.apache.org</a></p><ul><li>9 subscribers (up 1 in the last 3 months)</li></ul></li></ul><p><strong>JIRA activity</strong></p><ul><li><p>233 JIRA tickets created in the last 3 months</p></li><li><p>257 JIRA tickets closed/resolved in the last 3 months</p></li></ul><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><p><span style="color: rgb(0,0,0);">Apache.NMS added a new provider implementation </span><strong style="color: rgb(0,0,0);line-height: 1.42857;">Apache.NMS.XMS</strong><span style="color: rgb(0,0,0);"> for connecting to IBM WebSphere MQSeries. &#160;This was contributed by the user community, and based on the existing Apache.NMS provider implementation for TIBCO EMS. &#160;There are now eight NMS provider implementations.</span></p></li><li><span style="color: rgb(0,0,0);">ActiveMQ 5.x added several new
  features in version 5.13.0</span><ul><li><span style="color: rgb(0,0,0);">There is now support for automatic wire protocol detection (OpenWire, STOMP, MQTT, and AMQP) using the new&#160;<link><page ri:content-title="AUTO"></page><plain-text-link-body>auto transport</plain-text-link-body></link>.</span></li><li><span style="color: rgb(0,0,0);">Improved metrics as the broker now keeps track of the memory size of pending messages.</span></li><li><span style="color: rgb(0,0,0);">A pure Java API for runtime configuration changes to the broker. &#160;Previously only changes could be done in XML.</span></li><li><span style="color: rgb(0,0,0);">There is now support for <link ac:anchor="virtualconsumers"><page ri:content-title="Networks of Brokers"></page><plain-text-link-body>dynamic network demand</plain-text-link-body></link>&#160;based on the existence of Virtual Consumers.</span></li><li><span style="color: rgb(0,0,0);">Support was added for sending scheduled message using message anno
 tations when using AMQP.</span></li><li><span style="color: rgb(0,0,0);">The ability to dynamically shrink and regrow the store size at runtime based on available disk space.</span></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li><p>Currently 20 PMC members</p></li><li><p>New PMC members&#160;</p><ul><li><p>Christopher Shannon was added to the PMC on Sun Jan 24 2016</p></li><li><p>Jeff Genender was added to the PMC on Sun Jan 24 2016</p></li></ul></li></ul><p><strong>Committer base changes</strong></p><ul><li><p>Currently 56 committers</p></li><li><p>New commmitters</p><ul><li><p>Matt Richard Hogstrom was added as a committer on Thu Jan 28 2016 (not sure why he was added, got this info from&#160;<a shape="rect" href="http://reporter.apache.org">reporter.apache.org</a>)</p></li><li><p>John Robert Sisson was added as a committer on Thu Jan 28 2016&#160;(not sure why he was added, got this info from&#160;<a shape="rect" href="http://reporter.apache.org/">reporter.apache.o
 rg</a>)</p></li></ul></li></ul><p><strong>Releases</strong></p><ul><li><p>Activemq-CPP v3.9.1 was released on Thu Dec 03 2015</p></li><li><p>Activemq-CPP v3.9.2 was released on Thu Feb 08 2016</p></li><li><p>5.11.3 was released on Sun Nov 01 2015</p></li><li><p>5.12.1 was released on Wed Oct 14 2015</p></li><li><p>5.12.2 was released on Sun Jan 10 2016</p></li><li><p>5.13.0 was released on Wed Dec 02 2015</p></li><li>5.13.1 was released on Fri Feb 05 2016</li><li><p>ActiveMQ Artemis 1.2.0 was released on Thu Jan 07 2016</p></li></ul><p><strong>Mailing list activity</strong></p><ul><li><p><a shape="rect" href="mailto:users@activemq.apache.org">users@activemq.apache.org</a></p><ul><li>716 subscribers (down -5 in the last 3 months)</li><li>816 emails sent to list (712 in previous quarter)</li></ul></li><li><p><a shape="rect" href="mailto:dev@activemq.apache.org">dev@activemq.apache.org</a></p><ul><li>344 subscribers (up 7 in the last 3 months)</li><li>837 emails sent to list (765 in pr
 evious quarter)</li></ul></li><li><p><a shape="rect" href="mailto:issues@activemq.apache.org">issues@activemq.apache.org</a></p><ul><li>35 subscribers (up 4 in the last 3 months)</li><li>2045 emails sent to list (1763 in previous quarter)</li></ul></li><li><p><a shape="rect" href="mailto:announce@activemq.apache.org">announce@activemq.apache.org</a></p><ul><li>9 subscribers (up 1 in the last 3 months)</li></ul></li></ul><p><strong>JIRA activity</strong></p><ul><li><p>233 JIRA tickets created in the last 3 months</p></li><li><p>257 JIRA tickets closed/resolved in the last 3 months</p></li></ul><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201604-april.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201604-april.xml b/apache-activemq-board-report-201604-april.xml
index 6eb722f..d3de5aa 100644
--- a/apache-activemq-board-report-201604-april.xml
+++ b/apache-activemq-board-report-201604-april.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><p>Apache ActiveMQ Artemis has been working towards adding ActiveMQ 5.x equivalent features and client compatibility improvements:</p><ul><li><p>The OpenWire protocol module has been completely refactored, improvements include:</p><ul><li><span>Improved message encoding support with increased performance</span></li><li><p><span><span>Cluster connections can now be configured using ActiveMQ 5.x style URI</span></span></p></li></ul></li><li><p><span><span><span>Equivalent implementations of all ActiveMQ 5.
 x JAAS modules are now available in Artemis</span></span></span></p></li><li><p>Artemis has initial support for database backed Journal.</p></li><li><span>Various improvements and bug fixes to:</span><ul><li><p>HA Replication, STOMP protocol module, File Journal Storage.</p></li></ul></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li><p>Currently 20 PMC members</p></li></ul><p><strong>Committer base changes</strong></p><ul><li><p>Currently 56 committers</p></li></ul><p><strong>Releases</strong></p><ul><li><p><strong>5.13.2 was released on </strong>Fri Mar 04 2016</p></li><li><strong>AcitveMQ-CPP v3.9.3 </strong>on Thu Mar 31 2016</li><li><strong>Apache.NMS.ActiveMQ v1.7.2</strong> on Thu Apr 7 2016</li></ul><p><strong>Mailing list activity</strong></p><ul><li><p><a shape="rect" class="external-link" href="mailto:users@activemq.apache.org" rel="nofollow">users@activemq.apache.org</a></p><ul><li>TODO</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:d
 ev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a></p><ul><li>TODO</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:issues@activemq.apache.org" rel="nofollow">issues@activemq.apache.org</a></p><ul><li>TODO</li></ul></li><li><p><a shape="rect" class="external-link" href="mailto:announce@activemq.apache.org" rel="nofollow">announce@activemq.apache.org</a></p><ul><li>TODO</li></ul></li></ul><p><strong>JIRA activity</strong></p><ul><li><p>TODO</p></li></ul><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><p>Apache ActiveMQ Artemis has been working towards adding ActiveMQ 5.x equivalent features and client compatibility improvements:</p><ul><li><p>The OpenWire protocol module has been completely refactored, improvements include:</p><ul><li><span>Improved message encoding support with increased performance</span></li><li><p><span><span>Cluster connections can now be configured using ActiveMQ 5.x style URI</span></span></p></li></ul></li><li><p><span><span><span>Equivalent implementations of all ActiveMQ 5.
 x JAAS modules are now available in Artemis</span></span></span></p></li><li><p>Artemis has initial support for database backed Journal.</p></li><li><span>Various improvements and bug fixes to:</span><ul><li><p>HA Replication, STOMP protocol module, File Journal Storage.</p></li></ul></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li><p>Currently 20 PMC members</p></li></ul><p><strong>Committer base changes</strong></p><ul><li><p>Currently 56 committers</p></li></ul><p><strong>Releases</strong></p><ul><li><p><strong>5.13.2 was released on </strong>Fri Mar 04 2016</p></li><li><strong>AcitveMQ-CPP v3.9.3 </strong>on Thu Mar 31 2016</li><li><strong>Apache.NMS.ActiveMQ v1.7.2</strong> on Thu Apr 7 2016</li></ul><p><strong>Mailing list activity</strong></p><ul><li><p><a shape="rect" href="mailto:users@activemq.apache.org">users@activemq.apache.org</a></p><ul><li>TODO</li></ul></li><li><p><a shape="rect" href="mailto:dev@activemq.apache.org">dev@activemq.apache.org</a></p><ul>
 <li>TODO</li></ul></li><li><p><a shape="rect" href="mailto:issues@activemq.apache.org">issues@activemq.apache.org</a></p><ul><li>TODO</li></ul></li><li><p><a shape="rect" href="mailto:announce@activemq.apache.org">announce@activemq.apache.org</a></p><ul><li>TODO</li></ul></li></ul><p><strong>JIRA activity</strong></p><ul><li><p>TODO</p></li></ul><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201605-may.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201605-may.xml b/apache-activemq-board-report-201605-may.xml
index 27ebc9b..6623aae 100644
--- a/apache-activemq-board-report-201605-may.xml
+++ b/apache-activemq-board-report-201605-may.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Past Activity</span></strong></p><ul><li><p>This report is being filed based on a request from some board members during the April 2016 meeting. The request is to recap the results of challenges within the ActiveMQ project during the 2014-2015 time frame</p><ul><li><span style="color: rgb(34,34,34);">The <a shape="rect" class="external-link" href="https://mail-search.apache.org/members/private-arch/board/201504.mbox/%3CCAGZ-RDL96UCbTzwsLznEBQykBHNhj_usw95VjeJ8cEiF4gef=A@mail.gmail.com%3E">April 2015 ActiveMQ Board Report</a> included&#160;<span style="color: rgb(34,34,34);"
 >the following activities:</span></span><ul><li><span style="color: rgb(34,34,34);">Bruce Snyder elected to the PMC chair position</span></li><li><span style="color: rgb(34,34,34);">HornetQ code donation accepted</span></li></ul></li><li><span style="color: rgb(34,34,34);">The <a shape="rect" href="apache-activemq-board-report-201506-june.xml" rel="nofollow">June 2015 ActiveMQ Board Report</a> included the following activities:</span><ul><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Donated code base renamed to ActiveMQ Artemis (based on a vote)</span>&#160;<br clear="none"></span><ul><li><span style="color: rgb(34,34,34);">The HornetQ code donation was officially renamed to ActiveMQ Artemis</span></li></ul></li><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Marc Sch&#246;chlin</span>&#160;voted in as a committer</span></li><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Jeff Genender</span>&#160;
 voted in as a committer<br clear="none"></span></li></ul></li><li><span class="il" style="color: rgb(34,34,34);">On 7 August, 2015, </span><a shape="rect" class="external-link" href="https://mail-search.apache.org/members/private-arch/board/201508.mbox/%3C55C52714.4090400@gmail.com%3E"><span class="il" style="color: rgb(34,34,34);">Hadrian</span><span style="color: rgb(34,34,34);">&#160;Zbarcea&#160;</span><span class="il" style="color: rgb(34,34,34);">resigned</span><span style="color: rgb(34,34,34);">&#160;the ActiveMQ PMC</span></a><ul><li>Unfortunately this activity was not noted in the <a shape="rect" href="apache-activemq-board-report-201508-august.xml" rel="nofollow">August 2015 ActiveMQ Board Report</a></li><li>I, Bruce Snyder, was still new to the position of PMC chair and failed to add this item to the board report</li></ul></li><li>The <a shape="rect" href="apache-activemq-board-report-201508-august.xml" rel="nofollow">August 2015 ActiveMQ Board Report</a> included the fo
 llowing activities:<ul><li>Christopher Shannon was added to the PMC</li></ul></li><li>The <a shape="rect" href="apache-activemq-board-report-201602-february.xml" rel="nofollow">February 2016 ActiveMQ Board Report</a> included the following activities:<ul><li><p>Christopher Shannon was added to the PMC on Sun Jan 24 2016</p></li><li><p>Jeff Genender was added to the PMC on Sun Jan 24 2016</p></li></ul></li></ul></li><li>Regarding the overarching question that was asked about the turmoil within the ActiveMQ project in 2014-2015 timeframe:<ul><li>Neither were there any disagreements in the second half of 2015 nor have there been any disagreements in 2016</li></ul></li></ul><p><strong><span style="color: rgb(102,0,51);">Current Activity</span></strong></p><ul><li>CHANGE ME</li></ul><p><strong><span style="color: rgb(102,0,51);">&#160;</span></strong></p><p><strong><span style="color: rgb(102,0,51);"><br clear="none"></span></strong></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Past Activity</span></strong></p><ul><li><p>This report is being filed based on a request from some board members during the April 2016 meeting. The request is to recap the results of challenges within the ActiveMQ project during the 2014-2015 time frame</p><ul><li><span style="color: rgb(34,34,34);">The <a shape="rect" href="https://mail-search.apache.org/members/private-arch/board/201504.mbox/%3CCAGZ-RDL96UCbTzwsLznEBQykBHNhj_usw95VjeJ8cEiF4gef=A@mail.gmail.com%3E">April 2015 ActiveMQ Board Report</a> included&#160;<span style="color: rgb(34,34,34);">the following activit
 ies:</span></span><ul><li><span style="color: rgb(34,34,34);">Bruce Snyder elected to the PMC chair position</span></li><li><span style="color: rgb(34,34,34);">HornetQ code donation accepted</span></li></ul></li><li><span style="color: rgb(34,34,34);">The <a shape="rect" href="apache-activemq-board-report-201506-june.xml">June 2015 ActiveMQ Board Report</a> included the following activities:</span><ul><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Donated code base renamed to ActiveMQ Artemis (based on a vote)</span>&#160;<br clear="none"></span><ul><li><span style="color: rgb(34,34,34);">The HornetQ code donation was officially renamed to ActiveMQ Artemis</span></li></ul></li><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Marc Sch&#246;chlin</span>&#160;voted in as a committer</span></li><li><span style="color: rgb(34,34,34);"><span style="color: rgb(34,34,34);">Jeff Genender</span>&#160;voted in as a committer<br clear="non
 e"></span></li></ul></li><li><span class="il" style="color: rgb(34,34,34);">On 7 August, 2015, </span><a shape="rect" href="https://mail-search.apache.org/members/private-arch/board/201508.mbox/%3C55C52714.4090400@gmail.com%3E"><span class="il" style="color: rgb(34,34,34);">Hadrian</span><span style="color: rgb(34,34,34);">&#160;Zbarcea&#160;</span><span class="il" style="color: rgb(34,34,34);">resigned</span><span style="color: rgb(34,34,34);">&#160;the ActiveMQ PMC</span></a><ul><li>Unfortunately this activity was not noted in the <a shape="rect" href="apache-activemq-board-report-201508-august.xml">August 2015 ActiveMQ Board Report</a></li><li>I, Bruce Snyder, was still new to the position of PMC chair and failed to add this item to the board report</li></ul></li><li>The <a shape="rect" href="apache-activemq-board-report-201508-august.xml">August 2015 ActiveMQ Board Report</a> included the following activities:<ul><li>Christopher Shannon was added to the PMC</li></ul></li><li>The
  <a shape="rect" href="apache-activemq-board-report-201602-february.xml">February 2016 ActiveMQ Board Report</a> included the following activities:<ul><li><p>Christopher Shannon was added to the PMC on Sun Jan 24 2016</p></li><li><p>Jeff Genender was added to the PMC on Sun Jan 24 2016</p></li></ul></li></ul></li><li>Regarding the overarching question that was asked about the turmoil within the ActiveMQ project in 2014-2015 timeframe:<ul><li>Neither were there any disagreements in the second half of 2015 nor have there been any disagreements in 2016</li></ul></li></ul><p><strong><span style="color: rgb(102,0,51);">Current Activity</span></strong></p><ul><li>CHANGE ME</li></ul><p><strong><span style="color: rgb(102,0,51);">&#160;</span></strong></p><p><strong><span style="color: rgb(102,0,51);"><br clear="none"></span></strong></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201607-july.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201607-july.xml b/apache-activemq-board-report-201607-july.xml
index cf61db8..23dd9db 100644
--- a/apache-activemq-board-report-201607-july.xml
+++ b/apache-activemq-board-report-201607-july.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">The ActiveMQ Broker continues to see continued bug fixes and feature additions</span></span></span><ul><li><span style="color: rgb(0,0,0);">Support added for AMQP over WebSockets added for inclusion in 5.14.0</span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Improvements to the KahaDB message store allowing for better store clean up.<
 /span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Important fixes continue to be ported to the 5.13.x branch and a new 5.13.4 release is nearing release readiness.</span></span></span></li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Artemis&#160;continues working towards adding ActiveMQ 5.x equivalent features, client compatibility and improvements:</span></li></ul><ul><ul><li><p><span style="color: rgb(0,0,0);">The OpenWire protocol implementation is now feature complete</span></p></li><li><p><span style="color: rgb(0,0,0);">The Database journal has been improved and support added for</span>:</p><ul><li><p><span style="color: rgb(0,0,0);">MySQL</span></p></li><li><p><span style="color: rgb(0,0,0);">PostgreSQL</span></p></li></ul></li><li><p><span style="color: rgb(0,0,0);">Database storage for large messages has been added</span></p></li><li><p><span style="color: rgb(0,0,0);">HA
  using replication has been heavily tested and had several improvements</span></p></li><li><p><span style="color: rgb(0,0,0);">The AMQP protocol has had a lot of attention including many fixes and support for AMQP link drain and subscription addresses</span></p></li><li><p><span style="color: rgb(0,0,0);">MQTT protocol has been updated to support interceptors and cross protocol communication</span></p></li><li><p><span style="color: rgb(0,0,0);">Dual-authentication is now supported so SSL and non-SSL connections can be authenticated by different JAAS login modules.</span></p></li><li><p><span style="color: rgb(0,0,0);">The broker's SSL keystores can now be reloaded on demand without stopping the broker.</span></p></li><li><p><span style="color: rgb(0,0,0);">JMS topics are now auto-created by default when a producer sends a message or a client subscribes.</span></p></li><li><p><span style="color: rgb(0,0,0);">The name of the authenticated user can now be automatically added to the me
 ssages it sends.</span></p></li><li><p><span style="color: rgb(0,0,0);">STOMP clients can now have their authentication and authorization based on their SSL certificate.</span></p></li><li><p><span style="color: rgb(0,0,0);">Lots of smaller bug fixes and performance improvements</span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span></p></li></ul></ul><div><span style="color: rgb(0,0,0);"><br clear="none"></span></div><p><strong>PMC changes</strong></p><ul><li>Currently 23 PMC members</li><li><span style="color: rgb(34,34,34);">Martyn Taylor was added to the PMC on Sun Jul 10 2016</span></li><li>Last PMC addition:&#160;<span style="color: rgb(34,34,34);">Sun Jul 10 2016 (Martyn Taylor)</span></li></ul><p><br clear="none"><strong>Committer base changes</strong></p><ul><li>Currently 56 committers</li><li>No new committers added in the last 3 months</li><li>Last committer addition was Matt Rich
 ard Hogstrom at Thu Jan 28 2016</li></ul><p><br clear="none"><strong>Releases</strong></p><ul><li>5.13.3 was released on Sun May 01 2016</li><li>ActiveMQ Artemis 1.3.0 was released on Tue Jun 14 2016</li><li>Apache.NMS.ActiveMQ v1.7.2 was released on Wed Apr 06 2016</li></ul><p><strong>Mailing list activity</strong></p><ul><li><a shape="rect" class="external-link" href="mailto:users@activemq.apache.org" rel="nofollow">users@activemq.apache.org</a><ul><li>741 subscribers (up 14 in the last 3 months)</li><li><span style="line-height: 1.42857;">638 emails sent to list (837 in previous quarter)</span></li></ul></li></ul><ul><li><a shape="rect" class="external-link" href="mailto:dev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a><ul><li>367 subscribers (up 14 in the last 3 months)</li><li><span style="line-height: 1.42857;">909 emails sent to list (653 in previous quarter)</span></li></ul></li></ul><ul><li><a shape="rect" class="external-link" href="mailto:announce@active
 mq.apache.org" rel="nofollow">announce@activemq.apache.org</a><ul><li><a shape="rect" class="external-link" href="mailto:announce@activemq.apache.org" rel="nofollow"></a>9 subscribers (up 0 in the last 3 months)</li></ul></li></ul><ul><li><a shape="rect" class="external-link" href="mailto:issues@activemq.apache.org" rel="nofollow">issues@activemq.apache.org</a><ul><li>43 subscribers (up 3 in the last 3 months)</li><li>2159 emails sent to list (1698 in previous quarter)</li></ul></li></ul><p>&#160;</p><p><strong>JIRA activity</strong></p><ul><li>261 JIRA tickets created in the last 3 months</li><li>262 JIRA tickets closed/resolved in the last 3 months</li></ul><p>&#160;</p><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source messaging server. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 1.0.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">The ActiveMQ Broker continues to see continued bug fixes and feature additions</span></span></span><ul><li><span style="color: rgb(0,0,0);">Support added for AMQP over WebSockets added for inclusion in 5.14.0</span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Improvements to the KahaDB message store allowing for better store clean up.<
 /span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);">Important fixes continue to be ported to the 5.13.x branch and a new 5.13.4 release is nearing release readiness.</span></span></span></li></ul></li></ul><ul><li><span style="color: rgb(0,0,0);">ActiveMQ Artemis&#160;continues working towards adding ActiveMQ 5.x equivalent features, client compatibility and improvements:</span></li></ul><ul><ul><li><p><span style="color: rgb(0,0,0);">The OpenWire protocol implementation is now feature complete</span></p></li><li><p><span style="color: rgb(0,0,0);">The Database journal has been improved and support added for</span>:</p><ul><li><p><span style="color: rgb(0,0,0);">MySQL</span></p></li><li><p><span style="color: rgb(0,0,0);">PostgreSQL</span></p></li></ul></li><li><p><span style="color: rgb(0,0,0);">Database storage for large messages has been added</span></p></li><li><p><span style="color: rgb(0,0,0);">HA
  using replication has been heavily tested and had several improvements</span></p></li><li><p><span style="color: rgb(0,0,0);">The AMQP protocol has had a lot of attention including many fixes and support for AMQP link drain and subscription addresses</span></p></li><li><p><span style="color: rgb(0,0,0);">MQTT protocol has been updated to support interceptors and cross protocol communication</span></p></li><li><p><span style="color: rgb(0,0,0);">Dual-authentication is now supported so SSL and non-SSL connections can be authenticated by different JAAS login modules.</span></p></li><li><p><span style="color: rgb(0,0,0);">The broker's SSL keystores can now be reloaded on demand without stopping the broker.</span></p></li><li><p><span style="color: rgb(0,0,0);">JMS topics are now auto-created by default when a producer sends a message or a client subscribes.</span></p></li><li><p><span style="color: rgb(0,0,0);">The name of the authenticated user can now be automatically added to the me
 ssages it sends.</span></p></li><li><p><span style="color: rgb(0,0,0);">STOMP clients can now have their authentication and authorization based on their SSL certificate.</span></p></li><li><p><span style="color: rgb(0,0,0);">Lots of smaller bug fixes and performance improvements</span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span></p></li></ul></ul><div><span style="color: rgb(0,0,0);"><br clear="none"></span></div><p><strong>PMC changes</strong></p><ul><li>Currently 23 PMC members</li><li><span style="color: rgb(34,34,34);">Martyn Taylor was added to the PMC on Sun Jul 10 2016</span></li><li>Last PMC addition:&#160;<span style="color: rgb(34,34,34);">Sun Jul 10 2016 (Martyn Taylor)</span></li></ul><p><br clear="none"><strong>Committer base changes</strong></p><ul><li>Currently 56 committers</li><li>No new committers added in the last 3 months</li><li>Last committer addition was Matt Rich
 ard Hogstrom at Thu Jan 28 2016</li></ul><p><br clear="none"><strong>Releases</strong></p><ul><li>5.13.3 was released on Sun May 01 2016</li><li>ActiveMQ Artemis 1.3.0 was released on Tue Jun 14 2016</li><li>Apache.NMS.ActiveMQ v1.7.2 was released on Wed Apr 06 2016</li></ul><p><strong>Mailing list activity</strong></p><ul><li><a shape="rect" href="mailto:users@activemq.apache.org">users@activemq.apache.org</a><ul><li>741 subscribers (up 14 in the last 3 months)</li><li><span style="line-height: 1.42857;">638 emails sent to list (837 in previous quarter)</span></li></ul></li></ul><ul><li><a shape="rect" href="mailto:dev@activemq.apache.org">dev@activemq.apache.org</a><ul><li>367 subscribers (up 14 in the last 3 months)</li><li><span style="line-height: 1.42857;">909 emails sent to list (653 in previous quarter)</span></li></ul></li></ul><ul><li><a shape="rect" href="mailto:announce@activemq.apache.org">announce@activemq.apache.org</a><ul><li><a shape="rect" href="mailto:announce@act
 ivemq.apache.org"></a>9 subscribers (up 0 in the last 3 months)</li></ul></li></ul><ul><li><a shape="rect" href="mailto:issues@activemq.apache.org">issues@activemq.apache.org</a><ul><li>43 subscribers (up 3 in the last 3 months)</li><li>2159 emails sent to list (1698 in previous quarter)</li></ul></li></ul><p>&#160;</p><p><strong>JIRA activity</strong></p><ul><li>261 JIRA tickets created in the last 3 months</li><li>262 JIRA tickets closed/resolved in the last 3 months</li></ul><p>&#160;</p><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/apache-activemq-board-report-201610-october.xml
----------------------------------------------------------------------
diff --git a/apache-activemq-board-report-201610-october.xml b/apache-activemq-board-report-201610-october.xml
index 921a850..950142e 100644
--- a/apache-activemq-board-report-201610-october.xml
+++ b/apache-activemq-board-report-201610-october.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li>Overall, the project health is very stable. No disgreements in the&#160;community and the folks on the project are working together on both ActiveMQ&#160;and Artemis. The ActiveMQ code base continues to grow and improve and it is&#160;pushing releases more frequently as was the plan. Activity with the Artemis&#160;code base continues its successful march toward full compatibility with&#160;ActiveMQ.</li></ul><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,10
 2);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><span style="color: rgb(34,34,34);">Active Discussions around a new web console</span></span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><span style="color: rgb(34,34,34);">The project is a little stuck on the docker issues pending infra and legal&#160;</span><span style="color: rgb(34,34,34);">resolution</span><br clear="none"></span></span></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p><ul><li><p><span style="color: rgb(0,0,0);">Apache Artemis 1.4.0 Released</span></p></li><li><p><span style="color: rgb(0,0,0);">AMQP 1.0 implementation improve
 ments</span></p><ul><li><p><span style="color: rgb(0,0,0);">Local transaction support improved</span></p></li><li><p><span style="color: rgb(0,0,0);">Multi-session-per-tx and multi-tx-per-session capabilities support</span></p></li><li><p><span style="color: rgb(0,0,0);">Support for OASIS AMQP JMS mappings for JMS 1.1 over AMQP 1.0 added</span></p></li><li><p><span style="color: rgb(0,0,0);">Major refactor of the AMQP implementation making it simpler and easier to understand</span></p></li></ul></li><li><p><span style="color: rgb(34,34,34);">[</span><span class="il" style="color: rgb(34,34,34);">CVE</span><span style="color: rgb(34,34,34);">-2016-4978] Apache ActiveMQ Artemis: Deserialization of untrusted input vunerability.</span></p><ul><li><p><span style="color: rgb(34,34,34);">Fixed in Apache Artemis 1.4.0</span></p></li><li><p><span style="color: rgb(34,34,34);">Announcement made</span></p></li></ul></li><li><p><span style="color: rgb(34,34,34);">Support for setting global limi
 ts (total memory and disk utilization) added</span></p></li><li><p><span style="color: rgb(34,34,34);">Basic Java EE CDI integration added</span></p></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Currently 23 PMC members</li><li>No new PMC members added in the last 3 months</li><li>Last PMC addition was Martyn Taylor on Fri Jul 08 2016&#160;</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 57 committers</li><li>John D. Ament was added as a committer on Mon Aug 08 2016</li></ul><p><strong>Releases</strong></p><ul><li>5.13.4 was released on Mon Jul 18 2016</li><li>5.14.0 was released on Thu Aug 04 2016</li><li>5.14.1 was released on Thu Sep 29 2016</li><li>ActiveMQ Artemis 1.4.0 was released on Mon Sep 12 2016</li></ul><p>(Most of this information is pulled from <a shape="rect" class="external-link" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
+<div class="wiki-content maincontent"><p><strong>Description</strong></p><p><span style="color: rgb(102,0,51);">Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.</span></p><p><strong><span style="color: rgb(102,0,51);">Activity</span></strong></p><ul><li>Overall, the project health is very stable. No disgreements in the&#160;community and the folks on the project are working together on both ActiveMQ&#160;and Artemis. The ActiveMQ code base continues to grow and improve and it is&#160;pushing releases more frequently as was the plan. Activity with the Artemis&#160;code base continues its successful march toward full compatibility with&#160;ActiveMQ.</li></ul><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,10
 2);"><span style="color: rgb(0,0,0);">ActiveMQ</span></span></span><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><br clear="none"></span></span></span><ul><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><span style="color: rgb(34,34,34);">Active Discussions around a new web console</span></span></span></span></li><li><span style="color: rgb(255,0,0);"><span style="color: rgb(0,51,102);"><span style="color: rgb(0,0,0);"><span style="color: rgb(34,34,34);">The project is a little stuck on the docker issues pending infra and legal&#160;</span><span style="color: rgb(34,34,34);">resolution</span><br clear="none"></span></span></span></li></ul></li><li><p><span style="color: rgb(0,0,0);">ActiveMQ Artemis</span></p><ul><li><p><span style="color: rgb(0,0,0);">Apache Artemis 1.4.0 Released</span></p></li><li><p><span style="color: rgb(0,0,0);">AMQP 1.0 implementation improve
 ments</span></p><ul><li><p><span style="color: rgb(0,0,0);">Local transaction support improved</span></p></li><li><p><span style="color: rgb(0,0,0);">Multi-session-per-tx and multi-tx-per-session capabilities support</span></p></li><li><p><span style="color: rgb(0,0,0);">Support for OASIS AMQP JMS mappings for JMS 1.1 over AMQP 1.0 added</span></p></li><li><p><span style="color: rgb(0,0,0);">Major refactor of the AMQP implementation making it simpler and easier to understand</span></p></li></ul></li><li><p><span style="color: rgb(34,34,34);">[</span><span class="il" style="color: rgb(34,34,34);">CVE</span><span style="color: rgb(34,34,34);">-2016-4978] Apache ActiveMQ Artemis: Deserialization of untrusted input vunerability.</span></p><ul><li><p><span style="color: rgb(34,34,34);">Fixed in Apache Artemis 1.4.0</span></p></li><li><p><span style="color: rgb(34,34,34);">Announcement made</span></p></li></ul></li><li><p><span style="color: rgb(34,34,34);">Support for setting global limi
 ts (total memory and disk utilization) added</span></p></li><li><p><span style="color: rgb(34,34,34);">Basic Java EE CDI integration added</span></p></li></ul></li></ul><p><strong>PMC changes</strong></p><ul><li>Currently 23 PMC members</li><li>No new PMC members added in the last 3 months</li><li>Last PMC addition was Martyn Taylor on Fri Jul 08 2016&#160;</li></ul><p><strong>Committer base changes</strong></p><ul><li>Currently 57 committers</li><li>John D. Ament was added as a committer on Mon Aug 08 2016</li></ul><p><strong>Releases</strong></p><ul><li>5.13.4 was released on Mon Jul 18 2016</li><li>5.14.0 was released on Thu Aug 04 2016</li><li>5.14.1 was released on Thu Sep 29 2016</li><li>ActiveMQ Artemis 1.4.0 was released on Mon Sep 12 2016</li></ul><p>(Most of this information is pulled from <a shape="rect" href="https://reporter.apache.org/">reporter.apache.org</a>)</p></div>
 


[13/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/features.xml
----------------------------------------------------------------------
diff --git a/features.xml b/features.xml
index a13e052..c06392b 100644
--- a/features.xml
+++ b/features.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="Features-ApacheActiveMQFeatures">Apache ActiveMQ Features</h2><p>Apache ActiveMQ is packed with features; to get an idea you might want to look at the <a shape="rect" href="features-overview.xml">Features Overview</a> otherwise here is the list of all of the main features...</p><p></p><ul class="childpages-macro"><li><a shape="rect" href="active-groups.xml">Active Groups</a></li><li><a shape="rect" href="activemq-real-time.xml">ActiveMQ Real Time</a><ul class="childpages-macro"><li><a shape="rect" href="broadcasting.xml">Broadcasting</a></li><li><a shape="rect" href="group-membership.xml">Group Membership</a></li><li><a shape="rect" href="life-cycle.xml">Life Cycle</a></li><li><a shape="rect" href="the-activeblaze-message-type.xml">The ActiveBlaze Message type</a></li></ul></li><li><a shape="rect" href="broker-camel-component.xml">Broker Camel Component</a></li><li><a shape="rect" href="clustering.xml">Clustering</a><ul class="childpages
 -macro"><li><a shape="rect" href="masterslave.xml">MasterSlave</a><ul class="childpages-macro"><li><a shape="rect" href="jdbc-master-slave.xml">JDBC Master Slave</a></li><li><a shape="rect" href="kahadb-replication-experimental.xml">KahaDB Replication (Experimental)</a></li><li><a shape="rect" href="pure-master-slave.xml">Pure Master Slave</a></li><li><a shape="rect" href="shared-file-system-master-slave.xml">Shared File System Master Slave</a></li></ul></li><li><a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></li><li><a shape="rect" href="replicated-message-store.xml">Replicated Message Store</a></li></ul></li><li><a shape="rect" href="command-agent.xml">Command Agent</a></li><li><a shape="rect" href="consumer-features.xml">Consumer Features</a><ul class="childpages-macro"><li><a shape="rect" href="consumer-dispatch-async.xml">Consumer Dispatch Async</a></li><li><a shape="rect" href="consumer-priority.xml">Consumer Priority</a></li><li><a shape="rect" href="ex
 clusive-consumer.xml">Exclusive Consumer</a></li><li><a shape="rect" href="manage-durable-subscribers.xml">Manage Durable Subscribers</a></li><li><a shape="rect" href="message-groups.xml">Message Groups</a></li><li><a shape="rect" href="redelivery-policy.xml">Redelivery Policy</a></li><li><a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a></li><li><a shape="rect" href="selectors.xml">Selectors</a></li><li><a shape="rect" href="slow-consumer-handling.xml">Slow Consumer Handling</a></li><li><a shape="rect" href="subscription-recovery-policy.xml">Subscription Recovery Policy</a></li></ul></li><li><a shape="rect" href="destination-features.xml">Destination Features</a><ul class="childpages-macro"><li><a shape="rect" href="composite-destinations.xml">Composite Destinations</a></li><li><a shape="rect" href="configure-startup-destinations.xml">Configure Startup Destinations</a></li><li><a shape="rect" href="delete-inactive-destinations.xml">Delete Inactive Destinations
 </a></li><li><a shape="rect" href="destination-options.xml">Destination Options</a></li><li><a shape="rect" href="mirrored-queues.xml">Mirrored Queues</a></li><li><a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a></li><li><a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a></li><li><a shape="rect" href="wildcards.xml">Wildcards</a></li></ul></li><li><a shape="rect" href="discovery.xml">Discovery</a></li><li><a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a></li><li><a shape="rect" href="features-overview.xml">Features Overview</a></li><li><a shape="rect" href="horizontal-scaling.xml">Horizontal Scaling</a><ul class="childpages-macro"><li><a shape="rect" href="scaling-queues.xml">Scaling Queues</a></li></ul></li><li><a shape="rect" href="interceptors.xml">Interceptors</a><ul class="childpages-macro"><li><a shape="rect" href="destinations-plugin.xml">Destinations Plugin</a></li><li><a shape="
 rect" href="logging-interceptor.xml">Logging Interceptor</a></li><li><a shape="rect" href="statisticsplugin.xml">StatisticsPlugin</a></li><li><a shape="rect" href="timestampplugin.xml">TimeStampPlugin</a></li></ul></li><li><a shape="rect" href="jmsxuserid.xml">JMSXUserID</a></li><li><a shape="rect" href="jmx.xml">JMX</a><ul class="childpages-macro"><li><a shape="rect" href="jmx-support.xml">JMX Support</a></li></ul></li><li><a shape="rect" href="logging-a-warning-if-you-forget-to-start-a-connection.xml">Logging a warning if you forget to start a Connection</a></li><li><a shape="rect" href="mdc-logging.xml">MDC Logging</a></li><li><a shape="rect" href="message-dispatching-features.xml">Message Dispatching Features</a><ul class="childpages-macro"><li><a shape="rect" href="async-sends.xml">Async Sends</a></li><li><a shape="rect" href="dispatch-policies.xml">Dispatch Policies</a></li><li><a shape="rect" href="message-cursors.xml">Message Cursors</a></li><li><a shape="rect" href="optimiz
 ed-acknowledgement.xml">Optimized Acknowledgement</a></li><li><a shape="rect" href="producer-flow-control.xml">Producer Flow Control</a></li><li><a shape="rect" href="total-ordering.xml">Total Ordering</a></li></ul></li><li><a shape="rect" href="message-features.xml">Message Features</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-message-properties.xml">ActiveMQ Message Properties</a></li><li><a shape="rect" href="advisory-message.xml">Advisory Message</a></li><li><a shape="rect" href="blob-messages.xml">Blob Messages</a></li><li><a shape="rect" href="delay-and-schedule-message-delivery.xml">Delay and Schedule Message Delivery</a></li><li><a shape="rect" href="jms-streams.xml">JMS Streams</a></li><li><a shape="rect" href="message-transformation.xml">Message Transformation</a></li><li><a shape="rect" href="objectmessage.xml">ObjectMessage</a></li><li><a shape="rect" href="structured-message-properties-and-mapmessages.xml">Structured Message Properties and MapMessa
 ges</a></li></ul></li><li><a shape="rect" href="new-features.xml">New Features</a><ul class="childpages-macro"><li><a shape="rect" href="changes-in-40.xml">Changes in 4.0</a></li><li><a shape="rect" href="new-features-in-41.xml">New Features in 4.1</a></li><li><a shape="rect" href="new-features-in-50.xml">New Features in 5.0</a></li><li><a shape="rect" href="new-features-in-51.xml">New Features in 5.1</a></li><li><a shape="rect" href="new-features-in-52.xml">New Features in 5.2</a></li><li><a shape="rect" href="new-features-in-53.xml">New Features in 5.3</a></li><li><a shape="rect" href="new-features-in-54.xml">New Features in 5.4</a></li><li><a shape="rect" href="new-features-in-55.xml">New Features in 5.5</a></li><li><a shape="rect" href="new-features-in-56.xml">New Features in 5.6</a></li><li><a shape="rect" href="new-features-in-57.xml">New Features in 5.7</a></li><li><a shape="rect" href="new-features-in-58.xml">New Features in 5.8</a></li><li><a shape="rect" href="new-features
 -in-59.xml">New Features in 5.9</a><ul class="childpages-macro"><li><a shape="rect" href="runtime-configuration.xml">Runtime Configuration</a></li></ul></li><li><a shape="rect" href="new-features-in-511.xml">New Features in 5.11</a></li><li><a shape="rect" href="new-features-in-513.xml">New Features in 5.13</a></li><li><a shape="rect" href="new-features-in-60.xml">New Features in 6.0</a></li></ul></li><li><a shape="rect" href="performance.xml">Performance</a><ul class="childpages-macro"><li><a shape="rect" href="activemq-performance-module-users-manual.xml">ActiveMQ Performance Module Users Manual</a><ul class="childpages-macro"><li><a shape="rect" href="sample-report.xml">sample report</a></li></ul></li><li><a shape="rect" href="load-testing-with-camel.xml">Load Testing with Camel</a></li><li><a shape="rect" href="performance-report.xml">Performance report</a></li></ul></li><li><a shape="rect" href="persistence.xml">Persistence</a><ul class="childpages-macro"><li><a shape="rect" hr
 ef="amq-message-store.xml">AMQ Message Store</a></li><li><a shape="rect" href="configurable-ioexception-handling.xml">Configurable IOException Handling</a></li><li><a shape="rect" href="jdbc-support.xml">JDBC Support</a><ul class="childpages-macro"><li><a shape="rect" href="sqlserver.xml">SQLServer</a></li><li><a shape="rect" href="sybase.xml">Sybase</a></li></ul></li><li><a shape="rect" href="kahadb.xml">KahaDB</a></li><li><a shape="rect" href="kaha-persistence.xml">Kaha Persistence</a></li><li><a shape="rect" href="leveldb-store.xml">LevelDB Store</a></li><li><a shape="rect" href="periodically-checking-disk-limits.xml">Periodically checking disk limits</a></li><li><a shape="rect" href="pluggable-storage-lockers.xml">Pluggable storage lockers</a></li><li><a shape="rect" href="replicated-leveldb-store.xml">Replicated LevelDB Store</a></li></ul></li><li><a shape="rect" href="scaling-the-depth-of-a-queue.xml">Scaling the Depth of a Queue</a></li><li><a shape="rect" href="security.xml"
 >Security</a><ul class="childpages-macro"><li><a shape="rect" href="audit-logging.xml">Audit Logging</a></li><li><a shape="rect" href="cached-ldap-authorization-module.xml">Cached LDAP Authorization Module</a></li><li><a shape="rect" href="encrypted-passwords.xml">Encrypted passwords</a></li><li><a shape="rect" href="shiro.xml">Shiro</a></li></ul></li><li><a shape="rect" href="the-proxy-connector.xml">The Proxy Connector</a></li><li><a shape="rect" href="unix.xml">Unix</a><ul class="childpages-macro"><li><a shape="rect" href="unix-service.xml">Unix Service</a></li><li><a shape="rect" href="unix-shell-script.xml">Unix Shell Script</a></li></ul></li><li><a shape="rect" href="uri-protocols.xml">URI Protocols</a><ul class="childpages-macro"><li><a shape="rect" href="vm-protocol.xml">VM Protocol</a></li></ul></li><li><a shape="rect" href="visualisation.xml">Visualisation</a><ul class="childpages-macro"><li><a shape="rect" href="visualisation-wish-list.xml">Visualisation Wish List</a></li
 ></ul></li></ul></div>
+<div class="wiki-content maincontent"><h2>Apache ActiveMQ Features</h2><p>Apache ActiveMQ is packed with features; to get an idea you might want to look at the <link><page ri:content-title="Features Overview"></page></link> otherwise here is the list of all of the main features...</p><p><structured-macro ac:macro-id="00811776-2d5a-4b5e-99ed-6750b2bf8eac" ac:name="children" ac:schema-version="1"><parameter ac:name="depth">4</parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/general.xml
----------------------------------------------------------------------
diff --git a/general.xml b/general.xml
index ad5fdcc..3664ab6 100644
--- a/general.xml
+++ b/general.xml
@@ -3,5 +3,5 @@
 
 <p>General questions about ActiveMQ</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="can-i-get-commercial-support.xml">Can I get commercial support</a></li><li><a shape="rect" href="how-can-i-get-help.xml">How can I get help</a></li><li><a shape="rect" href="how-can-i-get-the-source-code-from-subversion.xml">How can I get the source code from subversion</a></li><li><a shape="rect" href="how-does-activemq-compare-to-amqp.xml">How does ActiveMQ compare to AMQP</a></li><li><a shape="rect" href="how-does-activemq-compare-to-artemis.xml">How does ActiveMQ compare to Artemis</a></li><li><a shape="rect" href="how-does-activemq-compare-to-fuse-message-broker.xml">How does ActiveMQ compare to Fuse Message Broker</a></li><li><a shape="rect" href="how-does-activemq-compare-to-jbossmq.xml">How does ActiveMQ compare to JBossMQ</a></li><li><a shape="rect" href="how-does-activemq-compare-to-mantaray.xml">How does ActiveMQ compare to Mantaray</a></li><li><a shape="rect" href="how-does-activemq-compare-to-mule.xml">How does Acti
 veMQ compare to Mule</a></li><li><a shape="rect" href="how-does-activemq-compare-to-spread-toolkit.xml">How does ActiveMQ compare to Spread Toolkit</a></li><li><a shape="rect" href="how-does-openwire-compare-to-stomp.xml">How does OpenWire compare to Stomp</a></li><li><a shape="rect" href="how-does-the-website-work.xml">How does the website work</a></li><li><a shape="rect" href="how-do-i-avoid-maven-downloading-latest-jars.xml">How do I avoid Maven downloading latest jars</a></li><li><a shape="rect" href="how-do-i-build-but-disable-the-unit-tests.xml">How do I build but disable the unit tests</a></li><li><a shape="rect" href="how-do-i-compile-from-the-source.xml">How do I compile from the source</a></li><li><a shape="rect" href="how-do-i-edit-the-website.xml">How do I edit the website</a></li><li><a shape="rect" href="how-fast-is-activemq.xml">How fast is ActiveMQ</a></li><li><a shape="rect" href="should-i-run-activemq-on-windows-in-a-directory-with-spaces.xml">Should I run ActiveMQ
  on Windows in a directory with spaces</a></li><li><a shape="rect" href="what-is-activemq.xml">What is ActiveMQ</a></li><li><a shape="rect" href="what-is-the-license.xml">What is the license</a></li><li><a shape="rect" href="what-jars-do-i-need.xml">What jars do I need</a></li><li><a shape="rect" href="what-open-source-integration-solution-works-best-with-activemq.xml">What open source integration solution works best with ActiveMQ</a></li><li><a shape="rect" href="what-platforms-does-activemq-support.xml">What platforms does ActiveMQ support</a></li><li><a shape="rect" href="what-version-should-i-use.xml">What version should I use</a></li></ul></div>
+<structured-macro ac:macro-id="e9504c5e-0217-433d-a299-002d125571a2" 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/geronimo.xml
----------------------------------------------------------------------
diff --git a/geronimo.xml b/geronimo.xml
index 76d67b7..1c7f2c9 100644
--- a/geronimo.xml
+++ b/geronimo.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<p>ActiveMQ is the default JMS provider in <a shape="rect" class="external-link" href="http://geronimo.apache.org">Apache Geronimo</a>.</p>
+<p>ActiveMQ is the default JMS provider in <a shape="rect" href="http://geronimo.apache.org">Apache Geronimo</a>.</p>
 
 <p>ActiveMQ can be used both as JMS Client and a JMS Broker. This short<br clear="none">
 article explains how to use it on a standalone client to access the<br clear="none">
@@ -14,19 +14,18 @@ Adapters to your Geronimo server.<br clear="none">
 The following deployment descriptor can be used to deploy two topics and a<br clear="none">
 ConnectionFactory: weatherTopic and weatherRequestsTopic</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;connector xmlns=&quot;http://geronimo.apache.org/xml/ns/j2ee/connector&quot;
-    version=&quot;1.5&quot;
-    configId=&quot;weather/Topics&quot;
-    parentId=&quot;org/apache/geronimo/SystemJMS&quot;&gt;
+<structured-macro ac:macro-id="d2250b10-bf1d-4e52-8a7e-e645e9fb44a1" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+    version="1.5"
+    configId="weather/Topics"
+    parentId="org/apache/geronimo/SystemJMS"&gt;
     &lt;resourceadapter&gt;
         &lt;resourceadapter-instance&gt;
             &lt;resourceadapter-name&gt;ActiveMQ RA&lt;/resourceadapter-name&gt;
-            &lt;config-property-setting name=&quot;ServerUrl&quot;&gt;tcp://localhost:61616&lt;/config-property-setting&gt;
-            &lt;config-property-setting name=&quot;UserName&quot;&gt;geronimo&lt;/config-property-setting&gt;
-            &lt;config-property-setting name=&quot;Password&quot;&gt;geronimo&lt;/config-property-setting&gt;
+            &lt;config-property-setting name="ServerUrl"&gt;tcp://localhost:61616&lt;/config-property-setting&gt;
+            &lt;config-property-setting name="UserName"&gt;geronimo&lt;/config-property-setting&gt;
+            &lt;config-property-setting name="Password"&gt;geronimo&lt;/config-property-setting&gt;
             &lt;workmanager&gt;
                 &lt;gbean-link&gt;DefaultWorkManager&lt;/gbean-link&gt;
             &lt;/workmanager&gt;
@@ -67,7 +66,7 @@ ConnectionFactory: weatherTopic and weatherRequestsTopic</p>
         &lt;adminobject-instance&gt;
             &lt;message-destination-name&gt;weatherTopic&lt;/message-destination-name&gt;
             &lt;config-property-setting
-name=&quot;PhysicalName&quot;&gt;weatherTopic&lt;/config-property-setting&gt;
+name="PhysicalName"&gt;weatherTopic&lt;/config-property-setting&gt;
         &lt;/adminobject-instance&gt;
     &lt;/adminobject&gt;
     &lt;adminobject&gt;
@@ -78,25 +77,22 @@ name=&quot;PhysicalName&quot;&gt;weatherTopic&lt;/config-property-setting&gt;
 
 &lt;message-destination-name&gt;weatherRequestsTopic&lt;/message-destination-name&gt;
             &lt;config-property-setting
-name=&quot;PhysicalName&quot;&gt;weatherRequestsTopic&lt;/config-property-setting&gt;
+name="PhysicalName"&gt;weatherRequestsTopic&lt;/config-property-setting&gt;
         &lt;/adminobject-instance&gt;
     &lt;/adminobject&gt;
 
 &lt;/connector&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Then deploy it using Geronimo's deploy tool :</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="d52711e4-100d-4c6a-bd05-d7b309b3b4d1" ac:name="code" ac:schema-version="1"><plain-text-body>
 D:\geronimo&gt;java -jar bin\deployer.jar deploy d:\projects\weather\src\resources\
 geronimo-activemq.xml repository\activemq\rars\activemq-ra-3.1-SNAPSHOT.rar
 Username: system
 Password: manager
 Deployed weather/Topics
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The geronimo.log file should now refer to these newly deployed Topics.</p>
 
@@ -132,54 +128,48 @@ jms.weatherRequestsTopic=weatherRequestsTopic</p>
 
 <ul class="alternate"><li>Now, in your Spring description file, declare the bean that will read<br clear="none">
 the properties from the bootstrap.properties file
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-    &lt;bean id=&quot;placeholderConfig&quot; 
-          class=&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;&gt;
-        &lt;property name=&quot;location&quot;&gt;&lt;value&gt;classpath:/bootstrap.properties&lt;/value&gt;&lt;/property&gt;
+<structured-macro ac:macro-id="4c35d9fb-b949-42d6-ac4a-848b747a8fa2" ac:name="code" ac:schema-version="1"><plain-text-body>
+    &lt;bean id="placeholderConfig" 
+          class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
+        &lt;property name="location"&gt;&lt;value&gt;classpath:/bootstrap.properties&lt;/value&gt;&lt;/property&gt;
     &lt;/bean&gt;
-]]></script>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul class="alternate"><li>Create a JNDI template (A Spring-specific wrapper around the JNDI InitialContext
- <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-   &lt;bean id=&quot;jndiTemplate&quot; class=&quot;org.springframework.jndi.JndiTemplate&quot;&gt;
-        &lt;property name=&quot;environment&quot;&gt;
+ <structured-macro ac:macro-id="2c47a0d9-75fe-436a-8995-0ced8834813c" ac:name="code" ac:schema-version="1"><plain-text-body>
+   &lt;bean id="jndiTemplate" class="org.springframework.jndi.JndiTemplate"&gt;
+        &lt;property name="environment"&gt;
             &lt;props&gt;
-                &lt;prop key=&quot;java.naming.factory.initial&quot;&gt;${jms.jndiContextFactory}&lt;/prop&gt;
+                &lt;prop key="java.naming.factory.initial"&gt;${jms.jndiContextFactory}&lt;/prop&gt;
 
 				&lt;!-- Specific to ActiveMQ --&gt;
 
 				&lt;!-- the address of the ActiveMQ broker --&gt;
-                &lt;prop key=&quot;brokerURL&quot;&gt;${jms.jndiProviderUrl}&lt;/prop&gt;
+                &lt;prop key="brokerURL"&gt;${jms.jndiProviderUrl}&lt;/prop&gt;
 				&lt;!-- Some Topics Registration, since we are using a fake JNDI implementation --&gt;
-                &lt;prop key=&quot;topic.${jms.weatherTopic}&quot;&gt;${jms.weatherTopic}&lt;/prop&gt;
-                &lt;prop key=&quot;topic.${jms.weatherRequestsTopic}&quot;&gt;${jms.weatherRequestsTopic}&lt;/prop&gt;
+                &lt;prop key="topic.${jms.weatherTopic}"&gt;${jms.weatherTopic}&lt;/prop&gt;
+                &lt;prop key="topic.${jms.weatherRequestsTopic}"&gt;${jms.weatherRequestsTopic}&lt;/prop&gt;
 			&lt;/props&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
-]]></script>
-</div></div></li></ul>
+</plain-text-body></structured-macro></li></ul>
 
 
 <ul class="alternate"><li>Retrieve the ConnectionFactory from the JNDI context</li></ul>
 
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-    &lt;bean id=&quot;internalJmsQueueConnectionFactory&quot;
-        class=&quot;org.springframework.jndi.JndiObjectFactoryBean&quot;&gt;
-        &lt;property name=&quot;jndiTemplate&quot;&gt;
-            &lt;ref bean=&quot;jndiTemplate&quot;/&gt;
+<structured-macro ac:macro-id="060cb49a-9253-4db0-8a36-06f8fcef8896" ac:name="code" ac:schema-version="1"><plain-text-body>
+    &lt;bean id="internalJmsQueueConnectionFactory"
+        class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
+        &lt;property name="jndiTemplate"&gt;
+            &lt;ref bean="jndiTemplate"/&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;jndiName&quot;&gt;
+        &lt;property name="jndiName"&gt;
             &lt;value&gt;${jms.connectionFactoryName}&lt;/value&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>I'm not 100% sure, but I think that you can put any Factory Name, it will just<br clear="none">
 work. (In a scenario where the JNDI context actually contacts a naming server,<br clear="none">
@@ -188,30 +178,29 @@ it should match the name of the deployed ConnectionFactory)</p>
 <ul class="alternate"><li>Get the Topics instances from the JNDI Context</li></ul>
 
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;bean id=&quot;weatherTopic&quot;
-		class=&quot;org.springframework.jndi.JndiObjectFactoryBean&quot;
-		singleton=&quot;true&quot;&gt;
-        &lt;property name=&quot;jndiTemplate&quot;&gt;
-            &lt;ref bean=&quot;jndiTemplate&quot;/&gt;
+<structured-macro ac:macro-id="d7a1771f-06d0-4f42-9806-62aa17e81627" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;bean id="weatherTopic"
+		class="org.springframework.jndi.JndiObjectFactoryBean"
+		singleton="true"&gt;
+        &lt;property name="jndiTemplate"&gt;
+            &lt;ref bean="jndiTemplate"/&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;jndiName&quot;&gt;
+        &lt;property name="jndiName"&gt;
             &lt;value&gt;${jms.weatherTopic}&lt;/value&gt;
         &lt;/property&gt;
 	&lt;/bean&gt;
-&lt;bean id=&quot;weatherRequestTopic&quot;
-		class=&quot;org.springframework.jndi.JndiObjectFactoryBean&quot;
-		singleton=&quot;true&quot;&gt;
-        &lt;property name=&quot;jndiTemplate&quot;&gt;
-            &lt;ref bean=&quot;jndiTemplate&quot;/&gt;
+&lt;bean id="weatherRequestTopic"
+		class="org.springframework.jndi.JndiObjectFactoryBean"
+		singleton="true"&gt;
+        &lt;property name="jndiTemplate"&gt;
+            &lt;ref bean="jndiTemplate"/&gt;
         &lt;/property&gt;
-        &lt;property name=&quot;jndiName&quot;&gt;
+        &lt;property name="jndiName"&gt;
             &lt;value&gt;${jms.weatherRequestsTopic}&lt;/value&gt;
         &lt;/property&gt;
 	&lt;/bean&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<ul class="alternate"><li>Now, you can reuse these Topics beans the way you want.</li></ul></div>
+<ul class="alternate"><li>Now, you can reuse these Topics beans the way you want.</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/getting-started.xml
----------------------------------------------------------------------
diff --git a/getting-started.xml b/getting-started.xml
index 4d4a659..a08c454 100644
--- a/getting-started.xml
+++ b/getting-started.xml
@@ -1,87 +1,39 @@
-<div class="wiki-content maincontent"><h2 id="GettingStarted-Introduction">Introduction</h2><p>This document describes how to install and configure ActiveMQ 4.x/5.x for both Unix and Windows' platforms.</p><h2 id="GettingStarted-DocumentOrganization">Document Organization</h2><p class="confluence-link">The Getting Started Guide for ActiveMQ 4.x document contains the following sections:</p><p class="confluence-link"></p><div class="toc-macro client-side-toc-macro" data-headerelements="H1,H2,H3,H4,H5,H6,H7"></div><h2 id="GettingStarted-Pre-InstallationRequirements">Pre-Installation Requirements</h2><p><strong>Hardware:</strong></p><ul><li>~ 60 MB of free disk space for the ActiveMQ 5.x binary distribution.<br clear="none">(you need additional disk space for storing persistent messages to disk)</li><li>~ 300 MB of free disk space for the ActiveMQ 5.x source or developer's distributions.</li></ul><p><strong>Operating Systems:</strong></p><ul><li>Windows: Windows XP SP2, Windows 2000, Wi
 ndows Vista, Windows 7.</li><li>Unix: Ubuntu Linux, Powerdog Linux, MacOS, AIX, HP-UX, Solaris, or any Unix platform that supports Java.</li></ul><p><strong>Environment:</strong></p><ul><li><a shape="rect" class="external-link" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" rel="nofollow">Java Runtime Environment (JRE)</a>&#160; <strong>JRE 1.7</strong> (1.6 for version &lt;=5.10.0)<br clear="none">(a JDK is required if you plan to recompile source code)</li><li>The JAVA_HOME environment variable must be set to the directory where the JRE is installed<br clear="none">(Unix: the binary "java" has to be resolvable by the PATH variable; execute "which java" to verify)</li><li><a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> 3.0.0 build system<br clear="none">(only if you plan to recompile source code)</li><li><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/geronimo-spec/jars/">JARs</a> that will be u
 sed must be added to the classpath.<br clear="none">(only if you plan to recompile source code)</li></ul><h2 id="GettingStarted-InstallationProcedureforWindows">Installation Procedure for Windows</h2><p>This section of the Getting Started Guide explains how to install binary and source distributions of ActiveMQ on a Windows system.</p><h4 id="GettingStarted-WindowsBinaryInstallation">Windows Binary Installation</h4><p>This procedure explains how to download and install the binary distribution on a Windows system.</p><ol><li>Download the latest release<br clear="none">(see&#160;<a shape="rect" href="download.xml">Download</a> -&gt; "The latest stable release" -&gt; "<span class="external-link">apache-activemq-x.x.x-bin.zip</span>")</li><li>Extract the files from the ZIP file into a directory of your choice.</li><li>Proceed to the <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> section of this document.</li><li>Following start-up, go to the <a shape="rec
 t" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section of this document.</li></ol><h4 id="GettingStarted-WindowsSourceInstallation">Windows Source Installation</h4><p>This procedure explains how to download and install the source distribution on a Windows system.</p><ol><li>Download the latest release<br clear="none">(see&#160;<a shape="rect" href="download.xml">Download</a> -&gt; "The latest stable release" -&gt; "<span class="external-link">apache-activemq-x.x.x-source-release.zip</span>")</li><li>Extract ActiveMQ from the ZIP file into a directory of your choice.</li><li><p><span class="confluence-anchor-link" id="GettingStarted-WindowsSourceInstallation"></span><br clear="none">The recommended method of building ActiveMQ is 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[REM add &quot;-Dmaven.test.skip=true&quot; if tests are failing on your system (should not happen)
+<div class="wiki-content maincontent"><h2>Introduction</h2><p>This document describes how to install and configure ActiveMQ 4.x/5.x for both Unix and Windows' platforms.</p><h2>Document Organization</h2><p class="confluence-link">The Getting Started Guide for ActiveMQ 4.x document contains the following sections:</p><p class="confluence-link"><structured-macro ac:macro-id="83d4dda2-6235-4647-bb2f-2fdaf82efe66" ac:name="toc" ac:schema-version="1"></structured-macro></p><h2>Pre-Installation Requirements</h2><p><strong>Hardware:</strong></p><ul><li>~ 60 MB of free disk space for the ActiveMQ 5.x binary distribution.<br clear="none">(you need additional disk space for storing persistent messages to disk)</li><li>~ 300 MB of free disk space for the ActiveMQ 5.x source or developer's distributions.</li></ul><p><strong>Operating Systems:</strong></p><ul><li>Windows: Windows XP SP2, Windows 2000, Windows Vista, Windows 7.</li><li>Unix: Ubuntu Linux, Powerdog Linux, MacOS, AIX, HP-UX, Solari
 s, or any Unix platform that supports Java.</li></ul><p><strong>Environment:</strong></p><ul><li><a shape="rect" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Java Runtime Environment (JRE)</a>&#160; <strong>JRE 1.7</strong> (1.6 for version &lt;=5.10.0)<br clear="none">(a JDK is required if you plan to recompile source code)</li><li>The JAVA_HOME environment variable must be set to the directory where the JRE is installed<br clear="none">(Unix: the binary "java" has to be resolvable by the PATH variable; execute "which java" to verify)</li><li><a shape="rect" href="http://maven.apache.org/">Maven</a> 3.0.0 build system<br clear="none">(only if you plan to recompile source code)</li><li><a shape="rect" href="http://cvs.apache.org/repository/geronimo-spec/jars/">JARs</a> that will be used must be added to the classpath.<br clear="none">(only if you plan to recompile source code)</li></ul><h2>Installation Procedure for Windows</h2><p>This section of the Get
 ting Started Guide explains how to install binary and source distributions of ActiveMQ on a Windows system.</p><h4>Windows Binary Installation</h4><p>This procedure explains how to download and install the binary distribution on a Windows system.</p><ol><li>Download the latest release<br clear="none">(see&#160;<link><page ri:content-title="Download"></page></link> -&gt; "The latest stable release" -&gt; "<span class="external-link">apache-activemq-x.x.x-bin.zip</span>")</li><li>Extract the files from the ZIP file into a directory of your choice.</li><li>Proceed to the <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> section of this document.</li><li>Following start-up, go to the <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section of this document.</li></ol><h4>Windows Source Installation</h4><p>This procedure explains how to download and install the 
 source distribution on a Windows system.</p><ol><li>Download the latest release<br clear="none">(see&#160;<link><page ri:content-title="Download"></page></link> -&gt; "The latest stable release" -&gt; "<span class="external-link">apache-activemq-x.x.x-source-release.zip</span>")</li><li>Extract ActiveMQ from the ZIP file into a directory of your choice.</li><li><p><structured-macro ac:macro-id="12713513-1e78-4853-94d7-aead9600d31f" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">Windows Source Installation</parameter></structured-macro><br clear="none">The recommended method of building ActiveMQ is the following:</p><structured-macro ac:macro-id="7517318b-d32d-4ffb-8d12-a0e79decca5f" ac:name="code" ac:schema-version="1"><plain-text-body>REM add "-Dmaven.test.skip=true" if tests are failing on your system (should not happen)
 mvn clean install 
-]]></script>
-</div></div><p>where [activemq_install_dir] is the directory in which ActiveMQ was installed.</p></li><li><p>If you prefer to use an IDE, then you can auto-generate the IDE's project file using maven plugins:</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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>or</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[mvn idea:idea
-]]></script>
-</div></div><p>Feel free to use any other applicable IDE. Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/reference/plugins/plugins.html">plugin reference</a> for more details.</p></li></ol><ol><li><p>Start ActiveMQ from the target directory, for 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[cd [activemq_install_dir]\assembly\target
+</plain-text-body></structured-macro><p>where [activemq_install_dir] is the directory in which ActiveMQ was installed.</p></li><li><p>If you prefer to use an IDE, then you can auto-generate the IDE's project file using maven plugins:</p><structured-macro ac:macro-id="5e3e66c2-a3f9-4106-acbf-b4f0f92bbc6f" ac:name="code" ac:schema-version="1"><plain-text-body>mvn eclipse:eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="ffbbf3b4-818d-49da-bff7-1f7aa7d3002e" ac:name="code" ac:schema-version="1"><plain-text-body>mvn idea:idea
+</plain-text-body></structured-macro><p>Feel free to use any other applicable IDE. Please refer to the <a shape="rect" href="http://maven.apache.org/reference/plugins/plugins.html">plugin reference</a> for more details.</p></li></ol><ol><li><p>Start ActiveMQ from the target directory, for example:</p><structured-macro ac:macro-id="bad7063a-88b2-400d-a879-ee55bbb0a9cb" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]\assembly\target
 unzip activemq-x.x-SNAPSHOT.zip
 cd activemq-x.x-SNAPSHOT
 bin\activemq
-]]></script>
-</div></div><p><strong>NOTE:</strong> Working directories get created relative to the current directory. To create the working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p></li><li><p>Proceed to the <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you are building ActiveMQ 4.x under Windows using Cygwin there is a path name length limitation. If the path name length is exceeded, you may see build errors. To correct this, move the ActiveMQ source directory higher in the file system tree, e.g., /cygdrive/c/d/sm.</p></div></div></li></ol><h4 id="GettingStarted-WindowsDeveloper'sRelease">Windows Developer's Release</h4><p>Thi
 s procedure explains how to download and install the latest developer's snapshot.</p><ol><li>Open the release archive: <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a><br clear="none">(open one of the SNAPSHOT directories)</li><li>Select the version of ActiveMQ to download (if necessary, scroll down to see the ActiveMQ snapshots).</li><li>Extract the files from the ZIP file into a directory of your choice.</li><li>If a binary snapshot was downloaded, proceed to the <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> section of this document.<br clear="none"> If a source snapshot was downloaded, perform step 6 and step 7 of the <a shape="rect" href="#GettingStarted-WindowsSourceInstallation">#Windows Source Installation</a> procedure.</li><li>Following start-up, pr
 oceed to the <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section.</li></ol><h2 id="GettingStarted-InstallationProcedureforUnix">Installation Procedure for Unix</h2><h4 id="GettingStarted-UnixBinaryInstallationUnixBinaryInstallation"><span class="confluence-anchor-link" id="GettingStarted-UnixBinaryInstallation"></span> Unix Binary Installation</h4><p>This procedure explains how to download and install the binary distribution on a Unix system.<br clear="none"> <strong>NOTE:</strong> There are several alternative ways to perform this type of installation.</p><ol><li><p>Download the activemq zipped tarball file to the Unix machine, using either a browser or a tool, i.e., wget, scp, ftp, etc. for example:<br clear="none">(see <a shape="rect" href="download.xml">Download</a> -&gt; "The latest stable release")</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[wget http://activemq.apache.org/path/tofile/apache-activemq-x.x.x-bin.tar.gz
-]]></script>
-</div></div></li><li><p>Extract the files from the zipped tarball into a directory of your choice. For 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[cd [activemq_install_dir]
+</plain-text-body></structured-macro><p><strong>NOTE:</strong> Working directories get created relative to the current directory. To create the working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p></li><li><p>Proceed to the <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section.</p><structured-macro ac:macro-id="96beee6a-1399-4d29-bb22-06d5e8ec4bd4" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>If you are building ActiveMQ 4.x under Windows using Cygwin there is a path name length limitation. If the path name length is exceeded, you may see build errors. To correct this, move the ActiveMQ source directory higher in the file system tree, e.g., /cygdrive/c/d/sm.</p></rich-text-body></structured-macro></li></ol><h4>Windows Developer's Release</h4><p>This procedure explains how to download and install 
 the latest developer's snapshot.</p><ol><li>Open the release archive: <a shape="rect" href="https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a><br clear="none">(open one of the SNAPSHOT directories)</li><li>Select the version of ActiveMQ to download (if necessary, scroll down to see the ActiveMQ snapshots).</li><li>Extract the files from the ZIP file into a directory of your choice.</li><li>If a binary snapshot was downloaded, proceed to the <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> section of this document.<br clear="none"> If a source snapshot was downloaded, perform step 6 and step 7 of the <link ac:anchor="Windows Source Installation"><plain-text-link-body>#Windows Source Installation</plain-text-link-body></link> procedure.</li><li>Following start-up, proceed to the <
 link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section.</li></ol><h2>Installation Procedure for Unix</h2><h4><structured-macro ac:macro-id="4f054d84-738e-410c-b571-1e89ae9dc91c" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">Unix Binary Installation</parameter></structured-macro> Unix Binary Installation</h4><p>This procedure explains how to download and install the binary distribution on a Unix system.<br clear="none"> <strong>NOTE:</strong> There are several alternative ways to perform this type of installation.</p><ol><li><p>Download the activemq zipped tarball file to the Unix machine, using either a browser or a tool, i.e., wget, scp, ftp, etc. for example:<br clear="none">(see <link><page ri:content-title="Download"></page></link> -&gt; "The latest stable release")</p><structured-macro ac:macro-id="df6f9691-1cfa-476b-8f95-f2a1b5f3960a" ac:name="code" ac:schema-version="1"><plain-text-body>wg
 et http://activemq.apache.org/path/tofile/apache-activemq-x.x.x-bin.tar.gz
+</plain-text-body></structured-macro></li><li><p>Extract the files from the zipped tarball into a directory of your choice. For example:</p><structured-macro ac:macro-id="6eb21686-0107-4421-a955-e57803e67163" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]
 tar zxvf activemq-x.x.x-bin.tar.gz
-]]></script>
-</div></div></li><li><p>Proceed to the <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> section of this document.</p></li><li>Following start-up, go to the <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section.</li></ol><h4 id="GettingStarted-UsingHomebrewinstalleronOSX">Using Homebrew installer on OSX</h4><p>If you use OSX as your platform, you can use <a shape="rect" class="external-link" href="http://mxcl.github.com/homebrew/" rel="nofollow">Homebrew</a> package manager to easily install Apache ActiveMQ.</p><ol><li><p>After installing Homebrew package manager successfully, just run</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[$ brew install apache-activemq
-]]></script>
-</div></div><p>You can expect the following output:</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[==&gt; Downloading http://www.gossipcheck.com/mirrors/apache/activemq/apache-activemq/x.x.x/apache-activemq-x.x.x-bin.tar.gz
+</plain-text-body></structured-macro></li><li><p>Proceed to the <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> section of this document.</p></li><li>Following start-up, go to the <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section.</li></ol><h4>Using Homebrew installer on OSX</h4><p>If you use OSX as your platform, you can use <a shape="rect" href="http://mxcl.github.com/homebrew/">Homebrew</a> package manager to easily install Apache ActiveMQ.</p><ol><li><p>After installing Homebrew package manager successfully, just run</p><structured-macro ac:macro-id="043a2c7d-bc97-4a14-83e6-5ee04057a267" ac:name="code" ac:schema-version="1"><plain-text-body>$ brew install apache-activemq
+</plain-text-body></structured-macro><p>You can expect the following output:</p><structured-macro ac:macro-id="4213c84c-66dd-42d4-94ee-9e59edd230df" ac:name="code" ac:schema-version="1"><plain-text-body>==&gt; Downloading http://www.gossipcheck.com/mirrors/apache/activemq/apache-activemq/x.x.x/apache-activemq-x.x.x-bin.tar.gz
 ######################################################################## 100.0%
 ==&gt; Caveats
 Software was installed to:
   /usr/local/Cellar/apache-activemq/x.x.x/libexec
 ==&gt; Summary
 /usr/local/Cellar/apache-activemq/x.x.x: 406 files, 35M, built in 2 seconds
-]]></script>
-</div></div></li></ol><p>ActiveMQ will be installed in <code>/usr/local/Cellar/apache-activemq/x.x.x/</code> directory (where <code>x.x.x</code> denotes the actual version being installed).</p><p>Now you can proceed to <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> and <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> sections.</p><h4 id="GettingStarted-UnixSourceInstallation">Unix Source Installation</h4><p>This procedure explains how to download and install the source distribution on a Unix system. This procedure assumes the Unix machine has a browser. Please see the previous <a shape="rect" href="#GettingStarted-UnixBinaryInstallation">#Unix Binary Installation</a> section for details on how to install ActiveMQ without a browser.</p><ol><li>Download the latest source release<br clear="none">(see&#160;<a shape="rect" href="download.xml">Download</a> -&gt; "The latest stable release" -&gt; "<span class="exter
 nal-link">activemq-parent-x.x.x-source-release.zip</span>")</li><li><p>Extract the files from the ZIP file into a directory of your choice. For 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[tar zxvf activemq.x.x-src.tar.gz
-]]></script>
-</div></div></li><li><p>Build ActiveMQ using Maven:<br clear="none"> The preferred method of building ActiveMQ is 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[cd [activemq_install_dir]
-mvn clean install # add &quot;-Dmaven.test.skip=true&quot; if tests are failing on your system (should not happen)]]></script>
-</div></div><p>If Maven crashes with a java.lang.OutOfMemoryError, you you need to do this first (assuming a Bourne-like shell):</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[export MAVEN_OPTS=&quot;-Xmx512M&quot;
-]]></script>
-</div></div><p>If you prefer to use an IDE then you can auto-generate the IDE's project file using maven plugins:</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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>or</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[mvn idea:idea
-]]></script>
-</div></div><p>Feel free to use any other applicable IDE. Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/reference/plugins/plugins.html">plugin reference</a> for more details.<br clear="none"> <strong>NOTE:</strong> Working directories get created relative to the current directory. To create working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p></li><li>Proceed to the <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> section of this document.</li><li>Proceed to <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section.</li></ol><h4 id="GettingStarted-UnixDeveloper'sRelease">Unix Developer's Release</h4><p>This procedure explains how to download and install the latest developer's snapshot.</p><ol><li>Open the release archive: <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/s
 napshots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a><br clear="none">(open one of the SNAPSHOT directories)</li><li>Select the version of ActiveMQ to download (you may have to scroll down to see the ActiveMQ snapshots). <br clear="none">The filename will be similar to: <code>activemq-x.x.x-tar.gz</code>.</li><li><p>Extract the files from the gzip file into a directory of your choice. For example:<br clear="none"> For a binary developer's snapshot:</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[tar zxvf activemq-x.x.x.tar.gz
-]]></script>
-</div></div><p>For a source developer's snapshot:</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[tar zxvf activemq-x.x.x-src.tar.gz
-]]></script>
-</div></div></li><li><p>If a binary snapshot was downloaded, to make it executable, the <code>ActiveMQ</code> script may need its permissions changed:</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[cd [activemq_install_dir]/bin
+</plain-text-body></structured-macro></li></ol><p>ActiveMQ will be installed in <code>/usr/local/Cellar/apache-activemq/x.x.x/</code> directory (where <code>x.x.x</code> denotes the actual version being installed).</p><p>Now you can proceed to <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> and <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> sections.</p><h4>Unix Source Installation</h4><p>This procedure explains how to download and install the source distribution on a Unix system. This procedure assumes the Unix machine has a browser. Please see the previous <link ac:anchor="Unix Binary Installation"><plain-text-link-body>#Unix Binary Installation</plain-text-link-body></link> section for details on how to install ActiveMQ without a browser.</p><ol><li>Download the latest source release<br clear="none">(see&#160;<link><page ri:content-title="Download">
 </page></link> -&gt; "The latest stable release" -&gt; "<span class="external-link">activemq-parent-x.x.x-source-release.zip</span>")</li><li><p>Extract the files from the ZIP file into a directory of your choice. For example:</p><structured-macro ac:macro-id="927fbb02-22fd-4c91-a5c3-7aa9501dc756" ac:name="code" ac:schema-version="1"><plain-text-body>tar zxvf activemq.x.x-src.tar.gz
+</plain-text-body></structured-macro></li><li><p>Build ActiveMQ using Maven:<br clear="none"> The preferred method of building ActiveMQ is the following:</p><structured-macro ac:macro-id="5826269a-b0d2-475b-89ce-9fe77715a810" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]
+mvn clean install # add "-Dmaven.test.skip=true" if tests are failing on your system (should not happen)</plain-text-body></structured-macro><p>If Maven crashes with a java.lang.OutOfMemoryError, you you need to do this first (assuming a Bourne-like shell):</p><structured-macro ac:macro-id="10e06e10-3e8d-4dfd-a58b-6a0f5c4df243" ac:name="code" ac:schema-version="1"><plain-text-body>export MAVEN_OPTS="-Xmx512M"
+</plain-text-body></structured-macro><p>If you prefer to use an IDE then you can auto-generate the IDE's project file using maven plugins:</p><structured-macro ac:macro-id="837cdfc6-8605-4279-b050-9c5d5f799b99" ac:name="code" ac:schema-version="1"><plain-text-body>mvn eclipse:eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="ab1ca934-28d3-4c3d-bcb8-a8b293855006" ac:name="code" ac:schema-version="1"><plain-text-body>mvn idea:idea
+</plain-text-body></structured-macro><p>Feel free to use any other applicable IDE. Please refer to the <a shape="rect" href="http://maven.apache.org/reference/plugins/plugins.html">plugin reference</a> for more details.<br clear="none"> <strong>NOTE:</strong> Working directories get created relative to the current directory. To create working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p></li><li>Proceed to the <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> section of this document.</li><li>Proceed to <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section.</li></ol><h4>Unix Developer's Release</h4><p>This procedure explains how to download and install the latest developer's snapshot.</p><ol><li>Open the release archive: <a shape="rect" href="https://repository.apache.org/content/repositories/snapsh
 ots/org/apache/activemq/apache-activemq/">https://repository.apache.org/content/repositories/snapshots/org/apache/activemq/apache-activemq/</a><br clear="none">(open one of the SNAPSHOT directories)</li><li>Select the version of ActiveMQ to download (you may have to scroll down to see the ActiveMQ snapshots). <br clear="none">The filename will be similar to: <code>activemq-x.x.x-tar.gz</code>.</li><li><p>Extract the files from the gzip file into a directory of your choice. For example:<br clear="none"> For a binary developer's snapshot:</p><structured-macro ac:macro-id="753d5cb8-9c85-451e-ad97-7e488ebe7469" ac:name="code" ac:schema-version="1"><plain-text-body>tar zxvf activemq-x.x.x.tar.gz
+</plain-text-body></structured-macro><p>For a source developer's snapshot:</p><structured-macro ac:macro-id="210f3fa1-edaa-4dec-96ba-b09493a7b67b" ac:name="code" ac:schema-version="1"><plain-text-body>tar zxvf activemq-x.x.x-src.tar.gz
+</plain-text-body></structured-macro></li><li><p>If a binary snapshot was downloaded, to make it executable, the <code>ActiveMQ</code> script may need its permissions changed:</p><structured-macro ac:macro-id="cb9549fd-d58b-4277-a978-4e8637b21118" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]/bin
 chmod 755 activemq
-]]></script>
-</div></div></li><li>For a binary snapshot, proceed to the <a shape="rect" href="#GettingStarted-StartingActiveMQ">#Starting ActiveMQ</a> section of this document.</li><li>If a source snapshot was downloaded perform steps 6 - 8 of the <a shape="rect" href="#GettingStarted-UnixSourceInstallation">#Unix Source Installation</a> procedure.</li><li>Proceed to the <a shape="rect" href="#GettingStarted-TestingtheInstallation">#Testing the Installation</a> section.</li></ol><h2 id="GettingStarted-StartingActiveMQStartingActiveMQ"><span class="confluence-anchor-link" id="GettingStarted-StartingActiveMQ"></span> Starting ActiveMQ</h2><p>There now follows instructions on how to <a shape="rect" href="run-broker.xml">run the ActiveMQ Message Broker</a>.</p><h4 id="GettingStarted-OnWindows:">On Windows:</h4><p>From a console window, change to the installation directory and run <code>ActiveMQ</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[cd [activemq_install_dir]
-]]></script>
-</div></div><p>where <code>activemq_install_dir</code> is the directory in which ActiveMQ was installed, e.g., <code>c:\Program Files\ActiveMQ-5.x</code>. <br clear="none" class="atl-forced-newline"> Then type:</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[bin\activemq start
-]]></script>
-</div></div><p><strong>NOTE:</strong> Working directories get created relative to the current directory. To create working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p><h4 id="GettingStarted-OnUnix:">On Unix:</h4><p>From a command shell, change to the installation directory and run <code>ActiveMQ</code> as a <strong>foregroud</strong> process:</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[cd [activemq_install_dir]/bin
-./activemq console]]></script>
-</div></div><p>From a command shell, change to the installation directory and run <code>ActiveMQ</code> as a <strong>daemon</strong> process:</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[cd [activemq_install_dir]/bin
-./activemq start]]></script>
-</div></div><h3 id="GettingStarted-Morehelp">More help</h3><p>For other ways of running the broker see <a shape="rect" href="run-broker.xml">Here</a>. For example you can run an <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">embedded broker</a> inside your JMS Connection to avoid starting a separate process.</p><h2 id="GettingStarted-TestingtheInstallationTestingtheInstallation"><span class="confluence-anchor-link" id="GettingStarted-TestingtheInstallation"></span> Testing the Installation</h2><h3 id="GettingStarted-Usingtheadministrativeinterface">Using the administrative interface</h3><ul><li>Open the administrative interface</li><li style="list-style-type: none;background-image: none;"><ul><li>URL: <a shape="rect" class="external-link" href="http://127.0.0.1:8161/admin/" rel="nofollow">http://127.0.0.1:8161/admin/</a></li><li>Login: admin</li><li>Passwort: admin</li></ul></li><li>Navigate to "Queues"</li><li>Add a queue name and click create</li><li>Send t
 est message by klicking on "Send to"</li></ul><h3 id="GettingStarted-Logfileandconsoleoutput">Logfile and console output</h3><p>If ActiveMQ is up and running without problems, the Window's console window or the Unix command shell will display information similar to the following log line:<br clear="none">(see stdout output or "[activemq_install_dir]/data/activemq.log")</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[Apache ActiveMQ 5.11.1 (localhost, ID:ntbk11111-50816-1428933306116-0:1) started | org.apache.activemq.broker.BrokerService | main
-]]></script>
-</div></div><h3 id="GettingStarted-Listenport">Listen port</h3><p>ActiveMQ's default port is 61616. From another window run netstat and search for port 61616.</p><p>From a Windows console, type:</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[netstat -an|find &quot;61616&quot;
-]]></script>
-</div></div><p><strong>OR</strong></p><p>From a Unix command shell, type:</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[netstat -nl|grep 61616
-]]></script>
-</div></div><h2 id="GettingStarted-MonitoringActiveMQ">Monitoring ActiveMQ</h2><p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.xml">Web Console</a> by pointing your browser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></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"><p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p></div></div><p>Or you can use the <a shape="rect" href="jmx.xml">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p><h2 id="Getting
 Started-StoppingActiveMQ">Stopping ActiveMQ</h2><p>For both Windows and Unix installations, terminate ActiveMQ by typing "CTRL-C" in the console or command shell in which it is running.</p><p>If ActiveMQ was started in the background on Unix, the process can be killed, with 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[cd [activemq_install_dir]/bin
+</plain-text-body></structured-macro></li><li>For a binary snapshot, proceed to the <link ac:anchor="Starting ActiveMQ"><plain-text-link-body>#Starting ActiveMQ</plain-text-link-body></link> section of this document.</li><li>If a source snapshot was downloaded perform steps 6 - 8 of the <link ac:anchor="Unix Source Installation"><plain-text-link-body>#Unix Source Installation</plain-text-link-body></link> procedure.</li><li>Proceed to the <link ac:anchor="Testing the Installation"><plain-text-link-body>#Testing the Installation</plain-text-link-body></link> section.</li></ol><h2><structured-macro ac:macro-id="2fd79e3b-e06e-4195-8fec-e57603deeb44" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">Starting ActiveMQ</parameter></structured-macro> Starting ActiveMQ</h2><p>There now follows instructions on how to <link><page ri:content-title="Run Broker"></page><plain-text-link-body>run the ActiveMQ Message Broker</plain-text-link-body></link>.</p><h4>On Windows:</h4><p>From a
  console window, change to the installation directory and run <code>ActiveMQ</code>:</p><structured-macro ac:macro-id="cf300c16-c08f-461b-89a0-7843597e1d37" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]
+</plain-text-body></structured-macro><p>where <code>activemq_install_dir</code> is the directory in which ActiveMQ was installed, e.g., <code>c:\Program Files\ActiveMQ-5.x</code>. <br clear="none" class="atl-forced-newline"> Then type:</p><structured-macro ac:macro-id="d3c78c22-4903-4bc2-ae87-aa44b9e9d65e" ac:name="code" ac:schema-version="1"><plain-text-body>bin\activemq start
+</plain-text-body></structured-macro><p><strong>NOTE:</strong> Working directories get created relative to the current directory. To create working directories in the proper place, ActiveMQ must be launched from its home/installation directory.</p><h4>On Unix:</h4><p>From a command shell, change to the installation directory and run <code>ActiveMQ</code> as a <strong>foregroud</strong> process:</p><structured-macro ac:macro-id="17788469-2f81-4294-addd-dba15eee852e" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]/bin
+./activemq console</plain-text-body></structured-macro><p>From a command shell, change to the installation directory and run <code>ActiveMQ</code> as a <strong>daemon</strong> process:</p><structured-macro ac:macro-id="233f7a71-6b58-4eb9-8185-7fa8af92a759" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]/bin
+./activemq start</plain-text-body></structured-macro><h3>More help</h3><p>For other ways of running the broker see <link><page ri:content-title="Run Broker"></page><plain-text-link-body>Here</plain-text-link-body></link>. For example you can run an <link><page ri:content-title="How do I embed a Broker inside a Connection"></page><plain-text-link-body>embedded broker</plain-text-link-body></link> inside your JMS Connection to avoid starting a separate process.</p><h2><structured-macro ac:macro-id="f5fd2cc6-ce2a-408e-a349-8a0a70273b0f" ac:name="anchor" ac:schema-version="1"><parameter ac:name="">Testing the Installation</parameter></structured-macro> Testing the Installation</h2><h3>Using the administrative interface</h3><ul><li>Open the administrative interface</li><li style="list-style-type: none;background-image: none;"><ul><li>URL: <a shape="rect" href="http://127.0.0.1:8161/admin/">http://127.0.0.1:8161/admin/</a></li><li>Login: admin</li><li>Passwort: admin</li></ul></li><li>Nav
 igate to "Queues"</li><li>Add a queue name and click create</li><li>Send test message by klicking on "Send to"</li></ul><h3>Logfile and console output</h3><p>If ActiveMQ is up and running without problems, the Window's console window or the Unix command shell will display information similar to the following log line:<br clear="none">(see stdout output or "[activemq_install_dir]/data/activemq.log")</p><structured-macro ac:macro-id="acba31d9-fffc-4d2f-a2d6-a8c2f84605e2" ac:name="code" ac:schema-version="1"><plain-text-body>Apache ActiveMQ 5.11.1 (localhost, ID:ntbk11111-50816-1428933306116-0:1) started | org.apache.activemq.broker.BrokerService | main
+</plain-text-body></structured-macro><h3>Listen port</h3><p>ActiveMQ's default port is 61616. From another window run netstat and search for port 61616.</p><p>From a Windows console, type:</p><structured-macro ac:macro-id="45b33dc5-47a0-4333-9823-42c08431ad51" ac:name="code" ac:schema-version="1"><plain-text-body>netstat -an|find "61616"
+</plain-text-body></structured-macro><p><strong>OR</strong></p><p>From a Unix command shell, type:</p><structured-macro ac:macro-id="48ad0806-4478-4942-b4cb-258f9c390733" ac:name="code" ac:schema-version="1"><plain-text-body>netstat -nl|grep 61616
+</plain-text-body></structured-macro><h2>Monitoring ActiveMQ</h2><p><structured-macro ac:macro-id="0c439581-e0ce-4a78-8ac2-8f01d36f2ca6" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Monitoring ActiveMQ"></page></link></parameter></structured-macro></p><h2>Stopping ActiveMQ</h2><p>For both Windows and Unix installations, terminate ActiveMQ by typing "CTRL-C" in the console or command shell in which it is running.</p><p>If ActiveMQ was started in the background on Unix, the process can be killed, with the following:</p><structured-macro ac:macro-id="6be78f73-6679-4ebd-9102-c0ff5ec26b6f" ac:name="code" ac:schema-version="1"><plain-text-body>cd [activemq_install_dir]/bin
 ./activemq stop
-]]></script>
-</div></div><h2 id="GettingStarted-ConfiguringActiveMQ">Configuring ActiveMQ</h2><p>The ActiveMQ broker should now run. You can configure the broker by specifying an <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> file as a parameter to the <em>activemq</em> command. An alternative is to use the <a shape="rect" href="broker-configuration-uri.xml">Broker Configuration URI</a> to configure things on the command line in a concise format (though the configuration options are not as extensive as if you use Java or XML code). You can also</p><p>Also see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a> to see how you can configure the various connection, transport and broker options using the connection URL in the ActiveMQConnectionFactory.</p><p>See the <a shape="rect" href="initial-configuration.xml">Initial Configuration</a> for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code</p><p>If you wa
 nt to use JNDI to connect to your JMS provider then please view the <a shape="rect" href="jndi-support.xml">JNDI Support</a>. If you are a Spring user you should read about <a shape="rect" href="spring-support.xml">Spring Support</a></p><p>After the installation, ActiveMQ is running with a basic configuration. For details on configuring options, please see refer to the <a shape="rect" href="configuration.xml">Configuration</a> section.</p><h2 id="GettingStarted-AdditionalResources">Additional Resources</h2><p>If you are new to using ActiveMQ, running the <a shape="rect" href="web-samples.xml">Web Samples</a> or the <a shape="rect" href="examples.xml">Examples</a> is a good next step to learn more about ActiveMQ.</p><p>The Commercial Providers listed on the <a shape="rect" href="support.xml">Support</a> page may also have additional documentation, examples, tutorials, etc... that can help you get started.</p></div>
+</plain-text-body></structured-macro><h2>Configuring ActiveMQ</h2><p>The ActiveMQ broker should now run. You can configure the broker by specifying an <link><page ri:content-title="Xml Configuration"></page></link> file as a parameter to the <em>activemq</em> command. An alternative is to use the <link><page ri:content-title="Broker Configuration URI"></page></link> to configure things on the command line in a concise format (though the configuration options are not as extensive as if you use Java or XML code). You can also</p><p>Also see <link><page ri:content-title="Configuring Transports"></page></link> to see how you can configure the various connection, transport and broker options using the connection URL in the ActiveMQConnectionFactory.</p><p>See the <link><page ri:content-title="Initial Configuration"></page></link> for details of which jars you need to add to your classpath to start using ActiveMQ in your Java code</p><p>If you want to use JNDI to connect to your JMS provi
 der then please view the <link><page ri:content-title="JNDI Support"></page></link>. If you are a Spring user you should read about <link><page ri:content-title="Spring Support"></page></link></p><p>After the installation, ActiveMQ is running with a basic configuration. For details on configuring options, please see refer to the <link><page ri:content-title="Configuration"></page></link> section.</p><h2>Additional Resources</h2><p>If you are new to using ActiveMQ, running the <link><page ri:content-title="Web Samples"></page></link> or the <link><page ri:content-title="Examples"></page></link> is a good next step to learn more about ActiveMQ.</p><p>The Commercial Providers listed on the <link><page ri:content-title="Support"></page></link> page may also have additional documentation, examples, tutorials, etc... that can help you get started.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/group-membership.xml
----------------------------------------------------------------------
diff --git a/group-membership.xml b/group-membership.xml
index 3e5e3c8..a21c361 100644
--- a/group-membership.xml
+++ b/group-membership.xml
@@ -2,17 +2,16 @@
 You have to explicitly say which group you want to join/leave - and you can join multiple groups.<br clear="none">
 Each GroupChannel has both a globally unique id and a name.</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="a74c7a79-dbfb-4d45-befd-60b5910478b9" ac:name="code" ac:schema-version="1"><plain-text-body>
 
 import org.apache.activeblaze.group.*;
 
 ...
 BlazeGroupChannelFactory factory = new BlazeGroupChannelFactory();
 
-BlazeGroupChannel channel = factory.createGroupChannel(&quot;My Channel&quot;);
+BlazeGroupChannel channel = factory.createGroupChannel("My Channel");
 //join a group
-channel.addToGroup(&quot;test&quot;);
+channel.addToGroup("test");
 channel.start();
 
 //listen for other members
@@ -20,14 +19,13 @@ channel.start();
 channel.addMemberChangedListener(new MemberChangedListener(){
 
      public void memberStarted(Member member) {
-         System.out.println(&quot;Member started&quot;);
+         System.out.println("Member started");
      }
 
      public void memberStopped(Member member) {
-         System.out.println(&quot;Member stopped&quot;);
+         System.out.println("Member stopped");
      }
             
  });
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/hello-world.xml
----------------------------------------------------------------------
diff --git a/hello-world.xml b/hello-world.xml
index d7bb4ea..b77074d 100644
--- a/hello-world.xml
+++ b/hello-world.xml
@@ -1,12 +1,11 @@
-<div class="wiki-content maincontent"><p>The following is a very simple JMS application with multiple, concurrent, consumers and producers.  See the <a shape="rect" href="initial-configuration.xml">Initial Configuration</a> guide for details on how to setup your classpath correctly.</p>
+<div class="wiki-content maincontent"><p>The following is a very simple JMS application with multiple, concurrent, consumers and producers.  See the <link><page ri:content-title="Initial Configuration"></page></link> guide for details on how to setup your classpath correctly.</p>
 
 <p>Things you might do after running this example:</p>
-<ul class="alternate"><li><a shape="rect" href="run-broker.xml">Setup a broker</a> instead of using the org.activemq.broker.impl.Main class directly</li><li>Use JNDI to lookup a javax.jms.ConnectionFactory rather than creating ActiveMQConnectionFactory directly.</li><li>Implement the javax.jms.MessageListener interface rather than calling consumer.receive()</li><li>Use transactional sessions</li><li>Use a Topic rather than a queue</li></ul>
+<ul class="alternate"><li><link><page ri:content-title="Run Broker"></page><link-body>Setup a broker</link-body></link> instead of using the org.activemq.broker.impl.Main class directly</li><li>Use JNDI to lookup a javax.jms.ConnectionFactory rather than creating ActiveMQConnectionFactory directly.</li><li>Implement the javax.jms.MessageListener interface rather than calling consumer.receive()</li><li>Use transactional sessions</li><li>Use a Topic rather than a queue</li></ul>
 
 
 <p>The point of this example is to show you the basic code required to use JMS in a straightforward way.  The Consumers and Producers could very easy be on completely different machines or in different processes.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>App.java</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="9a9982ea-46ba-4ce4-a8d8-8aaa2cc93092" ac:name="code" ac:schema-version="1"><parameter ac:name="title">App.java</parameter><plain-text-body>
 import org.apache.activemq.ActiveMQConnectionFactory;
 
 import javax.jms.Connection;
@@ -65,7 +64,7 @@ public class App {
         public void run() {
             try {
                 // Create a ConnectionFactory
-                ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(&quot;vm://localhost&quot;);
+                ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost");
 
                 // Create a Connection
                 Connection connection = connectionFactory.createConnection();
@@ -75,18 +74,18 @@ public class App {
                 Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
                 // Create the destination (Topic or Queue)
-                Destination destination = session.createQueue(&quot;TEST.FOO&quot;);
+                Destination destination = session.createQueue("TEST.FOO");
 
                 // Create a MessageProducer from the Session to the Topic or Queue
                 MessageProducer producer = session.createProducer(destination);
                 producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
 
                 // Create a messages
-                String text = &quot;Hello world! From: &quot; + Thread.currentThread().getName() + &quot; : &quot; + this.hashCode();
+                String text = "Hello world! From: " + Thread.currentThread().getName() + " : " + this.hashCode();
                 TextMessage message = session.createTextMessage(text);
 
                 // Tell the producer to send the message
-                System.out.println(&quot;Sent message: &quot;+ message.hashCode() + &quot; : &quot; + Thread.currentThread().getName());
+                System.out.println("Sent message: "+ message.hashCode() + " : " + Thread.currentThread().getName());
                 producer.send(message);
 
                 // Clean up
@@ -94,7 +93,7 @@ public class App {
                 connection.close();
             }
             catch (Exception e) {
-                System.out.println(&quot;Caught: &quot; + e);
+                System.out.println("Caught: " + e);
                 e.printStackTrace();
             }
         }
@@ -105,7 +104,7 @@ public class App {
             try {
 
                 // Create a ConnectionFactory
-                ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(&quot;vm://localhost&quot;);
+                ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost");
 
                 // Create a Connection
                 Connection connection = connectionFactory.createConnection();
@@ -117,7 +116,7 @@ public class App {
                 Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
                 // Create the destination (Topic or Queue)
-                Destination destination = session.createQueue(&quot;TEST.FOO&quot;);
+                Destination destination = session.createQueue("TEST.FOO");
 
                 // Create a MessageConsumer from the Session to the Topic or Queue
                 MessageConsumer consumer = session.createConsumer(destination);
@@ -128,25 +127,24 @@ public class App {
                 if (message instanceof TextMessage) {
                     TextMessage textMessage = (TextMessage) message;
                     String text = textMessage.getText();
-                    System.out.println(&quot;Received: &quot; + text);
+                    System.out.println("Received: " + text);
                 } else {
-                    System.out.println(&quot;Received: &quot; + message);
+                    System.out.println("Received: " + message);
                 }
 
                 consumer.close();
                 session.close();
                 connection.close();
             } catch (Exception e) {
-                System.out.println(&quot;Caught: &quot; + e);
+                System.out.println("Caught: " + e);
                 e.printStackTrace();
             }
         }
 
         public synchronized void onException(JMSException ex) {
-            System.out.println(&quot;JMS Exception occured.  Shutting down client.&quot;);
+            System.out.println("JMS Exception occured.  Shutting down client.");
         }
     }
 }
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/hermes-jms.xml
----------------------------------------------------------------------
diff --git a/hermes-jms.xml b/hermes-jms.xml
index 19a3735..c832bc9 100644
--- a/hermes-jms.xml
+++ b/hermes-jms.xml
@@ -1,22 +1,22 @@
-<div class="wiki-content maincontent"><p>You can use ActiveMQ with <a shape="rect" class="external-link" href="http://hermesjms.sourceforge.net/" rel="nofollow">Hermes JMS</a> which is a graphical user interface for working with JMS queues. Please refer to the <a shape="rect" class="external-link" href="http://hermesjms.sourceforge.net/" rel="nofollow">Hermes JMS</a> site for detailed instructions on using this software. </p>
+<div class="wiki-content maincontent"><p>You can use ActiveMQ with <a shape="rect" href="http://hermesjms.sourceforge.net/">Hermes JMS</a> which is a graphical user interface for working with JMS queues. Please refer to the <a shape="rect" href="http://hermesjms.sourceforge.net/">Hermes JMS</a> site for detailed instructions on using this software. </p>
 
-<h3 id="HermesJms-Demo">Demo </h3>
+<h3>Demo </h3>
 
-<p>Mark Bucayan kindly submitted a <a shape="rect" class="external-link" href="http://activemq.codehaus.org/HermesAndActiveMQ.html" rel="nofollow">Flash demo</a> showing how to use ActiveMQ inside Hermes.</p>
+<p>Mark Bucayan kindly submitted a <a shape="rect" href="http://activemq.codehaus.org/HermesAndActiveMQ.html">Flash demo</a> showing how to use ActiveMQ inside Hermes.</p>
 
 <p>Here are a few steps to get you started with ActiveMQ when using HermesJMS. </p>
 
-<h3 id="HermesJms-AddActiveMQasaProvider">Add ActiveMQ as a Provider</h3>
+<h3>Add ActiveMQ as a Provider</h3>
 
 <p>You need to register the jars required to run ActiveMQ inside HermesJMS. To do this click on Options -&gt; Preferences. Then on the Providers tab add the following jars: </p>
 
-<ul><li><a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/org/apache/activemq/" rel="nofollow">activemq-all.jar</a> Choose the version that matches your projects needs.</li></ul>
+<ul><li><a shape="rect" href="http://repo1.maven.org/maven2/org/apache/activemq/">activemq-all.jar</a> Choose the version that matches your projects needs.</li></ul>
 
 
-<ul><li><a shape="rect" class="external-link" href="http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar" rel="nofollow">geronimo-j2ee-management_1.0_spec-1.0.jar</a></li></ul>
+<ul><li><a shape="rect" href="http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar">geronimo-j2ee-management_1.0_spec-1.0.jar</a></li></ul>
 
 
-<h3 id="HermesJms-ConfigureanActiveMQSession">Configure an ActiveMQ Session</h3>
+<h3>Configure an ActiveMQ Session</h3>
 
 <p>On the Preferences dialog, the Sessions tab, create a new session using the org.activemq.ActiveMQConnectionFactory connection factory. </p>
 
@@ -24,15 +24,13 @@
 
 <p>Finally you can add some Destinations to the dialog on this page. (Right click to add). Add the destination FOO.BAR for the default test programs.</p>
 
-<h3 id="HermesJms-Viewingmessagesonqueues">Viewing messages on queues</h3>
+<h3>Viewing messages on queues</h3>
 
 <p>Use the tree control to open your session and the FOO.BAR destination. Try browse the queue. Then run the ActiveMQ sample producer via</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="83588121-5686-460b-b5c8-3a8d44c5eb45" ac:name="code" ac:schema-version="1"><plain-text-body>
 mvn producer
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>And hitting refresh in HermesJMS and you should see the messages that have just been published.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/hermes-screenshot.xml
----------------------------------------------------------------------
diff --git a/hermes-screenshot.xml b/hermes-screenshot.xml
index f3ed469..1f7f3f0 100644
--- a/hermes-screenshot.xml
+++ b/hermes-screenshot.xml
@@ -3,5 +3,5 @@
 
 <p>The following is an example of running HermesJms with ActiveMQ on OS X</p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.codehaus.org/hermes.png" data-image-src="http://activemq.codehaus.org/hermes.png"></span></p></div>
+<p><image><url ri:value="http://activemq.codehaus.org/hermes.png"></url></image></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-add-a-new-type-of-transport.xml
----------------------------------------------------------------------
diff --git a/how-can-i-add-a-new-type-of-transport.xml b/how-can-i-add-a-new-type-of-transport.xml
index f677b59..8da885f 100644
--- a/how-can-i-add-a-new-type-of-transport.xml
+++ b/how-can-i-add-a-new-type-of-transport.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><p>ActiveMQ is specifically designed to allow custom transports to be plugged in. You can programatically create TransportConnector instances and add them to the BrokerService in Java code using the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/apache/activemq/broker/BrokerService.html#addConnector(org.apache.activemq.broker.TransportConnector)" rel="nofollow">BrokerService.addConnector() method</a></p>
+<div class="wiki-content maincontent"><p>ActiveMQ is specifically designed to allow custom transports to be plugged in. You can programatically create TransportConnector instances and add them to the BrokerService in Java code using the <a shape="rect" href="http://activemq.codehaus.org/maven/apidocs/org/apache/activemq/broker/BrokerService.html#addConnector(org.apache.activemq.broker.TransportConnector)">BrokerService.addConnector() method</a></p>
 
 <p>or you can use the transport discovery mechanism, so that folks can just use your new transport using the neat URI syntax.</p>
 
-<p>The way it works is that the URI scheme (e.g. "vm") is used to find a text file on the classpath - <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/">here are all the schemes provided</a>.</p>
+<p>The way it works is that the URI scheme (e.g. "vm") is used to find a text file on the classpath - <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/">here are all the schemes provided</a>.</p>
 
-<p>then the contents of the file is the class name of a Java class on the classpath which extends the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/apache/activemq/transport/TransportFactory.html" rel="nofollow">TransportFactory class</a>.</p>
+<p>then the contents of the file is the class name of a Java class on the classpath which extends the <a shape="rect" href="http://activemq.codehaus.org/maven/apidocs/org/apache/activemq/transport/TransportFactory.html">TransportFactory class</a>.</p>
 
 <p>Then once you've implemented a Transport and TransportFactory class, folks can use your new transport using a URI in the JMS client or broker XML config file using the URI using your new schema name. e.g. if you wrote a new <em>foo</em> transport, you could use a URI of <em>foo://localhost?myParam=bar</em></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-avoid-serialization-of-objects-in-objectmessage.xml
----------------------------------------------------------------------
diff --git a/how-can-i-avoid-serialization-of-objects-in-objectmessage.xml b/how-can-i-avoid-serialization-of-objects-in-objectmessage.xml
index 802c1f2..5a4a9bc 100644
--- a/how-can-i-avoid-serialization-of-objects-in-objectmessage.xml
+++ b/how-can-i-avoid-serialization-of-objects-in-objectmessage.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Use the VM transport and see <a shape="rect" href="how-should-i-use-the-vm-transport.xml">details on how to disable serialization to pass by value</a></p></div>
+<p>Use the VM transport and see <link><page ri:content-title="How should I use the VM transport"></page><link-body>details on how to disable serialization to pass by value</link-body></link></p></div>
 


[10/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml b/how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml
index 4082c02..bcdaaab 100644
--- a/how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml
+++ b/how-do-i-use-durable-subscribers-in-a-network-of-brokers.xml
@@ -2,23 +2,21 @@
 
 <p>For example, if you have two brokers A and B networked together in both directions to form a cluster, and a durable subscriber connects to broker B, a producer P on broker A will have its messages properly forwarded to broker B and the durable subscriber. However, if the subscriber disconnects and reconnects to broker A, any messages sent by P while the subscriber was away will be stuck on B until the subscriber reconnects to B. </p>
 
-<p>The solution is to use <a shape="rect" href="virtual-destinations.xml">Virtual Destinations</a></p>
+<p>The solution is to use <link><page ri:content-title="Virtual Destinations"></page></link></p>
 
-<p>Virtual topics use queues under the covers and this allows ActiveMQ to treat each subscriber as a plain old Queue subscriber. This allows ActiveMQ to replay messages that have been orphaned on another broker in the cluster using this configuration as explained in the <a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a> documentation:</p>
+<p>Virtual topics use queues under the covers and this allows ActiveMQ to treat each subscriber as a plain old Queue subscriber. This allows ActiveMQ to replay messages that have been orphaned on another broker in the cluster using this configuration as explained in the <link><page ri:content-title="Networks of Brokers"></page></link> documentation:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;destinationPolicy&gt;
+<structured-macro ac:macro-id="ce6314bd-e55b-41ec-933d-471a912c167a" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>    &lt;destinationPolicy&gt;
       &lt;policyMap&gt;
         &lt;policyEntries&gt;
-          &lt;policyEntry queue=&quot;TEST.&gt;&quot; enableAudit=&quot;false&quot;&gt;
-            &lt;conditionalNetworkBridgeFilterFactory replayWhenNoConsumers=&quot;true&quot;/&gt;
+          &lt;policyEntry queue="TEST.&gt;" enableAudit="false"&gt;
+            &lt;conditionalNetworkBridgeFilterFactory replayWhenNoConsumers="true"/&gt;
           &lt;/policyEntry&gt;
         &lt;/policyEntries&gt;
       &lt;/policyMap&gt;
-    &lt;/destinationPolicy&gt;]]></script>
-</div></div> 
+    &lt;/destinationPolicy&gt;</plain-text-body></structured-macro> 
 
 
 
-<p>Also, take a look at <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VirtualTopicNetworkClusterReactivationTest.java?view=markup">this unit test to see the full configuration and usage</a></p></div>
+<p>Also, take a look at <a shape="rect" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/VirtualTopicNetworkClusterReactivationTest.java?view=markup">this unit test to see the full configuration and usage</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-ivy-with-activemq.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-ivy-with-activemq.xml b/how-do-i-use-ivy-with-activemq.xml
index 0af8af1..3574006 100644
--- a/how-do-i-use-ivy-with-activemq.xml
+++ b/how-do-i-use-ivy-with-activemq.xml
@@ -1,11 +1,10 @@
 <div class="wiki-content maincontent">
-<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="5ff6c8bd-e17a-4f67-a44d-35d367e4cfc3" ac:name="code" ac:schema-version="1"><plain-text-body>
 &lt;ivyconf&gt;
         &lt;!--loads properties file as ivy variables, 0..n--&gt;
-        &lt;properties file=&quot;${ivy.conf.dir}/ivyconf-file.properties&quot; /&gt;
+        &lt;properties file="${ivy.conf.dir}/ivyconf-file.properties" /&gt;
         &lt;!--configures ivy with some defaults, 0..1--&gt;
-        &lt;conf defaultResolver=&quot;localChain&quot; checkUpToDate=&quot;false&quot; /&gt;
+        &lt;conf defaultResolver="localChain" checkUpToDate="false" /&gt;
 
         &lt;!--typedef:defines new types in ivy--&gt;
         &lt;!--latest-strategies: defines latest strategies--&gt;
@@ -13,32 +12,31 @@
 
         &lt;!--defines dependency resolvers--&gt;
         &lt;resolvers&gt;
-             &lt;chain name=&quot;localChain&quot; returnFirst=&quot;false&quot;&gt;
-                 &lt;filesystem name=&quot;internal&quot; latest=&quot;latest-revision&quot;&gt;
+             &lt;chain name="localChain" returnFirst="false"&gt;
+                 &lt;filesystem name="internal" latest="latest-revision"&gt;
                         &lt;ivy     
-pattern=&quot;${repository.dir}/[organisation]/[module]/[type]s/ivy-[revision].xml&quot; /&gt;
+pattern="${repository.dir}/[organisation]/[module]/[type]s/ivy-[revision].xml" /&gt;
                         &lt;artifact
-pattern=&quot;${repository.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]&quot; /&gt;
+pattern="${repository.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" /&gt;
                 &lt;/filesystem&gt;
-                &lt;ivyrep name=&quot;ivyrep&quot;/&gt;
+                &lt;ivyrep name="ivyrep"/&gt;
              &lt;/chain&gt;
-             &lt;ibiblio name=&quot;ibiblio&quot;
-pattern=&quot;[organisation]/jars/[module]-[revision].[ext]&quot;/&gt;
+             &lt;ibiblio name="ibiblio"
+pattern="[organisation]/jars/[module]-[revision].[ext]"/&gt;
         &lt;/resolvers&gt;
 
         &lt;!--defines rules between modules and dependency resolvers--&gt;
         &lt;modules&gt;
-                &lt;module organisation=&quot;verticon&quot; name=&quot;.*&quot;
-resolver=&quot;internal&quot; /&gt;
-                &lt;module organisation=&quot;mandarax&quot; name=&quot;.*&quot;
-resolver=&quot;internal&quot; /&gt;
-                &lt;module organisation=&quot;geronimo-spec&quot; name=&quot;.*&quot;
-resolver=&quot;ibiblio&quot; /&gt;
-                &lt;module organisation=&quot;tomcat&quot; name=&quot;.*&quot;
-resolver=&quot;ibiblio&quot; /&gt;
+                &lt;module organisation="verticon" name=".*"
+resolver="internal" /&gt;
+                &lt;module organisation="mandarax" name=".*"
+resolver="internal" /&gt;
+                &lt;module organisation="geronimo-spec" name=".*"
+resolver="ibiblio" /&gt;
+                &lt;module organisation="tomcat" name=".*"
+resolver="ibiblio" /&gt;
         &lt;/modules&gt;
 
 &lt;/ivyconf&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-jms-efficiently.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-jms-efficiently.xml b/how-do-i-use-jms-efficiently.xml
index a3da3cb..dbecb3a 100644
--- a/how-do-i-use-jms-efficiently.xml
+++ b/how-do-i-use-jms-efficiently.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIuseJMSefficiently-HowdoIuseJMSefficiently?">How do I use JMS efficiently?</h2>
+<div class="wiki-content maincontent"><h2>How do I use JMS efficiently?</h2>
 
 <p>JMS is designed for high performance. In particular its design is such that you are meant to create a number of objects up front on the startup of your application and then resuse them throughout your application. e.g. its a good idea to create upfront and then reuse the following</p>
 
@@ -9,26 +9,26 @@
 
 <p>Note a little trick - you can reuse the same MessageProducer for sending messages to different destinations; just create it with a null destination and specify it on the send method.</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"><p>MessageProducer instances that are created with a null destination are anonymous producers and as such the broker cannot fire an advisory for producer when these are created.  This means that when the pooled MessageProducer is in use no advisories for producers will ever be sent.</p></div></div>
+<structured-macro ac:macro-id="ccc153ab-d88c-47fe-8513-11d4a6743a3b" ac:name="info" ac:schema-version="1"><rich-text-body><p>MessageProducer instances that are created with a null destination are anonymous producers and as such the broker cannot fire an advisory for producer when these are created.  This means that when the pooled MessageProducer is in use no advisories for producers will ever be sent.</p></rich-text-body></structured-macro>
 
-<h3 id="HowdoIuseJMSefficiently-UsingPoolingwithJMS">Using Pooling with JMS</h3>
+<h3>Using Pooling with JMS</h3>
 
-<p>To use JMS efficiently we recommend you use <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel</a> to hide the JMS API and <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/bean-integration.html">bind the messaging to your beans</a>. </p>
+<p>To use JMS efficiently we recommend you use <a shape="rect" href="http://activemq.apache.org/camel/">Camel</a> to hide the JMS API and <a shape="rect" href="http://activemq.apache.org/camel/bean-integration.html">bind the messaging to your beans</a>. </p>
 
-<p>Alternatively try using Spring's <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-mdp" rel="nofollow">MessageListenerContainer</a> for consuming messages and <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-jmstemplate" rel="nofollow">JmsTemplate</a> for sending - but be <a shape="rect" class="external-link" href="http://activemq.apache.org/jmstemplate-gotchas.html">aware of the gotchas</a></p>
+<p>Alternatively try using Spring's <a shape="rect" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-mdp">MessageListenerContainer</a> for consuming messages and <a shape="rect" href="http://static.springsource.org/spring/docs/2.5.x/reference/jms.html#jms-jmstemplate">JmsTemplate</a> for sending - but be <a shape="rect" href="http://activemq.apache.org/jmstemplate-gotchas.html">aware of the gotchas</a></p>
 
-<h3 id="HowdoIuseJMSefficiently-Otherperformancetips">Other performance tips</h3>
+<h3>Other performance tips</h3>
 
 <p>Also see</p>
 
-<ul><li><a shape="rect" href="should-i-use-transactions.xml">Should I use transactions</a></li><li><a shape="rect" href="should-i-use-xa.xml">Should I use XA</a></li></ul>
+<ul><li><link><page ri:content-title="Should I use transactions"></page></link></li><li><link><page ri:content-title="Should I use XA"></page></link></li></ul>
 
 
-<h3 id="HowdoIuseJMSefficiently-JavaConnectorArchitecture">Java Connector Architecture</h3>
+<h3>Java Connector Architecture</h3>
 
-<p><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/connector/" rel="nofollow">Java Connector Architecture</a> supports the pooling of JMS connections, sessions and MessageListeners, parallel message processing, thread pooling and transaction &amp; exception handling, through the use of a JCA <a shape="rect" href="resource-adapter.xml">Resource Adapter</a>.</p>
+<p><a shape="rect" href="http://java.sun.com/j2ee/connector/">Java Connector Architecture</a> supports the pooling of JMS connections, sessions and MessageListeners, parallel message processing, thread pooling and transaction &amp; exception handling, through the use of a JCA <link><page ri:content-title="Resource Adapter"></page></link>.</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"><p>All of these benefits are also available through Spring's MessageListenerContiner <strong>except</strong> for the XA transactions. If you need XA support then you must use JCA</p></div></div>
+<structured-macro ac:macro-id="9defc5ad-cad2-4c9b-a04d-f628a5477c2b" ac:name="info" ac:schema-version="1"><rich-text-body><p>All of these benefits are also available through Spring's MessageListenerContiner <strong>except</strong> for the XA transactions. If you need XA support then you must use JCA</p></rich-text-body></structured-macro>
 
-<p>Typically JCA is used in a J2EE container via MDBs; though there is a POJO Spring based <a shape="rect" href="jca-container.xml">JCA Container</a> you can use, which is simple and lightweight and easy to embed inside Tomcat or any J2SE application.</p></div>
+<p>Typically JCA is used in a J2EE container via MDBs; though there is a POJO Spring based <link><page ri:content-title="JCA Container"></page></link> you can use, which is simple and lightweight and easy to embed inside Tomcat or any J2SE application.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-log4j-jms-appender-with-activemq.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-log4j-jms-appender-with-activemq.xml b/how-do-i-use-log4j-jms-appender-with-activemq.xml
index 67dda65..8179ec5 100644
--- a/how-do-i-use-log4j-jms-appender-with-activemq.xml
+++ b/how-do-i-use-log4j-jms-appender-with-activemq.xml
@@ -1,50 +1,45 @@
-<div class="wiki-content maincontent"><p><a shape="rect" class="external-link" href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/net/JMSAppender.html">Log4j JMS appender</a> can be used to send your log messages to JMS broker. To use ActiveMQ as a destination of your messages, you need to configure JMS appender properly. The code sample below shows example configuration:</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/net/JMSAppender.html">Log4j JMS appender</a> can be used to send your log messages to JMS broker. To use ActiveMQ as a destination of your messages, you need to configure JMS appender properly. The code sample below shows example configuration:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="1e4e9cda-6e94-4f52-9920-cdafe5b54326" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, stdout, jms
 
-## Be sure that ActiveMQ messages are not logged to &#39;jms&#39; appender
+## Be sure that ActiveMQ messages are not logged to 'jms' appender
 log4j.logger.org.apache.activemq=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c - %m%n
 
-## Configure &#39;jms&#39; appender. You&#39;ll also need jndi.properties file in order to make it work
+## Configure 'jms' appender. You'll also need jndi.properties file in order to make it work
 log4j.appender.jms=org.apache.log4j.net.JMSAppender
 log4j.appender.jms.InitialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory
 log4j.appender.jms.ProviderURL=tcp://localhost:61616
 log4j.appender.jms.TopicBindingName=logTopic
 log4j.appender.jms.TopicConnectionFactoryBindingName=ConnectionFactory
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The important thing is not to send ActiveMQ logs to JMS appender, as it can cause errors since the broker will want to log before the connection is established. You will also need a JNDI configuration, so that appender can find appropriate topic to send log messages to. The example <code>jndi.properties</code> file can look 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[
+<structured-macro ac:macro-id="c31e68dc-dc6a-4b98-a5d0-39136b232d7d" ac:name="code" ac:schema-version="1"><plain-text-body>
 topic.logTopic=logTopic
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Finally, you can subscribe to the topic and listen for log messages:</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="66ba3987-6740-460b-8c38-f1c5528edcd1" ac:name="code" ac:schema-version="1"><plain-text-body>
 public class Log4jJMSAppenderExample implements MessageListener {
 
 	public Log4jJMSAppenderExample() throws Exception {
 		// create a logTopic topic consumer
-		ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(&quot;tcp://localhost:61616&quot;);
+		ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
 		Connection conn = factory.createConnection();
 		Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 		conn.start();
-		MessageConsumer consumer = sess.createConsumer(sess.createTopic(&quot;logTopic&quot;));
+		MessageConsumer consumer = sess.createConsumer(sess.createTopic("logTopic"));
 		consumer.setMessageListener(this);
 		// log a message
 		Logger log = Logger.getLogger(Log4jJMSAppenderExample.class);
-		log.info(&quot;Test log&quot;);
+		log.info("Test log");
 		// clean up
 		Thread.sleep(1000);
 		consumer.close();
@@ -61,34 +56,29 @@ public class Log4jJMSAppenderExample implements MessageListener {
 		try {
 			// receive log event in your consumer
 			LoggingEvent event = (LoggingEvent)((ActiveMQObjectMessage)message).getObject();
-			System.out.println(&quot;Received log [&quot; + event.getLevel() + &quot;]: &quot;+ event.getMessage());
+			System.out.println("Received log [" + event.getLevel() + "]: "+ event.getMessage());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 }
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Note that appender send logging event wrapped in an object message, so you can extract information such as logger name, level and of course the message.</p>
 
 <p>Starting with ActiveMQ 5.3, this example is included in the standard distribution. You can run it by executing</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="f04a5d05-04c5-4f1f-a6ba-53458c756417" ac:name="code" ac:schema-version="1"><plain-text-body>
 ant log4j-jms
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>inside <code>example/</code> folder. You can expect the following output as a result:</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="56c65ae1-19f4-4da9-9411-2adf43fa2cf9" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j-jms:
      [echo] Running a Log4j JMS Appender example
      [java] 2009-08-11 13:58:46,767 INFO  Log4jJMSAppenderExample - Test log
      [java] Received log [INFO]: Test log
      [java] Java Result: 1
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-ssl.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-ssl.xml b/how-do-i-use-ssl.xml
index b5985e4..2643dfd 100644
--- a/how-do-i-use-ssl.xml
+++ b/how-do-i-use-ssl.xml
@@ -1,61 +1,33 @@
-<div class="wiki-content maincontent"><h3 id="HowdoIuseSSL-SettinguptheKeyandTrustStores">Setting up the Key and Trust Stores</h3><p>Also see <a shape="rect" class="external-link" href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/ssl-howto.html">Tomcat's SSL instructions</a> for more info. The following was provided by Colin Kilburn. Thanks Colin!</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">ActiveMQ uses dummy credentials by default</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>ActiveMQ includes key and trust stores that reference a dummy self signed cert. When you create a broker certificate and stores for your installation, either overwrite the values in the conf directory or delete the existing dummy key and trust stores so they cannot interfere)</p></div></div><ol><li><p>Using keytool, create a certificate for 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[keytool -genkey -alias broker -keyalg RSA -keystore broker.ks
-]]></script>
-</div></div></li><li><p>Export the broker's certificate so it can be shared with clients:</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[keytool -export -alias broker -keystore broker.ks -file broker_cert
-]]></script>
-</div></div></li><li><p>Create a certificate/keystore for the client:</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[keytool -genkey -alias client -keyalg RSA -keystore client.ks]]></script>
-</div></div></li><li><p>Create a truststore for the client, and import the broker's certificate. This establishes that the client "trusts" 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[keytool -import -alias broker -keystore client.ts -file broker_cert]]></script>
-</div></div></li></ol><h3 id="HowdoIuseSSL-StartingtheBroker">Starting the Broker</h3><h4 id="HowdoIuseSSL-Usingthejavax.net.ssl.*SystemProperties">Using the javax.net.ssl.* System Properties</h4><p>Before starting the broker's VM set the ACTIVEMQ_SSL_OPTS&#160;environment variable so that it knows to use the broker keystore. &#160;(note that in previous versions of ActiveMQ this property was called SSL_OPTS in some scripts. &#160;As of v5.12.0 all scripts use ACTIVEMQ_SSL_OPTS)</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[export ACTIVEMQ_SSL_OPTS = -Djavax.net.ssl.keyStore=/path/to/broker.ks -Djavax.net.ssl.keyStorePassword=password
-]]></script>
-</div></div><h4 id="HowdoIuseSSL-UsingSpringtoconfigureSSLforaBrokerinstance">Using Spring to configure SSL for a Broker instance</h4><p>Sometimes the use of javax.net.ssl.* system properties is not appropriate as they effect all SSL users in a JVM. ActiveMQ 5.2.x adds an &lt;sslContext&gt; element to the &lt;amq:broker&gt; that allows a broker specific set of SSL properties to be configured.</p><p>The SslContext <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java">test case</a> validates starting an SSL transport listener using the configuration specified in the broker Xbean. The SslContext element is added to the broker 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[&lt;beans
-  &lt;amq:broker useJmx=&quot;false&quot; persistent=&quot;false&quot;&gt;
+<div class="wiki-content maincontent"><h3>Setting up the Key and Trust Stores</h3><p>Also see <a shape="rect" href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/ssl-howto.html">Tomcat's SSL instructions</a> for more info. The following was provided by Colin Kilburn. Thanks Colin!</p><structured-macro ac:macro-id="976b2a51-1506-40ba-ae9d-908d1a5545b2" ac:name="info" ac:schema-version="1"><parameter ac:name="title">ActiveMQ uses dummy credentials by default</parameter><rich-text-body><p>ActiveMQ includes key and trust stores that reference a dummy self signed cert. When you create a broker certificate and stores for your installation, either overwrite the values in the conf directory or delete the existing dummy key and trust stores so they cannot interfere)</p></rich-text-body></structured-macro><ol><li><p>Using keytool, create a certificate for the broker:</p><structured-macro ac:macro-id="91038e3a-caa3-4865-9974-074b6d87c07f" ac:name="code" ac:schema-version="1"><plain-text-body
 >keytool -genkey -alias broker -keyalg RSA -keystore broker.ks
+</plain-text-body></structured-macro></li><li><p>Export the broker's certificate so it can be shared with clients:</p><structured-macro ac:macro-id="be4ed62e-85bb-4c7e-b02a-70b697c0d4d9" ac:name="code" ac:schema-version="1"><plain-text-body>keytool -export -alias broker -keystore broker.ks -file broker_cert
+</plain-text-body></structured-macro></li><li><p>Create a certificate/keystore for the client:</p><structured-macro ac:macro-id="d7265148-3905-4928-a608-30e11f0a2c97" ac:name="code" ac:schema-version="1"><plain-text-body>keytool -genkey -alias client -keyalg RSA -keystore client.ks</plain-text-body></structured-macro></li><li><p>Create a truststore for the client, and import the broker's certificate. This establishes that the client "trusts" the broker:</p><structured-macro ac:macro-id="e573e708-be21-4b0f-a46d-40054c5d3e5e" ac:name="code" ac:schema-version="1"><plain-text-body>keytool -import -alias broker -keystore client.ts -file broker_cert</plain-text-body></structured-macro></li></ol><h3>Starting the Broker</h3><h4>Using the javax.net.ssl.* System Properties</h4><p>Before starting the broker's VM set the ACTIVEMQ_SSL_OPTS&#160;environment variable so that it knows to use the broker keystore. &#160;(note that in previous versions of ActiveMQ this property was called SSL_OPTS in 
 some scripts. &#160;As of v5.12.0 all scripts use ACTIVEMQ_SSL_OPTS)</p><structured-macro ac:macro-id="1b53f6c7-66f1-4df8-9aaa-371607cd3e5c" ac:name="code" ac:schema-version="1"><plain-text-body>export ACTIVEMQ_SSL_OPTS = -Djavax.net.ssl.keyStore=/path/to/broker.ks -Djavax.net.ssl.keyStorePassword=password
+</plain-text-body></structured-macro><h4>Using Spring to configure SSL for a Broker instance</h4><p>Sometimes the use of javax.net.ssl.* system properties is not appropriate as they effect all SSL users in a JVM. ActiveMQ 5.2.x adds an &lt;sslContext&gt; element to the &lt;amq:broker&gt; that allows a broker specific set of SSL properties to be configured.</p><p>The SslContext <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java">test case</a> validates starting an SSL transport listener using the configuration specified in the broker Xbean. The SslContext element is added to the broker as follows:</p><structured-macro ac:macro-id="e8315105-9b37-4739-a749-b7b7b512f6cc" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;beans
+  &lt;amq:broker useJmx="false" persistent="false"&gt;
 
     &lt;amq:sslContext&gt;
       &lt;amq:sslContext
-      		keyStore=&quot;broker.ks&quot; keyStorePassword=&quot;password&quot;
-      		trustStore=&quot;client.ks&quot; trustStorePassword=&quot;password&quot;/&gt;
+      		keyStore="broker.ks" keyStorePassword="password"
+      		trustStore="client.ks" trustStorePassword="password"/&gt;
     &lt;/amq:sslContext&gt;
 
     &lt;amq:transportConnectors&gt;
-      &lt;amq:transportConnector uri=&quot;ssl://localhost:61616&quot; /&gt;
+      &lt;amq:transportConnector uri="ssl://localhost:61616" /&gt;
     &lt;/amq:transportConnectors&gt;
 
   &lt;/amq:broker&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div><p>The SslContext is used to configure the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java">SslTransportFactory</a> for that broker. Full details of the configuration options available can be seen in the <a shape="rect" class="external-link" href="http://activemq.apache.org/schema/core/activemq-core-5.2-SNAPSHOT.xsd">schema definition</a> or in the accessors of <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java">org.apache.activemq.spring.SpringSslContext</a></p><h3 id="HowdoIuseSSL-StartingtheClient">Starting the Client</h3><p>When starting the client's VM, specify the following system properties:</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[javax.net.ssl.keyStore=/path/to/client.ks
+</plain-text-body></structured-macro><p>The SslContext is used to configure the <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java">SslTransportFactory</a> for that broker. Full details of the configuration options available can be seen in the <a shape="rect" href="http://activemq.apache.org/schema/core/activemq-core-5.2-SNAPSHOT.xsd">schema definition</a> or in the accessors of <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java">org.apache.activemq.spring.SpringSslContext</a></p><h3>Starting the Client</h3><p>When starting the client's VM, specify the following system properties:</p><structured-macro ac:macro-id="a25e8ade-909a-4083-8e1d-dc35710cf62d" ac:name="code" ac:schema-version="1"><plain-text-body>javax.net.ssl.keyStore=/path/to/client.ks
 javax.net.ssl.keyStorePassword=password
 javax.net.ssl.trustStore=/path/to/client.ts
-]]></script>
-</div></div><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>In Linux, do not use absolute path to keystore. By default, keytool uses ~/.keystore, but in some setups passing -Djavax.net.ssl.keyStore=/home/account/.keystore to Java VM does not work. This is not ActiveMQ specific but good to keep in mind anyway.</p></div></div><h3 id="HowdoIuseSSL-Clientcertificates">Client certificates</h3><p>If you want to verify client certificates, you need to take a few extra steps:</p><ol><li><p>Export the client's certificate so it can be shared with 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[keytool -export -alias client -keystore client.ks -file client_cert
-]]></script>
-</div></div></li><li><p>Create a truststore for the broker, and import the client's certificate. This establishes that the broker "trusts" the client:</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[keytool -import -alias client -keystore broker.ts -file client_cert]]></script>
-</div></div></li><li><p>Add</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[-Djavax.net.ssl.trustStore=/path/to/broker.ts]]></script>
-</div></div><p>to ACTIVEMQ_SSL_OPTS</p></li><li><p>Instruct ActiveMQ to require client authentication by setting the following in activemq.xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[  &lt;transportConnectors&gt;
-    &lt;transportConnector name=&quot;ssl&quot; uri=&quot;ssl://localhost:61617?needClientAuth=true&quot; /&gt;
-  &lt;/transportConnectors&gt;]]></script>
-</div></div></li></ol><h3 id="HowdoIuseSSL-Certificaterevocation">Certificate revocation</h3><p>Starting with version <strong>5.12</strong>, you can define certificate revocation list (CRL) path on ssl context, so that invalid certificates can revoked</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[    &lt;sslContext&gt;
-        &lt;sslContext keyStore=&quot;org/apache/activemq/security/broker1.ks&quot;
-                    keyStorePassword=&quot;password&quot;
-                    trustStore=&quot;org/apache/activemq/security/activemq-revoke.jks&quot;
-                    trustStorePassword=&quot;password&quot;
-                    crlPath=&quot;org/apache/activemq/security/activemq-revoke.crl&quot;/&gt;
-    &lt;/sslContext&gt;]]></script>
-</div></div><p>This list is static and loaded on broker startup.</p><p>Starting with version <strong>5.14.0</strong>, you can also enable more advanced&#160;Online Certificate Status Protocol (OCSP) protocol. For that you need to configure a location for the<code> java.security</code> configuration extension by setting appropriate system properties (in <code>${ACTIVEMQ_HOME}/bin/env</code>) like</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[ACTIVEMQ_SSL_OPTS=&quot;-Djava.security.properties=$ACTIVEMQ_CONF/java.security&quot;]]></script>
-</div></div><p>Then you need to configure OCSP responder properties in <code>java.security</code> file like</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[ocsp.enable=true
-ocsp.responderURL=http://ocsp.example.net:80]]></script>
-</div></div><p>A demo of the broker configuration working with OCSP responder can be found at&#160;<a shape="rect" class="external-link" href="https://github.com/dejanb/sslib" rel="nofollow">https://github.com/dejanb/sslib</a></p><h3 id="HowdoIuseSSL-WorkingAroundJava7SSLBugs">Working Around Java 7 SSL Bugs</h3><p>As noted by issue AMQ-5970, it seems some versions of Java 7 have problems with SSL sessions that need to use the Diffie-Hellman cypher suite. If you run into this issue, just copy the Bouncy Castle bcprov-jdk15on-148.jar to ActiveMQ's lib directory and restart your broker.</p><h3 id="HowdoIuseSSL-Usefullinks">Useful links</h3><p>These links might also help</p><ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html#CreateKeystore" rel="nofollow">Sun's JSSE guide</a></li><li><a shape="rect" class="external-link" href="https://search.thawte.com/support/ssl-digital-certificates/index?page=content&amp;id=SO1
 0061" rel="nofollow">Thawte SSL Troubleshooting Tips</a></li></ul></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="156cab22-46c8-47ee-9d80-84f5f67aaed8" ac:name="warning" ac:schema-version="1"><parameter ac:name="">Be careful on Linux</parameter><rich-text-body><p>In Linux, do not use absolute path to keystore. By default, keytool uses ~/.keystore, but in some setups passing -Djavax.net.ssl.keyStore=/home/account/.keystore to Java VM does not work. This is not ActiveMQ specific but good to keep in mind anyway.</p></rich-text-body></structured-macro><h3>Client certificates</h3><p>If you want to verify client certificates, you need to take a few extra steps:</p><ol><li><p>Export the client's certificate so it can be shared with broker:</p><structured-macro ac:macro-id="fd39bcff-a4ce-402b-871d-d0cf04657d86" ac:name="code" ac:schema-version="1"><plain-text-body>keytool -export -alias client -keystore client.ks -file client_cert
+</plain-text-body></structured-macro></li><li><p>Create a truststore for the broker, and import the client's certificate. This establishes that the broker "trusts" the client:</p><structured-macro ac:macro-id="86e24c54-d55a-4818-8d02-45f6f0f20e80" ac:name="code" ac:schema-version="1"><plain-text-body>keytool -import -alias client -keystore broker.ts -file client_cert</plain-text-body></structured-macro></li><li><p>Add</p><structured-macro ac:macro-id="6bd663bb-0dd6-4f0d-8a17-3e9f7557b781" ac:name="code" ac:schema-version="1"><plain-text-body>-Djavax.net.ssl.trustStore=/path/to/broker.ts</plain-text-body></structured-macro><p>to ACTIVEMQ_SSL_OPTS</p></li><li><p>Instruct ActiveMQ to require client authentication by setting the following in activemq.xml:</p><structured-macro ac:macro-id="552bbf90-fc3d-4452-adb1-043f39b7a36c" ac:name="code" ac:schema-version="1"><plain-text-body>  &lt;transportConnectors&gt;
+    &lt;transportConnector name="ssl" uri="ssl://localhost:61617?needClientAuth=true" /&gt;
+  &lt;/transportConnectors&gt;</plain-text-body></structured-macro></li></ol><h3>Certificate revocation</h3><p>Starting with version <strong>5.12</strong>, you can define certificate revocation list (CRL) path on ssl context, so that invalid certificates can revoked</p><structured-macro ac:macro-id="4711bfda-6a1d-4233-801a-0294d3b0619e" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>    &lt;sslContext&gt;
+        &lt;sslContext keyStore="org/apache/activemq/security/broker1.ks"
+                    keyStorePassword="password"
+                    trustStore="org/apache/activemq/security/activemq-revoke.jks"
+                    trustStorePassword="password"
+                    crlPath="org/apache/activemq/security/activemq-revoke.crl"/&gt;
+    &lt;/sslContext&gt;</plain-text-body></structured-macro><p>This list is static and loaded on broker startup.</p><p>Starting with version <strong>5.14.0</strong>, you can also enable more advanced&#160;Online Certificate Status Protocol (OCSP) protocol. For that you need to configure a location for the<code> java.security</code> configuration extension by setting appropriate system properties (in <code>${ACTIVEMQ_HOME}/bin/env</code>) like</p><structured-macro ac:macro-id="8d57fab2-5a8b-4204-891d-94b910374942" ac:name="code" ac:schema-version="1"><plain-text-body>ACTIVEMQ_SSL_OPTS="-Djava.security.properties=$ACTIVEMQ_CONF/java.security"</plain-text-body></structured-macro><p>Then you need to configure OCSP responder properties in <code>java.security</code> file like</p><structured-macro ac:macro-id="4da0cadd-0e98-4b9e-8001-cb66c53b8c2c" ac:name="code" ac:schema-version="1"><plain-text-body>ocsp.enable=true
+ocsp.responderURL=http://ocsp.example.net:80</plain-text-body></structured-macro><p>A demo of the broker configuration working with OCSP responder can be found at&#160;<a shape="rect" href="https://github.com/dejanb/sslib">https://github.com/dejanb/sslib</a></p><h3>Working Around Java 7 SSL Bugs</h3><p>As noted by issue AMQ-5970, it seems some versions of Java 7 have problems with SSL sessions that need to use the Diffie-Hellman cypher suite. If you run into this issue, just copy the Bouncy Castle bcprov-jdk15on-148.jar to ActiveMQ's lib directory and restart your broker.</p><h3>Useful links</h3><p>These links might also help</p><ul><li><a shape="rect" href="http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html#CreateKeystore">Sun's JSSE guide</a></li><li><a shape="rect" href="https://search.thawte.com/support/ssl-digital-certificates/index?page=content&amp;id=SO10061">Thawte SSL Troubleshooting Tips</a></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-message-groups-compare-to-selectors.xml
----------------------------------------------------------------------
diff --git a/how-do-message-groups-compare-to-selectors.xml b/how-do-message-groups-compare-to-selectors.xml
index 23adaee..756a9b0 100644
--- a/how-do-message-groups-compare-to-selectors.xml
+++ b/how-do-message-groups-compare-to-selectors.xml
@@ -17,5 +17,6 @@
 <ul><li>there's nothing to stop you accidentally creating 2 threads with the same selector - or 2 processes on the network starting up with the same selector and accidentally consuming from the same group of messages which completely breaks ordering; with message groups you don't have to worry about this - since it guarrentees that only 1 thread in your entire system will process messages from one group at once in order - irrespective how many consumers you start.</li></ul>
 
 
-<p>So in general; you can manually partition yourself using selectors. Message Groups however are a self-partitioning and auto-failvoer mechanism which also guarrentees that a single thread will process a specific message group at once, in order.</p></div>
+<p>So in general; you can manually partition yourself using selectors. Message Groups however are a self-partitioning and auto-failvoer mechanism which also guarrentees that a single thread will process a specific message group at once, in order.</p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-multiple-transports-work.xml
----------------------------------------------------------------------
diff --git a/how-do-multiple-transports-work.xml b/how-do-multiple-transports-work.xml
index 2ab1a3c..c7cb62a 100644
--- a/how-do-multiple-transports-work.xml
+++ b/how-do-multiple-transports-work.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<h3 id="Howdomultipletransportswork-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
 
 
 <p>The transport a client uses to connect to the broker is just the transport your client uses. So messages the broker sends to your client will be sent over that transport. However the broker can support many transports.</p>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-transactions-work.xml
----------------------------------------------------------------------
diff --git a/how-do-transactions-work.xml b/how-do-transactions-work.xml
index 863e079..f2c8cf4 100644
--- a/how-do-transactions-work.xml
+++ b/how-do-transactions-work.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>There are two levels of transaction support in ActiveMQ:</p><ul><li>JMS Transactions - the&#160;<strong><code>commit()/</code></strong><strong><code>rollback()</code></strong> methods on a Session (which is like doing&#160;<strong><code>commit()/</code></strong><strong><code>rollback()</code></strong> on a JDBC connection)</li><li>XA Transactions - where the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/ActiveMQXASession.html">XASession</a> acts as an <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/transaction/xa/XAResource.html" rel="nofollow">XAResource</a> by communicating with the Message Broker, rather like a JDBC Connection takes place in an XA transaction by communicating with the database.</li></ul><p>They are both implemented in a similar manner. When operations are carried out on a transacted (or XA transacted) session, a tran
 saction command is sent to the broker, with a unique transaction ID which is then followed by all the usual commands (send message, acknowledge message etc). When a <strong><code>commit()</code></strong> or <strong><code>rollback()</code></strong> is called on the Session, this command is sent to the broker for it to commit or rollback the transaction.</p><p>Now the operations carried out on a transacted session inside a transaction, like a send message or acknowledge message, do not really perform a real send or acknowledge until the commit occurs. So the Broker explicitly handles these cases separately - essentially buffering up the commands until the commit occurs when the messages are really sent or acknowledged.</p><p>ActiveMQ uses <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/store/TransactionStore.html">TransactionStore</a> (implemented by all persistence adapters) to handle transactions. <strong><code>Transa
 ctionStore</code></strong> will cache all messages and ACKs until commit or rollback occurs. Besides storing messages, the broker will withhold dispatching any of the messages until the session commit. If you wanna see the code, take a look at <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/store/memory/MemoryTransactionStore.html">MemoryTransactionStore</a> which proxies transactions for Memory and JDBC persistence adapters.&#160; The only real difference with XA transactions is that at the PREPARE stage we MUST write every command we have received (the send message or acknowledge message commands) to a persistent store so that we can recover properly.</p></div>
+<div class="wiki-content maincontent"><p>There are two levels of transaction support in ActiveMQ:</p><ul><li>JMS Transactions - the&#160;<strong><code>commit()/</code></strong><strong><code>rollback()</code></strong> methods on a Session (which is like doing&#160;<strong><code>commit()/</code></strong><strong><code>rollback()</code></strong> on a JDBC connection)</li><li>XA Transactions - where the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/ActiveMQXASession.html">XASession</a> acts as an <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/transaction/xa/XAResource.html">XAResource</a> by communicating with the Message Broker, rather like a JDBC Connection takes place in an XA transaction by communicating with the database.</li></ul><p>They are both implemented in a similar manner. When operations are carried out on a transacted (or XA transacted) session, a transaction command is sent to the broker, with a unique transa
 ction ID which is then followed by all the usual commands (send message, acknowledge message etc). When a <strong><code>commit()</code></strong> or <strong><code>rollback()</code></strong> is called on the Session, this command is sent to the broker for it to commit or rollback the transaction.</p><p>Now the operations carried out on a transacted session inside a transaction, like a send message or acknowledge message, do not really perform a real send or acknowledge until the commit occurs. So the Broker explicitly handles these cases separately - essentially buffering up the commands until the commit occurs when the messages are really sent or acknowledged.</p><p>ActiveMQ uses <a shape="rect" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/store/TransactionStore.html">TransactionStore</a> (implemented by all persistence adapters) to handle transactions. <strong><code>TransactionStore</code></strong> will cache all messages and ACKs until commit or rollb
 ack occurs. Besides storing messages, the broker will withhold dispatching any of the messages until the session commit. If you wanna see the code, take a look at <a shape="rect" href="http://activemq.apache.org/maven/apidocs/src-html/org/apache/activemq/store/memory/MemoryTransactionStore.html">MemoryTransactionStore</a> which proxies transactions for Memory and JDBC persistence adapters.&#160; The only real difference with XA transactions is that at the PREPARE stage we MUST write every command we have received (the send message or acknowledge message commands) to a persistent store so that we can recover properly.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-a-queue-compare-to-a-topic.xml
----------------------------------------------------------------------
diff --git a/how-does-a-queue-compare-to-a-topic.xml b/how-does-a-queue-compare-to-a-topic.xml
index 94fc25c..30167dc 100644
--- a/how-does-a-queue-compare-to-a-topic.xml
+++ b/how-does-a-queue-compare-to-a-topic.xml
@@ -1,7 +1,7 @@
-<div class="wiki-content maincontent"><h3 id="HowdoesaQueuecomparetoaTopic-Topics">Topics</h3>
+<div class="wiki-content maincontent"><h3>Topics</h3>
 <p>In JMS a Topic implements <em>publish and subscribe</em> semantics. When you publish a message it goes to all the subscribers who are interested - so zero to many subscribers will receive a copy of the message. Only subscribers who had an active subscription at the time the broker receives the message will get a copy of the message.</p>
 
-<h3 id="HowdoesaQueuecomparetoaTopic-Queues">Queues</h3>
+<h3>Queues</h3>
 <p>A JMS Queue implements <em>load balancer</em> semantics. A single message will be received by exactly one consumer. If there are no consumers available at the time the message is sent it will be kept until a consumer is available that can process the message. If a consumer receives a message and does not acknowledge it before closing then the message will be redelivered to another consumer. A queue can have many consumers with messages <em>load balanced</em> across the available consumers.</p>
 
 <p>So Queues implement a reliable load balancer in JMS.</p></div>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-amqp.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-amqp.xml b/how-does-activemq-compare-to-amqp.xml
index c7be595..ec89dbc 100644
--- a/how-does-activemq-compare-to-amqp.xml
+++ b/how-does-activemq-compare-to-amqp.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><p><a shape="rect" href="amqp.xml">AMQP</a> stands for the <em>Advanced Message Queue Protocol</em> and is a specification for how messaging clients and brokers can interoperate. AMQP is a specification of a wire-level protocol for client to message broker communication.  It is not a messaging system like ActiveMQ, but just a messaging protocol.</p>
+<div class="wiki-content maincontent"><p><link><page ri:content-title="AMQP"></page></link> stands for the <em>Advanced Message Queue Protocol</em> and is a specification for how messaging clients and brokers can interoperate. AMQP is a specification of a wire-level protocol for client to message broker communication.  It is not a messaging system like ActiveMQ, but just a messaging protocol.</p>
 
 <p>ActiveMQ now implements AMQP 1.0!</p>
 
 <p>ActiveMQ also supports other open wire protocols:</p>
 
-<ul><li><a shape="rect" href="openwire.xml">OpenWire</a>, a fast binary format</li><li><a shape="rect" href="stomp.xml">Stomp</a>, a simple and easily implemented text based-protocol</li><li><a shape="rect" href="mqtt.xml">MQTT</a>, a compact binary format for limited devices on an unreliable network</li></ul>
+<ul><li><link><page ri:content-title="OpenWire"></page></link>, a fast binary format</li><li><link><page ri:content-title="Stomp"></page></link>, a simple and easily implemented text based-protocol</li><li><link><page ri:content-title="MQTT"></page></link>, a compact binary format for limited devices on an unreliable network</li></ul>
 
 
 <p>Through these protocols, ActiveMQ can support clients in C, C++, C#, Ruby, Python, Perl, PHP, Pike etc. AMQP is most similar to OpenWire, because both OpenWire and AMQP are designed for high performance messaging, through a binary (rather than text-based) format. As a text-based format, STOMP is much easier to implement, but gives somewhat slower performance.</p></div>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-artemis.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-artemis.xml b/how-does-activemq-compare-to-artemis.xml
index 892920c..2e6c9d8 100644
--- a/how-does-activemq-compare-to-artemis.xml
+++ b/how-does-activemq-compare-to-artemis.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><a shape="rect" class="external-link" href="https://activemq.apache.org/artemis/">Artemis</a> is the codename used for the HornetQ code that was donated to the Apache Foundation.</p><p>It is possible that Artemis will eventually become the successor to ActiveMQ 5.x (and that it might eventually be branded as ActiveMQ 6.x), but no decision about that had been made as of April 2015 as documented in that month's <a shape="rect" class="external-link" href="http://activemq.apache.org/apache-activemq-board-report-201504-april.html">ActiveMQ Board Report</a>.</p></div>
+<div class="wiki-content maincontent"><p><a shape="rect" href="https://activemq.apache.org/artemis/">Artemis</a> is the codename used for the HornetQ code that was donated to the Apache Foundation.</p><p>It is possible that Artemis will eventually become the successor to ActiveMQ 5.x (and that it might eventually be branded as ActiveMQ 6.x), but no decision about that had been made as of April 2015 as documented in that month's <a shape="rect" href="http://activemq.apache.org/apache-activemq-board-report-201504-april.html">ActiveMQ Board Report</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-fuse-message-broker.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-fuse-message-broker.xml b/how-does-activemq-compare-to-fuse-message-broker.xml
index dcb3d80..2d13240 100644
--- a/how-does-activemq-compare-to-fuse-message-broker.xml
+++ b/how-does-activemq-compare-to-fuse-message-broker.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><a shape="rect" class="external-link" href="http://fusesource.com/products/enterprise-activemq/" rel="nofollow">Fuse Message Broker</a> is a certified distribution of Apache ActiveMQ provided by FuseSource. <a shape="rect" class="external-link" href="http://fusesource.com" rel="nofollow">FuseSource</a> does all of its development and bug fixes as part of the Apache ActiveMQ community, so there are no functional differences between the two. FuseSource may do more frequent releases than Apache, so it is possible to get bug fixes from a Fuse Message Broker release sooner than from an official Apache ActiveMQ release.</p></div>
+<div class="wiki-content maincontent"><p><a shape="rect" href="http://fusesource.com/products/enterprise-activemq/">Fuse Message Broker</a> is a certified distribution of Apache ActiveMQ provided by FuseSource. <a shape="rect" href="http://fusesource.com">FuseSource</a> does all of its development and bug fixes as part of the Apache ActiveMQ community, so there are no functional differences between the two. FuseSource may do more frequent releases than Apache, so it is possible to get bug fixes from a Fuse Message Broker release sooner than from an official Apache ActiveMQ release.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-jbossmq.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-jbossmq.xml b/how-does-activemq-compare-to-jbossmq.xml
index 8e4a806..bf6162a 100644
--- a/how-does-activemq-compare-to-jbossmq.xml
+++ b/how-does-activemq-compare-to-jbossmq.xml
@@ -1,17 +1,13 @@
-<div class="wiki-content maincontent"><p>There are some similarities between the two; they both support JMS 1.1 and run inside <a shape="rect" href="jboss-integration.xml">JBoss 4.x</a>.</p>
+<div class="wiki-content maincontent"><p>There are some similarities between the two; they both support JMS 1.1 and run inside <link><page ri:content-title="JBoss Integration"></page><link-body>JBoss 4.x</link-body></link>.</p>
 
 <p>However ActiveMQ does offer some specific differences and advantages (at least from our perspective)</p>
 
-<ul><li>ActiveMQ works great in any JVM not just inside the JBoss application server</li><li>ActiveMQ comes complete with a large number of <a shape="rect" href="cross-language-clients.xml">Cross Language Clients</a></li><li>ActiveMQ supports many different <a shape="rect" href="protocols.xml">Protocols</a> such as <a shape="rect" href="ajax.xml">Ajax</a>, <a shape="rect" href="rest.xml">REST</a>, <a shape="rect" href="stomp.xml">Stomp</a>, <a shape="rect" href="openwire.xml">OpenWire</a>, <a shape="rect" href="xmpp.xml">XMPP</a></li><li>ActiveMQ supports a large number of advanced features like <a shape="rect" href="message-groups.xml">Message Groups</a>, <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a>, <a shape="rect" href="composite-destinations.xml">Composite Destinations</a>, <a shape="rect" href="advisory-message.xml">Advisory Message</a> support</li><li>ActiveMQ supports reliable connections with <a shape="rect" href="configuring-transports.xml">configura
 ble</a> automatic reconnection</li><li>ActiveMQ has great <a shape="rect" href="spring-support.xml">Spring Support</a></li><li>ActiveMQ supports distributed destinations across networks</li><li>ActiveMQ is very fast; often 10x faster than JBossMQ.</li></ul>
+<ul><li>ActiveMQ works great in any JVM not just inside the JBoss application server</li><li>ActiveMQ comes complete with a large number of <link><page ri:content-title="Cross Language Clients"></page></link></li><li>ActiveMQ supports many different <link><page ri:content-title="Protocols"></page></link> such as <link><page ri:content-title="Ajax"></page></link>, <link><page ri:content-title="REST"></page></link>, <link><page ri:content-title="Stomp"></page></link>, <link><page ri:content-title="OpenWire"></page></link>, <link><page ri:content-title="XMPP"></page></link></li><li>ActiveMQ supports a large number of advanced features like <link><page ri:content-title="Message Groups"></page></link>, <link><page ri:content-title="Exclusive Consumer"></page></link>, <link><page ri:content-title="Composite Destinations"></page></link>, <link><page ri:content-title="Advisory Message"></page></link> support</li><li>ActiveMQ supports reliable connections with <link><page ri:content-title="C
 onfiguring Transports"></page><link-body>configurable</link-body></link> automatic reconnection</li><li>ActiveMQ has great <link><page ri:content-title="Spring Support"></page></link></li><li>ActiveMQ supports distributed destinations across networks</li><li>ActiveMQ is very fast; often 10x faster than JBossMQ.</li></ul>
 
 
-<h2 id="HowdoesActiveMQcomparetoJBossMQ-Performanceguides">Performance guides</h2>
+<structured-macro ac:macro-id="615ae0c7-9f69-416b-a39e-2f40b2fe9130" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Performance report"></page></link></parameter></structured-macro>
 
-<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.xml">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.xml">ActiveMQ Performance Module Users Manual</a></p>
+<h2>More on JBoss Integration </h2>
 
-<p>The Commercial Providers on the <a shape="rect" href="support.xml">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p>
-
-<h2 id="HowdoesActiveMQcomparetoJBossMQ-MoreonJBossIntegration">More on JBoss Integration </h2>
-
-<p><a shape="rect" href="integrating-apache-activemq-with-jboss.xml">Integrating Apache ActiveMQ with JBoss</a></p></div>
+<p><link><page ri:content-title="Integrating Apache ActiveMQ with JBoss"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-mantaray.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-mantaray.xml b/how-does-activemq-compare-to-mantaray.xml
index c369376..7f5183d 100644
--- a/how-does-activemq-compare-to-mantaray.xml
+++ b/how-does-activemq-compare-to-mantaray.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><p>We are obviously biased, and will tell you "just use ActiveMQ!" <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)">  But Mantaray is an OK JMS provider. The interesting thing about MantaRay is it can support a peer-based network, just as ActiveMQ does with its <a shape="rect" href="peer-transport-reference.xml">peer transport</a>.</p>
+<div class="wiki-content maincontent"><p>We are obviously biased, and will tell you "just use ActiveMQ!" <emoticon ac:name="smile"></emoticon>  But Mantaray is an OK JMS provider. The interesting thing about MantaRay is it can support a peer-based network, just as ActiveMQ does with its <link><page ri:content-title="Peer Transport Reference"></page><link-body>peer transport</link-body></link>.</p>
 
-<p>We <a shape="rect" href="performance.xml">benchmark</a> against Mantaray and other open source JMS providers and in our tests (in which we try to be as objective as possible) ActiveMQ exhibits higher performance in most scenarios.</p>
+<p>We <link><page ri:content-title="Performance"></page><link-body>benchmark</link-body></link> against Mantaray and other open source JMS providers and in our tests (in which we try to be as objective as possible) ActiveMQ exhibits higher performance in most scenarios.</p>
 
 <p>A peer transport can be useful when using non-persistent messaging. But if you want persistent messaging you often want to use a federated network with certain brokers on the network being the persistence brokers (so you can backup the file systems etc).</p>
 
-<p>The ideal topology often depends on your requirements and how you want to manage persistence and deal with hardware failures such as with <a shape="rect" href="masterslave.xml">MasterSlave</a>.</p></div>
+<p>The ideal topology often depends on your requirements and how you want to manage persistence and deal with hardware failures such as with <link><page ri:content-title="MasterSlave"></page></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-mule.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-mule.xml b/how-does-activemq-compare-to-mule.xml
index 72ba2ef..72167d8 100644
--- a/how-does-activemq-compare-to-mule.xml
+++ b/how-does-activemq-compare-to-mule.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ is a messaging provider, with extensive capabilities for message brokering. Mule is described as an ESB, in that it defines and executes the brokering of message exchanges among integrated software components.</p><h4 id="HowdoesActiveMQcomparetoMule-Architecture">Architecture</h4><p>Mule provides an accessible programming model for integration, designed to work well with - and leverage - other middleware technologies. For this reason, Mule does not provide a native messaging system, and it is therefore frequently used with Apache ActiveMQ.</p><p>If you use Mule to define an integration based on Apache ActiveMQ, you would use a distinct framework, (the Mule Component Model) to define interfaces for connectivity, as well as mediating activities such as transformations and exception handling. (Note that the Mule framework model presumes a SEDA process model.)Used in this manner, you could think of Mule as a library for defining t
 he interactions among components, with the advantage that it is loosely coupled to both the integrated components and the messaging infrastructure.</p><p>If you have made the choice to use Apache ActiveMQ for messaging and such loose coupling to the messaging infrastructure is not required, you can also configure ActiveMQ directly or through the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Apache Camel container</a>. This may give you access to message handling features not defined in the Mule framework, while still providing connectivity to non-JMS clients through ActiveMQ's numerous options for client connectivity. Working with ActiveMQ directly also allows you to take advantage of clustering and failover capabilities that lie outside the scope of the Mule Component Model.</p><h4 id="HowdoesActiveMQcomparetoMule-PointsinCommon">Points in Common</h4><p>The Mule framework is quite user-friendly, is Java-based (Mule components, called Universal Model
  Objects, are essentially POJOs), and is both flexible (deploys to virtually any Java environment) and lightweight (can be deployed in Spring). These are advantages that it shares with ActiveMQ, so it's not surprising that the two technologies were often used together, before the advent of <a shape="rect" class="external-link" href="http://activemq.apache.org/camel">Apache Camel</a></p><h4 id="HowdoesActiveMQcomparetoMule-&quot;ESB&quot;versus&quot;Messaging&quot;">"ESB" versus "Messaging"</h4><p>Mule supports a number of integration capabilities that go beyond the scope of messaging, such as BPEL-based orchestration and (SOAP-to-Java) Web Services support. These are rightly described as ESB features, in that they are more than what one would expect from a messaging platform alone. For environments with these requirements, Camel or Mule provides a good extension to the capabilities of ActiveMQ.</p><p>Additional ESB requirements, such as support for a distributed architecture and a n
 ative JBI container and components, are not supported by Mule. If you require these capabilities, we encourage you to investigate other open source ESBs that also integrate Apache ActiveMQ, such as <a shape="rect" class="external-link" href="http://servicemix.org/" rel="nofollow">Apache ServiceMix</a>, and even the <a shape="rect" class="external-link" href="http://incubator.apache.org/cxf/">Apache CXF</a> service framework.</p><h4 id="HowdoesActiveMQcomparetoMule-CommercialSupport,CopyrightandLicense">Commercial Support, Copyright and License</h4><p>Both Mule and ActiveMQ have commercial support available from companies dedicated to the technologies. The commercial support corporation for Mule (MuleSource) holds the copyright to Mule, and licenses it under an open source license adapted from the Mozilla Public License (an "MPL+" license). Apache ActiveMQ is an open source project at the Apache Software Foundation, and as such is available under the Apache License 2.0. Commercial su
 pport for ActiveMQ is provided by <a shape="rect" class="external-link" href="http://open.iona.com/" rel="nofollow">Iona plc</a>.</p></div>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is a messaging provider, with extensive capabilities for message brokering. Mule is described as an ESB, in that it defines and executes the brokering of message exchanges among integrated software components.</p><h4>Architecture</h4><p>Mule provides an accessible programming model for integration, designed to work well with - and leverage - other middleware technologies. For this reason, Mule does not provide a native messaging system, and it is therefore frequently used with Apache ActiveMQ.</p><p>If you use Mule to define an integration based on Apache ActiveMQ, you would use a distinct framework, (the Mule Component Model) to define interfaces for connectivity, as well as mediating activities such as transformations and exception handling. (Note that the Mule framework model presumes a SEDA process model.)Used in this manner, you could think of Mule as a library for defining the interactions among components, with the adva
 ntage that it is loosely coupled to both the integrated components and the messaging infrastructure.</p><p>If you have made the choice to use Apache ActiveMQ for messaging and such loose coupling to the messaging infrastructure is not required, you can also configure ActiveMQ directly or through the <a shape="rect" href="http://activemq.apache.org/camel/">Apache Camel container</a>. This may give you access to message handling features not defined in the Mule framework, while still providing connectivity to non-JMS clients through ActiveMQ's numerous options for client connectivity. Working with ActiveMQ directly also allows you to take advantage of clustering and failover capabilities that lie outside the scope of the Mule Component Model.</p><h4>Points in Common</h4><p>The Mule framework is quite user-friendly, is Java-based (Mule components, called Universal Model Objects, are essentially POJOs), and is both flexible (deploys to virtually any Java environment) and lightweight (ca
 n be deployed in Spring). These are advantages that it shares with ActiveMQ, so it's not surprising that the two technologies were often used together, before the advent of <a shape="rect" href="http://activemq.apache.org/camel">Apache Camel</a></p><h4>"ESB" versus "Messaging"</h4><p>Mule supports a number of integration capabilities that go beyond the scope of messaging, such as BPEL-based orchestration and (SOAP-to-Java) Web Services support. These are rightly described as ESB features, in that they are more than what one would expect from a messaging platform alone. For environments with these requirements, Camel or Mule provides a good extension to the capabilities of ActiveMQ.</p><p>Additional ESB requirements, such as support for a distributed architecture and a native JBI container and components, are not supported by Mule. If you require these capabilities, we encourage you to investigate other open source ESBs that also integrate Apache ActiveMQ, such as <a shape="rect" hre
 f="http://servicemix.org/">Apache ServiceMix</a>, and even the <a shape="rect" href="http://incubator.apache.org/cxf/">Apache CXF</a> service framework.</p><h4>Commercial Support, Copyright and License</h4><p>Both Mule and ActiveMQ have commercial support available from companies dedicated to the technologies. The commercial support corporation for Mule (MuleSource) holds the copyright to Mule, and licenses it under an open source license adapted from the Mozilla Public License (an "MPL+" license). Apache ActiveMQ is an open source project at the Apache Software Foundation, and as such is available under the Apache License 2.0. Commercial support for ActiveMQ is provided by <a shape="rect" href="http://open.iona.com/">Iona plc</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-activemq-compare-to-spread-toolkit.xml
----------------------------------------------------------------------
diff --git a/how-does-activemq-compare-to-spread-toolkit.xml b/how-does-activemq-compare-to-spread-toolkit.xml
index 9651be1..1770989 100644
--- a/how-does-activemq-compare-to-spread-toolkit.xml
+++ b/how-does-activemq-compare-to-spread-toolkit.xml
@@ -1,11 +1,7 @@
 <div class="wiki-content maincontent">
-<p>Spread Toolkit is a C++ library for messaging and only has <a shape="rect" class="external-link" href="http://www.spread.org/JMS4Spread/docs/" rel="nofollow">partial support for JMS</a>. It doesn't support durable messaging, transactions, XA or full JMS 1.1. It is also dependent on a native code Spread daemon running on the machine.</p>
+<p>Spread Toolkit is a C++ library for messaging and only has <a shape="rect" href="http://www.spread.org/JMS4Spread/docs/">partial support for JMS</a>. It doesn't support durable messaging, transactions, XA or full JMS 1.1. It is also dependent on a native code Spread daemon running on the machine.</p>
 
-<p>Apache ActiveMQ on the other hand is the JMS provider used in <a shape="rect" class="external-link" href="http://geronimo.apache.org">Apache Geronimo</a> and is J2EE 1.4 certified in Geronimo and is 100% pure Java. ActiveMQ supports transient and durable messaging, transactions, XA, J2EE 1.4, JMS 1.1, JCA 1.5 as well as heaps of different features like <a shape="rect" href="message-groups.xml">Message Groups</a> and <a shape="rect" href="clustering.xml">Clustering</a></p>
+<p>Apache ActiveMQ on the other hand is the JMS provider used in <a shape="rect" href="http://geronimo.apache.org">Apache Geronimo</a> and is J2EE 1.4 certified in Geronimo and is 100% pure Java. ActiveMQ supports transient and durable messaging, transactions, XA, J2EE 1.4, JMS 1.1, JCA 1.5 as well as heaps of different features like <link><page ri:content-title="Message Groups"></page></link> and <link><page ri:content-title="Clustering"></page></link></p>
 
-<h2 id="HowdoesActiveMQcomparetoSpreadToolkit-Performanceguides">Performance guides</h2>
-
-<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.xml">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.xml">ActiveMQ Performance Module Users Manual</a></p>
-
-<p>The Commercial Providers on the <a shape="rect" href="support.xml">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
+<structured-macro ac:macro-id="3a3420b9-f796-4044-895d-6667e944d341" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Performance report"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-connectionfactory-relate-to-the-broker.xml
----------------------------------------------------------------------
diff --git a/how-does-connectionfactory-relate-to-the-broker.xml b/how-does-connectionfactory-relate-to-the-broker.xml
index 8465ac1..b0137a9 100644
--- a/how-does-connectionfactory-relate-to-the-broker.xml
+++ b/how-does-connectionfactory-relate-to-the-broker.xml
@@ -1,9 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowdoesConnectionFactoryrelatetotheBroker-HowdoesConnectionFactoryrelatetotheBroker?">How does ConnectionFactory relate to the Broker?</h2>
+<div class="wiki-content maincontent"><h2>How does ConnectionFactory relate to the Broker?</h2>
 
-<p>The ConnectionFactory is a JMS specification client side interface for creating connections to a JMS broker. The Broker is a service on the network or <a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">embedded in the same JVM</a> which provides the message provider. So think of the ConnectionFactory as the client API for sending and receiving messages and the broker is a server side implementation.</p>
+<p>The ConnectionFactory is a JMS specification client side interface for creating connections to a JMS broker. The Broker is a service on the network or <link><page ri:content-title="How do I embed a Broker inside a Connection"></page><link-body>embedded in the same JVM</link-body></link> which provides the message provider. So think of the ConnectionFactory as the client API for sending and receiving messages and the broker is a server side implementation.</p>
 
-<h3 id="HowdoesConnectionFactoryrelatetotheBroker-SeeAlso">See Also</h3>
+<h3>See Also</h3>
+
+<ul><li><link><page ri:content-title="How do I create new destinations"></page></link></li><li><link><page ri:content-title="How do I embed a Broker inside a Connection"></page></link></li><li><link><page ri:content-title="What are administered objects"></page></link></li></ul>
 
-<ul><li><a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a></li><li><a shape="rect" href="how-do-i-embed-a-broker-inside-a-connection.xml">How do I embed a Broker inside a Connection</a></li><li><a shape="rect" href="what-are-administered-objects.xml">What are administered objects</a></li></ul>
 </div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-jms-compare-with-email.xml
----------------------------------------------------------------------
diff --git a/how-does-jms-compare-with-email.xml b/how-does-jms-compare-with-email.xml
index a23fdcc..6df5b80 100644
--- a/how-does-jms-compare-with-email.xml
+++ b/how-does-jms-compare-with-email.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
 <p>Certainly they both do similar things.  The main difference between them is their history and design criteria. </p>
 
-<p>JMS has a bunch of different qualities of service (durable v non-durable, queue v topic) designed for very high performance messaging with low latency together with reliability. Email is designed for connectivitiy on the web. So they have different design trade offs. e.g. its not a big deal to get multiple copies of an email (which I get fairly often if I loose a connection with an email server over POP for example). It would be a major disaster to get 2 copies of the "remove $1000 from my bank account" messages <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>JMS has a bunch of different qualities of service (durable v non-durable, queue v topic) designed for very high performance messaging with low latency together with reliability. Email is designed for connectivitiy on the web. So they have different design trade offs. e.g. its not a big deal to get multiple copies of an email (which I get fairly often if I loose a connection with an email server over POP for example). It would be a major disaster to get 2 copies of the "remove $1000 from my bank account" messages <emoticon ac:name="smile"></emoticon></p>
 
 <p>The main reasons for using JMS is performance (throughput &amp; latency), together with support for transactions &amp; XA together with avoiding duplicates and message loss.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-openwire-compare-to-stomp.xml
----------------------------------------------------------------------
diff --git a/how-does-openwire-compare-to-stomp.xml b/how-does-openwire-compare-to-stomp.xml
index 8f0af69..79fe8cb 100644
--- a/how-does-openwire-compare-to-stomp.xml
+++ b/how-does-openwire-compare-to-stomp.xml
@@ -1,5 +1,5 @@
-<div class="wiki-content maincontent"><p><a shape="rect" href="openwire.xml">OpenWire</a> is the native protocol that Apache ActiveMQ uses. It is designed for performance and size on the wire - sacrificing some ease of implementation with higher performance and reduced network bandwidth as a priority. OpenWire was first released in Apache ActiveMQ 4.0.</p>
+<div class="wiki-content maincontent"><p><link><page ri:content-title="OpenWire"></page></link> is the native protocol that Apache ActiveMQ uses. It is designed for performance and size on the wire - sacrificing some ease of implementation with higher performance and reduced network bandwidth as a priority. OpenWire was first released in Apache ActiveMQ 4.0.</p>
 
-<p><a shape="rect" href="stomp.xml">Stomp</a> is a simpler text based protocol which is designed to be very simple to implement in a few hours in any language or platform (e.g. you can use a telnet client to communicate via Stomp). A Stomp client is not going to be as efficient as an client that uses<br clear="none">
+<p><link><page ri:content-title="Stomp"></page></link> is a simpler text based protocol which is designed to be very simple to implement in a few hours in any language or platform (e.g. you can use a telnet client to communicate via Stomp). A Stomp client is not going to be as efficient as an client that uses<br clear="none">
 OpenWire, but it much simpler so you can generally be up and running with it much quicker.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-the-journal-work.xml
----------------------------------------------------------------------
diff --git a/how-does-the-journal-work.xml b/how-does-the-journal-work.xml
index 71ae34a..b756f47 100644
--- a/how-does-the-journal-work.xml
+++ b/how-does-the-journal-work.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>See the description <a shape="rect" href="persistence.xml">here</a></p></div>
+<p>See the description <link><page ri:content-title="Persistence"></page><link-body>here</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-the-website-work.xml
----------------------------------------------------------------------
diff --git a/how-does-the-website-work.xml b/how-does-the-website-work.xml
index 9d9fd7d..6e39830 100644
--- a/how-does-the-website-work.xml
+++ b/how-does-the-website-work.xml
@@ -1,9 +1,9 @@
-<div class="wiki-content maincontent"><p>This website is actually rendered from the Wiki contents that you can <a shape="rect" href="how-do-i-edit-the-website.xml">edit</a>.  <br clear="none">
+<div class="wiki-content maincontent"><p>This website is actually rendered from the Wiki contents that you can <link><page ri:content-title="How do I edit the website"></page><link-body>edit</link-body></link>.  <br clear="none">
 When viewing a page on the static HTML website you can click on the <strong>edit</strong> link (bottom of the page) and you can edit the page. </p>
 
-<p>Other useful <a shape="rect" href="site.xml">Site links</a> are</p>
+<p>Other useful <link><page ri:content-title="Site"></page><link-body>Site links</link-body></link> are</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="banner.xml">Banner</a></li><li><a shape="rect" href="navigation.xml">Navigation</a></li><li><a shape="rect" href="quicklinks.xml">QuickLinks</a></li><li><a shape="rect" href="siteindex.xml">SiteIndex</a></li><li><a shape="rect" href="sitemap.xml">SiteMap</a></li></ul>
+<structured-macro ac:macro-id="d6f12256-015e-46f5-91b7-1ba114ec712e" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Site"></page></link></parameter></structured-macro>
 
 <p>Note that it takes a little while to update the Apache site at <a shape="rect" class="external-link" href="http://activemq.apache.org/">http://activemq.apache.org/</a> due to caching. Though this site usually updates quickly: <a shape="rect" class="external-link" href="http://cwiki.apache.org/ACTIVEMQ/">http://cwiki.apache.org/ACTIVEMQ/</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-does-xbean-compare-to-spring-2.xml
----------------------------------------------------------------------
diff --git a/how-does-xbean-compare-to-spring-2.xml b/how-does-xbean-compare-to-spring-2.xml
index 669ca9c..b43b187 100644
--- a/how-does-xbean-compare-to-spring-2.xml
+++ b/how-does-xbean-compare-to-spring-2.xml
@@ -1,17 +1,17 @@
-<div class="wiki-content maincontent"><p>Spring 2.0 has introduced the ability to handle custom XML languages inside the spring.xml. This is something we developed <a shape="rect" class="external-link" href="http://geronimo.apache.org/xbean/">XBean</a> for way back in the Spring 1.x days.</p>
+<div class="wiki-content maincontent"><p>Spring 2.0 has introduced the ability to handle custom XML languages inside the spring.xml. This is something we developed <a shape="rect" href="http://geronimo.apache.org/xbean/">XBean</a> for way back in the Spring 1.x days.</p>
 
 <p>The Spring hook requires component developers to write their own XML handling, processing DOMs and so forth. On various projects like ActiveMQ, Jencks, Jetty, ServiceMix, XFire - we didn't want to have to spend time hand-crafting parsing of XML code. So XBean is used to auto-create the parsing code along with an XSD and reference documentation for how to configure these services in custom XML languages.</p>
 
 <p>So you can think of XBean as being like a JAXB2 tool for working inside Spring XML files</p>
 
-<h3 id="HowdoesXBeancomparetoSpring2-Springversionssupported">Spring versions supported</h3>
+<h3>Spring versions supported</h3>
 
 <p>So you can use XBean in Spring 1.x or Spring 2.x (for Spring 2.0 support you need XBean 2.6 or later along with the matching release of ActiveMQ).</p>
 
 <p>If you are using Spring 1.x you use the XBean versions of the Spring ApplicationContext classes. In Spring 2.0 the XBean functionality works perfectly fine inside a regular spring.xml file. The only main difference between using the XBean ApplicationContext files and the Spring ones is that the Spring ones mandate validation, so your XML must include all the XSD information (which is handy for IDE completion anyway) whereas this is not mandatory in the XBean configuraiton files.</p>
 
 
-<h3 id="HowdoesXBeancomparetoSpring2-Examples">Examples</h3>
+<h3>Examples</h3>
 
 <p>Here's a regular Spring 2 XML file using ActiveMQ's XML inside it to configure a broker &amp; destinations &amp; a connection factory</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-fast-is-activemq.xml
----------------------------------------------------------------------
diff --git a/how-fast-is-activemq.xml b/how-fast-is-activemq.xml
index b51ea90..4d2e421 100644
--- a/how-fast-is-activemq.xml
+++ b/how-fast-is-activemq.xml
@@ -1,10 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="HowfastisActiveMQ-HowfastisActiveMQ?">How fast is ActiveMQ?</h2>
+<div class="wiki-content maincontent"><h2>How fast is ActiveMQ?</h2>
 
-<p>It all depends on the configuration, the operating system, hardware, JVM, JVM configuration and what you're doing. For more details see <a shape="rect" href="performance.xml">Performance</a></p>
+<p>It all depends on the configuration, the operating system, hardware, JVM, JVM configuration and what you're doing. For more details see <link><page ri:content-title="Performance"></page></link></p>
 
-<h2 id="HowfastisActiveMQ-Performanceguides">Performance guides</h2>
-
-<p>If you're not convinced by performance reports then please do try running performance tests yourself. You might wanna check out our overview of <a shape="rect" href="performance.xml">Performance</a> or try using out the <a shape="rect" href="activemq-performance-module-users-manual.xml">ActiveMQ Performance Module Users Manual</a></p>
-
-<p>The Commercial Providers on the <a shape="rect" href="support.xml">Support</a> page may also be able to help diagnose performance issues, suggest changes, etc...</p></div>
+<structured-macro ac:macro-id="47f7b2f3-f9ea-4700-bec0-7e30bf92562a" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Performance report"></page></link></parameter></structured-macro></div>
 


[09/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
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 &amp; 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 &amp; 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 = &quot;tcp://localhost:61616&quot;;
-        messageQueueName = &quot;client.messages&quot;;
+        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 = &quot;client.messages&quot;;
+        clientQueueName = "client.messages";
         ackMode = Session.AUTO_ACKNOWLEDGE;
     }
 
     public Client() {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(&quot;tcp://localhost:61616&quot;);
+        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(&quot;MyProtocolMessage&quot;);
+            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(&quot;messageText = &quot; + 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 (&quot;MyProtocolMessage&quot;.equalsIgnoreCase(messageText)) {
-            responseText = &quot;I recognize your protocol message&quot;;
+        if ("MyProtocolMessage".equalsIgnoreCase(messageText)) {
+            responseText = "I recognize your protocol message";
         } else {
-            responseText = &quot;Unknown protocol message: &quot; + 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(&quot;vm://localhost&quot;);
+<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>&#160;</p>
 
 <p>&#160;</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&#160;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;">&#160;</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.&#160;</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.&#160;</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.&#160;</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>&#160;</p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects&#160;</li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists&#160;</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&#160;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;">&#160;</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.&#160;</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.&#160;</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.&#160;</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>&#160;</p><ul><li>Demonstrated ability to contribute patches/pull requests to ActiveMQ projects&#160;</li><li>Demonstrated participation in discussions on the ActiveMQ mailing lists&#160;</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[
-  &lt;bean id=&quot;mysql-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-    &lt;property name=&quot;driverClassName&quot; value=&quot;com.mysql.jdbc.Driver&quot;/&gt;
-    &lt;property name=&quot;url&quot; value=&quot;jdbc:mysql://localhost/activemq&quot;/&gt;
-    &lt;property name=&quot;username&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;password&quot; value=&quot;activemq&quot;/&gt;
-    &lt;property name=&quot;poolPreparedStatements&quot; value=&quot;true&quot;/&gt;
+<structured-macro ac:macro-id="8c9473ba-d5ec-4a14-b9dc-dcefecdec2c2" ac:name="code" ac:schema-version="1"><plain-text-body>
+  &lt;bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+    &lt;property name="driverClassName" value="com.mysql.jdbc.Driver"/&gt;
+    &lt;property name="url" value="jdbc:mysql://localhost/activemq"/&gt;
+    &lt;property name="username" value="activemq"/&gt;
+    &lt;property name="password" value="activemq"/&gt;
+    &lt;property name="poolPreparedStatements" value="true"/&gt;
   &lt;/bean&gt;
-]]></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[
-&lt;bean id=&quot;mssql-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-    &lt;property name=&quot;driverClassName&quot;&gt;
+<structured-macro ac:macro-id="3423b393-7e75-4fe6-baf4-6d8d7d26dc7e" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;bean id="mssql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+    &lt;property name="driverClassName"&gt;
         &lt;value&gt;com.microsoft.jdbc.sqlserver.SQLServerDriver&lt;/value&gt;
     &lt;/property&gt;
-    &lt;property name=&quot;url&quot;&gt;
+    &lt;property name="url"&gt;
         &lt;value&gt;jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=activedb&lt;/value&gt;
     &lt;/property&gt;
-    &lt;property name=&quot;username&quot;&gt;
+    &lt;property name="username"&gt;
         &lt;value&gt;sa&lt;/value&gt;
     &lt;/property&gt;
-    &lt;property name=&quot;password&quot;&gt;
+    &lt;property name="password"&gt;
         &lt;value&gt;&lt;/value&gt;
     &lt;/property&gt;
-    &lt;property name=&quot;poolPreparedStatements&quot;&gt;
+    &lt;property name="poolPreparedStatements"&gt;
         &lt;value&gt;true&lt;/value&gt;
     &lt;/property&gt;
 &lt;/bean&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>2. Set the datasource reference to use the new jdbc configuration e.g &lt;jdbcPersistence dataSourceRef="mssql-ds"/&gt;</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(&quot;tcp://localhost:61616&quot;);
+<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(&quot;tcp://localhost:61616&quot;);
+<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(&quot;tcp://localhost:61616&quot;);
+<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 -&gt; Tools -&gt; 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)&#160; in the classpath . One way to do this is by dropping the jars in the lib directory of the domain (&lt;%BEA_HOME%&gt;\user_projects\domains\&lt;%DOMAIN_NAME%&gt;\lib).&#160;</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>
 &lt;config-property&gt;
   &lt;description&gt;
     Sets the XML configuration file used to configure the ActiveMQ broker via
@@ -21,11 +20,11 @@
   &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
   &lt;config-property-value&gt;xbean:file:C:\broker-config.xml&lt;/config-property-value&gt;
 &lt;/config-property&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 &#160;
 <br clear="none" class="atl-forced-newline">
 &#160;
 <br clear="none" class="atl-forced-newline">
-&#160;</li><li>Start the domain's weblogic server (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; 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 &amp; 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>
+&#160;</li><li>Start the domain's weblogic server (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; Start Admin Server for Weblogic Server Domain).</li><li>Start the domain's admin console (BEA Products -&gt; User Projects -&gt; &lt;domain_name&gt; -&gt; 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 &amp; 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 &lt;transportConnector/&gt;:</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[&lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://localhost:61616&quot; discoveryUri=&quot;multicast://default&quot;/&gt;
-]]></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[&lt;transportConnector name=&quot;openwire&quot; uri=&quot;tcp://localhost:61616&quot; /&gt;
-]]></script>
-</div></div><p>If you do not require any networked broker support remove the &lt;networkConnector/&gt; 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[&lt;networkConnector name=&quot;default-nc&quot; uri=&quot;multicast://default&quot;/&gt;
-]]></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 &lt;transportConnector/&gt;:</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>&lt;transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/&gt;
+</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>&lt;transportConnector name="openwire" uri="tcp://localhost:61616" /&gt;
+</plain-text-body></structured-macro><p>If you do not require any networked broker support remove the &lt;networkConnector/&gt; altogether. Remove</p><structured-macro ac:macro-id="9aa1c552-8664-4833-812c-6173fc7855ee" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;networkConnector name="default-nc" uri="multicast://default"/&gt;
+</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&#160;<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(&quot;vm://localhost?broker.persistent=false&quot;);
-]]></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&#160;<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&#160;<strong><code>ConnectionFactory</code></strong> and <strong><code>Destination</code></strong>'s to use, then you could use the&#160;<a shape="rect" href="jndi-support.xml">JNDI Support</a>&#160;in ActiveMQ.</p><p>Add the following&#160;<strong><code>jndi.properties</code></strong> to your classpath, e.g., in&#160;<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&#160;<a shape="rect" href="jndi-support.xml">Dynamic destinations in JNDI</a>&#160;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(&quot;dynamicQueues/FOO.BAR&quot;);]]></script>
-</div></div><h3 id="HowToUnitTestJMSCode-UsingTheEmbeddedActiveMQBrokerJUnitRule(ActiveMQ5.13)">Using The&#160;<code>EmbeddedActiveMQBroker</code> JUnit Rule (ActiveMQ 5.13)</h3><p>If your test code is using JUnit, then you could use the&#160;<strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule provided&#160;in the&#160;<strong><code>activemq-junit</code></strong> library. Add the&#160;<strong><code>activemq-junit</code></strong> library along with the&#160;<strong><code>activemq-broker</code></strong> libraries for the version of ActiveMQ you want to test with. &#160;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[&lt;dependency&gt;
+</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&#160;<strong><code>ConnectionFactory</code></strong> and <strong><code>Destination</code></strong>'s to use, then you could use the&#160;<link><page ri:content-title="JNDI Support"></page></link>&#160;in ActiveMQ.</p><p>Add the following&#160;<strong><code>jndi.properties</code></strong> to your classpath, e.g., in&#160;<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&#160;<link><page ri:content-title="JNDI Support"></page><plain-text-link-body>Dynamic destinations in JNDI</plain-text-link-body></link>&#160;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&#160;<code>EmbeddedActiveMQBroker</code> JUnit Rule (ActiveMQ 5.13)</h3><p>If your test code is using JUnit, then you could use the&#160;<strong><code>EmbeddedActiveMQBroker</code></strong> JUnit Rule provided&#160;in the&#160;<strong><code>activemq-junit</code></strong> library. Add the&#160;<strong><code>activemq-junit</code></strong> library along with the&#160;<strong><code>activemq-broker</code></strong>
  libraries for the version of ActiveMQ you want to test with. &#160;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>&lt;dependency&gt;
     &lt;groupId&gt;org.apache.activemq.tooling&lt;/groupId&gt;
     &lt;artifactId&gt;activemq-junit&lt;/artifactId&gt;
     &lt;version&gt;${activemq-junit-version}&lt;/version&gt;
@@ -24,24 +15,16 @@ java.naming.provider.url = vm://localhost?broker.persistent=false]]></script>
     &lt;artifactId&gt;activemq-broker&lt;/artifactId&gt;
     &lt;version&gt;${activemq-version}&lt;/version&gt;
     &lt;scope&gt;test&lt;/scope&gt;
-&lt;/dependency&gt;]]></script>
-</div></div><p>&#160;Then add the&#160;<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&#160;<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&#160;<strong><code>EmbeddedActiveMQBroker</code></strong> class and override the&#160;<strong><code>configure()</code></strong> method, or use an XML configuration for the broker. &#160;</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
+&lt;/dependency&gt;</plain-text-body></structured-macro><p>&#160;Then add the&#160;<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&#160;<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&#160;<strong><code>EmbeddedActiveMQBroker</code></strong> class and override the&#160;<strong><code>configure()</code></strong> method, or use an XML configuration for the broker. &#160;</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(&quot;bean:customize-activemq.xml&quot;);
-]]></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. &#160;The versions of the&#160;<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[&lt;dependency&gt;
+}</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. &#160;The versions of the&#160;<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>&lt;dependency&gt;
     &lt;groupId&gt;org.springframework&lt;/groupId&gt;
     &lt;artifactId&gt;spring-context&lt;/artifactId&gt;
     &lt;version&gt;Appropriate version for activemq-version&lt;/version&gt;
@@ -51,10 +34,5 @@ EmbeddedActiveMQBroker customizedBroker = new EmbeddedActiveMQBroker(&quot;bean:
     &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
     &lt;artifactId&gt;activemq-spring&lt;/artifactId&gt;
     &lt;version&gt;${activemq-version&gt;&lt;/version&gt;
-&lt;/dependency&gt;]]></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(&quot;vm://embedded-broker?create=false&quot;);]]></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>
+&lt;/dependency&gt;</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=&lt;hostname&gt; 
 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=&lt;hostname&gt; 
 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>
 


[28/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-311-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-311-release.xml b/cms/activemq-cpp-311-release.xml
index 3e613e5..a048b25 100644
--- a/cms/activemq-cpp-311-release.xml
+++ b/cms/activemq-cpp-311-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a bug fix release that resolves several memory leaks found since the 3.1 release.  Also a few small issues with some compilers was addressed.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="e356b887-a8b6-4319-b0b9-a4f8d322c261" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.1.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.1.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.zip">activemq-cpp-library-3.1.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.zip.asc">activemq-cpp-library-3.1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.tar.gz">activemq-cpp-library-3.1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.tar.gz.asc">activemq-cpp-library-3.1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.zip">activemq-cpp-library-3.1.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.zip.asc">activemq-cpp-library-3.1.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.tar.gz">activemq-cpp-library-3.1.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.1-src.tar.gz.asc">activemq-cpp-library-3.1.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.1.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="515f89ec-f112-4c06-8952-2c268b9daffe" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.1.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.1.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12190">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12190">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-312-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-312-release.xml b/cms/activemq-cpp-312-release.xml
index 85c9fdd..7a22674 100644
--- a/cms/activemq-cpp-312-release.xml
+++ b/cms/activemq-cpp-312-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.1.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a bug fix release that resolves several crash bugs found since the 3.1.1 release.  Also a few small issues with some compilers was addressed.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="3db19e4b-4cf3-427a-81b8-4fd4ff4e0547" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.1.2Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.1.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.zip">activemq-cpp-library-3.1.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.zip.asc">activemq-cpp-library-3.1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.tar.gz">activemq-cpp-library-3.1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.tar.gz.asc">activemq-cpp-library-3.1.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.zip">activemq-cpp-library-3.1.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.zip.asc">activemq-cpp-library-3.1.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.tar.gz">activemq-cpp-library-3.1.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.2-src.tar.gz.asc">activemq-cpp-library-3.1.2-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.1.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="5ee36097-dd01-44bf-9b11-6bd10b8f6e1b" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.1.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.1.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12260">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12260">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-313-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-313-release.xml b/cms/activemq-cpp-313-release.xml
index 9690df7..b1f6fe0 100644
--- a/cms/activemq-cpp-313-release.xml
+++ b/cms/activemq-cpp-313-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.1.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a bug fix release that resolves an issue on Windows that could lead to deadlocks.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="765ffeda-1817-40aa-ba52-ca6f5ef04fb1" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.1.3Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.1.3Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.zip">activemq-cpp-library-3.1.3-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.zip.asc">activemq-cpp-library-3.1.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.tar.gz">activemq-cpp-library-3.1.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.tar.gz.asc">activemq-cpp-library-3.1.3-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.zip">activemq-cpp-library-3.1.3-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.zip.asc">activemq-cpp-library-3.1.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.tar.gz">activemq-cpp-library-3.1.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.1.3-src.tar.gz.asc">activemq-cpp-library-3.1.3-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.1.3Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="fb3d51cd-4d0b-4f69-ab2a-03453116fe6f" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.1.3/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.1.3Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12291">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12291">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-320-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-320-release.xml b/cms/activemq-cpp-320-release.xml
index 712a550..12fb9b0 100644
--- a/cms/activemq-cpp-320-release.xml
+++ b/cms/activemq-cpp-320-release.xml
@@ -1,33 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a major update for the ActiveMQ-CPP library adding in support for SSL, QueueBrowser, Message compression and more.  Many issues have been addressed as well as work to improve performance and prevent memory leaks.  </p>
 
 <p>The SSL support makes use of the OpenSSL libraries so you need them installed to use it.  </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="15ca9364-fb04-4409-b55a-46d178f19fd6" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.zip">activemq-cpp-library-3.2.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.zip.asc">activemq-cpp-library-3.2.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.tar.gz">activemq-cpp-library-3.2.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.tar.gz.asc">activemq-cpp-library-3.2.0-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.zip">activemq-cpp-library-3.2.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.zip.asc">activemq-cpp-library-3.2.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.tar.gz">activemq-cpp-library-3.2.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.0-src.tar.gz.asc">activemq-cpp-library-3.2.0-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="1df56e26-ad59-40aa-961e-f2028ce61bcb" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12191">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12191">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-321-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-321-release.xml b/cms/activemq-cpp-321-release.xml
index f9322de..7d10f00 100644
--- a/cms/activemq-cpp-321-release.xml
+++ b/cms/activemq-cpp-321-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release that addresses issues with the original 3.2.0 release for users on Windows,</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="43142ce7-f083-4efd-9ff2-2429c82c6321" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.zip">activemq-cpp-library-3.2.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.zip.asc">activemq-cpp-library-3.2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.tar.gz">activemq-cpp-library-3.2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.tar.gz.asc">activemq-cpp-library-3.2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.zip">activemq-cpp-library-3.2.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.zip.asc">activemq-cpp-library-3.2.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.tar.gz">activemq-cpp-library-3.2.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.1-src.tar.gz.asc">activemq-cpp-library-3.2.1-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="d74cb088-6f10-40be-af00-979be64b545d" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12333">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12333">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-322-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-322-release.xml b/cms/activemq-cpp-322-release.xml
index 7ce5872..d73efab 100644
--- a/cms/activemq-cpp-322-release.xml
+++ b/cms/activemq-cpp-322-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release that addresses issues with the 3.2.1 release.  Several issues that users were seeing as segfaults from APR Atomics have been addressed as well as a fix for sending and receiving empty MapMessages.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="4f5e1a37-b4e0-4998-8668-79c5c6a48ba1" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.2Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.zip">activemq-cpp-library-3.2.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.zip.asc">activemq-cpp-library-3.2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.tar.gz">activemq-cpp-library-3.2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.tar.gz.asc">activemq-cpp-library-3.2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.zip">activemq-cpp-library-3.2.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.zip.asc">activemq-cpp-library-3.2.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.tar.gz">activemq-cpp-library-3.2.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.2-src.tar.gz.asc">activemq-cpp-library-3.2.2-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="36d70e14-c0b4-4585-84e4-0673dfd1f677" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12336">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12336">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-323-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-323-release.xml b/cms/activemq-cpp-323-release.xml
index 9754034..3d7efe9 100644
--- a/cms/activemq-cpp-323-release.xml
+++ b/cms/activemq-cpp-323-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release that addresses issues with the 3.2.2 release.  This release fixes an additional issue found in unmarshaling MapMessage objects on Windows as well as fixing a threading issue that causes invalid client Ids to be generated if two connections were created from two different threads at the same time.  Also a fix to the pkg-config file that is generated for the build was added.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="922e3741-b91b-481c-8c7c-9285d8b4d882" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.3Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.3Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.zip">activemq-cpp-library-3.2.3-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.zip.asc">activemq-cpp-library-3.2.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.tar.gz">activemq-cpp-library-3.2.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.tar.gz.asc">activemq-cpp-library-3.2.3-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.zip">activemq-cpp-library-3.2.3-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.zip.asc">activemq-cpp-library-3.2.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.tar.gz">activemq-cpp-library-3.2.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.3-src.tar.gz.asc">activemq-cpp-library-3.2.3-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.3Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="27ee1521-47f4-46f0-950b-ad9db75cc069" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.3/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.3Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12338">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=11000&amp;styleName=Html&amp;version=12338">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-324-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-324-release.xml b/cms/activemq-cpp-324-release.xml
index 539986e..7ac1e5f 100644
--- a/cms/activemq-cpp-324-release.xml
+++ b/cms/activemq-cpp-324-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.4Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release that addresses issues with the 3.2.3 release.  This release fixes an issue with the Stomp support as well as addressing some problems in the CMSTemplate classes.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="6a911d9f-6db7-4ab9-96a3-61f6c9b08f77" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.4Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.0">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.4Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.zip">activemq-cpp-library-3.2.4-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.zip.asc">activemq-cpp-library-3.2.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.tar.gz">activemq-cpp-library-3.2.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.tar.gz.asc">activemq-cpp-library-3.2.4-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.zip">activemq-cpp-library-3.2.4-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.zip.asc">activemq-cpp-library-3.2.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.tar.gz">activemq-cpp-library-3.2.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.4-src.tar.gz.asc">activemq-cpp-library-3.2.4-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.4Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="dd07a595-d994-4acf-9971-29356b0ab0d7" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.4/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.4Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12315667">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12315667">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-325-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-325-release.xml b/cms/activemq-cpp-325-release.xml
index 958ff04..9fd7ead 100644
--- a/cms/activemq-cpp-325-release.xml
+++ b/cms/activemq-cpp-325-release.xml
@@ -1,31 +1,28 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.2.5Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release that addresses issues with the 3.2.4 release.  This release fixes a bug that was causing the client to segfault on Mac OS as well as fixing an issue with the SSL transport and X509v3 Certificates.  Several small issues with URI parsing have also been fixed.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="cee29dff-51fb-4423-b691-2558e8ee2913" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.2.5Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.2.5/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.2.5/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.2.5Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.zip">activemq-cpp-library-3.2.5-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.zip.asc">activemq-cpp-library-3.2.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix </p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.tar.gz">activemq-cpp-library-3.2.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.tar.gz.asc">activemq-cpp-library-3.2.5-src.tar.gz.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.zip">activemq-cpp-library-3.2.5-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.zip.asc">activemq-cpp-library-3.2.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.tar.gz">activemq-cpp-library-3.2.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a sha
 pe="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.2.5-src.tar.gz.asc">activemq-cpp-library-3.2.5-src.tar.gz.asc</a> </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ-CPP3.2.5Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="95657f19-8048-4820-9065-e103618627af" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.2.5/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.2.5Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316124">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316124">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-330-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-330-release.xml b/cms/activemq-cpp-330-release.xml
index 690178c..821da43 100644
--- a/cms/activemq-cpp-330-release.xml
+++ b/cms/activemq-cpp-330-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.3.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a major release of the ActiveMQ-CPP client which includes some API changes and several new features and improvements.  Some additional methods have been added to the CMS API to make it easier to use.  Some highlights for this release:</p>
 
 <ul><li>Solved some deadlock issues that could occur during failover when using asynchronous consumers.</li><li>Synchronous Consumers now get an exception if they call receive when the Connection has failed.</li><li>CMS API now provides an XA domain for linking the CMS client into XA transactions.</li><li>The Failover Transport now supports the connection rebalancing feature in ActiveMQ.</li><li>Fixes in the Stomp handling allow the client to work with ActiveMQ Apollo.</li><li>Better message redelivery processing for Transacted consumers.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="14a44314-e431-4e8d-ac43-efa8e1ff3ae5" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.3.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.3.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.3.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.3.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.zip">activemq-cpp-library-3.3.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.zip.asc">activemq-cpp-library-3.3.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.gz">activemq-cpp-library-3.3.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.gz.asc">activemq-cpp-library-3.3.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.bz2">activemq-cpp-library-3.3.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.3.0-src.tar.bz2.asc">activemq-cpp-library-3.3.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.zip">activemq-cpp-library-3.3.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.zip.asc">activemq-cpp-library-3.3.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.gz">activemq-cpp-library-3.3.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.gz.asc">activemq-cpp-library-3.3.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.bz2">activemq-cpp-library-3.3.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.3.0-src.tar.bz2.asc">activemq-cpp-library-3.3.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.3.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="4f6fde0b-9b1b-488c-a296-2c7ca8c304ff" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.3.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.3.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12315668">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12315668">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-340-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-340-release.xml b/cms/activemq-cpp-340-release.xml
index 86ce853..f00a36b 100644
--- a/cms/activemq-cpp-340-release.xml
+++ b/cms/activemq-cpp-340-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a major release of the ActiveMQ-CPP client which includes some API changes and several improvements.  Some additional methods have been added to the CMS API to make it easier to use.  Some highlights for this release:</p>
 
 <ul><li>Added start and stop methods to CMS Session and MessageConsumer.</li><li>Fixed some build issues on Windows.</li><li>Resolved some issues with failover not recovering consumers correctly.</li><li>Fixed some problems with URI parsing.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="f7bd2097-0ac9-4cf7-a683-09a1ce5fbad9" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.zip">activemq-cpp-library-3.4.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.zip.asc">activemq-cpp-library-3.4.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.gz">activemq-cpp-library-3.4.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.gz.asc">activemq-cpp-library-3.4.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.bz2">activemq-cpp-library-3.4.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.0-src.tar.bz2.asc">activemq-cpp-library-3.4.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.zip">activemq-cpp-library-3.4.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.zip.asc">activemq-cpp-library-3.4.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.gz">activemq-cpp-library-3.4.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.gz.asc">activemq-cpp-library-3.4.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.bz2">activemq-cpp-library-3.4.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.0-src.tar.bz2.asc">activemq-cpp-library-3.4.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="fdc9cfd7-2cae-456b-a977-884079ac1e31" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316372">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316372">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-341-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-341-release.xml b/cms/activemq-cpp-341-release.xml
index a7f6f56..5490608 100644
--- a/cms/activemq-cpp-341-release.xml
+++ b/cms/activemq-cpp-341-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.0 release.  </p>
 
 <ul><li>Implements the Session recover method.</li><li>Fixed some build issues on Mac with dynamic libs.</li><li>Fixed an issue with BytesMessage marshaling when compression is enabled.</li><li>Fixed an issue on Windows with some unmarshaling cases causing a crash.</li><li>A few other minor package and build fixes.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="1606fed1-5993-4056-81de-1eb701ba9195" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.zip">activemq-cpp-library-3.4.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.zip.asc">activemq-cpp-library-3.4.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.gz">activemq-cpp-library-3.4.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.gz.asc">activemq-cpp-library-3.4.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.bz2">activemq-cpp-library-3.4.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.1-src.tar.bz2.asc">activemq-cpp-library-3.4.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.zip">activemq-cpp-library-3.4.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.zip.asc">activemq-cpp-library-3.4.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.gz">activemq-cpp-library-3.4.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.gz.asc">activemq-cpp-library-3.4.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.bz2">activemq-cpp-library-3.4.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.1-src.tar.bz2.asc">activemq-cpp-library-3.4.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="6c088493-4ee0-498f-83ef-4d689c7711d2" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.1/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316381">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316381">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-342-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-342-release.xml b/cms/activemq-cpp-342-release.xml
index fe53ef7..73e45f7 100644
--- a/cms/activemq-cpp-342-release.xml
+++ b/cms/activemq-cpp-342-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.1 release.  </p>
 
 <ul><li>Some build issues on various platforms were resolved.</li><li>A problem with setting the username / password from the Connection Factory was fixed.</li><li>A problem with expired messages and DLQ processing was addressed.</li><li>An issue with the failover transport and hangs in Connection start() was fixed.</li><li>A couple of race conditions on Connection close() were addressed.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="9c75d284-e25b-4c1d-8ed6-06d35c0b2752" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.2Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.2Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.zip">activemq-cpp-library-3.4.2-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.zip.asc">activemq-cpp-library-3.4.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.gz">activemq-cpp-library-3.4.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.gz.asc">activemq-cpp-library-3.4.2-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.bz2">activemq-cpp-library-3.4.2-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.2-src.tar.bz2.asc">activemq-cpp-library-3.4.2-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.zip">activemq-cpp-library-3.4.2-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.zip.asc">activemq-cpp-library-3.4.2-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.gz">activemq-cpp-library-3.4.2-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.gz.asc">activemq-cpp-library-3.4.2-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.bz2">activemq-cpp-library-3.4.2-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.2-src.tar.bz2.asc">activemq-cpp-library-3.4.2-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="b4a28b0a-97b0-4958-82e2-f7d22b60e523" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.2/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.2Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12319269">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12319269">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-343-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-343-release.xml b/cms/activemq-cpp-343-release.xml
index 661a710..eba5e5b 100644
--- a/cms/activemq-cpp-343-release.xml
+++ b/cms/activemq-cpp-343-release.xml
@@ -1,32 +1,29 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.3Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.2 release.  This release resolves some memory leaks found in the prior 3.4.x releases in the TCP transport and in the use of Transactions for producers.</p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="05c464d4-8dcb-446f-a725-547c94be3b1e" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.3Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.3Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.zip">activemq-cpp-library-3.4.3-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.zip.asc">activemq-cpp-library-3.4.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.gz">activemq-cpp-library-3.4.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.gz.asc">activemq-cpp-library-3.4.3-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.bz2">activemq-cpp-library-3.4.3-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.3-src.tar.bz2.asc">activemq-cpp-library-3.4.3-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.zip">activemq-cpp-library-3.4.3-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.zip.asc">activemq-cpp-library-3.4.3-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.gz">activemq-cpp-library-3.4.3-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.gz.asc">activemq-cpp-library-3.4.3-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.bz2">activemq-cpp-library-3.4.3-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.3-src.tar.bz2.asc">activemq-cpp-library-3.4.3-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.3Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="5028df99-e1dd-4bf4-9e96-47f9dd150adc" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.3/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.3Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12321240">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12321240">release notes</a></p></div>
 


[27/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-344-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-344-release.xml b/cms/activemq-cpp-344-release.xml
index 370e1cc..649be5b 100644
--- a/cms/activemq-cpp-344-release.xml
+++ b/cms/activemq-cpp-344-release.xml
@@ -1,32 +1,29 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.4Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release of the ActiveMQ-CPP client which includes some fixes for issues found since the v3.4.3 release.  This release resolves some memory and thread leaks found in the prior 3.4.x releases having to do with Connection shutdown.  Also the Windows project files are cleaned up a bit.  </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="8022618d-5a89-4e38-bda1-e28df001f7a8" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.4Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.4Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.zip">activemq-cpp-library-3.4.4-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.zip.asc">activemq-cpp-library-3.4.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.gz">activemq-cpp-library-3.4.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.gz.asc">activemq-cpp-library-3.4.4-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.bz2">activemq-cpp-library-3.4.4-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.4-src.tar.bz2.asc">activemq-cpp-library-3.4.4-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.zip">activemq-cpp-library-3.4.4-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.zip.asc">activemq-cpp-library-3.4.4-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.gz">activemq-cpp-library-3.4.4-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.gz.asc">activemq-cpp-library-3.4.4-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.bz2">activemq-cpp-library-3.4.4-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.4-src.tar.bz2.asc">activemq-cpp-library-3.4.4-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.4Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="840acb7b-d8f1-4c82-ad90-f49f9f242d8a" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.4/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.4Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12321703">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12321703">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-345-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-345-release.xml b/cms/activemq-cpp-345-release.xml
index 233d15c..9f43c23 100644
--- a/cms/activemq-cpp-345-release.xml
+++ b/cms/activemq-cpp-345-release.xml
@@ -1,32 +1,29 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.4.5Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a patch release of ActiveMQ-CPP that fixes several issues found since the v3.4.4 release. This release contains fixes for memory leaks that can occur when a socket connection is broken during a message marshal or unmarshal as well as fixes for some exceptions that were not being handled correctly internally in the Connection class.  Also a fix the STOMP messages and correlation-id are in this release. </p>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="e4ad3e7b-9426-4364-ae2a-c762996b63b0" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.4.5Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.4.5Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.zip">activemq-cpp-library-3.4.5-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.zip.asc">activemq-cpp-library-3.4.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.gz">activemq-cpp-library-3.4.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.gz.asc">activemq-cpp-library-3.4.5-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.bz2">activemq-cpp-library-3.4.5-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.4.5-src.tar.bz2.asc">activemq-cpp-library-3.4.5-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.zip">activemq-cpp-library-3.4.5-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.zip.asc">activemq-cpp-library-3.4.5-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.gz">activemq-cpp-library-3.4.5-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.gz.asc">activemq-cpp-library-3.4.5-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.bz2">activemq-cpp-library-3.4.5-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.4.5-src.tar.bz2.asc">activemq-cpp-library-3.4.5-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.4.5Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="3759455c-cc45-4731-9b63-ff88974acf63" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.4.5/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.4.5Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12323248">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12323248">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-350-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-350-release.xml b/cms/activemq-cpp-350-release.xml
index 8f82e35..f2e5a5e 100644
--- a/cms/activemq-cpp-350-release.xml
+++ b/cms/activemq-cpp-350-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.5.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new Major release of ActiveMQ-CPP with several new APIs and internal changes meant to improve overall stability of the C++ client.  Besides a large amount of bug fixing and memory fixing this release also features a lot of new features in the CMS API:</p>
 
 <ul><li>Added Message Transformation capabilities for incoming and outgoing messages.</li><li>You can now query for the type of a Message property so you can choose the best getter method.</li><li>MapMessage and StreamMessage object now expose an API to find out what type a value is before you try to get a value using one of the getter methods.</li><li>Polling consumers now can set a Message available listener.</li><li>Stomp clients can configure the destination prefixes for the Destination types (Queues, Topics...).</li><li>StreamMessage now has a reset method to allow object reuse.</li><li>Added an AdvisorySupport class to make dealing with advisory topics easier.</li><li>Added support for non-blocking sends to Message Producers.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="b9760e39-9635-4e7e-bc0c-2d1c72332201" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.5.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 2.4 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.4.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.5.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.zip">activemq-cpp-library-3.5.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.zip.asc">activemq-cpp-library-3.5.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.gz">activemq-cpp-library-3.5.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.gz.asc">activemq-cpp-library-3.5.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.bz2">activemq-cpp-library-3.5.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.5.0-src.tar.bz2.asc">activemq-cpp-library-3.5.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.zip">activemq-cpp-library-3.5.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.zip.asc">activemq-cpp-library-3.5.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.gz">activemq-cpp-library-3.5.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.gz.asc">activemq-cpp-library-3.5.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.bz2">activemq-cpp-library-3.5.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.5.0-src.tar.bz2.asc">activemq-cpp-library-3.5.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.5.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="678985c1-2a8a-47e0-a148-4ee9a30a20a1" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.5.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.5.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316380">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12316380">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-360-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-360-release.xml b/cms/activemq-cpp-360-release.xml
index 5a7ac84..5def1ca 100644
--- a/cms/activemq-cpp-360-release.xml
+++ b/cms/activemq-cpp-360-release.xml
@@ -1,33 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.6.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new Major release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.5.0 release which should reduce memory consumption and improve overall stability.  </p>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="92c7af68-d10b-4c21-bc04-8d24664d2555" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.6.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 3.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.6.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.zip">activemq-cpp-library-3.6.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.zip.asc">activemq-cpp-library-3.6.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.gz">activemq-cpp-library-3.6.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.gz.asc">activemq-cpp-library-3.6.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.bz2">activemq-cpp-library-3.6.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.6.0-src.tar.bz2.asc">activemq-cpp-library-3.6.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.zip">activemq-cpp-library-3.6.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.zip.asc">activemq-cpp-library-3.6.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.gz">activemq-cpp-library-3.6.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.gz.asc">activemq-cpp-library-3.6.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.bz2">activemq-cpp-library-3.6.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.6.0-src.tar.bz2.asc">activemq-cpp-library-3.6.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.6.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="a5e80eca-b60f-450c-ab57-dbba4e03122c" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.6.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.6.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12323973">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12323973">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-370-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-370-release.xml b/cms/activemq-cpp-370-release.xml
index 1b08381..4bc153e 100644
--- a/cms/activemq-cpp-370-release.xml
+++ b/cms/activemq-cpp-370-release.xml
@@ -1,35 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.7.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new Major release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.6.0 release which should reduce memory consumption and improve overall stability.  Some new features have been added as well.  </p>
 
 <ul><li>Added support of Optimized Acknowledge</li><li>Added support for Non-blocking redelivery.</li><li>Removed dependence on the APR-Util library.</li><li>Supports priority backup for Failover Transport</li><li>Supports the cluster rebalancing feature.</li><li>Message Audits to filter duplicates on Failover.</li><li>A lot of other little bug fixes and improvements.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="fc16e21a-a443-4421-a462-159b1ebfcf11" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.7.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 3.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.7.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.7.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.7.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.zip">activemq-cpp-library-3.7.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.zip.asc">activemq-cpp-library-3.7.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.gz">activemq-cpp-library-3.7.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.gz.asc">activemq-cpp-library-3.7.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.bz2">activemq-cpp-library-3.7.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.7.0-src.tar.bz2.asc">activemq-cpp-library-3.7.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.zip">activemq-cpp-library-3.7.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.zip.asc">activemq-cpp-library-3.7.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.gz">activemq-cpp-library-3.7.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.gz.asc">activemq-cpp-library-3.7.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.bz2">activemq-cpp-library-3.7.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.0-src.tar.bz2.asc">activemq-cpp-library-3.7.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.7.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<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="f49a8eac-35df-4f38-9f87-ef0aa2dafb79" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.7.0/
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.7.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324161">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324161">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-371-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-371-release.xml b/cms/activemq-cpp-371-release.xml
index 2b1d34c..c308873 100644
--- a/cms/activemq-cpp-371-release.xml
+++ b/cms/activemq-cpp-371-release.xml
@@ -1,33 +1,31 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.7.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new patch release of ActiveMQ-CPP, a lot of bugs have been fixed that were found in the v3.7.0 release which should reduce memory consumption and improve overall stability.  Several compilation fixes were made as well so things should be better on a number of platforms.  Fixes of note:</p>
 
 <ul><li>3.7.0 does not compile with gcc-4.4.7 on CentOS-6</li><li>APR-Util header include missed in latest release.</li><li>CMS FailoverTransport Leaks Socket Descriptors</li><li>closing a connection stalled in start because of failover should stop the transport safely.</li><li>Compilation Error Fix for Sun Studio under Solaris 10</li><li>Exception lifetime confusion can cause the application to crash</li><li>Connection didn't switch to the slave broker when the master broker is down</li><li>Commiting a session with a deleted consumer causes access violation</li><li>Compilation of 3.7.0 fails for Linux systems (Redhat 5.8 and SuSE SLES 10)</li><li>Cient doesn't work on Linux Red Hat 6.4 systems, fails when setting thread priority</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="f30d409a-d3b4-4d3a-9be0-75595f2b9241" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.7.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 3.1 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.7.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.zip">activemq-cpp-library-3.7.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.zip.asc">activemq-cpp-library-3.7.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.gz">activemq-cpp-library-3.7.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.gz.asc">activemq-cpp-library-3.7.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.bz2">activemq-cpp-library-3.7.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.7.1-src.tar.bz2.asc">activemq-cpp-library-3.7.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.zip">activemq-cpp-library-3.7.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.zip.asc">activemq-cpp-library-3.7.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.gz">activemq-cpp-library-3.7.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.gz.asc">activemq-cpp-library-3.7.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.bz2">activemq-cpp-library-3.7.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.7.1-src.tar.bz2.asc">activemq-cpp-library-3.7.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.7.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
+<h2>SVN Tag Checkout</h2>
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>svn co <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.7.1/">https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.7.1/</a></p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="6c37c90d-b6c3-481f-ab12-70006a81046c" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p>svn co <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.7.1/">https://svn.apache.org/repos/asf/activemq/activemq-cpp/tags/activemq-cpp-3.7.1/</a></p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.7.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324543">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324543">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-380-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-380-release.xml b/cms/activemq-cpp-380-release.xml
index 06b49b8..5e6ad83 100644
--- a/cms/activemq-cpp-380-release.xml
+++ b/cms/activemq-cpp-380-release.xml
@@ -1,34 +1,32 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.8.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new major release of ActiveMQ-CPP, a few bugs have been fixed that were found in the v3.7.0 and v3.7.1 releases which should reduce memory consumption and improve overall stability.  Several compilation fixes were made as well so things should be better on a number of platforms.  Also some new APIs were added to the CMS API to provide an event based construct to listen for addition and removal of destinations on the Broker.  Fixes of note:</p>
 
 <ul><li>3.7.0 does not compile with gcc-4.4.7 on CentOS-6</li><li>APR-Util header include missed in latest release.</li><li>CMS FailoverTransport Leaks Socket Descriptors</li><li>closing a connection stalled in start because of failover should stop the transport safely.</li><li>Compilation Error Fix for Sun Studio under Solaris 10</li><li>Exception lifetime confusion can cause the application to crash</li><li>Connection didn't switch to the slave broker when the master broker is down</li><li>Commiting a session with a deleted consumer causes access violation</li><li>Compilation of 3.7.0 fails for Linux systems (Redhat 5.8 and SuSE SLES 10)</li><li>Cient doesn't work on Linux Red Hat 6.4 systems, fails when setting thread priority</li><li>Exception "attempt to unlock read lock, not locked by current thread" when doing performance testing</li><li>For SSL connections ensure the SNI field is set.</li><li>Can't send to temporary queues created by name</li><li>Added Visual Studio 2010 pro
 ject files for the project.</li><li>Added Destination Source events based listener interfaces to the CMS API.</li></ul>
 
 
-<p><br clear="none" class="atl-forced-newline"></p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<p><br clear="none" class="atl-forced-newline"><structured-macro ac:macro-id="d1d5aa7a-14d6-43ae-95b8-310cb735092e" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ-CPP3.8.0Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 3.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.8.0Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.zip">activemq-cpp-library-3.8.0-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.zip.asc">activemq-cpp-library-3.8.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.gz">activemq-cpp-library-3.8.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.gz.asc">activemq-cpp-library-3.8.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.bz2">activemq-cpp-library-3.8.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.8.0-src.tar.bz2.asc">activemq-cpp-library-3.8.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.zip">activemq-cpp-library-3.8.0-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.zip.asc">activemq-cpp-library-3.8.0-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.gz">activemq-cpp-library-3.8.0-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.gz.asc">activemq-cpp-library-3.8.0-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.bz2">activemq-cpp-library-3.8.0-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.0-src.tar.bz2.asc">activemq-cpp-library-3.8.0-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.8.0Release-GitTagCheckout">Git Tag Checkout</h2>
+<h2>Git Tag Checkout</h2>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<structured-macro ac:macro-id="954b8b3d-f733-4c45-8aaa-effe62c2afc2" ac:name="panel" ac:schema-version="1"><rich-text-body>
 <p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a><br clear="none">
-git checkout tags/activemq-cpp-3.8.0</p>
-</div></div>
+git checkout tags/activemq-cpp-3.8.0</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.8.0Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324544">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324544">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-381-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-381-release.xml b/cms/activemq-cpp-381-release.xml
index 209132e..7dd1ee0 100644
--- a/cms/activemq-cpp-381-release.xml
+++ b/cms/activemq-cpp-381-release.xml
@@ -1,31 +1,29 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.8.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a new patch release that resolves a memory leak issue found in the 3.8.0 and 3.7.x releases.  If you are running an older release you are strongly advised to upgrade (you can work around the leak by disabling message audit in your ActiveMQConnectionFactory). </p>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div>
+<structured-macro ac:macro-id="b43a6b4d-1d71-4884-9e59-4a611fcb048d" ac:name="panel" ac:schema-version="1"><rich-text-body>
+<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.8.1Release-API">API</h2>
+<h2>API</h2>
 
 <p>This release is based on the CMS 3.2 API.</p>
 
-<p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
+<p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p>
 
-<h2 id="ActiveMQ-CPP3.8.1Release-DownloadHere">Download Here</h2>
+<h2>Download Here</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Download Link </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Windows </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.zip">activemq-cpp-library-3.8.1-src.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.zip.asc">activemq-cpp-library-3.8.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (gzipped) </p></td
 ><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.gz">activemq-cpp-library-3.8.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.gz.asc">activemq-cpp-library-3.8.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.bz2">activemq-cpp-library-3.8.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/activem
 q-cpp/source/activemq-cpp-library-3.8.1-src.tar.bz2.asc">activemq-cpp-library-3.8.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Download Link </p></th><th colspan="1" rowspan="1"><p> PGP Signature file of download </p></th></tr><tr><td colspan="1" rowspan="1"><p> Source code for Windows </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.zip">activemq-cpp-library-3.8.1-src.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.zip.asc">activemq-cpp-library-3.8.1-src.zip.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (gzipped) </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.gz">activemq-cpp-library-3.8.1-src.tar.gz</a> </p></td><td colspan="1" rowspan="1">
 <p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.gz.asc">activemq-cpp-library-3.8.1-src.tar.gz.asc</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.bz2">activemq-cpp-library-3.8.1-src.tar.bz2</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-3.8.1-src.tar.bz2.asc">activemq-cpp-library-3.8.1-src.tar.bz2.asc</a> </p></td></tr></tbody></table>
 
 
 
-<h2 id="ActiveMQ-CPP3.8.1Release-GitTagCheckout">Git Tag Checkout</h2>
+<h2>Git Tag Checkout</h2>
 
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<structured-macro ac:macro-id="a1d6119f-69dd-4a4e-a9c3-df00e5992710" ac:name="panel" ac:schema-version="1"><rich-text-body>
 <p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a><br clear="none">
-git checkout tags/activemq-cpp-3.8.1</p>
-</div></div>
+git checkout tags/activemq-cpp-3.8.1</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ-CPP3.8.1Release-Changelog">Changelog</h2>
+<h2>Changelog</h2>
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324975">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324975">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-382-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-382-release.xml b/cms/activemq-cpp-382-release.xml
index c5f9fdd..5742e7e 100644
--- a/cms/activemq-cpp-382-release.xml
+++ b/cms/activemq-cpp-382-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.8.2Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.8.2Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2 id="ActiveMQ-CPP3.8.2Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.zip">activemq-cpp-library-3.8.2-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.zip.asc">activemq-cpp-library-3.8.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.gz">activemq-cpp-library-3.8.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.gz.asc">activemq-cpp-library-3.8.2-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.bz2">activemq-cpp-library-3.8.2-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.bz2.asc">activemq-cpp-library-3.8.2-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.8.2Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a><br clear="none"> git checkout tags/activemq-cpp-3.8.2</p>
-</div></div><h2 id="ActiveMQ-CPP3.8.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12325248">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><structured-macro ac:macro-id="9c959107-12b4-4bac-8dae-a1530892aa4d" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist
 /activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.zip">activemq-cpp-library-3.8.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.zip.asc">activemq-cpp-library-3.8.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.gz">activemq-cpp-library-3.8.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.gz.asc">activemq-cpp-library-3.8.2-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/ac
 tivemq-cpp-library-3.8.2-src.tar.bz2">activemq-cpp-library-3.8.2-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.2/activemq-cpp-library-3.8.2-src.tar.bz2.asc">activemq-cpp-library-3.8.2-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="0d53d12e-7694-47b0-a256-f80b48366f08" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git</a><br clear="none"> git checkout tags/activemq-cpp-3.8.2</p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12325248">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-383-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-383-release.xml b/cms/activemq-cpp-383-release.xml
index c46540c..691e8ab 100644
--- a/cms/activemq-cpp-383-release.xml
+++ b/cms/activemq-cpp-383-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.8.3Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.8.3Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2 id="ActiveMQ-CPP3.8.3Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.zip">activemq-cpp-library-3.8.3-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.zip.asc">activemq-cpp-library-3.8.3-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz">activemq-cpp-library-3.8.3-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz.asc">activemq-cpp-library-3.8.3-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.bz2">activemq-cpp-library-3.8.3-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.bz2.asc">activemq-cpp-library-3.8.3-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.8.3Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.8.3</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.8.3Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12325744">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><structured-macro ac:macro-id="281495e5-c964-44e5-b296-1a0291e896a3" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist
 /activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.zip">activemq-cpp-library-3.8.3-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.zip.asc">activemq-cpp-library-3.8.3-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz">activemq-cpp-library-3.8.3-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz.asc">activemq-cpp-library-3.8.3-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/3.8
 .3/activemq-cpp-library-3.8.3-src.tar.bz2">activemq-cpp-library-3.8.3-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.bz2.asc">activemq-cpp-library-3.8.3-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="788a6db2-faba-4c5d-bf74-343c93803e12" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.8.3</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;style
 Name=Html&amp;version=12325744">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-384-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-384-release.xml b/cms/activemq-cpp-384-release.xml
index 752c72a..0be8424 100644
--- a/cms/activemq-cpp-384-release.xml
+++ b/cms/activemq-cpp-384-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.8.4Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.8.4Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2 id="ActiveMQ-CPP3.8.4Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.zip">activemq-cpp-library-3.8.4-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.zip.asc">activemq-cpp-library-3.8.4-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.gz">activemq-cpp-library-3.8.4-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.gz.asc">activemq-cpp-library-3.8.4-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.bz2">activemq-cpp-library-3.8.4-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.bz2.asc">activemq-cpp-library-3.8.4-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.8.4Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.8.4</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.8.4Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12327391">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a new patch release that resolves some issues that have been found since the last patch release.</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.6.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist
 /activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.zip">activemq-cpp-library-3.8.4-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.zip.asc">activemq-cpp-library-3.8.4-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.gz">activemq-cpp-library-3.8.4-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.gz.asc">activemq-cpp-library-3.8.4-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/ac
 tivemq-cpp-library-3.8.4-src.tar.bz2">activemq-cpp-library-3.8.4-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.8.4/activemq-cpp-library-3.8.4-src.tar.bz2.asc">activemq-cpp-library-3.8.4-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.8.4</span></p></rich-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=
 Html&amp;version=12327391">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/activemq-cpp-390-release.xml
----------------------------------------------------------------------
diff --git a/cms/activemq-cpp-390-release.xml b/cms/activemq-cpp-390-release.xml
index e701aa1..61d7f11 100644
--- a/cms/activemq-cpp-390-release.xml
+++ b/cms/activemq-cpp-390-release.xml
@@ -1,6 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ-CPP3.9.0Release-NewandNoteworthy">New and Noteworthy</h2><p>This is a new major release that resolves a number of issues found since the 3.8.x series was released.&#160; The client has been updated to include many of the same fixes that were placed into the ActiveMQ JMS client.&#160; Additional fixes for memory leaks and segfaults have been added as well.&#160;</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p>
-</div></div><h2 id="ActiveMQ-CPP3.9.0Release-API">API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2 id="ActiveMQ-CPP3.9.0Release-DownloadHere">Download Here</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip">activemq-cpp-library-3.9.0-src.zip</a></p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip.asc">activemq-cpp-library-3.9.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz">activemq-cpp-library-3.9.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz.asc">activemq-cpp-library-3.9.0-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2">activemq-cpp-library-3.9.0-src.tar.bz2</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2.asc">activemq-cpp-library-3.9.0-src.tar.bz2.asc</a></p></td></tr></tbody></table></div><h2 id="ActiveMQ-CPP3.9.0Release-GitTagCheckout">Git Tag Checkout</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.0</span></p>
-</div></div><h2 id="ActiveMQ-CPP3.9.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324974">release notes</a></p></div>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2><p>This is a new major release that resolves a number of issues found since the 3.8.x series was released.&#160; The client has been updated to include many of the same fixes that were placed into the ActiveMQ JMS client.&#160; Additional fixes for memory leaks and segfaults have been added as well.&#160;</p><structured-macro ac:macro-id="ffb0b158-d0aa-4c5f-97d2-778681956eac" ac:name="panel" ac:schema-version="1"><rich-text-body><p><strong>NOTE:</strong> Compatible with ActiveMQ Broker versions in the 4.X and 5.X family</p></rich-text-body></structured-macro><h2>API</h2><p>This release is based on the CMS 3.2 API.</p><p>Check out the API for this release <a shape="rect" href="http://activemq.apache.org/cms/api_docs/activemqcpp-3.9.0/html">here</a></p><h2>Download Here</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"
 ><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip">activemq-cpp-library-3.9.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip.asc">activemq-cpp-library-3.9.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (gzipped)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz">activemq-cpp-library-3.9.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz.asc">activemq-cpp-library-3.9.0-src.tar.gz.asc</a>
 </p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix (bz2)</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2">activemq-cpp-library-3.9.0-src.tar.bz2</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2.asc">activemq-cpp-library-3.9.0-src.tar.bz2.asc</a></p></td></tr></tbody></table><h2>Git Tag Checkout</h2><structured-macro ac:macro-id="97c66a3b-2056-4cd5-8082-0bf1d83b65dc" ac:name="panel" ac:schema-version="1"><rich-text-body><p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq-cpp.git">https://git-wip-us.apache.org/repos/asf/activemq-cpp.git<br clear="none"></a><span style="line-height: 1.4285715;">cd activemq-cpp<br clear="none">git checkout tags/3.9.0</span></p></rich-text-body></structured-ma
 cro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311207&amp;styleName=Html&amp;version=12324974">release notes</a></p></div>
 


[41/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-543-release.xml
----------------------------------------------------------------------
diff --git a/activemq-543-release.xml b/activemq-543-release.xml
index b7af54e..338b7b9 100644
--- a/activemq-543-release.xml
+++ b/activemq-543-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.4.3 is a maintenance release which resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>, a critical bug which caused the 5.4.0, 5.4.1, and 5.4.2 releases to be retracted.</p><h2 id="ActiveMQ5.4.3Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.zip">apache-activemq-5.4.3-bin.zip</a></p></td><td colspan="1" rows
 pan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.zip.asc">apache-activemq-5.4.3-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.tar.gz">apache-activemq-5.4.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.tar.gz.asc">apache-activemq-5.4.3-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.4.3Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the download
 ed files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.4.3Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="9fdf537d-513e-48cf-908a-e526e633292a" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.4.3 is a maintenance release which resolves <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>, a critical bug which caused the 5.4.0, 5.4.1, and 5.4.2 releases to be retracted.</p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.zip">apache-activemq-5.4.3-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq
 /5.4.3/apache-activemq-5.4.3-bin.zip.asc">apache-activemq-5.4.3-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.tar.gz">apache-activemq-5.4.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/apache-activemq-5.4.3-bin.tar.gz.asc">apache-activemq-5.4.3-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="374bb88a-aba4-4de4-b2a3-666eab66ba64" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://
 maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="9a5a889b-7eea-4402-864a-fc08b9e275a1" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.4.3&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.4.3Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.4.3Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.zip">activemq-parent-5.4.3-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.zip.
 asc">activemq-parent-5.4.3-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.tar.gz">activemq-parent-5.4.3-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.tar.gz.asc">activemq-parent-5.4.3-source-release.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.4.3Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.3
-]]></script>
-</div></div><p>Also see the previous <a shape="rect" href="activemq-542-release.xml">ActiveMQ 5.4.2 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="d0df1094-e342-43c0-88c4-ed2e5213190f" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.zip">activemq-parent-5.4.3-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.zip.asc">activemq-parent-5.4.3-source-release.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan
 ="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.tar.gz">activemq-parent-5.4.3-source-release.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.4.3/activemq-parent-5.4.3-source-release.tar.gz.asc">activemq-parent-5.4.3-source-release.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="e1f2f090-5641-4dbd-81a9-bfb4c545b78f" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.3
+</plain-text-body></structured-macro><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.4.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-550-release.xml
----------------------------------------------------------------------
diff --git a/activemq-550-release.xml b/activemq-550-release.xml
index b3a0898..361f5ae 100644
--- a/activemq-550-release.xml
+++ b/activemq-550-release.xml
@@ -1,38 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release has been retracted due to bug <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <a shape="rect" href="activemq-551-release.xml">ActiveMQ 5.5.1 Release</a> instead.</p></div></div><p>Apache ActiveMQ 5.5.0 is primarily a maintenance release which resolves over <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+12315626+AND+status+in+%28Resolved%2C+Closed%29+ORDER+BY+priority+DESC">130 issues</a>, mostly bug fixes and improvements</p><p></p><h2 id="ActiveMQ5.5.0Release-NewFeaturesin5.5.0">New Featur
 es in 5.5.0</h2>
-<ul><li>Dependency on Java 1.6 (java 1.5 is no longer supported)</li><li>MDC logging (<a shape="rect" class="external-link" href="http://slf4j.org/" rel="nofollow">SLF4J</a>)</li><li>Upgrade to camel 2.7.0</li><li>DLQ processing per durable subscription</li><li>New network connector MBeans</li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/configurable-ioexception-handling.html">IOExceptionHandler</a> for JDBC store</li><li>Added support for <a shape="rect" class="external-link" href="http://commons.apache.org/daemon/">Apache Commons Daemon</a></li></ul>
-
-
-<h2 id="ActiveMQ5.5.0Release-Improvementsin5.5.0">Improvements in 5.5.0</h2>
-<ul><li>Improved support for recovery of durable subscribers with priority support</li><li>Improved performance for offline durable subscriptions with large message backlogs (JDBC store)</li><li>better support for Guest login via JAAS</li></ul>
-
-<h2 id="ActiveMQ5.5.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.zip">apache-activemq-5.5.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.zip.asc">apache-activemq-5.5.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" 
 class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.tar.gz">apache-activemq-5.5.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.tar.gz.asc">apache-activemq-5.5.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.5.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Do
 wnload the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.5.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="ce18c011-1795-4e65-aad9-bce312d7065e" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="a5253e2e-cc15-45bc-8855-51784e15c6bc" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>This release has been retracted due to bug <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>. It is no longer downloadable from ASF servers. Please use the <link><page ri:content-title="ActiveMQ 5.5.1 Release"></page></link> instead.</p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.5.0 is primarily a maintenance release which resolves over <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+12315626+AND+status+in+%28Resolved%2C+Closed%29+ORDER+BY+priority+DESC">130 issues</a>, mostly bug fixes and improvements</p><p><stru
 ctured-macro ac:macro-id="bb01b72c-face-4f5d-b367-c288641d1e1a" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.5"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.zip">apache-activemq-5.5.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.zip.asc">apache-activemq-5.5.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td co
 lspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.tar.gz">apache-activemq-5.5.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/apache-activemq-5.5.0-bin.tar.gz.asc">apache-activemq-5.5.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="57c3b26b-459a-4457-b2a6-b39e0e437b35" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="06905d8a-dc91-4725-a5d6-5f102422459b" ac:name="code" a
 c:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.5.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.5.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.5.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/activemq-parent-5.5.0-source-release.zip">activemq-parent-5.5.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/activemq-parent-5.5.0-source-release.zip.asc"
 >activemq-parent-5.5.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.5.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.5.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.5.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;styleName=Html&amp;version=12315626">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-542-release.xml">ActiveMQ 5.4.2 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="dd3c9aeb-4c0b-442d-af88-c09ff004e47a" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/activemq-parent-5.5.0-source-release.zip">activemq-parent-5.5.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.0/activemq-parent-5.5.0-source-release.zip.asc">activemq-parent-5.5.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="4fad5d4a-9ff0-4
 26d-8920-e8de04c6fd5e" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.5.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;styleName=Html&amp;version=12315626">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.4.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-551-release.xml
----------------------------------------------------------------------
diff --git a/activemq-551-release.xml b/activemq-551-release.xml
index bff7346..46c7dc3 100644
--- a/activemq-551-release.xml
+++ b/activemq-551-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.5.1 is a maintenance release which resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>, a critical bug which caused the 5.5.0 release to be retracted.</p><h2 id="ActiveMQ5.5.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.zip">apache-activemq-5.5.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="conf
 luenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.zip.asc">apache-activemq-5.5.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.tar.gz">apache-activemq-5.5.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.tar.gz.asc">apache-activemq-5.5.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.5.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the 
 PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.5.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="149e73d0-1690-45aa-bf52-478c3f1e622f" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.5.1 is a maintenance release which resolves <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-3491">AMQ-3491</a>, a critical bug which caused the 5.5.0 release to be retracted.</p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.zip">apache-activemq-5.5.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activ
 emq-5.5.1-bin.zip.asc">apache-activemq-5.5.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.tar.gz">apache-activemq-5.5.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.tar.gz.asc">apache-activemq-5.5.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="889ab8bb-6dfa-4ca6-851d-3e53b6e329fa" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/gu
 ides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="d8b9a537-55f1-45da-9ca8-ad1f2c3ba842" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.5.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.5.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.5.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/activemq-parent-5.5.1-source-release.zip">activemq-parent-5.5.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/activemq-parent-5.5.1-source-release.zip.asc"
 >activemq-parent-5.5.1-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.5.1Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.5.1
-]]></script>
-</div></div><p>Also see the previous <a shape="rect" href="activemq-550-release.xml">ActiveMQ 5.5.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="ae1ee154-3001-47c0-a6af-0aab887f2058" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/activemq-parent-5.5.1-source-release.zip">activemq-parent-5.5.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/activemq-parent-5.5.1-source-release.zip.asc">activemq-parent-5.5.1-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="283e5b6b-9b9a-4
 516-902b-4330fea749e3" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.5.1
+</plain-text-body></structured-macro><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.5.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-560-release.xml
----------------------------------------------------------------------
diff --git a/activemq-560-release.xml b/activemq-560-release.xml
index ce1fd09..8f6e057 100644
--- a/activemq-560-release.xml
+++ b/activemq-560-release.xml
@@ -1,33 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.6.0 is primarily a maintenance release which resolves over <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+12317974+AND+status+in+%28Resolved%2C+Closed%29+ORDER+BY+priority+DESC">435 issues</a>, mostly bug fixes and improvements</p><p></p><h2 id="ActiveMQ5.6.0Release-NewFeaturesin5.6.0">New Features in 5.6.0</h2>
-
-<ul class="alternate"><li>LevelDB Store</li><li>MQTT transport</li><li>New LDAP security module</li><li>Stomp 1.1 support</li><li>stomp+nio+ssl transport</li><li>Multi KahaDB persistence</li><li>Priority Failover URIs</li><li>Automatic client rebalance in broker cluster</li></ul><h2 id="ActiveMQ5.6.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.zip">apache-activemq-5.6.0-bin.zip</a></p><
 /td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.zip.asc">apache-activemq-5.6.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.tar.gz">apache-activemq-5.6.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.tar.gz.asc">apache-activemq-5.6.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.6.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the i
 ntegrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.6.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="a087644e-729b-4432-8b75-fc8eb5c0461e" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.6.0 is primarily a maintenance release which resolves over <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+12317974+AND+status+in+%28Resolved%2C+Closed%29+ORDER+BY+priority+DESC">435 issues</a>, mostly bug fixes and improvements</p><p><structured-macro ac:macro-id="d34296c8-a08c-466e-ac9b-d4728fe62c56" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.6"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan=
 "1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.zip">apache-activemq-5.6.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.zip.asc">apache-activemq-5.6.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.tar.gz">apache-activemq-5.6.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/apache-activemq-5.6.0-bin.tar.gz.asc">apache-activemq-5.6.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="8ee71ef1-dbae-4f32-9f7d-f6c85c58ecb
 a" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="7ddaa2b0-52f1-4757-9b95-74805093e5c3" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.6.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.6.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.6.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/activemq-parent-5.6.0-source-release.zip">activemq-parent-5.6.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/activemq-parent-5.6.0-source-release.zip.asc"
 >activemq-parent-5.6.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.6.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.6.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.6.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12317974">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-551-release.xml">ActiveMQ 5.5.1 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="ad8e3944-b2c3-4d68-8b12-98a38a831240" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/activemq-parent-5.6.0-source-release.zip">activemq-parent-5.6.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.6.0/activemq-parent-5.6.0-source-release.zip.asc">activemq-parent-5.6.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="b2594842-c4ec-4
 4d7-b70b-6aaeb5f433c1" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.6.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12317974">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.5.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-570-release.xml
----------------------------------------------------------------------
diff --git a/activemq-570-release.xml b/activemq-570-release.xml
index 35a207a..26e8732 100644
--- a/activemq-570-release.xml
+++ b/activemq-570-release.xml
@@ -1,31 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.7.0 is primarily a maintenance release which resolves nearly <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.7.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">200 issues</a>, mostly bug fixes and improvements</p><p></p><ul><li>Java 7 support (compiled with jdk6 and validated with jdk7)</li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/websockets.html#WebSockets-SecureWebSockets">Secure WebSockets (wss) transport </a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/message-redelivery-and-dlq-handling.html#MessageRedeliveryandDLQHandling-BrokerRedelivery%28v5.7%29">Broker Based Redelivery</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/pluggable-storage-lockers.html">Pluggable Store Lockers</a></li><li><a shape="rect" class="external-li
 nk" href="http://activemq.apache.org/pluggable-storage-lockers.html#Pluggablestoragelockers-LeaseDatabaseLocker">Lease based database locker</a></li><li>Set a <a shape="rect" class="external-link" href="http://activemq.apache.org/redelivery-policy.html#RedeliveryPolicy-RedeliveryPolicyperDestination">RedeliveryPolicy per destination</a></li><li>Includes <a shape="rect" class="external-link" href="http://camel.apache.org/camel-2100-release.html">Apache Camel 2.10</a></li></ul><h2 id="ActiveMQ5.7.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"
  class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.zip">apache-activemq-5.7.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.zip.asc">apache-activemq-5.7.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.tar.gz">apache-activemq-5.7.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.tar.gz.asc">apache-activemq-5.7.0
 -bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.7.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.7.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="6c06cdf2-5a57-4f9c-a903-cba298a9b18e" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.7.0 is primarily a maintenance release which resolves nearly <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.7.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">200 issues</a>, mostly bug fixes and improvements</p><p><structured-macro ac:macro-id="c9a46d0d-78d5-44ee-9568-f75c7865756c" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.7"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td cols
 pan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.zip">apache-activemq-5.7.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.zip.asc">apache-activemq-5.7.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.tar.gz">apache-activemq-5.7.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/apache-activemq-5.7.0-bin.tar.gz.asc">apache-activemq-5.7.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="2f9cc2b7-2544-40bc-8ebf-7e4d5a8
 6794c" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="b0952581-f297-475b-9e29-0672a1d54ba5" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.7.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.7.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.7.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/activemq-parent-5.7.0-source-release.zip">activemq-parent-5.7.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/activemq-parent-5.7.0-source-release.zip.asc"
 >activemq-parent-5.7.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.7.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.7.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.7.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12321258">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-560-release.xml">ActiveMQ 5.6.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="ebaa5719-945e-4667-afd4-ff51ce706a98" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/activemq-parent-5.7.0-source-release.zip">activemq-parent-5.7.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.7.0/activemq-parent-5.7.0-source-release.zip.asc">activemq-parent-5.7.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="d385533c-f27b-4
 b80-b122-b5bd18d85a27" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.7.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12321258">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.6.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-580-release.xml
----------------------------------------------------------------------
diff --git a/activemq-580-release.xml b/activemq-580-release.xml
index 9e7863b..8186c90 100644
--- a/activemq-580-release.xml
+++ b/activemq-580-release.xml
@@ -1,40 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.8.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.8.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">160 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p></p><ul><li><a shape="rect" href="amqp.xml">AMQP</a></li><li>new feature modules and activemq-client module allowing smaller foorprint</li><li>management via <a shape="rect" href="rest.xml#REST-REST-RestManagement">REST</a> with <a shape="rect" class="external-link" href="http://www.jolokia.org/" rel="nofollow">jolokia</a> jmx to http bridge</li><li>Includes <a shape="rect" class="external-link" href="http://camel.apache.org/camel-2103-release.html">Apache Camel 2.10.3</a></li><li>Java 7 support (compiled with jdk6 and validated with jdk7)</li><li><a shape="rect" href="pure-master-slave.xml">Pure Master Slave</a> no longer suppo
 rted</li></ul> There are some changes in 5.8 that may require some code change
-
-<ol><li>New modules may effect your maven pom dependencies<br clear="none">
-<code>activemq-core</code> has been replaced with <code>activemq-client</code> and <code>activemq-broker</code>. The various message stores have their own activemq-xx-store module. The uber module <code>activemq-all</code> remains.</li><li>Changed JMX Mbean ObjectNames will effect scripts or tools that directly reference Mbean names<br clear="none">
-All mbeans now share the type=Broker attribute, which gives them containment. In this way, consumers hang off of destinations, which hang off the broker.<br clear="none">
-The different Mbean types are identified by the presence of specific identifiers in their ObjectNames. The mapping from old to new ObjectName is as follows:
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Old Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> New Name </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Destination </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Queue|Topic,Destination=&lt;destination identifier&gt; </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,destinationType=Queue|Topic,destinationName=&lt;destination identifier&gt; </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Connector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Con
 nector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=clientConnectors </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> NetworkConnector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=NetworkConnector </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=networkConnectors </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Connection </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Type=Connection </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> type=Broker,connector=*,connectionViewType=remoteAddress|clientId </p></td></tr></tbody></table></div>
-</li><li>OSGi integration has changed. The full details are at <a shape="rect" href="osgi-integration.xml">OSGi Integration</a>. In summary:
-	<ol><li>There is a single uber OSGI bundle</li><li>The broker and webconsole are now configured via config admin pid files through an OSGi managed service factory.</li></ol>
-	</li><li>The ActiveMQ binary file <code>bin/run.jar</code> has been renamed to <code>bin/activemq.jar</code>.</li></ol><h2 id="ActiveMQ5.8.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.zip">apache-activemq-5.8.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.
 0/apache-activemq-5.8.0-bin.zip.asc">apache-activemq-5.8.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.tar.gz">apache-activemq-5.8.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.tar.gz.asc">apache-activemq-5.8.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.8.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><l
 i>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.8.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="6c3bb079-92bb-42d3-a311-08ff6d5c107f" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.8.0 resolves <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.8.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">160 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p><structured-macro ac:macro-id="576415ce-1b9c-4bc0-b0bd-95de9d33823d" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.8"></page></link></parameter></structured-macro> <structured-macro ac:macro-id="5e84bd11-540b-4fd3-8caa-214f9e289b94" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="5.8 Migration Guide"></page></link></parameter></structured-macro></p><h2>Getting the Binary Distributio
 ns</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.zip">apache-activemq-5.8.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.zip.asc">apache-activemq-5.8.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.tar.gz">apache-activemq-5.8.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apac
 he.org/dist/activemq/apache-activemq/5.8.0/apache-activemq-5.8.0-bin.tar.gz.asc">apache-activemq-5.8.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="b6e9d1a4-76b8-4c07-b014-c158bc3c2cd9" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="0d434389-7bb2-4dd2-a337-07ed9e3d98b8" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.8.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.8.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.8.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/activemq-parent-5.8.0-source-release.zip">activemq-parent-5.8.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/activemq-parent-5.8.0-source-release.zip.asc"
 >activemq-parent-5.8.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.8.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.8.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.8.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323282">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-570-release.xml">ActiveMQ 5.7.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="71b85c08-b789-45d0-8cbe-c335a03d8650" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/activemq-parent-5.8.0-source-release.zip">activemq-parent-5.8.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.8.0/activemq-parent-5.8.0-source-release.zip.asc">activemq-parent-5.8.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="28afd1d4-f143-4
 d8e-bed4-e16141a668ad" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.8.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323282">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.7.0 Release"></page></link></p></div>
 


[47/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-412-release.xml
----------------------------------------------------------------------
diff --git a/activemq-412-release.xml b/activemq-412-release.xml
index 8d11cc3..653bce4 100644
--- a/activemq-412-release.xml
+++ b/activemq-412-release.xml
@@ -1,59 +1,46 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="adb7e2bb-80d2-4600-a407-b06e9be999bf" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></url></image></p></rich-text-body></structured-macro>
 
-
-
-
-<div style="min-height:200px">
-<h2 id="ActiveMQ4.1.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<structured-macro ac:macro-id="d9aaef9d-e61f-4f60-842f-267fbd13e127" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
+<h2>New and Noteworthy</h2>
 
 <p>Contains slew of bug fixes that are tracked in the change log.</p>
 
-<h2 id="ActiveMQ4.1.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
+<h2>Getting the Binary Distributions</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.zip">apache-activemq-4.1.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.zip.asc">apache-activemq-4.1.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" clas
 s="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.tar.gz">apache-activemq-4.1.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.tar.gz.asc">apache-activemq-4.1.2-bin.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.zip">apache-activemq-4.1.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.zip.asc">apache-activemq-4.1.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.tar.gz">apache-activemq-4.1.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.
 org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-bin.tar.gz.asc">apache-activemq-4.1.2-bin.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.1.2Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
+<h2>Getting the Binaries using Maven 2</h2>
 
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
+<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</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="1745a3eb-65f2-4234-8e75-0c772cc44a84" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;4.1.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div>
-</div>
-
+</plain-text-body></structured-macro>
+</rich-text-body></structured-macro>
 
+<h2>Getting the Source Code</h2>
 
+<h3>Source Distributions</h3>
 
-<h2 id="ActiveMQ4.1.2Release-GettingtheSourceCode">Getting the Source Code</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.zip">apache-activemq-4.1.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.zip.asc">apache-activemq-4.1.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.tar.gz">apache-activemq-4.1.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/
 dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.tar.gz.asc">apache-activemq-4.1.2-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
-<h3 id="ActiveMQ4.1.2Release-SourceDistributions">Source Distributions</h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.zip">apache-activemq-4.1.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.zip.asc">apache-activemq-4.1.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.tar.gz">apache-activemq-4.1.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.2/apache-activemq-4.1.2-src.tar.gz.asc">apache-activemq-4.1.2-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h3>SVN Tag Checkout</h3>
 
-
-<h3 id="ActiveMQ4.1.2Release-SVNTagCheckout">SVN Tag Checkout</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="cab11c13-707c-4236-af36-710492cceb2b" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.2
-]]></script>
-</div></div>
-
-<h2 id="ActiveMQ4.1.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11801&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+</plain-text-body></structured-macro>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11801&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
+<structured-macro ac:macro-id="b3cfbe4b-3b3f-4e40-96a2-7fa80738b266" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11801&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>
 
-<p>Also see the previous <a shape="rect" href="activemq-411-release.xml">ActiveMQ 4.1.1 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.1.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-500-release.xml
----------------------------------------------------------------------
diff --git a/activemq-500-release.xml b/activemq-500-release.xml
index 9a5b12d..a7b7c81 100644
--- a/activemq-500-release.xml
+++ b/activemq-500-release.xml
@@ -1,45 +1,28 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="/confluence/download/attachments/72278/activemq-5.x-box-reflection.png?version=1&amp;modificationDate=1207832700000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="59671794" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="activemq-5.x-box-reflection.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="72278" data-linked-resource-container-version="14"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="921c3ad5-f110-467b-bb7d-7d9b55a9522a" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><attachment ri:filename="activemq-5.x-box-reflection.png"></attachment></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="ce86d20d-34ec-4b96-b6cc-8b5cb02c3705" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
 
+<structured-macro ac:macro-id="a026b8c3-72f3-403d-a6c6-021861aa59ce" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.0"></page></link></parameter></structured-macro>
 
-<div style="min-height:200px">
+<h2>Getting the Binary Distributions</h2>
 
-<h2 id="ActiveMQ5.0.0Release-NewFeaturesin5.0">New Features in 5.0</h2>
 
-<p>In the 5.0 release of Apache ActiveMQ there are the following new features:</p>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.zip">apache-activemq-5.0.0.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.zip.asc">apache-activemq-5.0.0.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.tar.gz">apache-activemq-5.0.0.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apac
 he-activemq/5.0.0/apache-activemq-5.0.0.tar.gz.asc">apache-activemq-5.0.0.tar.gz.asc</a></p></td></tr></tbody></table>
 
-<ul><li><a shape="rect" href="amq-message-store.xml">AMQ Message Store</a> (Faster Persistence!)</li><li><a shape="rect" href="message-cursors.xml">Message Cursors</a> (To handle very large number of stored messages)</li><li><a shape="rect" href="blob-messages.xml">Blob Messages</a></li><li><a shape="rect" href="command-agent.xml">Command Agent</a></li><li><a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel Integration</a></li><li><a shape="rect" href="logging-a-warning-if-you-forget-to-start-a-connection.xml">Logging a warning if you forget to start a Connection</a></li><li><a shape="rect" href="message-transformation.xml">Message Transformation</a></li><li><a shape="rect" href="mirrored-queues.xml">Mirrored Queues</a></li><li><a shape="rect" href="producer-flow-control.xml">Producer Flow Control</a></li></ul>
 
-<h2 id="ActiveMQ5.0.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
+<structured-macro ac:macro-id="196f5825-a4a1-4fcd-a316-82ac54d91923" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Do not use Safari to download, the above URLs use redirection</parameter><rich-text-body>
+<p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" href="http://www.mozilla.com/en-US/firefox/">FireFox</a></p></rich-text-body></structured-macro>
 
+<h2>Getting the Binaries using Maven 2</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.zip">apache-activemq-5.0.0.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.zip.asc">apache-activemq-5.0.0.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd
 "><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.tar.gz">apache-activemq-5.0.0.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0.tar.gz.asc">apache-activemq-5.0.0.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
 
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Do not use Safari to download, the above URLs use redirection</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" class="external-link" href="http://www.mozilla.com/en-US/firefox/" rel="nofollow">FireFox</a></p></div></div>
-
-<h2 id="ActiveMQ5.0.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
-
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</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="be4e8bb9-5179-4982-a18a-1653698cac71" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.0.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div>
-</div>
-
-
-<h2 id="ActiveMQ5.0.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.0.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.zip">apache-activemq-5.0.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.zip.asc">apache-activemq-5.0.0-src.zi
 p.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.tar.gz">apache-activemq-5.0.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.tar.gz.asc">apache-activemq-5.0.0-src.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.0.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.0.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.0.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11712&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p><p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-<p>Also see the previous <a shape="rect" href="activemq-411-release.xml">ActiveMQ 4.1.1 Release</a></p></div>
+</plain-text-body></structured-macro>
+</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.zip">apache-activemq-5.0.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.zip.asc">apache-activemq-5.0.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.tar.gz">apache-activemq-5.0.0-src.tar.g
 z</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.0.0/apache-activemq-5.0.0-src.tar.gz.asc">apache-activemq-5.0.0-src.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="9a8558b6-ff9b-47aa-b6e6-1e3cd4e1c992" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.0.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11712&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p><p><structured-macro ac:macro-id="58aa6862-801e-4b2a-b296-a9e50b5f9259" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11712&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 4.1.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-510-release.xml
----------------------------------------------------------------------
diff --git a/activemq-510-release.xml b/activemq-510-release.xml
index a831dd6..e79abf2 100644
--- a/activemq-510-release.xml
+++ b/activemq-510-release.xml
@@ -1,46 +1,23 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="3a4d805f-5a60-4fe0-9d1e-092bf9446812" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="0f60386e-cdcc-429b-bbf3-96f0ef2b5c54" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
 
+<structured-macro ac:macro-id="d62d6b9c-662a-4fe8-89d6-03c8c27c9db6" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.1"></page></link></parameter></structured-macro>
 
-<div style="min-height:200px">
+<h2>Getting the Binary Distributions</h2>
 
-<h2 id="ActiveMQ5.1.0Release-NewFeaturesin5.1">New Features in 5.1</h2>
 
-<p>In the 5.1.x release of Apache ActiveMQ there are the following new features:</p>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.zip">apache-activemq-5.1.0-bin.zip</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/apache-activemq-5.1.0-bin.zip.asc">apache-activemq-5.1.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.tar.gz">apache-activemq-5.1.0-bin.tar.gz</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/
 dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.tar.gz.asc">apache-activemq-5.1.0-bin.tar.gz.asc</a></p></td></tr></tbody></table>
 
-<ul><li>You can use the new <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.
-<h2 id="ActiveMQ5.1.0Release-NewFeaturesin5.1.1">New Features in 5.1</h2></li><li>Support for more graceful handling of <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-1517">timeouts within MessageProducer.send</a></li><li>Add the option for a <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ-1572">backup channel that is already connected for the Failover transport</a></li><li>ActiveMQ configuration can now validate against an XSD which means that it can be embedded in a spring configuration file.</li><li>Stomp can now handle delivering Map and Object messages.</li></ul>
 
+<structured-macro ac:macro-id="f470ad0a-c90b-4aed-ae1c-a47258e4bbf7" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Do not use Safari to download, the above URLs use redirection</parameter><rich-text-body>
+<p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" href="http://www.mozilla.com/en-US/firefox/">FireFox</a></p></rich-text-body></structured-macro>
 
+<structured-macro ac:macro-id="52a39382-420f-473f-b1ee-7c98a4a63d05" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro>
 
-<h2 id="ActiveMQ5.1.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.zip">apache-activemq-5.1.0-bin.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/apache-activemq-5.1.0-bin.zip.asc">apache-activemq-5.1.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.tar.gz">apache-activemq-5.1.0-bin.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-bin.tar.gz.asc">apache-activemq-5.1.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Do not use Safari to download, the above URLs use redirection</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using <a shape="rect" class="external-link" href="http://www.mozilla.com/en-US/firefox/" rel="nofollow">FireFox</a></p></div></div>
-
-<h2 id="ActiveMQ5.1.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Error When Expanding Tarballs</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="1039a25b-c5ed-4fa0-8c2e-0bccd4ff54e7" ac:name="tip" ac:schema-version="1"><parameter ac:name="title">Error When Expanding Tarballs</parameter><rich-text-body>
 <p>When expanding the binary tarballs you might wind up experiencing 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="e796ae17-de14-452c-97a2-48a300eb1828" ac:name="code" ac:schema-version="1"><plain-text-body> 
 $ tar zxvf /path/to/apache-activemq-5.1.0-bin.tar.gz
 apache-activemq-5.1.0/bin/run.jar
 apache-activemq-5.1.0/activemq-all-5.1.0.jar
@@ -52,32 +29,21 @@ apache-activemq-5.1.0/webapps/fileserver/WEB-INF/classes/org/apache/activemq/uti
 tar: Unexpected EOF in archive
 tar: A lone zero block at 61740
 tar: Error exit delayed from previous errors
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>These errors are a product of an open <a shape="rect" class="external-link" href="http://jira.codehaus.org/browse/MASSEMBLY-302" rel="nofollow">bug in Maven</a> and are innocuous and won't affect anything.</p></div></div>
+<p>These errors are a product of an open <a shape="rect" href="http://jira.codehaus.org/browse/MASSEMBLY-302">bug in Maven</a> and are innocuous and won't affect anything.</p></rich-text-body></structured-macro>
 
-<h2 id="ActiveMQ5.1.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
+<h2>Getting the Binaries using Maven 2</h2>
 
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
+<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</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="c6bf1393-c057-4f86-821b-9bfd3c176877" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;5.1.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div>
-</div>
-
-
-<h2 id="ActiveMQ5.1.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.1.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.zip">apache-activemq-5.1.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.zip.asc">apache-activemq-5.1.0-src.zi
 p.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.tar.gz">apache-activemq-5.1.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.tar.gz.asc">apache-activemq-5.1.0-src.tar.gz.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.1.0Release-SVNTagCheckout">SVN Tag Checkout</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[svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.1.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.1.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11802&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p><p></p><div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
-<p>Also see the previous <a shape="rect" href="activemq-500-release.xml">ActiveMQ 5.0.0 Release</a></p></div>
+</plain-text-body></structured-macro>
+</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.zip">apache-activemq-5.1.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.zip.asc">apache-activemq-5.1.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.tar.gz">apache-activemq-5.1.0-src.tar.g
 z</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.1.0/apache-activemq-5.1.0-src.tar.gz.asc">apache-activemq-5.1.0-src.tar.gz.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="e95d37ce-297f-4204-9eed-717027d99571" ac:name="code" ac:schema-version="1"><plain-text-body>svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-5.1.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11802&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p><p><structured-macro ac:macro-id="8642b5a0-fa7e-4975-95bf-3ab5e6147c11" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11802&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.0.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5100-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5100-release.xml b/activemq-5100-release.xml
index 8454334..70d2c56 100644
--- a/activemq-5100-release.xml
+++ b/activemq-5100-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.10.0Release-ActiveMQ5.10.0Release">ActiveMQ 5.10.0 Release</h2><p>Apache ActiveMQ 5.10.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5061?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.10.0%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC">more than 234 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><h3 id="ActiveMQ5.10.0Release-NewFeaturesandnoteworthyimprovementsandfixes">New Features and noteworthy improvements and fixes</h3><ul><li>Java 8 support</li><li>Apache Shiro Security Plugin -&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/shiro.html">http://activemq.apache.org/shiro.html</a></li><li>Hardened MQTT support</li><li>Hardened AMQP support</li><li>Hardened LevelDB store</li><li>Improved RAR/JCA adapter</li><li>Improved Runtime configuration plugin</li><li>Improved Web console</li></ul><h3 id="ActiveMQ5.10.0Release-Migratio
 nGuide">Migration Guide</h3><ul><li>Removed <code>org.apache.activemq.camel.converter.IdentityMessageReuseConverter</code> class from the <code>activemq-camel</code> component.</li></ul><h2 id="ActiveMQ5.10.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.zip">apache-activemq-5.10.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http:/
 /archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.zip.asc">apache-activemq-5.10.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz">apache-activemq-5.10.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz.asc">apache-activemq-5.10.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.10.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these 
 steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.10.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="2b816b48-0ce8-4428-9f7a-3ce13990b456" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.10.0 Release</h2><p>Apache ActiveMQ 5.10.0 resolves <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-5061?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.10.0%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC">more than 234 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><h3>New Features and noteworthy improvements and fixes</h3><ul><li>Java 8 support</li><li>Apache Shiro Security Plugin -&#160;<a shape="rect" href="http://activemq.apache.org/shiro.html">http://activemq.apache.org/shiro.html</a><
 /li><li>Hardened MQTT support</li><li>Hardened AMQP support</li><li>Hardened LevelDB store</li><li>Improved RAR/JCA adapter</li><li>Improved Runtime configuration plugin</li><li>Improved Web console</li></ul><h3>Migration Guide</h3><ul><li>Removed <code>org.apache.activemq.camel.converter.IdentityMessageReuseConverter</code> class from the <code>activemq-camel</code> component.</li></ul><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.zip">apache-activemq-5.10.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.zip
 .asc">apache-activemq-5.10.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz">apache-activemq-5.10.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz.asc">apache-activemq-5.10.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="22429d97-e64a-4d5a-a414-f45c4a71f6af" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM
 </a> is:</p><structured-macro ac:macro-id="68d18794-fb7b-463d-8646-351f4e4bb4f8" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.10.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.10.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.10.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.0/activemq-parent-5.10.0-source-release.zip">activemq-parent-5.10.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.10.0/activemq-parent-5.10.0-source-release.zip.asc">activemq-parent
 -5.10.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.10.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0</a></p><h2 id="ActiveMQ5.10.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12324950">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-590-release.xml">ActiveMQ 5.9.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="c4f08922-bdc7-4ccc-b40c-959a578a51f2" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.0/activemq-parent-5.10.0-source-release.zip">activemq-parent-5.10.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/
 dist/activemq/5.10.0/activemq-parent-5.10.0-source-release.zip.asc">activemq-parent-5.10.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12324950">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.9.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5101-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5101-release.xml b/activemq-5101-release.xml
index 42879a3..5669e1a 100644
--- a/activemq-5101-release.xml
+++ b/activemq-5101-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.10.1Release-ActiveMQ5.10.1Release">ActiveMQ 5.10.1 Release</h2><p>Apache ActiveMQ 5.10.1 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-5514?jql=fixVersion%20%3D%205.10.1%20AND%20project%20%3D%20AMQ">33 issues</a>, mostly bug fixes.</p><h3 id="ActiveMQ5.10.1Release-GettingtheBinaryDistributions"><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apa
 che.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.zip">apache-activemq-5.10.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.zip.asc">apache-activemq-5.10.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.tar.gz">apache-activemq-5.10.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.tar.gz.asc">apache-activemq-5.10.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.10.1Release-VerifytheIntegrityofDownloads">Verify the Integ
 rity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.10.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="87e9bf30-9a8a-4aef-b07c-763a2f49a1cf" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.10.1 Release</h2><p>Apache ActiveMQ 5.10.1 resolves <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-5514?jql=fixVersion%20%3D%205.10.1%20AND%20project%20%3D%20AMQ">33 issues</a>, mostly bug fixes.</p><h3><span style="font-size: 20.0px;font-weight: normal;line-height: 1.5;">Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan
 ="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.zip">apache-activemq-5.10.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.zip.asc">apache-activemq-5.10.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.tar.gz">apache-activemq-5.10.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.1/apache-activemq-5.10.1-bin.tar.gz.asc">apache-activemq-5.10.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="d9e7c120-555c-4df2-908d-62a8e6d0ba0a" ac:name="include" ac:schema-version="1"><parameter ac:name="
 "><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="067bb458-fa21-4f3e-8b63-835ba93a7094" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.10.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.10.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.10.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/5.10.1/activemq-parent-5.10.1-source-release.zip">activemq-parent-5.10.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.10.1/activemq-parent-5.10.1-source-release.zip.asc">activemq-parent-5.10.1-
 source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.10.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.1</a></p><h2 id="ActiveMQ5.10.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12326456">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-5100-release.xml">ActiveMQ 5.10.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="f43d3185-ed06-471c-9bf1-19a2e1fc09f3" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/5.10.1/activemq-parent-5.10.1-source-release.zip">activemq-parent-5.10.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/act
 ivemq/5.10.1/activemq-parent-5.10.1-source-release.zip.asc">activemq-parent-5.10.1-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.1</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12326456">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.10.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5102-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5102-release.xml b/activemq-5102-release.xml
index e25fd6e..cc6999c 100644
--- a/activemq-5102-release.xml
+++ b/activemq-5102-release.xml
@@ -1,27 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.10.2Release-ActiveMQ5.10.2Release">ActiveMQ 5.10.2&#160;Release</h2><p>Apache ActiveMQ 5.10.2&#160;resolves&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.10.2">2 issues</a>, both bug fixes.</p><h3 id="ActiveMQ5.10.2Release-GettingtheBinaryDistributions"><span>Getting the Binary Distributions</span></h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/apache-activemq-5.1
 0.2-bin.zip">apache-activemq-5.10.2-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.10.2/apache-activemq-5.10.2-bin.zip.asc">apache-activemq-5.10.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/apache-activemq-5.10.2-bin.tar.gz">apache-activemq-5.10.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.10.2/apache-activemq-5.10.2-bin.tar.gz.asc">apache-activemq-5.10.2-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.10.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential t
 hat you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.10.2Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="2939d36d-7f54-4a70-8c2e-734014a5eff0" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.10.2&#160;Release</h2><p>Apache ActiveMQ 5.10.2&#160;resolves&#160;<a shape="rect" href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20AMQ%20AND%20fixVersion%20%3D%205.10.2">2 issues</a>, both bug fixes.</p><h3><span>Getting the Binary Distributions</span></h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan
 ="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/apache-activemq-5.10.2-bin.zip">apache-activemq-5.10.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.10.2/apache-activemq-5.10.2-bin.zip.asc">apache-activemq-5.10.2-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/apache-activemq-5.10.2-bin.tar.gz">apache-activemq-5.10.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.10.2/apache-activemq-5.10.2-bin.tar.gz.asc">apache-activemq-5.10.2-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="8f5aa4d1-456e-4952-96e7-af4f6fd37e33" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Dow
 nloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="95101944-74fe-438e-984e-95532caab72b" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.10.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.10.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.10.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/activemq-parent-5.10.2-source-release.zip">activemq-parent-5.10.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.10.2/activemq-parent-5.10.2-source-release.zip.asc">activemq-parent
 -5.10.2-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.10.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.2</a></p><h2 id="ActiveMQ5.10.2Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329390">release notes</a></p><p>Also see the previous&#160;<a shape="rect" href="activemq-5100-release.xml">ActiveMQ 5.10.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="70b40244-080e-414e-8345-5c612650771f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.2/activemq-parent-5.10.2-source-release.zip">activemq-parent-5.10.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/
 dist/activemq/5.10.2/activemq-parent-5.10.2-source-release.zip.asc">activemq-parent-5.10.2-source-release.zip.asc</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.2</a></p><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12329390">release notes</a></p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.10.0 Release"></page><plain-text-link-body>ActiveMQ 5.10.1 Release</plain-text-link-body></link></p></div>
 


[11/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml b/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
index f5933e7..9ad8956 100644
--- a/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
+++ b/how-do-i-configure-activemq-to-hold-100s-of-millions-of-queue-messages.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Nearly all messaging systems (certainly open source ones) hold either a copy of a persistent message or a reference to a persisted message in memory. This is primarily to try and improve performance, but it also can significantly decrease the complexity of implementation. In fact ActiveMQ version 4 and below worked this - way - by holding references to persisted messages in memory.</p><p>However there is a limitation to this approach, no matter how much memory you have at your disposal, you will hit a limit to the number persistent messages a broker can handle at any particular time.</p><p>To get around this limitation, ActiveMQ introduced a paging cache - for all message stores (except the memory store) to get the best of both worlds - great performance and the ability to hold 100s of millions of messages in persistent store. ActiveMQ is <strong>not</strong> limited by memory availability, but by the size of the disk available to hold the pe
 rsistent messages.</p><p>For more information see: <a shape="rect" href="message-cursors.xml">Message Cursors</a></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="726a720b-0202-42db-aa45-6578592397db" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Scaling the Depth of a Queue"></page></link></parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-activemq-to-use-aio-server-transport.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-activemq-to-use-aio-server-transport.xml b/how-do-i-configure-activemq-to-use-aio-server-transport.xml
index 0641644..69d78df 100644
--- a/how-do-i-configure-activemq-to-use-aio-server-transport.xml
+++ b/how-do-i-configure-activemq-to-use-aio-server-transport.xml
@@ -2,7 +2,7 @@
 
 <p>For Windows XP:</p>
 
-<p>1. Download AIO (Asynchronous IO for Java) from IBM (<a shape="rect" class="external-link" href="http://www.alphaworks.ibm.com/tech/aio4j" rel="nofollow">http://www.alphaworks.ibm.com/tech/aio4j</a>).</p>
+<p>1. Download AIO (Asynchronous IO for Java) from IBM (<a shape="rect" href="http://www.alphaworks.ibm.com/tech/aio4j">http://www.alphaworks.ibm.com/tech/aio4j</a>).</p>
 
 <p>2. Unzip the downloaded file and copy the following files: </p>
 
@@ -15,8 +15,8 @@
 
 <p>5. Edit ActiveMQ's configuration file (<strong>activemq.xml</strong>, found in the conf folder). Look the following snippet:
 <br clear="none" class="atl-forced-newline"></p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;!-- ==================================================================== --&gt;
+<structured-macro ac:macro-id="8206c53e-2e9b-45bc-a393-0943547bde5e" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+&lt;!-- ==================================================================== --&gt;
 &lt;!-- ActiveMQ Broker Configuration --&gt;
 &lt;!-- ==================================================================== --&gt;
 &lt;broker&gt;
@@ -26,27 +26,23 @@
     .
     .
 &lt;/broker&gt;   
-</pre>
-</div></div>  
+</plain-text-body></structured-macro>  
 <p><br clear="none" class="atl-forced-newline"></p>
 
 <p>   Change the connector settings, change <strong>tcpServerTransport</strong> to <strong>serverTransport</strong> and remove the unneeded parameters): 
 <br clear="none" class="atl-forced-newline"></p>
- <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;connector&gt;
+ <structured-macro ac:macro-id="910ac916-db01-4ecd-92d7-49c2996bc791" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+&lt;connector&gt;
  &lt;serverTransport uri="activeio:aio://&lt;ip address&gt;:&lt;port&gt;" /&gt;
 &lt;/connector&gt;
- </pre>
-</div></div>
+ </plain-text-body></structured-macro>
 <p><br clear="none" class="atl-forced-newline"></p>
 
 <p>    Example:
 <br clear="none" class="atl-forced-newline"></p>
- <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>    
+ <structured-macro ac:macro-id="e6ac3503-9331-425d-8a3c-e928fd877cac" ac:name="noformat" ac:schema-version="1"><plain-text-body>    
 &lt;connector&gt;
  &lt;serverTransport uri="activeio:aio://192.168.0.162:61616" /&gt;
 &lt;/connector&gt;
- </pre>
-</div></div></div>
+ </plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-automatic-reconnection.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-automatic-reconnection.xml b/how-do-i-configure-automatic-reconnection.xml
index c34a2d9..ed460d9 100644
--- a/how-do-i-configure-automatic-reconnection.xml
+++ b/how-do-i-configure-automatic-reconnection.xml
@@ -4,11 +4,9 @@
 
 <p>e.g. connecting to the URL</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="103c4336-24eb-48b3-8809-5d7e5adba995" ac:name="code" ac:schema-version="1"><plain-text-body>
 failover:tcp://host1:port1,tcp://host2:port2
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>For more detail see <a shape="rect" href="failover-transport-reference.xml">Failover Transport Reference</a></p></div>
+<p>For more detail see <link><page ri:content-title="Failover Transport Reference"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-distributed-queues-or-topics.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-distributed-queues-or-topics.xml b/how-do-i-configure-distributed-queues-or-topics.xml
index 7f26bb8..39ed60d 100644
--- a/how-do-i-configure-distributed-queues-or-topics.xml
+++ b/how-do-i-configure-distributed-queues-or-topics.xml
@@ -1,13 +1,14 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIconfiguredistributedqueuesortopics-HowdoIconfiguredistributedqueuesortopics">How do I configure distributed queues or topics</h2>
+<div class="wiki-content maincontent"><h2>How do I configure distributed queues or topics</h2>
 
-<p>You don't need to explicitly <a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">configure distributed queues or topics</a> as any queue or topic is automatically distributed across other brokers when the brokers are configured in either a store and forward network or a master/slave cluster. </p>
+<p>You don't need to explicitly <link><page ri:content-title="How do I configure the queues I want"></page><link-body>configure distributed queues or topics</link-body></link> as any queue or topic is automatically distributed across other brokers when the brokers are configured in either a store and forward network or a master/slave cluster. </p>
 
 <p>So you just need to connect brokers together to form either</p>
 
-<ul><li>a <a shape="rect" href="networks-of-brokers.xml">Store and Forward Network of Brokers</a>, which means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time</li><li>a <a shape="rect" href="masterslave.xml">Master/Slave Cluster</a>, which means all messages are replicated across each broker in the master/slave cluster</li></ul>
+<ul><li>a <link><page ri:content-title="Networks of Brokers"></page><link-body>Store and Forward Network of Brokers</link-body></link>, which means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time</li><li>a <link><page ri:content-title="MasterSlave"></page><link-body>Master/Slave Cluster</link-body></link>, which means all messages are replicated across each broker in the master/slave cluster</li></ul>
 
 
-<h3 id="HowdoIconfiguredistributedqueuesortopics-Alsosee">Also see</h3>
+<h3>Also see</h3>
 
-<ul><li><a shape="rect" href="how-do-i-configure-the-queues-i-want.xml">How do I configure the queues I want</a></li><li><a shape="rect" href="how-do-distributed-queues-work.xml">How do distributed queues work</a></li><li><a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></li><li><a shape="rect" href="masterslave.xml">MasterSlave</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I configure the queues I want"></page></link></li><li><link><page ri:content-title="How do distributed queues work"></page></link></li><li><link><page ri:content-title="Networks of Brokers"></page></link></li><li><link><page ri:content-title="MasterSlave"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-the-queues-i-want.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-the-queues-i-want.xml b/how-do-i-configure-the-queues-i-want.xml
index f3356b4..541cc19 100644
--- a/how-do-i-configure-the-queues-i-want.xml
+++ b/how-do-i-configure-the-queues-i-want.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><p><span class="error">The license could not be verified: License Certificate has expired!</span></p>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="2affa320-6478-41f3-92c5-b82475c1c623" ac:name="redirect" ac:schema-version="1"><parameter ac:name="location"><link><page ri:content-title="How do I create new destinations"></page></link></parameter></structured-macro></p>
 
 <p>With ActiveMQ there is no real resaon to explicitly setup/configure the queues you are gonna need. If you try to publish or subscribe from any queue or topic it will be silently created on the fly.</p>
 
 <p>Sometimes people put destinations into JNDI so that they can be pulled out by their application without needing to know the real, physical queue/topic name. This is fine, you can just add the ActiveMQQueue and ActiveMQTopic objects into JNDI (or any configuration mechanism you wish).</p>
 
-<p>Also if you use the ActiveMQInitialContextFactory, then you can explicitly configure which destinations appear in the context using the jndi.properties approach. For more information please refer to the <a shape="rect" href="jndi-support.xml">JNDI Support</a></p></div>
+<p>Also if you use the ActiveMQInitialContextFactory, then you can explicitly configure which destinations appear in the context using the jndi.properties approach. For more information please refer to the <link><page ri:content-title="JNDI Support"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
----------------------------------------------------------------------
diff --git a/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml b/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
index c9a13f0..87aff01 100644
--- a/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
+++ b/how-do-i-connect-to-one-of-a-number-of-message-brokers.xml
@@ -2,11 +2,9 @@
 
 <p>You can specify a list of URLs to connect to (for example if you have message brokers running on a number of machines). To specify a list of URLs, use a comma separated list of URLs with a prefix of list:. e.g.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="25ac053a-6b38-4166-85ed-49477b4e7659" ac:name="code" ac:schema-version="1"><plain-text-body>
 list:tcp://localhost:61699,tcp://localhost:61617,tcp://localhost:61698
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The JMS client will then try and connect to each one in turn, in a random order until one is connected. If they all fail to connect a sleep occurs and then this loop is retried a number of times until either a connection can be established or an exception is thrown. For more detail see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p></div>
+<p>The JMS client will then try and connect to each one in turn, in a random order until one is connected. If they all fail to connect a sleep occurs and then this loop is retried a number of times until either a connection can be established or an exception is thrown. For more detail see <link><page ri:content-title="Configuring Transports"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-consume-a-specific-message.xml
----------------------------------------------------------------------
diff --git a/how-do-i-consume-a-specific-message.xml b/how-do-i-consume-a-specific-message.xml
index 1f5aaf1..f37823a 100644
--- a/how-do-i-consume-a-specific-message.xml
+++ b/how-do-i-consume-a-specific-message.xml
@@ -6,13 +6,11 @@
 
 <p>e.g. here is an example selector</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-JMSMessageID = &#39;abc&#39;
-]]></script>
-</div></div>
+<structured-macro ac:macro-id="8edc4aec-e914-4d4b-912f-59a0a0fccd19" ac:name="code" ac:schema-version="1"><plain-text-body>
+JMSMessageID = 'abc'
+</plain-text-body></structured-macro>
 
 <p>Note that this is not a very efficient way of working with JMS (JMS is designed for consumers to be long lived objects working across many messageS), but it can be useful in certain situations.</p>
 
-<p>Another option is just to use <a shape="rect" href="jmx.xml">JMX</a> directly to browse messages on a queue, process them and then delete them.</p></div>
+<p>Another option is just to use <link><page ri:content-title="JMX"></page></link> directly to browse messages on a queue, process them and then delete them.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-create-new-destinations.xml
----------------------------------------------------------------------
diff --git a/how-do-i-create-new-destinations.xml b/how-do-i-create-new-destinations.xml
index a4613cc..01aa301 100644
--- a/how-do-i-create-new-destinations.xml
+++ b/how-do-i-create-new-destinations.xml
@@ -7,21 +7,21 @@
 
 <p>and the broker will automatically create the physical destinations for you.  This avoids spending large amounts of time creating every individual destination you wish to use and possibly then exposing it in some JNDI provider.</p>
 
-<p>In addition, if you are using JNDI to lookup connection factory and destinations, you can specify which destinations you wish to create by default using the properties file. See the <a shape="rect" href="jndi-support.xml">JNDI Support</a> for more details. </p>
+<p>In addition, if you are using JNDI to lookup connection factory and destinations, you can specify which destinations you wish to create by default using the properties file. See the <link><page ri:content-title="JNDI Support"></page></link> for more details. </p>
 
 
-<h3 id="HowdoIcreatenewdestinations-Creatingdestinationsonstartup">Creating destinations on startup</h3>
+<h3>Creating destinations on startup</h3>
 
-<p>Its completely optional but as of 4.1 you can <a shape="rect" href="configure-startup-destinations.xml">Configure Startup Destinations</a> to specify which destinations are automatically created when the broker starts.</p>
+<p>Its completely optional but as of 4.1 you can <link><page ri:content-title="Configure Startup Destinations"></page></link> to specify which destinations are automatically created when the broker starts.</p>
 
-<h3 id="HowdoIcreatenewdestinations-Limitingcreationofdestinations">Limiting creation of destinations</h3>
+<h3>Limiting creation of destinations</h3>
 
-<p>If you need to restrict access or creation of destinations then please use the <a shape="rect" href="security.xml">Security</a> option to disable destinations being auto-created for certain users. </p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Client side destination objects are not the same as server side resources</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<p>If you need to restrict access or creation of destinations then please use the <link><page ri:content-title="Security"></page></link> option to disable destinations being auto-created for certain users. </p>
+<structured-macro ac:macro-id="5a28a8d5-28a7-45ad-87a8-b42708854c9a" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Client side destination objects are not the same as server side resources</parameter><rich-text-body>
 <p>Note that the ActiveMQ Broker will only create server side resources for destinations when messages are actually sent to them. So you can create as many instances of ActiveMQTopic and ActiveMQQueue on a client without any real overhead until you actually send messages to them on a broker.  So a JMS client creating a new ActiveMQQueue POJO does not mean you are creating server side queue resources.</p>
 
 <p>Think of the ActiveMQQueue and ActiveMQTopic classes as like java.net.URL. They are just names which refer to server side resources which are auto-created when they are used.<br clear="none">
-This means that different clients creating different ActiveMQQueue instances will communicate with the same physical queue on a JMS broker if the name is the same.</p></div></div>
+This means that different clients creating different ActiveMQQueue instances will communicate with the same physical queue on a JMS broker if the name is the same.</p></rich-text-body></structured-macro>
 
-<p>You can browse the currently available queues and topics using <a shape="rect" href="jmx.xml">JMX</a>. You can also use the <a shape="rect" href="jmx.xml">JMX</a> MBeans to create the destinations you require.</p></div>
+<p>You can browse the currently available queues and topics using <link><page ri:content-title="JMX"></page></link>. You can also use the <link><page ri:content-title="JMX"></page></link> MBeans to create the destinations you require.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-debug-activemq-from-my-ide.xml
----------------------------------------------------------------------
diff --git a/how-do-i-debug-activemq-from-my-ide.xml b/how-do-i-debug-activemq-from-my-ide.xml
index 849de9a..0f9fe11 100644
--- a/how-do-i-debug-activemq-from-my-ide.xml
+++ b/how-do-i-debug-activemq-from-my-ide.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>One option is to run your broker in the same JVM as your application; see <a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a>.</p><p>Or you can try uncommenting ACTIVEMQ_DEBUG_OPTS in your activemq start script (bin/activemq or bin\activemq.bat) and start remote debugging in your IDE.</p><p>For IDEA, see this article <a shape="rect" class="external-link" href="http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html" rel="nofollow">http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html</a></p></div>
+<div class="wiki-content maincontent"><p>One option is to run your broker in the same JVM as your application; see <link><page ri:content-title="How To Unit Test JMS Code"></page></link>.</p><p>Or you can try uncommenting ACTIVEMQ_DEBUG_OPTS in your activemq start script (bin/activemq or bin\activemq.bat) and start remote debugging in your IDE.</p><p>For IDEA, see this article <a shape="rect" class="external-link" href="http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html" rel="nofollow">http://www.javaranch.com/journal/200408/DebuggingServer-sideCode.html</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
----------------------------------------------------------------------
diff --git a/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml b/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
index 6ed70e5..e210d57 100644
--- a/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
+++ b/how-do-i-define-a-local-address-and-local-port-for-tcp-or-ssl.xml
@@ -1,5 +1,3 @@
-<div class="wiki-content maincontent"><p>TCP based transport protocols (including SSL) allow you to define the local address and local port for Socket to use when it's created.<br clear="none"> This can be useful for clients that reside on multi-homed machines or for clients operating in a DMZ, where only pre-defined ports can be used.</p><p>To specify the local address and local port, ActiveMQ supports the use of the path on the URI, e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ssl://localhost:5666/localhost:60606
-]]></script>
-</div></div><p>&#160;</p><p>where the path following the forward slash "localhost:60606" defines the local address and local port</p></div>
+<div class="wiki-content maincontent"><p>TCP based transport protocols (including SSL) allow you to define the local address and local port for Socket to use when it's created.<br clear="none"> This can be useful for clients that reside on multi-homed machines or for clients operating in a DMZ, where only pre-defined ports can be used.</p><p>To specify the local address and local port, ActiveMQ supports the use of the path on the URI, e.g.</p><structured-macro ac:macro-id="f096e582-9220-4ce7-a139-7ba5c7b744d4" ac:name="code" ac:schema-version="1"><plain-text-body>ssl://localhost:5666/localhost:60606
+</plain-text-body></structured-macro><p>&#160;</p><p>where the path following the forward slash "localhost:60606" defines the local address and local port</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-delete-a-destination.xml
----------------------------------------------------------------------
diff --git a/how-do-i-delete-a-destination.xml b/how-do-i-delete-a-destination.xml
index 4bcacd8..bed918b 100644
--- a/how-do-i-delete-a-destination.xml
+++ b/how-do-i-delete-a-destination.xml
@@ -1,12 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIdeleteadestination-HowdoIdeleteadestination">How do I delete a destination</h2>
+<div class="wiki-content maincontent"><h2>How do I delete a destination</h2>
 
-<p>via Java code or <a shape="rect" href="jmx.xml">JMX</a> you can grab the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a> and call one of the following methods</p>
+<p>via Java code or <link><page ri:content-title="JMX"></page></link> you can grab the <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a> and call one of the following methods</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeQueue(java.lang.String)">removeQueue(String)</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeTopic(java.lang.String)">removeTopic(String)</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeQueue(java.lang.String)">removeQueue(String)</a></li><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html#removeTopic(java.lang.String)">removeTopic(String)</a></li></ul>
 
 
 
-<h3 id="HowdoIdeleteadestination-Seealso">See also</h3>
+<h3>See also</h3>
 
-<ul><li><a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a></li><li><a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a></li><li><a shape="rect" href="jmx.xml">JMX</a></li><li><a shape="rect" href="web-console.xml">Web Console</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I create new destinations"></page></link></li><li><link><page ri:content-title="How can I monitor ActiveMQ"></page></link></li><li><link><page ri:content-title="JMX"></page></link></li><li><link><page ri:content-title="Web Console"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-disable-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-disable-logging.xml b/how-do-i-disable-logging.xml
index 5edf5f1..f660be1 100644
--- a/how-do-i-disable-logging.xml
+++ b/how-do-i-disable-logging.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIdisablelogging-HowdoIdisablelogging?">How do I disable logging?</h2>
+<div class="wiki-content maincontent"><h2>How do I disable logging?</h2>
 
-<p>See <a shape="rect" href="how-do-i-change-the-logging.xml">How do I change the logging</a></p></div>
+<p>See <link><page ri:content-title="How do I change the logging"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-disable-persistence.xml
----------------------------------------------------------------------
diff --git a/how-do-i-disable-persistence.xml b/how-do-i-disable-persistence.xml
index d123b6c..f300c0d 100644
--- a/how-do-i-disable-persistence.xml
+++ b/how-do-i-disable-persistence.xml
@@ -1,9 +1,9 @@
 <div class="wiki-content maincontent"><p>There are three main ways to disable persistence, such as for unit testing JMS code</p>
 
-<ol><li>Set the NON_PERSISTENT message delivery flag on your MessageProducer</li><li>Set the <strong>persistent=false</strong> flag in the <strong>&lt;broker/&gt;</strong> element of the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> or on the property <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService</a></li><li>Delete the persistence files before running your tests (a bit hacky)</li></ol>
+<ol><li>Set the NON_PERSISTENT message delivery flag on your MessageProducer</li><li>Set the <strong>persistent=false</strong> flag in the <strong>&lt;broker/&gt;</strong> element of the <link><page ri:content-title="Xml Configuration"></page></link> or on the property <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService</a></li><li>Delete the persistence files before running your tests (a bit hacky)</li></ol>
 
 
-<p>If you are unit testing you may be interested in <a shape="rect" href="how-to-unit-test-jms-code.xml">How To Unit Test JMS Code</a>.</p>
+<p>If you are unit testing you may be interested in <link><page ri:content-title="How To Unit Test JMS Code"></page></link>.</p>
 
-<p>Please refer to the <a shape="rect" href="initial-configuration.xml">Initial Configuration</a> guide on how to disable persistence via system properties, java code or using the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a></p></div>
+<p>Please refer to the <link><page ri:content-title="Initial Configuration"></page></link> guide on how to disable persistence via system properties, java code or using the <link><page ri:content-title="Xml Configuration"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-edit-the-website.xml
----------------------------------------------------------------------
diff --git a/how-do-i-edit-the-website.xml b/how-do-i-edit-the-website.xml
index a152cde..777f479 100644
--- a/how-do-i-edit-the-website.xml
+++ b/how-do-i-edit-the-website.xml
@@ -1,20 +1,20 @@
-<div class="wiki-content maincontent"><p>The website is all contained on a Wiki so that anyone can <a shape="rect" href="contributing.xml">contribute</a></p>
+<div class="wiki-content maincontent"><p>The website is all contained on a Wiki so that anyone can <link><page ri:content-title="Contributing"></page><link-body>contribute</link-body></link></p>
 
-<h3 id="HowdoIeditthewebsite-Howtoedit">How to edit</h3>
+<h3>How to edit</h3>
 
 <p>You can also click the <strong>edit</strong> button when viewing the website which is located on the bottom of each page.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Spam Prevention</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="789e806b-e666-4c9b-ac2f-bd25b7630156" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Spam Prevention</parameter><rich-text-body>
 <p>We have been attacked by spammers so we are running a spam-avoiding scheme. So you have to ask to be added to the editing group of Confluence. This is quick and easy to do.</p>
 
-<p>Just send a quick mail to the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> giving details of your confluence username and we can grant you the necessary editing karma.</p></div></div>
+<p>Just send a quick mail to the <link><page ri:content-title="Discussion Forums"></page></link> giving details of your confluence username and we can grant you the necessary editing karma.</p></rich-text-body></structured-macro>
 
 <p>Note that after you've changed the wiki it is immediately rendered on the <a shape="rect" class="external-link" href="http://cwiki.apache.org/ACTIVEMQ/">http://cwiki.apache.org/ACTIVEMQ/</a> site so you can test it out; then up to an hour or two later it is updated on the Apache site.</p>
 
-<h3 id="HowdoIeditthewebsite-Howthesiteworks">How the site works</h3>
-<p>There are a few special pages; for example the <a shape="rect" href="navigation.xml">Navigation</a> page is the left hand navigation bar and the <a shape="rect" href="quicklinks.xml">QuickLinks</a> is the top right navigation bar.</p>
+<h3>How the site works</h3>
+<p>There are a few special pages; for example the <link><page ri:content-title="Navigation"></page></link> page is the left hand navigation bar and the <link><page ri:content-title="QuickLinks"></page></link> is the top right navigation bar.</p>
 
-<p>Other useful <a shape="rect" href="site.xml">links</a> are</p>
+<p>Other useful <link><page ri:content-title="Site"></page><link-body>links</link-body></link> are</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="banner.xml">Banner</a></li><li><a shape="rect" href="navigation.xml">Navigation</a></li><li><a shape="rect" href="quicklinks.xml">QuickLinks</a></li><li><a shape="rect" href="siteindex.xml">SiteIndex</a></li><li><a shape="rect" href="sitemap.xml">SiteMap</a></li></ul></div>
+<structured-macro ac:macro-id="bf1b0c9c-5191-4874-9ce5-d01b82b366fa" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Site"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-embed-a-broker-inside-a-connection.xml
----------------------------------------------------------------------
diff --git a/how-do-i-embed-a-broker-inside-a-connection.xml b/how-do-i-embed-a-broker-inside-a-connection.xml
index d054702..b362669 100644
--- a/how-do-i-embed-a-broker-inside-a-connection.xml
+++ b/how-do-i-embed-a-broker-inside-a-connection.xml
@@ -1,136 +1,116 @@
-<div class="wiki-content maincontent"><p>In many messaging topologies there are JMS Brokers (server side) and a JMS client side. Often it makes sense to deploy a broker within your JVM. This allows you to optimise away a network hop; making the networking of JMS as efficient as pure RMI, but with all the usual JMS features of location independence, reliability, load balancing etc.</p><p>There are various ways to embed a broker in ActiveMQ depending on if you are using Java, Spring, XBean or using the ActiveMQConnectionFactory .</p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingexplicitJavacode">Using explicit Java code</h3><p>The following Java code will create an embedded broker</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[BrokerService broker = new BrokerService();
+<div class="wiki-content maincontent"><p>In many messaging topologies there are JMS Brokers (server side) and a JMS client side. Often it makes sense to deploy a broker within your JVM. This allows you to optimise away a network hop; making the networking of JMS as efficient as pure RMI, but with all the usual JMS features of location independence, reliability, load balancing etc.</p><p>There are various ways to embed a broker in ActiveMQ depending on if you are using Java, Spring, XBean or using the ActiveMQConnectionFactory .</p><h3>Using explicit Java code</h3><p>The following Java code will create an embedded broker</p><structured-macro ac:macro-id="9eaa5bb3-576f-42b5-9c4b-04d93d7c7ee6" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
 
 // configure the broker
-broker.addConnector(&quot;tcp://localhost:61616&quot;);
+broker.addConnector("tcp://localhost:61616");
 
 broker.start();
-]]></script>
-</div></div><p>If you want to lazily bind the transport connector as part of start(), useful when start() will block pending a store lock (as in a slave start), you can use the following code</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[BrokerService broker = new BrokerService();
+</plain-text-body></structured-macro><p>If you want to lazily bind the transport connector as part of start(), useful when start() will block pending a store lock (as in a slave start), you can use the following code</p><structured-macro ac:macro-id="ac608f29-1173-4703-b0cc-192bed0dd67f" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
 
 TransportConnector connector = new TransportConnector();
-connector.setUri(new URI(&quot;tcp://localhost:61616&quot;));
+connector.setUri(new URI("tcp://localhost:61616"));
 broker.addConnector(connector);
 broker.start();
-]]></script>
-</div></div><p>In the same JVM clients can then use the <a shape="rect" href="vm-transport-reference.xml">vm:// transport</a> to connect to the embedded broker - whilst external clients can use the <a shape="rect" href="tcp-transport-reference.xml">tcp:// protocol</a></p><p>If you have more than one embedded broker, ensure that you give them a unique name and - e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[BrokerService broker = new BrokerService();
+</plain-text-body></structured-macro><p>In the same JVM clients can then use the <link><page ri:content-title="VM Transport Reference"></page><plain-text-link-body>vm:// transport</plain-text-link-body></link> to connect to the embedded broker - whilst external clients can use the <link><page ri:content-title="TCP Transport Reference"></page><plain-text-link-body>tcp:// protocol</plain-text-link-body></link></p><p>If you have more than one embedded broker, ensure that you give them a unique name and - e.g.</p><structured-macro ac:macro-id="ab19815a-2dfd-4e65-a5be-b8210339a28c" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
 // configure the broker
-broker.setBrokerName(&quot;fred&quot;);
-broker.addConnector(&quot;tcp://localhost:61616&quot;);
+broker.setBrokerName("fred");
+broker.addConnector("tcp://localhost:61616");
 broker.start();
-]]></script>
-</div></div><p>Then if you want to connect to the broker named 'fred' from within the same JVM, you can by using the uri <strong>vm://fred</strong></p><p>It is possible to fully configure a broker through application code e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[BrokerService broker = new BrokerService();
-broker.setBrokerName(&quot;fred&quot;);
+</plain-text-body></structured-macro><p>Then if you want to connect to the broker named 'fred' from within the same JVM, you can by using the uri <strong>vm://fred</strong></p><p>It is possible to fully configure a broker through application code e.g.</p><structured-macro ac:macro-id="7e0ebf92-ef49-416b-b093-0dd90aa42955" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = new BrokerService();
+broker.setBrokerName("fred");
 broker.setUseShutdownHook(false);
 //Add plugin
 broker.setPlugins(new BrokerPlugin[]{new JaasAuthenticationPlugin()});
 //Add a network connection
-NetworkConnector connector = answer.addNetworkConnector(&quot;static://&quot;+&quot;tcp://somehost:61616&quot;);
+NetworkConnector connector = answer.addNetworkConnector("static://"+"tcp://somehost:61616");
 connector.setDuplex(true);
-broker.addConnector(&quot;tcp://localhost:61616&quot;);
+broker.addConnector("tcp://localhost:61616");
 broker.start();
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please note that you should add plugins before connectors or they will not be initialized</p></div></div><p>For more details on the available properties you can specify, see the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.11.0/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService javadoc</a></p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingtheBrokerFactory">Using the BrokerFactory</h3><p>There is a helper class called <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerFactory.html">BrokerFactory</a> which can be used to create a broker via URI for configuration.</p><div class="code panel pdl" style="border-width: 1px;
 "><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[BrokerService broker = BrokerFactory.createBroker(new URI(someURI));
-]]></script>
-</div></div><p>The available values of the URI are</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>URI scheme</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Example</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>xbean:</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>xbean:activemq.xml</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Searches the classpath (and file system) for an XML document with the given URI (activemq.xml in this case) which will then be used as the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>broker:</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>broker:tcp://localhost:61616</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Uses the <a shape="rect" hr
 ef="broker-configuration-uri.xml">Broker Configuration URI</a> to confgure the broker</p></td></tr></tbody></table></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingSpring">Using Spring</h3><p>There is a factory bean that can refer to an external ActiveMQ XML configuration file</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;broker&quot; class=&quot;org.apache.activemq.xbean.BrokerFactoryBean&quot;&gt;
-    &lt;property name=&quot;config&quot; value=&quot;classpath:org/apache/activemq/xbean/activemq.xml&quot; /&gt;
-    &lt;property name=&quot;start&quot; value=&quot;true&quot; /&gt;
+</plain-text-body></structured-macro><structured-macro ac:macro-id="b7967e06-0454-4e9a-af9a-5c24b63b0501" ac:name="note" ac:schema-version="1"><rich-text-body><p>Please note that you should add plugins before connectors or they will not be initialized</p></rich-text-body></structured-macro><p>For more details on the available properties you can specify, see the <a shape="rect" href="http://activemq.apache.org/maven/5.11.0/apidocs/org/apache/activemq/broker/BrokerService.html">BrokerService javadoc</a></p><h3>Using the BrokerFactory</h3><p>There is a helper class called <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/broker/BrokerFactory.html">BrokerFactory</a> which can be used to create a broker via URI for configuration.</p><structured-macro ac:macro-id="a8d3bdfc-dd6d-4a02-aa2e-76524c94fc34" ac:name="code" ac:schema-version="1"><plain-text-body>BrokerService broker = BrokerFactory.createBroker(new URI(someURI));
+</plain-text-body></structured-macro><p>The available values of the URI are</p><table><tbody><tr><th colspan="1" rowspan="1"><p>URI scheme</p></th><th colspan="1" rowspan="1"><p>Example</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p>xbean:</p></td><td colspan="1" rowspan="1"><p>xbean:activemq.xml</p></td><td colspan="1" rowspan="1"><p>Searches the classpath (and file system) for an XML document with the given URI (activemq.xml in this case) which will then be used as the <link><page ri:content-title="Xml Configuration"></page></link></p></td></tr><tr><td colspan="1" rowspan="1"><p>broker:</p></td><td colspan="1" rowspan="1"><p>broker:tcp://localhost:61616</p></td><td colspan="1" rowspan="1"><p>Uses the <link><page ri:content-title="Broker Configuration URI"></page></link> to confgure the broker</p></td></tr></tbody></table><h3>Using Spring</h3><p>There is a factory bean that can refer to an external ActiveMQ XML configuration file<
 /p><structured-macro ac:macro-id="2243664c-6d07-401c-94c7-af12ccb45fbf" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean"&gt;
+    &lt;property name="config" value="classpath:org/apache/activemq/xbean/activemq.xml" /&gt;
+    &lt;property name="start" value="true" /&gt;
   &lt;/bean&gt;
-]]></script>
-</div></div><p>In this case the usual Spring 'classpath:org/apache/activemq/xbean/activemq.xml' resource mechanism is being used so that the activemq.xml file would be found on the classpath by looking inside all the directories on the classpath then looking for 'org/apache/activemq/xbean/activemq.xml'. You can of course change this to any value you like. e.g. use classpath:activemq.xml if you just want to drop it in a directory that is in the classpath; like WEB-INF/classes in a web application.</p><p>If you wish you can use a URL instead using the <strong>file:* or *http:</strong> prefixes. For more details see how <a shape="rect" class="external-link" href="http://static.springframework.org/spring/docs/1.2.x/reference/beans.html#context-functionality-resources" rel="nofollow">Spring deals with resources</a></p><h3 id="HowdoIembedaBrokerinsideaConnection-UsingXBean">Using XBean</h3><p>If you are already using <a shape="rect" class="external-link" href="http://geronimo.apache.org/x
 bean/">XBean</a> then you can just mix and match your Spring/XBean <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml">XML configuration</a> with ActiveMQ's configuration.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans 
-  xmlns=&quot;http://www.springframework.org/schema/beans&quot; 
-  xmlns:amq=&quot;http://activemq.apache.org/schema/core&quot;
-  xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-  xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd&quot;&gt;
+</plain-text-body></structured-macro><p>In this case the usual Spring 'classpath:org/apache/activemq/xbean/activemq.xml' resource mechanism is being used so that the activemq.xml file would be found on the classpath by looking inside all the directories on the classpath then looking for 'org/apache/activemq/xbean/activemq.xml'. You can of course change this to any value you like. e.g. use classpath:activemq.xml if you just want to drop it in a directory that is in the classpath; like WEB-INF/classes in a web application.</p><p>If you wish you can use a URL instead using the <strong>file:* or *http:</strong> prefixes. For more details see how <a shape="rect" href="http://static.springframework.org/spring/docs/1.2.x/reference/beans.html#context-functionality-resources">Spring deals with resources</a></p><h3>Using XBean</h3><p>If you are already using <a shape="rect" href="http://geronimo.apache.org/xbean/">XBean</a> then you can just mix and match your Spring/XBean <a shape="rect" hre
 f="https://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml">XML configuration</a> with ActiveMQ's configuration.</p><structured-macro ac:macro-id="8349179f-1e83-4dd6-801a-e787987af165" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&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 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;persistenceFactory&gt;
-      &lt;kahaDB directory=&quot;${basedir}/target&quot; /&gt;
+      &lt;kahaDB directory="${basedir}/target" /&gt;
     &lt;/persistenceFactory&gt;
 
     &lt;transportConnectors&gt;
-      &lt;transportConnector uri=&quot;tcp://localhost:61636&quot; /&gt;
+      &lt;transportConnector uri="tcp://localhost:61636" /&gt;
     &lt;/transportConnectors&gt;
 
   &lt;/broker&gt;
 &lt;/beans&gt;
-]]></script>
-</div></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingSpring2.0">Using Spring 2.0</h3><p>If you are using Spring 2.0 and ActiveMQ 4.1 or later (and xbean-spring 2.5 or later) you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml">example</a> of a regular Spring XML file in Spring 2.0 which also configures a broker.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;beans 
-  xmlns=&quot;http://www.springframework.org/schema/beans&quot; 
-  xmlns:amq=&quot;http://activemq.apache.org/schema/core&quot;
-  xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-  xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd&quot;&gt;
+</plain-text-body></structured-macro><h3>Using Spring 2.0</h3><p>If you are using Spring 2.0 and ActiveMQ 4.1 or later (and xbean-spring 2.5 or later) you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an <a shape="rect" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml">example</a> of a regular Spring XML file in Spring 2.0 which also configures a broker.</p><structured-macro ac:macro-id="fe131cb2-ea4a-4f1f-a40a-fc78932b400b" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
   
   &lt;!--  lets create an embedded ActiveMQ Broker --&gt;
-  &lt;amq:broker useJmx=&quot;false&quot; persistent=&quot;false&quot;&gt;
+  &lt;amq:broker useJmx="false" persistent="false"&gt;
     &lt;amq:transportConnectors&gt;
-      &lt;amq:transportConnector uri=&quot;tcp://localhost:0&quot; /&gt;
+      &lt;amq:transportConnector uri="tcp://localhost:0" /&gt;
     &lt;/amq:transportConnectors&gt;
   &lt;/amq:broker&gt;
 
    &lt;!--  ActiveMQ destinations to use  --&gt;
-  &lt;amq:queue id=&quot;destination&quot;  physicalName=&quot;org.apache.activemq.spring.Test.spring.embedded&quot;/&gt;
+  &lt;amq:queue id="destination"  physicalName="org.apache.activemq.spring.Test.spring.embedded"/&gt;
 
   &lt;!-- JMS ConnectionFactory to use, configuring the embedded broker using XML --&gt;
-  &lt;amq:connectionFactory id=&quot;jmsFactory&quot; brokerURL=&quot;vm://localhost&quot;/&gt;
+  &lt;amq:connectionFactory id="jmsFactory" brokerURL="vm://localhost"/&gt;
   
 
   &lt;!-- Spring JMS Template --&gt;
-  &lt;bean id=&quot;myJmsTemplate&quot; class=&quot;org.springframework.jms.core.JmsTemplate&quot;&gt;
-    &lt;property name=&quot;connectionFactory&quot;&gt;
+  &lt;bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate"&gt;
+    &lt;property name="connectionFactory"&gt;
       &lt;!-- lets wrap in a pool to avoid creating a connection per send --&gt;
-      &lt;bean class=&quot;org.springframework.jms.connection.SingleConnectionFactory&quot;&gt;
-        &lt;property name=&quot;targetConnectionFactory&quot;&gt;
-          &lt;ref local=&quot;jmsFactory&quot; /&gt;
+      &lt;bean class="org.springframework.jms.connection.SingleConnectionFactory"&gt;
+        &lt;property name="targetConnectionFactory"&gt;
+          &lt;ref local="jmsFactory" /&gt;
         &lt;/property&gt;
       &lt;/bean&gt;
     &lt;/property&gt;
   &lt;/bean&gt;
 
-  &lt;bean id=&quot;consumerJmsTemplate&quot; class=&quot;org.springframework.jms.core.JmsTemplate&quot;&gt;
-    &lt;property name=&quot;connectionFactory&quot; ref=&quot;jmsFactory&quot;/&gt;
+  &lt;bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate"&gt;
+    &lt;property name="connectionFactory" ref="jmsFactory"/&gt;
   &lt;/bean&gt;
 
   &lt;!-- a sample POJO which uses a Spring JmsTemplate --&gt;
-  &lt;bean id=&quot;producer&quot; class=&quot;org.apache.activemq.spring.SpringProducer&quot;&gt;
-    &lt;property name=&quot;template&quot;&gt;
-      &lt;ref bean=&quot;myJmsTemplate&quot;&gt;&lt;/ref&gt;
+  &lt;bean id="producer" class="org.apache.activemq.spring.SpringProducer"&gt;
+    &lt;property name="template"&gt;
+      &lt;ref bean="myJmsTemplate"&gt;&lt;/ref&gt;
     &lt;/property&gt;
 
-    &lt;property name=&quot;destination&quot;&gt;
-      &lt;ref bean=&quot;destination&quot; /&gt;
+    &lt;property name="destination"&gt;
+      &lt;ref bean="destination" /&gt;
     &lt;/property&gt;
 
-    &lt;property name=&quot;messageCount&quot;&gt;
+    &lt;property name="messageCount"&gt;
       &lt;value&gt;10&lt;/value&gt;
     &lt;/property&gt;
   &lt;/bean&gt;
 
   &lt;!-- a sample POJO consumer --&gt;
-  &lt;bean id=&quot;consumer&quot; class=&quot;org.apache.activemq.spring.SpringConsumer&quot;&gt;
-    &lt;property name=&quot;template&quot; ref=&quot;consumerJmsTemplate&quot;/&gt;
-    &lt;property name=&quot;destination&quot; ref=&quot;destination&quot;/&gt;
+  &lt;bean id="consumer" class="org.apache.activemq.spring.SpringConsumer"&gt;
+    &lt;property name="template" ref="consumerJmsTemplate"/&gt;
+    &lt;property name="destination" ref="destination"/&gt;
   &lt;/bean&gt;
 
 &lt;/beans&gt;
-]]></script>
-</div></div><h3 id="HowdoIembedaBrokerinsideaConnection-UsingActiveMQConnectionFactory">Using ActiveMQConnectionFactory</h3><p>An embedded broker can also be created using an ActiveMQConnectionFactory and using a vm connector as a uri. e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(&quot;vm://localhost?broker.persistent=false&quot;);
-]]></script>
-</div></div><p>Use the query parameters "broker.&lt;property&gt;" to configure the broker, where &lt;property&gt; matches the bean properties on the BrokerService.</p><p>The broker will be created upon creation of the first connection.</p><p>You can turn off auto creation by setting the create property on the VM Transport to false:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(&quot;vm://localhost?create=false&quot;);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro><h3>Using ActiveMQConnectionFactory</h3><p>An embedded broker can also be created using an ActiveMQConnectionFactory and using a vm connector as a uri. e.g.</p><structured-macro ac:macro-id="3f36f9a1-bc84-4200-9611-e572416daf76" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+</plain-text-body></structured-macro><p>Use the query parameters "broker.&lt;property&gt;" to configure the broker, where &lt;property&gt; matches the bean properties on the BrokerService.</p><p>The broker will be created upon creation of the first connection.</p><p>You can turn off auto creation by setting the create property on the VM Transport to false:</p><structured-macro ac:macro-id="5d37b378-935e-4ddb-872f-10e99dce2b27" ac:name="code" ac:schema-version="1"><plain-text-body>ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost?create=false");
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-enable-asynchronous-sending.xml
----------------------------------------------------------------------
diff --git a/how-do-i-enable-asynchronous-sending.xml b/how-do-i-enable-asynchronous-sending.xml
index a768473..c878fb5 100644
--- a/how-do-i-enable-asynchronous-sending.xml
+++ b/how-do-i-enable-asynchronous-sending.xml
@@ -5,9 +5,7 @@
 <ul><li>set the useAsyncSend property on the ActiveMQConnectionFactory</li><li>set the property using the URI when you connect to the broker</li></ul>
 
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="44308207-4c2b-4a2a-9a3d-33831df7c467" ac:name="code" ac:schema-version="1"><plain-text-body>
 tcp://localhost:61616?jms.useAsyncSend=true
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-enable-debug-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-enable-debug-logging.xml b/how-do-i-enable-debug-logging.xml
index 098ca3a..c95567b 100644
--- a/how-do-i-enable-debug-logging.xml
+++ b/how-do-i-enable-debug-logging.xml
@@ -1,12 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIenabledebuglogging-HowdoIenabledebuglogging?">How do I enable debug logging?</h2>
+<div class="wiki-content maincontent"><h2>How do I enable debug logging?</h2>
 
-<p>For background see <a shape="rect" href="how-do-i-change-the-logging.xml">How do I change the logging</a>.</p>
+<p>For background see <link><page ri:content-title="How do I change the logging"></page></link>.</p>
 
 <p>You can enable debug logging in ActiveMQ by adding the following line to the <code><strong>conf/log4j.properties</strong></code> file </p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="c8dded93-20c3-4af9-a3bf-64b6e312f91d" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.apache.activemq=DEBUG
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-find-the-size-of-a-queue.xml
----------------------------------------------------------------------
diff --git a/how-do-i-find-the-size-of-a-queue.xml b/how-do-i-find-the-size-of-a-queue.xml
index c5f4c35..4869196 100644
--- a/how-do-i-find-the-size-of-a-queue.xml
+++ b/how-do-i-find-the-size-of-a-queue.xml
@@ -1,10 +1,10 @@
 <div class="wiki-content maincontent"><p>How do I check on the size of the queue? I know it's not JMS standard, but most JMS implementations have a way to do this.</p>
 
-<p>You can view the queue depth using the MBeans in ActiveMQ 5.x. Use any JMX management console to see the statistics. See <a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a>.</p>
+<p>You can view the queue depth using the MBeans in ActiveMQ 5.x. Use any JMX management console to see the statistics. See <link><page ri:content-title="How can I monitor ActiveMQ"></page></link>.</p>
 
-<p>You can also browse the contents of a queue using the JMS <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/QueueBrowser.html" rel="nofollow">QueueBrowser</a>.</p>
+<p>You can also browse the contents of a queue using the JMS <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/QueueBrowser.html">QueueBrowser</a>.</p>
 
-<p>Or you can access statistics <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a></p>
+<p>Or you can access statistics <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link></p>
 
 <p>Through the MBeans, you can monitor individual destinations including message statistics related to the destination. For example, you'll see the following attributes on a destination (Queue or Topic):</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-get-started-with-jms.xml
----------------------------------------------------------------------
diff --git a/how-do-i-get-started-with-jms.xml b/how-do-i-get-started-with-jms.xml
index 5e209e9..fc5b877 100644
--- a/how-do-i-get-started-with-jms.xml
+++ b/how-do-i-get-started-with-jms.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIgetstartedwithJMS-HowdoIgetstartedwithJMS">How do I get started with JMS</h2>
+<div class="wiki-content maincontent"><h2>How do I get started with JMS</h2>
 
-<p>Your best way to get started understanding the JMS API is <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS.html#wp84181" rel="nofollow">Sun's JMS tutorial</a>.</p>
+<p>Your best way to get started understanding the JMS API is <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/tutorial/doc/JMS.html#wp84181">Sun's JMS tutorial</a>.</p>
 
-<p>Alternatively you could stick to writing business level POJOs and hide the middleware via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Apache Camel</a> which hides the JMS API from you letting you focus on your business logic via the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/bean-integration.html">Bean Integration</a> </p></div>
+<p>Alternatively you could stick to writing business level POJOs and hide the middleware via <a shape="rect" href="http://activemq.apache.org/camel/">Apache Camel</a> which hides the JMS API from you letting you focus on your business logic via the <a shape="rect" href="http://activemq.apache.org/camel/bean-integration.html">Bean Integration</a> </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-make-messages-durable.xml
----------------------------------------------------------------------
diff --git a/how-do-i-make-messages-durable.xml b/how-do-i-make-messages-durable.xml
index f0e2b20..420b72c 100644
--- a/how-do-i-make-messages-durable.xml
+++ b/how-do-i-make-messages-durable.xml
@@ -1,12 +1,10 @@
 <div class="wiki-content maincontent">
-<p>Durability of messages is defined by the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html" rel="nofollow">MessagerProducer</a>. You can explicitly configure the durability via the <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setDeliveryMode(int)" rel="nofollow">setDeliveryMode() method</a>. e.g.</p>
+<p>Durability of messages is defined by the <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html">MessagerProducer</a>. You can explicitly configure the durability via the <a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setDeliveryMode(int)">setDeliveryMode() method</a>. e.g.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="5ec93947-a8e0-4c38-ad32-61b5733ffee4" ac:name="code" ac:schema-version="1"><plain-text-body>
 MessageProducer producer = ...;
 producer.setDeliveryMode(DeliveryMode.PERSISTENT);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Note that the default is for durable messages to be used if you don't specify a delivery mode.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-preserve-order-of-messages.xml
----------------------------------------------------------------------
diff --git a/how-do-i-preserve-order-of-messages.xml b/how-do-i-preserve-order-of-messages.xml
index df56587..358180e 100644
--- a/how-do-i-preserve-order-of-messages.xml
+++ b/how-do-i-preserve-order-of-messages.xml
@@ -2,5 +2,6 @@
 <p>ActiveMQ will preserve the order of messages sent by a single producer to all consumers on a topic. If there is a single consumer on a queue then the order of messages sent by a single producer will be preserved as well.</p>
 
 <p>If you have multiple consumers on a single queue the consumers will compete for messages and ActiveMQ will load balance across them, so order will be lost. For background on the issue and how it can be solved see</p>
-<ul><li><a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a> which allows only a single consumer to consume from the queue at once to preseve order</li><li><a shape="rect" href="message-groups.xml">Message Groups</a> which splits the messages on a queue into parallel virtual exclusive queues to ensure that messages to a single message group (defined by the JMSXGroupID header) will have their order preserved but that different groups will be load balanced to different consumers.</li></ul></div>
+<ul><li><link><page ri:content-title="Exclusive Consumer"></page></link> which allows only a single consumer to consume from the queue at once to preseve order</li><li><link><page ri:content-title="Message Groups"></page></link> which splits the messages on a queue into parallel virtual exclusive queues to ensure that messages to a single message group (defined by the JMSXGroupID header) will have their order preserved but that different groups will be load balanced to different consumers.</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-purge-a-queue.xml
----------------------------------------------------------------------
diff --git a/how-do-i-purge-a-queue.xml b/how-do-i-purge-a-queue.xml
index a83ded2..9999e15 100644
--- a/how-do-i-purge-a-queue.xml
+++ b/how-do-i-purge-a-queue.xml
@@ -1,16 +1,17 @@
 <div class="wiki-content maincontent"><p>A frequent requirement is to purge a queue (i.e. delete all the messages on it).</p>
 
-<h3 id="HowdoIpurgeaqueue-Solution">Solution</h3>
+<h3>Solution</h3>
 
-<p>You can use the <a shape="rect" href="web-console.xml">Web Console</a> to view queues, add/remove queues, purge queues or delete/forward individual messages.</p>
+<p>You can use the <link><page ri:content-title="Web Console"></page></link> to view queues, add/remove queues, purge queues or delete/forward individual messages.</p>
 
-<p>Another option is to use <a shape="rect" href="jmx.xml">JMX</a> to browse the queues and call the <strong>purge()</strong> method on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/QueueViewMBean.html">QueueViewMBean</a>. </p>
+<p>Another option is to use <link><page ri:content-title="JMX"></page></link> to browse the queues and call the <strong>purge()</strong> method on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/QueueViewMBean.html">QueueViewMBean</a>. </p>
 
-<p>You could also delete the queue via removeQueue(String) or removeTopic(String) methods on the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a></p>
+<p>You could also delete the queue via removeQueue(String) or removeTopic(String) methods on the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/broker/jmx/BrokerViewMBean.html">BrokerViewMBean</a></p>
 
-<p>You can also do it <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a></p>
+<p>You can also do it <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link></p>
 
-<h3 id="HowdoIpurgeaqueue-AlsoSee">Also See</h3>
+<h3>Also See</h3>
 
-<ul><li><a shape="rect" href="web-console.xml">Web Console</a></li><li><a shape="rect" href="jmx.xml">JMX</a></li><li><a shape="rect" href="how-do-i-find-the-size-of-a-queue.xml">How do I find the Size of a Queue</a></li><li><a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">How can I see what destinations are used</a></li></ul></div>
+<ul><li><link><page ri:content-title="Web Console"></page></link></li><li><link><page ri:content-title="JMX"></page></link></li><li><link><page ri:content-title="How do I find the Size of a Queue"></page></link></li><li><link><page ri:content-title="How can I see what destinations are used"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-restart-embedded-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-restart-embedded-broker.xml b/how-do-i-restart-embedded-broker.xml
index 7dee46e..8942db2 100644
--- a/how-do-i-restart-embedded-broker.xml
+++ b/how-do-i-restart-embedded-broker.xml
@@ -1,34 +1,29 @@
 <div class="wiki-content maincontent"><p>Pure restart of the embedded broker is not advisable, since it's state could be corrupted. Therefore, you're advised to instantiate the broker again before restarting it.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-BrokerService service = BrokerFactory.createBroker(&quot;xbean:activemq.xml&quot;);
+<structured-macro ac:macro-id="83b8db39-13df-4c7d-8bd8-e959f2722bfb" ac:name="code" ac:schema-version="1"><plain-text-body>
+BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
 service.start();
 service.waitUntilStarted();
 
 service.stop();
 service.waitUntilStopped();
 
-service = BrokerFactory.createBroker(&quot;xbean:activemq.xml&quot;);
+service = BrokerFactory.createBroker("xbean:activemq.xml");
 service.start();
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>In 5.3 however, we allowed the force start of the broker that has been stopped for use cases that need this functionality. You can do it by using </p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="2781ad46-6498-41c8-833e-8adb8bbf24ac" ac:name="code" ac:schema-version="1"><plain-text-body>
 BrokerService.start(boolean force);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>method.</p>
 
 <p>The following example demonstrates it.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-BrokerService service = BrokerFactory.createBroker(&quot;xbean:activemq.xml&quot;);
+<structured-macro ac:macro-id="708b1ca9-f8db-4529-831c-180bd947d7b0" ac:name="code" ac:schema-version="1"><plain-text-body>
+BrokerService service = BrokerFactory.createBroker("xbean:activemq.xml");
 service.start();
 service.waitUntilStarted();
 
@@ -36,8 +31,7 @@ service.stop();
 service.waitUntilStopped();
 
 service.start(true);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>However, it's better (more reliable) to instantiate the broker again if it is possible.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
----------------------------------------------------------------------
diff --git a/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml b/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
index 2c370ea..9eec89d 100644
--- a/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
+++ b/how-do-i-restrict-connections-from-creating-new-queues-or-topics.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIrestrictconnectionsfromcreatingnewqueuesortopics-HowdoIrestrictconnectionsfromcreatingnewqueuesortopics?">How do I restrict connections from creating new queues or topics?</h2>
+<div class="wiki-content maincontent"><h2>How do I restrict connections from creating new queues or topics?</h2>
 
-<p>As is described in <a shape="rect" href="how-do-i-create-new-destinations.xml">How do I create new destinations</a> there is no need to create all the destinations up front, you can let the broker create them on the fly.</p>
+<p>As is described in <link><page ri:content-title="How do I create new destinations"></page></link> there is no need to create all the destinations up front, you can let the broker create them on the fly.</p>
 
-<p>However if you don't want this behaviour, or wish to restrict this behaviour to certain topic or queue <a shape="rect" href="wildcards.xml">Wildcards</a> (areas of the queue or topic name space) then you can use the <a shape="rect" href="security.xml">Security</a> plugins to disallow the <strong>admin</strong> role on whatever areas of the queue and topic namespace you wish</p></div>
+<p>However if you don't want this behaviour, or wish to restrict this behaviour to certain topic or queue <link><page ri:content-title="Wildcards"></page></link> (areas of the queue or topic name space) then you can use the <link><page ri:content-title="Security"></page></link> plugins to disallow the <strong>admin</strong> role on whatever areas of the queue and topic namespace you wish</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-run-a-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-run-a-broker.xml b/how-do-i-run-a-broker.xml
index bc2ac33..ce2da3b 100644
--- a/how-do-i-run-a-broker.xml
+++ b/how-do-i-run-a-broker.xml
@@ -1,6 +1,6 @@
 <div class="wiki-content maincontent">
-<h3 id="HowdoIrunabroker-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
 
 
-<p>Please see the <a shape="rect" href="run-broker.xml">running a broker page</a></p></div>
+<p>Please see the <link><page ri:content-title="Run Broker"></page><link-body>running a broker page</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-run-activemq-under-the-kaffe-jvm.xml
----------------------------------------------------------------------
diff --git a/how-do-i-run-activemq-under-the-kaffe-jvm.xml b/how-do-i-run-activemq-under-the-kaffe-jvm.xml
index 491778d..f5f2ddf 100644
--- a/how-do-i-run-activemq-under-the-kaffe-jvm.xml
+++ b/how-do-i-run-activemq-under-the-kaffe-jvm.xml
@@ -14,25 +14,23 @@ OS &amp; version: Linux dev-10 2.6.13-15.8-smp #1 SMP Tue Feb 7 11:07:24 UTC</p>
 
 <p>The following is the activemq.xml that was used:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="8e4c7537-d5e9-4587-9711-486889e4f14d" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;beans&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 useJmx=&quot;false&quot; xmlns=&quot;http://activemq.org/config/1.0&quot;&gt;
+ &lt;broker useJmx="false" xmlns="http://activemq.org/config/1.0"&gt;
 
   &lt;persistenceAdapter&gt;
-     &lt;journaledJDBC useJournal=&quot;false&quot; dataDirectory=&quot;activemq-data&quot;/&gt;
+     &lt;journaledJDBC useJournal="false" dataDirectory="activemq-data"/&gt;
   &lt;/persistenceAdapter&gt;
 
   &lt;transportConnectors&gt;
-     &lt;transportConnector name=&quot;default&quot; uri=&quot;tcp://localhost:61616&quot;/&gt;
-     &lt;transportConnector name=&quot;stomp&quot;   uri=&quot;stomp://localhost:61613&quot;/&gt;
+     &lt;transportConnector name="default" uri="tcp://localhost:61616"/&gt;
+     &lt;transportConnector name="stomp"   uri="stomp://localhost:61613"/&gt;
   &lt;/transportConnectors&gt;
 
  &lt;/broker&gt;
 
 &lt;/beans&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
----------------------------------------------------------------------
diff --git a/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml b/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
index ff5c43b..f2be69e 100644
--- a/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
+++ b/how-do-i-send-messages-to-different-destinations-from-a-single-messageproducer.xml
@@ -1,14 +1,12 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIsendmessagestodifferentDestinationsfromasingleMessageProducer-HowdoIsendmessagestodifferentDestinationsfromasingleMessageProducer?">How do I send messages to different Destinations from a single MessageProducer?</h2>
+<div class="wiki-content maincontent"><h2>How do I send messages to different Destinations from a single MessageProducer?</h2>
 
 <p>Create the MessageProducer using a null destination; then specify the destination each time you send...</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="cfdfbd31-1bde-4d5f-aa90-0f60d4ed9759" ac:name="code" ac:schema-version="1"><plain-text-body>
 MessageProducer producer = session.createProducer(null);
 ...
 producer.send(someDestination, message);
 ...
 producer.send(anotherDestination, message);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-set-the-message-expiration.xml
----------------------------------------------------------------------
diff --git a/how-do-i-set-the-message-expiration.xml b/how-do-i-set-the-message-expiration.xml
index 993ef4e..c652860 100644
--- a/how-do-i-set-the-message-expiration.xml
+++ b/how-do-i-set-the-message-expiration.xml
@@ -1,4 +1,5 @@
 <div class="wiki-content maincontent"><p>JMSExpiration on a message is set by the MessageProducer in JMS - either via</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setTimeToLive(long)" rel="nofollow">producer.setTimeToLive()</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#send(javax.jms.Destination,%20javax.jms.Message,%20int,%20int,%20long)" rel="nofollow">producer.send(Destination, Message, int, int, long)</a></li></ul></div>
+<ul><li><a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#setTimeToLive(long)">producer.setTimeToLive()</a></li><li><a shape="rect" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/MessageProducer.html#send(javax.jms.Destination,%20javax.jms.Message,%20int,%20int,%20long)">producer.send(Destination, Message, int, int, long)</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-unack-the-message-with-stomp.xml
----------------------------------------------------------------------
diff --git a/how-do-i-unack-the-message-with-stomp.xml b/how-do-i-unack-the-message-with-stomp.xml
index 33b345a..18ec01d 100644
--- a/how-do-i-unack-the-message-with-stomp.xml
+++ b/how-do-i-unack-the-message-with-stomp.xml
@@ -4,54 +4,51 @@
 
 <p>Take a look at the following example:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="bd6d23fc-406a-498a-8d12-05f047cb310f" ac:name="code" ac:schema-version="1"><plain-text-body>
 StompConnection connection = new StompConnection();
-connection.open(&quot;localhost&quot;, 61613);
+connection.open("localhost", 61613);
 		
-connection.connect(&quot;system&quot;, &quot;manager&quot;);
+connection.connect("system", "manager");
 		
-connection.send(&quot;/queue/test&quot;, &quot;message 1&quot;);
-connection.send(&quot;/queue/test&quot;, &quot;message 2&quot;);
-connection.send(&quot;/queue/test&quot;, &quot;message 3&quot;);
+connection.send("/queue/test", "message 1");
+connection.send("/queue/test", "message 2");
+connection.send("/queue/test", "message 3");
 		
 HashMap&lt;String, String&gt; headers = new HashMap&lt;String, String&gt;();
-headers.put(&quot;activemq.prefetchSize&quot;, &quot;1&quot;);
-connection.subscribe(&quot;/queue/test&quot;, &quot;client&quot;, headers);
+headers.put("activemq.prefetchSize", "1");
+connection.subscribe("/queue/test", "client", headers);
 		
-connection.begin(&quot;tx1&quot;);
+connection.begin("tx1");
 StompFrame frame = connection.receive();
 System.out.println(frame.getBody());
-connection.ack(frame, &quot;tx1&quot;);
-connection.abort(&quot;tx1&quot;);
+connection.ack(frame, "tx1");
+connection.abort("tx1");
 		
-connection.begin(&quot;tx2&quot;);
-connection.ack(frame, &quot;tx2&quot;);        //sending the ack again
+connection.begin("tx2");
+connection.ack(frame, "tx2");        //sending the ack again
 frame = connection.receive();
 System.out.println(frame.getBody());
-connection.ack(frame, &quot;tx2&quot;);
-connection.commit(&quot;tx2&quot;);
+connection.ack(frame, "tx2");
+connection.commit("tx2");
 		
-connection.begin(&quot;tx3&quot;);
+connection.begin("tx3");
 frame = connection.receive();
 System.out.println(frame.getBody());
-connection.ack(frame, &quot;tx3&quot;);
-connection.commit(&quot;tx3&quot;);
-]]></script>
-</div></div>
+connection.ack(frame, "tx3");
+connection.commit("tx3");
+</plain-text-body></structured-macro>
 
 <p>This simple application will print </p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="56487b6e-0246-466b-9e13-4c366a548105" ac:name="code" ac:schema-version="1"><plain-text-body>
 message 1
 message 2
 message 3
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Since the transaction <code>tx1</code> has been aborted, we needed to acknowledge that message again in <code>tx2</code> in order to be able to receive the next message (since the prefetch size used is 1).</p>
 
 <p>Also take a look at these pages for more info:</p>
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling">http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">http://activemq.apache.org/what-is-the-prefetch-limit-for.html</a></li></ul></div>
+<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling">http://activemq.apache.org/stomp/stomp10/additional.html#transaction_handling</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/what-is-the-prefetch-limit-for.html">http://activemq.apache.org/what-is-the-prefetch-limit-for.html</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-use-activemq-using-in-jvm-messaging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-use-activemq-using-in-jvm-messaging.xml b/how-do-i-use-activemq-using-in-jvm-messaging.xml
index d86df89..8f6980f 100644
--- a/how-do-i-use-activemq-using-in-jvm-messaging.xml
+++ b/how-do-i-use-activemq-using-in-jvm-messaging.xml
@@ -1,18 +1,16 @@
 <div class="wiki-content maincontent">
-<h3 id="HowdoIuseActiveMQusinginJVMmessaging-ForActiveMQ3.x/4.x">For ActiveMQ 3.x/4.x</h3>
+<h3>For ActiveMQ 3.x/4.x</h3>
 
 
 <p>To use pure in-memory messaging you just need to set the broker URL to be</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="b3266292-d211-4cd5-b05d-8bae5faa307c" ac:name="code" ac:schema-version="1"><plain-text-body>
 vm://localhost
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>&#160;</p>
 
 <p>Actually you can use any text after <em>vm://</em> so that you can segment multiple logical JMS brokers within the same JVM and classloader, using the name to distinguish between them.</p>
 
-<p>There is an example of how to do this along with a description of the available protocols in the <a shape="rect" href="uri-protocols.xml">Protocols overview</a>.</p>
+<p>There is an example of how to do this along with a description of the available protocols in the <link><page ri:content-title="URI Protocols"></page><link-body>Protocols overview</link-body></link>.</p>
 
-<p>Also see: <a shape="rect" href="how-should-i-use-the-vm-transport.xml">how to optimise the VM transport</a></p></div>
+<p>Also see: <link><page ri:content-title="How should I use the VM transport"></page><link-body>how to optimise the VM transport</link-body></link></p></div>
 


[48/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-30-release.xml
----------------------------------------------------------------------
diff --git a/activemq-30-release.xml b/activemq-30-release.xml
index cdf760c..703dc1d 100644
--- a/activemq-30-release.xml
+++ b/activemq-30-release.xml
@@ -1,24 +1,21 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>a new 'discovery' transport <a shape="rect" href="uri-protocols.xml">protocol</a> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li><li>more test cases and fixes of the <a shape="rect" href="jca-container.xml">JCA Container</a></li><li>various performance enhancements and bug fixes</li></ul>
+<ul><li>a new 'discovery' transport <link><page ri:content-title="URI Protocols"></page><link-body>protocol</link-body></link> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li><li>more test cases and fixes of the <link><page ri:content-title="JCA Container"></page></link></li><li>various performance enhancements and bug fixes</li></ul>
 
 
 
-<h2 id="ActiveMQ3.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.zip" rel="nofollow">activemq-3.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.zip" rel="nofollow">activemq-3.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.0.tar.gz" rel="nofollow">activemq-3.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.tar.gz" rel="nofollow">activemq-3.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.zip">activemq-3.0.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.zip">activemq-3.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0.tar.gz">activemq-3.0.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.0-src.tar.gz">activemq-3.0-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11500&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11500&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="f214b00e-ab9d-4881-8e53-a6c15a42c09b" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11500&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-21-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 2.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-31-release.xml
----------------------------------------------------------------------
diff --git a/activemq-31-release.xml b/activemq-31-release.xml
index 94fcb91..a2042cb 100644
--- a/activemq-31-release.xml
+++ b/activemq-31-release.xml
@@ -1,26 +1,23 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>New <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> support to make it easy to create cross language clients such as for Ruby or Perl etc. (Python, C and .Net coming soon)</li><li>XPath based selectors and demand based publishing, making it easy to implement <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> on top of ActiveMQ</li><li>a pooling JMS ConnectionFactory for better support of the Spring JMSTemplate outside of a JCA container</li><li>improved JNDI support to allow easy dynamic creation of Queues and Topics, to handle different connection settings and to reuse standard JNDI properties</li><li>Increased support for the number of <a shape="rect" href="jdbc-support.xml">databases and JDBC drivers</a> to include
+<ul><li>New <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> support to make it easy to create cross language clients such as for Ruby or Perl etc. (Python, C and .Net coming soon)</li><li>XPath based selectors and demand based publishing, making it easy to implement <a shape="rect" href="http://servicemix.org/WS+Notification">WS-Notification</a> on top of ActiveMQ</li><li>a pooling JMS ConnectionFactory for better support of the Spring JMSTemplate outside of a JCA container</li><li>improved JNDI support to allow easy dynamic creation of Queues and Topics, to handle different connection settings and to reuse standard JNDI properties</li><li>Increased support for the number of <link><page ri:content-title="JDBC Support"></page><link-body>databases and JDBC drivers</link-body></link> to include
 	<ul><li>Apache Derby</li><li>Oracle</li><li>Sybase</li><li>DB2</li><li>SQLServer</li><li>Postgresql</li><li>MySQL</li><li>Axion</li><li>HSQL</li></ul>
 	</li><li>improved authentication at the connection and destination level</li><li>More flexible prefetch policy configurations for more control over queue dispatching and performance tuning</li><li>improved support for priority message ordering</li><li>cleaner servlet integration</li><li>better XA integration to allow outbound producers to reuse inbound JMS sessions</li><li>improved support for WebSphere and JBoss</li><li>easier journal file size and checkpoint period configuration</li><li>jabber transport</li><li>various performance enhancements and bug fixes</li></ul>
 
 
 
-<h2 id="ActiveMQ3.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.zip" rel="nofollow">activemq-3.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.zip" rel="nofollow">activemq-3.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.1.tar.gz" rel="nofollow">activemq-3.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.tar.gz" rel="nofollow">activemq-3.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.zip">activemq-3.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.zip">activemq-3.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1.tar.gz">activemq-3.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.1-src.tar.gz">activemq-3.1-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11501&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11501&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="734eb27c-b8f6-4715-b880-1907d691ed20" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;fixfor=11501&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=100&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-30-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.0 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-32-release.xml
----------------------------------------------------------------------
diff --git a/activemq-32-release.xml b/activemq-32-release.xml
index b526bfc..f26e103 100644
--- a/activemq-32-release.xml
+++ b/activemq-32-release.xml
@@ -1,23 +1,20 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This new release includes the following</p>
 
-<ul><li>Improved <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
+<ul><li>Improved <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
 
 
-<h2 id="ActiveMQ3.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.zip" rel="nofollow">activemq-3.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.zip" rel="nofollow">activemq-3.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-
 3.2.tar.gz" rel="nofollow">activemq-3.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.tar.gz" rel="nofollow">activemq-3.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.zip">activemq-3.2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.zip">activemq-3.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.tar.gz">activemq-3.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2-src.tar.gz">activemq-3.2-src.tar.gz</a></p></td><td
  colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11610&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11610&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="b8c785ae-8206-49dd-b5c9-8d7c264d7dfd" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;fixfor=11610&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-31-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-321-release.xml
----------------------------------------------------------------------
diff --git a/activemq-321-release.xml b/activemq-321-release.xml
index 9fab03b..cd87bc5 100644
--- a/activemq-321-release.xml
+++ b/activemq-321-release.xml
@@ -1,19 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This release is a bug fix release and users of previous versions of 3.2 are encouraged to upgrade to this version.</p>
 
-<h2 id="ActiveMQ3.2.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.zip" rel="nofollow">activemq-3.2.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.zip" rel="nofollow">activemq-3.2.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/a
 ctivemq-3.2.1.tar.gz" rel="nofollow">activemq-3.2.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.tar.gz" rel="nofollow">activemq-3.2.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.zip">activemq-3.2.1.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.zip">activemq-3.2.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1.tar.gz">activemq-3.2.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.1-src.tar.gz">activemq-3.2.1-src.tar.gz
 </a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11715&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11715&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="03b2865f-ddfe-4560-861a-5df69548bb43" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;pid=10520&amp;types=1&amp;types=2&amp;types=4&amp;types=3&amp;fixfor=11715&amp;statusIds=5&amp;statusIds=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-32-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.2 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-322-release.xml
----------------------------------------------------------------------
diff --git a/activemq-322-release.xml b/activemq-322-release.xml
index ca99bc9..19fbb7e 100644
--- a/activemq-322-release.xml
+++ b/activemq-322-release.xml
@@ -1,19 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ3.2.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This release is a bug fix release and users of previous versions of 3.2 are encouraged to upgrade to this version.</p>
 
-<h2 id="ActiveMQ3.2.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.zip" rel="nofollow">activemq-3.2.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.zip" rel="nofollow">activemq-3.2.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/a
 ctivemq-3.2.2.tar.gz" rel="nofollow">activemq-3.2.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.tar.gz" rel="nofollow">activemq-3.2.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.zip">activemq-3.2.2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.zip">activemq-3.2.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2.tar.gz">activemq-3.2.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://dist.codehaus.org/activemq/distributions/activemq-3.2.2-src.tar.gz">activemq-3.2.2-src.tar.gz
 </a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ3.2.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11723&amp;styleName=Html&amp;projectId=10520&amp;Create=Create" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?version=11723&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="8e517002-3efb-4615-8af9-0e710c7488b0" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11723&amp;status=5&amp;status=6&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>You may also want to look at <a shape="rect" href="activemq-321-release.xml">the previous Changelog</a></p></div>
+<p>You may also want to look at <link><page ri:content-title="ActiveMQ 3.2.1 Release"></page><link-body>the previous Changelog</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-m4-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-m4-release.xml b/activemq-40-m4-release.xml
index cba8dfc..ed4ee9c 100644
--- a/activemq-40-m4-release.xml
+++ b/activemq-40-m4-release.xml
@@ -1,18 +1,16 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ4.0M4Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
-<p>This is the first milestone release of 4.x since the move to Apache so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>This is the first milestone release of 4.x since the move to Apache so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
-<p>This release of ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This release of ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h2 id="ActiveMQ4.0M4Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.zip">activemq-4.0-M4.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.zip">activemq-4.0-M4-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incuba
 tor-activemq/distributions/activemq-4.0-M4.tar.gz">activemq-4.0-M4.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.tar.gz">activemq-4.0-M4-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.zip">activemq-4.0-M4.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4-src.zip">activemq-4.0-M4-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-M4.tar.gz">activemq-4.0-M4.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubat
 or-activemq/distributions/activemq-4.0-M4-src.tar.gz">activemq-4.0-M4-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0M4Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11726" rel="nofollow">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.activemq.org/jira/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11726">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div></div>
+<structured-macro ac:macro-id="8d93ac92-0500-4bfe-942f-1385b04c0286" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://jira.activemq.org/jira/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11726&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-rc2-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-rc2-release.xml b/activemq-40-rc2-release.xml
index 1e1dd82..0370233 100644
--- a/activemq-40-rc2-release.xml
+++ b/activemq-40-rc2-release.xml
@@ -1,30 +1,27 @@
 <div class="wiki-content maincontent">
-<h2 id="ActiveMQ4.0RC2Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This is the second release candiate release of 4.0.</p>
 
-<p>This release of ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This release of ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h3 id="ActiveMQ4.0RC2Release-Warnings">Warnings</h3>
+<h3>Warnings</h3>
 
 <p>When upgrading from a previous release you are advised to clear down the journal files and persistent database first before upgrading to this jar as the binary format of messages is not compatible with 3.x or earlier 4.x releases.</p>
 
-<h3 id="ActiveMQ4.0RC2Release-Whathaschanged">What has changed</h3>
+<h3>What has changed</h3>
 
-<p>The 4.x branch of ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>The 4.x branch of ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
 
-<h2 id="ActiveMQ4.0RC2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.zip">activemq-4.0-RC2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.zip">activemq-4.0-RC2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/in
 cubator-activemq/distributions/activemq-4.0-RC2.tar.gz">activemq-4.0-RC2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.tar.gz">activemq-4.0-RC2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.zip">activemq-4.0-RC2.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2-src.zip">activemq-4.0-RC2-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/incubator-activemq/distributions/activemq-4.0-RC2.tar.gz">activemq-4.0-RC2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://cvs.apache.org/repository/i
 ncubator-activemq/distributions/activemq-4.0-RC2-src.tar.gz">activemq-4.0-RC2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0RC2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11750">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/activemq/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=11750">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="3568981f-91dc-4af7-ad4b-a49717f05b55" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="https://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11750&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=1000&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-m4-release.xml">ActiveMQ 4.0 M4 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 M4 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-40-release.xml
----------------------------------------------------------------------
diff --git a/activemq-40-release.xml b/activemq-40-release.xml
index b39faa8..773face 100644
--- a/activemq-40-release.xml
+++ b/activemq-40-release.xml
@@ -1,53 +1,44 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ4.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
-<p>This is the 4.0 release of Apache ActiveMQ. This release of Apache ActiveMQ includes a large number of <a shape="rect" href="changes-in-40.xml">new features</a> such as <a shape="rect" href="masterslave.xml">MasterSlave</a> and <a shape="rect" href="message-groups.xml">Message Groups</a> together with numerous bug fixes.</p>
+<p>This is the 4.0 release of Apache ActiveMQ. This release of Apache ActiveMQ includes a large number of <link><page ri:content-title="Changes in 4.0"></page><link-body>new features</link-body></link> such as <link><page ri:content-title="MasterSlave"></page></link> and <link><page ri:content-title="Message Groups"></page></link> together with numerous bug fixes.</p>
 
-<h3 id="ActiveMQ4.0Release-Warnings">Warnings</h3>
+<h3>Warnings</h3>
 
 <p>When upgrading from a previous release you are advised to clear down the journal files and persistent database first before upgrading to this jar as the binary format of messages is not compatible with 3.x or earlier 4.0 milestone releases. </p>
 
-<h3 id="ActiveMQ4.0Release-Knownissues">Known issues</h3>
+<h3>Known issues</h3>
 
-<p>Some folks have found issues with acknowledgements, particularly when using auto-ack mode. This has been fixed in 4.0.1 which will be released shortly. Until then we recommend you disable <a shape="rect" href="connection-configuration-uri.xml">optimizeAcknowledge</a>. e.g. connect via</p>
+<p>Some folks have found issues with acknowledgements, particularly when using auto-ack mode. This has been fixed in 4.0.1 which will be released shortly. Until then we recommend you disable <link><page ri:content-title="Connection Configuration URI"></page><link-body>optimizeAcknowledge</link-body></link>. e.g. connect via</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="1c57366d-fb90-4fe9-b78b-95402c62f258" ac:name="code" ac:schema-version="1"><plain-text-body>
 tcp://localhost:61616?jms.optimizeAcknowledge=false
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The source distributions do not build as is anymore due to changes in the way the maven repo is now setup at Apache.  You must first apply the following <a shape="rect" href="activemq-40-release.data/amq4-build.patch?version=1&amp;modificationDate=1150318678000&amp;api=v2" data-linked-resource-id="3263" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="amq4-build.patch" data-linked-resource-content-type="text/x-patch" data-linked-resource-container-id="36141" data-linked-resource-container-version="12">patch</a> before doing the build.  You will need to download the patch and apply it using the patch command.</p>
+<p>The source distributions do not build as is anymore due to changes in the way the maven repo is now setup at Apache.  You must first apply the following <link><attachment ri:filename="amq4-build.patch"></attachment><link-body>patch</link-body></link> before doing the build.  You will need to download the patch and apply it using the patch command.</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="91f79a80-5459-4350-a9df-c59951da64a7" ac:name="code" ac:schema-version="1"><plain-text-body>
 cd ${path-to-activemq-source-distro}
 patch -p 0 &lt; ${path-to-amq4-build.patch}
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="ActiveMQ4.0Release-Whathaschanged">What has changed</h3>
+<h3>What has changed</h3>
 
-<p>The 4.x branch of Apache ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <a shape="rect" href="changes-in-40.xml">Changes in 4.0</a>.</p>
+<p>The 4.x branch of Apache ActiveMQ has now moved to the Apache Incubator so the package names have changed from org.activemq to org.apache.activemq. For a full list see the <link><page ri:content-title="Changes in 4.0"></page></link>.</p>
 
 
-<h2 id="ActiveMQ4.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Download</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.zip">incubator-activemq-4.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.zip">incubator-activemq-4.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http:
 //people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.tar.gz">incubator-activemq-4.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.tar.gz">incubator-activemq-4.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Distribution in gz package</p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Download</p></th><th colspan="1" rowspan="1"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.zip">incubator-activemq-4.0.zip</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.zip">incubator-activemq-4.0-src.zip</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in zip package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.tar.gz">incubator-activemq-4.0.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Binary Distribution in gz package</p></td></tr><tr><td colspan="1" rowspan="1"><p><a shape="r
 ect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0-src.tar.gz">incubator-activemq-4.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p>Source Distribution in gz package</p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="497437e5-e037-401e-a9dd-847fdc296bd3" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;pid=10520&amp;fixfor=11660">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?reset=true&amp;pid=10520&amp;fixfor=11660">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="8b7fb8e1-5345-4ccd-b51b-6c43b7304faf" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11660&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-rc2-release.xml">ActiveMQ 4.0 RC2 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 RC2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-401-release.xml
----------------------------------------------------------------------
diff --git a/activemq-401-release.xml b/activemq-401-release.xml
index 8fa6915..424306c 100644
--- a/activemq-401-release.xml
+++ b/activemq-401-release.xml
@@ -1,29 +1,30 @@
-<div class="wiki-content maincontent"><p>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="e8c22b09-3bcf-4961-9bc2-8f0c7641feae" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;!--
+{warning:title=The Release is still in progress}
+You are previewing the release page for unreleased version of ActiveMQ.  The download links on the page below will not work until it is offically released.
 
-</p>
+Until the release is approved you could try the current build: http://people.apache.org/~chirino/incubator-activemq-4.0.1-RC1/maven1/incubator-activemq/distributions/
+{warning} 
+--&gt;
+</plain-text-body></structured-macro></p>
 
-<h2 id="ActiveMQ4.0.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<h2>New and Noteworthy</h2>
 
 <p>This is a minor bug fix release.  All previous installations of Apache ActiveMQ 4.0 are recommended to upgrade to this release.</p>
 
-<h2 id="ActiveMQ4.0.1Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip">incubator-activemq-4.0.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip.asc">incubator-activemq-4.0.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip">incubator-activemq-4.0.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip.asc">incubator-activemq-4.0.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz">incubator-activemq-4.0.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz.asc">incub
 ator-activemq-4.0.1.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz">incubator-activemq-4.0.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz.asc">incubator-activemq-4.0.1-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip">incubator-activemq-4.0.1.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.zip.asc">incubator-activemq-4.0.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip">incubator-activemq-4.0.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apac
 he.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.zip.asc">incubator-activemq-4.0.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz">incubator-activemq-4.0.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1.tar.gz.asc">incubator-activemq-4.0.1.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.1-src.tar.gz">incubator-activemq-4.0.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distr
 ibutions/incubator-activemq-4.0.1-src.tar.gz.asc">incubator-activemq-4.0.1-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0.1Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="c6de6663-a103-4b0e-b354-a8397b6f9cd2" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0.1
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11780&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11780&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="c00ff1c9-4ae1-4d1f-a4b6-242420b352fd" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11780&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-40-release.xml">ActiveMQ 4.0 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-402-release.xml
----------------------------------------------------------------------
diff --git a/activemq-402-release.xml b/activemq-402-release.xml
index 4ed31d0..20e725b 100644
--- a/activemq-402-release.xml
+++ b/activemq-402-release.xml
@@ -1,25 +1,20 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQ4.0.2Release-NewandNoteworthy">New and Noteworthy</h2>
+<div class="wiki-content maincontent"><h2>New and Noteworthy</h2>
 
 <p>This is a minor bug fix release.  All previous installations of Apache ActiveMQ 4.0.1 are recommended to upgrade to this release.</p>
 
-<h2 id="ActiveMQ4.0.2Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip">incubator-activemq-4.0.2.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip.asc">incubator-activemq-4.0.2.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Windows</p></td><td colspan="1" rowspan="1" class
 ="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip">incubator-activemq-4.0.2-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip.asc">incubator-activemq-4.0.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz">incubator-activemq-4.0.2.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz.asc">incub
 ator-activemq-4.0.2.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source code for Unix</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz">incubator-activemq-4.0.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz.asc">incubator-activemq-4.0.2-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip">incubator-activemq-4.0.2.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.zip.asc">incubator-activemq-4.0.2.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip">incubator-activemq-4.0.2-src.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apac
 he.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.zip.asc">incubator-activemq-4.0.2-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz">incubator-activemq-4.0.2.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2.tar.gz.asc">incubator-activemq-4.0.2.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source code for Unix</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distributions/incubator-activemq-4.0.2-src.tar.gz">incubator-activemq-4.0.2-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repository/incubator-activemq/distr
 ibutions/incubator-activemq-4.0.2-src.tar.gz.asc">incubator-activemq-4.0.2-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.0.2Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="9fa8cc37-c891-4e8d-a3e3-ca1d15c70e78" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0.2 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="ActiveMQ4.0.2Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11783&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11783&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<structured-macro ac:macro-id="0f3fb5c8-0599-412e-905b-bd2abd34969e" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11783&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-
-<p>Also see the previous <a shape="rect" href="activemq-401-release.xml">ActiveMQ 4.0.1 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-410-release.xml
----------------------------------------------------------------------
diff --git a/activemq-410-release.xml b/activemq-410-release.xml
index 9d61949..56d8f4c 100644
--- a/activemq-410-release.xml
+++ b/activemq-410-release.xml
@@ -1,11 +1,8 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="7eb0ee22-25e8-40c4-93e7-7b231d410e59" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></url></image></p></rich-text-body></structured-macro>
 
-
-
-
-<div style="min-height:200px">
-<h2 id="ActiveMQ4.1.0Release-NewandNoteworthy">New and Noteworthy</h2>
+<structured-macro ac:macro-id="c53e9a16-861b-44a4-9315-41722329fbd8" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
+<h2>New and Noteworthy</h2>
 
 <p>This is release contains several major enhancements such as:</p>
 
@@ -14,28 +11,20 @@
 
 <p>It also contains a slew of bug fixes that are tracked in the change log.</p>
 
-<h2 id="ActiveMQ4.1.0Release-DownloadHere">Download Here</h2>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip">apache-activemq-4.1.0-incubator.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip.asc">incubator-activemq-4.1.0.zip.asc</a></p></td></tr><tr><td colspan="1" rows
 pan="1" class="confluenceTd"><p>Binary for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz">apache-activemq-4.1.0-incubator.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz.asc">incubator-activemq-4.1.0.tar.gz.asc</a></p></td></tr></tbody></table></div>
-
-</div>
+<h2>Download Here</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Binary for Windows</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip">apache-activemq-4.1.0-incubator.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.zip.asc">incubator-activemq-4.1.0.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Binary for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-act
 ivemq-4.1.0-incubator.tar.gz">apache-activemq-4.1.0-incubator.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://people.apache.org/repo/m2-incubating-repository/org/apache/activemq/apache-activemq/4.1.0-incubator/apache-activemq-4.1.0-incubator.tar.gz.asc">incubator-activemq-4.1.0.tar.gz.asc</a></p></td></tr></tbody></table>
 
+</rich-text-body></structured-macro>
 
-
-
-<h2 id="ActiveMQ4.1.0Release-SVNTagCheckout">SVN Tag Checkout</h2>
-<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[
+<h2>SVN Tag Checkout</h2>
+<structured-macro ac:macro-id="555f21ec-222c-48eb-924c-4afaccbc4b25" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.0 
-]]></script>
-</div></div>
-
-<h2 id="ActiveMQ4.1.0Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11691&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+</plain-text-body></structured-macro>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11691&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
+<structured-macro ac:macro-id="e45b257b-5f8b-4949-b9f8-d1e7da3d4e24" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/secure/IssueNavigator.jspa?view=rss&amp;&amp;pid=10520&amp;fixfor=11691&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;tempMax=25&amp;reset=true&amp;decorator=none"></url></parameter></structured-macro>
 
-<p>Also see the previous <a shape="rect" href="activemq-402-release.xml">ActiveMQ 4.0.2 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.0.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-411-release.xml
----------------------------------------------------------------------
diff --git a/activemq-411-release.xml b/activemq-411-release.xml
index 86a3e88..9a04fe5 100644
--- a/activemq-411-release.xml
+++ b/activemq-411-release.xml
@@ -1,59 +1,46 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></span></p></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="41cfe7e2-77b3-4f0a-b9bb-a34cb5af876b" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-410-release.data/activemq-4.1-box-reflection.png"></url></image></p></rich-text-body></structured-macro>
 
-
-
-
-<div style="min-height:200px">
-<h2 id="ActiveMQ4.1.1Release-NewandNoteworthy">New and Noteworthy</h2>
+<structured-macro ac:macro-id="b324427f-3e30-4c8c-b056-1a7aaacb22f3" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body>
+<h2>New and Noteworthy</h2>
 
 <p>Contains slew of bug fixes that are tracked in the change log.</p>
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
+<h2>Getting the Binary Distributions</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip">apache-activemq-4.1.1.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip.asc">apache-activemq-4.1.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"
 ><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz">apache-activemq-4.1.1.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz.asc">apache-activemq-4.1.1.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip">apache-activemq-4.1.1.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.zip.asc">apache-activemq-4.1.1.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1.tar.gz">apache-activemq-4.1.1.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache
 -activemq/4.1.1/apache-activemq-4.1.1.tar.gz.asc">apache-activemq-4.1.1.tar.gz.asc</a></p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
+<h2>Getting the Binaries using Maven 2</h2>
 
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
+<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</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="31b69de9-6a99-471d-809c-0f83c4c47c48" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-core&lt;/artifactId&gt;
   &lt;version&gt;4.1.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div>
-</div>
-
+</plain-text-body></structured-macro>
+</rich-text-body></structured-macro>
 
+<h2>Getting the Source Code</h2>
 
+<h3>Source Distributions</h3>
 
-<h2 id="ActiveMQ4.1.1Release-GettingtheSourceCode">Getting the Source Code</h2>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source for Windows</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip">apache-activemq-4.1.1-src.zip</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip.asc">apache-activemq-4.1.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz">apache-activemq-4.1.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://archive.apache.org/
 dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz.asc">apache-activemq-4.1.1-src.tar.gz.asc</a></p></td></tr></tbody></table>
 
-<h3 id="ActiveMQ4.1.1Release-SourceDistributions">Source Distributions</h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Windows</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip">apache-activemq-4.1.1-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.zip.asc">apache-activemq-4.1.1-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source for Unix/Linux/Cygwin</p></td><td colspan="1" rowspan="1" class="c
 onfluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz">apache-activemq-4.1.1-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/4.1.1/apache-activemq-4.1.1-src.tar.gz.asc">apache-activemq-4.1.1-src.tar.gz.asc</a></p></td></tr></tbody></table></div>
+<h3>SVN Tag Checkout</h3>
 
-
-<h3 id="ActiveMQ4.1.1Release-SVNTagCheckout">SVN Tag Checkout</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="34c1cfa9-0ea8-4d66-9f01-2c2cf172511f" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co http://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.1
-]]></script>
-</div></div>
-
-<h2 id="ActiveMQ4.1.1Release-Changelog">Changelog</h2>
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11800&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
+</plain-text-body></structured-macro>
 
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Data cannot be retrieved due to an unexpected error
-</div>
+<h2>Changelog</h2>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11800&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a></p>
 
+<structured-macro ac:macro-id="d8bdcfa0-84ce-4997-b564-8b0b7d7c4444" ac:name="jiraissues" ac:schema-version="1"><parameter ac:name="columns">type;key;summary</parameter><parameter ac:name="url"><url ri:value="http://issues.apache.org/activemq/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&amp;pid=10520&amp;fixfor=11800&amp;sorter/field=issuekey&amp;sorter/order=DESC"></url></parameter></structured-macro>
 
-<p>Also see the previous <a shape="rect" href="activemq-410-release.xml">ActiveMQ 4.1.0 Release</a></p></div>
+<p>Also see the previous <link><page ri:content-title="ActiveMQ 4.1.0 Release"></page></link></p></div>
 


[23/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/general-build-issues.xml
----------------------------------------------------------------------
diff --git a/cms/general-build-issues.xml b/cms/general-build-issues.xml
index f6427fe..6d6367c 100644
--- a/cms/general-build-issues.xml
+++ b/cms/general-build-issues.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h6 id="GeneralBuildIssues-Errorduringconfigure:&quot;error:libpthreadnotfound!&quot;">Error during configure: "error: libpthread not found!"</h6>
+<div class="wiki-content maincontent"><h6>Error during configure: "error: libpthread not found!"</h6>
 
 <p>Getting an error about libpthread not found even though its installed, in many cases indicates that the tool chain required to build the library isn't fully installed.&#160; One good place to start checking is to ensure that both 'gcc' and 'g+<span style="text-decoration: underline;">' are installed as the M4 configure macros that check for pthread related features uses 'g</span>+'. &#160; </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/general.xml
----------------------------------------------------------------------
diff --git a/cms/general.xml b/cms/general.xml
index 7892dfa..3e017ad 100644
--- a/cms/general.xml
+++ b/cms/general.xml
@@ -1,4 +1,4 @@
 <div class="wiki-content maincontent"><p>General Questions about ActiveMQ's CMS client.</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="are-there-more-faq-entries.xml">Are there more FAQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.xml">What is ActiveMQ CPP</a></li></ul></div>
+<structured-macro ac:macro-id="35a0132d-8bbc-4b99-9ccd-bbcf5bdf58e0" 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/cms/getting-started.xml
----------------------------------------------------------------------
diff --git a/cms/getting-started.xml b/cms/getting-started.xml
index 7ab5040..15f8f9a 100644
--- a/cms/getting-started.xml
+++ b/cms/getting-started.xml
@@ -1,4 +1,5 @@
-<div class="wiki-content maincontent"><h2 id="GettingStarted-GettingStartedGuide">Getting Started Guide</h2>
+<div class="wiki-content maincontent"><h2>Getting Started Guide</h2>
 
-<p>Start off by getting a <a shape="rect" href="download.xml">Download</a> or by grabbing the <a shape="rect" href="source.xml">Source</a> and <a shape="rect" href="building.xml">Building</a> it.</p></div>
+<p>Start off by getting a <link><page ri:content-title="Download"></page></link> or by grabbing the <link><page ri:content-title="Source"></page></link> and <link><page ri:content-title="Building"></page></link> it.</p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/handling-advisory-messages.xml
----------------------------------------------------------------------
diff --git a/cms/handling-advisory-messages.xml b/cms/handling-advisory-messages.xml
index 1af52cf..a54b259 100644
--- a/cms/handling-advisory-messages.xml
+++ b/cms/handling-advisory-messages.xml
@@ -3,83 +3,76 @@
 <ul><li>See consumers, producers and connections starting and stopping</li><li>See temporary destinations being created and destroyed</li><li>Get notified messages expiring on topics and queues</li><li>Observe brokers sending messages to destinations with no consumers.</li><li>See connections starting and stopping</li></ul>
 
 
-<p>Advisory messages can be thought as some kind of administrative channel where you receive information regarding what is happening on your JMS provider along with what's happening with producers, consumers and destinations.  To learn more about the broker's advisory message support see this <a shape="rect" href="../advisory-message.xml">article</a>.</p>
+<p>Advisory messages can be thought as some kind of administrative channel where you receive information regarding what is happening on your JMS provider along with what's happening with producers, consumers and destinations.  To learn more about the broker's advisory message support see this <link><page ri:content-title="Advisory Message" ri:space-key="ActiveMQ"></page><link-body>article</link-body></link>.</p>
 
-<h3 id="HandlingAdvisoryMessages-BeforeYouBegin"><strong>Before You Begin</strong></h3>
+<h3><strong>Before You Begin</strong></h3>
 
-<p>This tutorial assumes that the reader has a working knowledge of the CMS API and knows how to build basic applications using the ActiveMQ-CPP Library.  If you aren't sure how to use the CMS API then you should first read the <a shape="rect" href="cms-api-overview.xml">CMS API Overview</a>.  The tutorial is written against the ActiveMQ-CPP 3.0 release API and while it is possible to handle advisory messages using the older ActiveMQ-CPP 2.x clients there may be some code differences which are not shown in this article.  </p>
+<p>This tutorial assumes that the reader has a working knowledge of the CMS API and knows how to build basic applications using the ActiveMQ-CPP Library.  If you aren't sure how to use the CMS API then you should first read the <link><page ri:content-title="CMS API Overview"></page><link-body>CMS API Overview</link-body></link>.  The tutorial is written against the ActiveMQ-CPP 3.0 release API and while it is possible to handle advisory messages using the older ActiveMQ-CPP 2.x clients there may be some code differences which are not shown in this article.  </p>
 
-<h3 id="HandlingAdvisoryMessages-SubscribingtoAdvisoryTopics"><strong>Subscribing to Advisory Topics</strong></h3>
+<h3><strong>Subscribing to Advisory Topics</strong></h3>
 
 <p>To receive advisory message's you first need to subscribe to the Topic that supplies the advisory message you want.  You subscribe to these Topics like you would any other destination, the trick is to use the correct name for the Topic that you want to use.  Lets first take a look at a couple of the types available for use (this is not a complete set).</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ActiveMQ.Advisory.Connection </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Connection start &amp; stop messages </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ActiveMQ.Advisory.Producer.Queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Producer start &amp; stop messages on a Queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String='producerCount' - the number of producers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ProducerInfo</p></td></tr><tr><td colspan="1" rowspan="1" class=
 "confluenceTd"><p> ActiveMQ.Advisory.Producer.Topic </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Producer start &amp; stop messages on a Topic </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String='producerCount' - the number of producers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ProducerInfo</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ActiveMQ.Advisory.Consumer.Queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Consumer start &amp; stop messages on a Queue </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>String='consumerCount' - the number of Consumers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ConsumerInfo</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ActiveMQ.Advisory.Consumer.Topic </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Consumer start &amp; stop messages on a Topic </p></td><td colspan="1" rowspan="1" class="confl
 uenceTd"><p>String='consumerCount' - the number of Consumers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ConsumerInfo</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th></tr><tr><td colspan="1" rowspan="1"><p> ActiveMQ.Advisory.Connection </p></td><td colspan="1" rowspan="1"><p> Connection start &amp; stop messages </p></td></tr><tr><td colspan="1" rowspan="1"><p> ActiveMQ.Advisory.Producer.Queue </p></td><td colspan="1" rowspan="1"><p> Producer start &amp; stop messages on a Queue </p></td><td colspan="1" rowspan="1"><p>String='producerCount' - the number of producers</p></td><td colspan="1" rowspan="1"><p> ProducerInfo</p></td></tr><tr><td colspan="1" rowspan="1"><p> ActiveMQ.Advisory.Producer.Topic </p></td><td colspan="1" rowspan="1"><p> Producer start &amp; stop messages on a Topic </p></td><td colspan="1" rowspan="1"><p>String='producerCount' - the number of producers</p></td><td colspan="1" rowspan="1"><p>ProducerInfo
 </p></td></tr><tr><td colspan="1" rowspan="1"><p> ActiveMQ.Advisory.Consumer.Queue </p></td><td colspan="1" rowspan="1"><p> Consumer start &amp; stop messages on a Queue </p></td><td colspan="1" rowspan="1"><p>String='consumerCount' - the number of Consumers</p></td><td colspan="1" rowspan="1"><p>ConsumerInfo</p></td></tr><tr><td colspan="1" rowspan="1"><p> ActiveMQ.Advisory.Consumer.Topic </p></td><td colspan="1" rowspan="1"><p> Consumer start &amp; stop messages on a Topic </p></td><td colspan="1" rowspan="1"><p>String='consumerCount' - the number of Consumers</p></td><td colspan="1" rowspan="1"><p>ConsumerInfo</p></td></tr></tbody></table>
 
 
 <p>Now, looking at the above list lets pick one of the Topics and figure out how we would create the CMS Topic to subscribe to in order to receive the advisory messages.  Using the Java client we could create the Destination using the utility class <strong>AdvisorySupport</strong> but for now ActiveMQ-CPP doesn't provide such a utility class, hopefully we will see this added in a future release (Contributions are of course always welcomed!).</p>
 
 <p>If we had a Topic named TOPIC.FOO and we wanted to know when a producer subscribed to that Topic we would need to create a Topic object whose name is <strong>ActiveMQ.Advisory.Producer.Topic.TOPIC.FOO</strong> in order to receive the advisory message we are interested in.  We know this because we can look at the above table and see that the <strong>ActiveMQ.Advisory.Producer.Topic</strong> is informed whenever a Producer starts or stops publishing messages on a Topic and we also know that our Topic is named TOPIC.FOO, so adding them together gets us the name of our Advisory Topic, we also know this because we peaked at the AdvisorySupport.java class, and no, that's not cheating.  Below is a code snippet showing the creation of the Topic using a CMS Session:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating an Advisory Topic for Producers on TOPIC.FOO</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="ac0429a2-01b4-421a-8e3a-5abbe4840c4f" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating an Advisory Topic for Producers on TOPIC.FOO</parameter><plain-text-body>
 
     std::auto_ptr&lt;cms::Topic&gt; advisories( session-&gt;createTopic(
-        &quot;ActiveMQ.Advisory.Producer.Topic.TOPIC.FOO&quot; ) );
+        "ActiveMQ.Advisory.Producer.Topic.TOPIC.FOO" ) );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Once we create the Topic for the advisory messages we want to listen for we just need to create a consumer to listen for them, the code snippet below demonstrates this:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating an Consumer for an Advisory Topic.</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="59084ef4-8042-4829-8a92-5ee78351e123" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Creating an Consumer for an Advisory Topic.</parameter><plain-text-body>
 
 std::auto_ptr&lt;cms::MessageConsumer&gt; consumer;
 consumer.reset( session-&gt;createConsumer( advisories.get() ) );
 consumer-&gt;setMessageListener( this );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>As you can see there is no difference between subscriptions to advisory topics that subscriptions to any other Destination in CMS.  In the above example we registered as an asynchronous listener, you can also use the normal blocking <strong>receive</strong> method but we prefer this method.</p>
 
-<h3 id="HandlingAdvisoryMessages-DealingwithincomingAdvisoryMessages"><strong>Dealing with incoming Advisory Messages</strong></h3>
+<h3><strong>Dealing with incoming Advisory Messages</strong></h3>
 
 <p>Every Advisory has the message type 'Advisory' and some predefined message properties, to check a CMS Message for this type you would call the <strong>getCMSType</strong> method on a Message object.  In some cases you will know that the only message you are going to receive are advisory messages because your client only subscribes to advisory topics, other times you might have wired multiple MessageConsumers to the same MessageListener in which case you will have to check the message tppe.  Once you know you are dealing with an advisory message then you can start to inspect it to determine what sort of message it is and extract the data that is meaningful to your application.</p>
 
 <p>Many of the advisory messages store meaningful data in the Message properties, for instance the Consumer Start / Stop advisory message contains an element with the key <strong>consumerCount</strong> which is populated with the current number of active consumers on the Topic or Queue in question.  Lets take a look at a code snippet now that checks the messages received in an onMessage callback to see if its an advisory message and acts on it if it is:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using the CMS Type to determine if a Message is an Advisory</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="c025c6dd-e89f-4115-a690-58e22829e2f8" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Using the CMS Type to determine if a Message is an Advisory</parameter><plain-text-body>
 
  void AdvisoryProducer::onMessage( const cms::Message* message ) {
 
-     if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
+     if( message-&gt;getCMSType() == "Advisory" ) {
 
-         std::cout &lt;&lt; &quot;Received an Advisory Message!&quot; &lt;&lt; std::endl;
+         std::cout &lt;&lt; "Received an Advisory Message!" &lt;&lt; std::endl;
 
-         if( message-&gt;propertyExists( &quot;consumerCount&quot; ) ) {
+         if( message-&gt;propertyExists( "consumerCount" ) ) {
 
-             std::string consumerCount = message-&gt;getStringProperty( &quot;consumerCount&quot; );
-             std::cout &lt;&lt; &quot;Number of Consumers = &quot; &lt;&lt; consumerCount &lt;&lt; std::endl;
+             std::string consumerCount = message-&gt;getStringProperty( "consumerCount" );
+             std::cout &lt;&lt; "Number of Consumers = " &lt;&lt; consumerCount &lt;&lt; std::endl;
  
              // Do Something Meaningful here....
          }
 
      } else {
-         std::cout &lt;&lt; &quot;Received a Non-Advisory Message!&quot; &lt;&lt; std::endl;
+         std::cout &lt;&lt; "Received a Non-Advisory Message!" &lt;&lt; std::endl;
      }
  }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HandlingAdvisoryMessages-CompleteExample:ProducerthatonlyProduceswhenthereisaConsumer"><strong>Complete Example: Producer that only Produces when there is a Consumer</strong></h3>
+<h3><strong>Complete Example: Producer that only Produces when there is a Consumer</strong></h3>
 
 <p>Now that you've seen the basics of advisory message processing its time to show you a complete example that demonstrates what you can do with advisory messages.  The following code shows a class header and source file that implements a basic CMS Producer that will send heart beat message to a Topic called <strong>HEART-BEAT-CHANNEL</strong> only when there are active consumers, otherwise it sits idle.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>AdvisoryProducer Header file</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="d44fac8d-a18d-433f-99fb-bb8af9d942f8" ac:name="code" ac:schema-version="1"><parameter ac:name="title">AdvisoryProducer Header file</parameter><plain-text-body>
 
 #ifndef _ACTIVEMQCPP_EXAMPLES_ADVISORIES_ADVISORYPRODUCER_H_
 #define _ACTIVEMQCPP_EXAMPLES_ADVISORIES_ADVISORYPRODUCER_H_
@@ -145,13 +138,11 @@ namespace advisories {
 
 #endif /* _ACTIVEMQCPP_EXAMPLES_ADVISORIES_ADVISORYPRODUCER_H_ */
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>AdvisoryProducer Source file</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f39527c7-13c5-47cc-b854-cd091268e6b0" ac:name="code" ac:schema-version="1"><parameter ac:name="title">AdvisoryProducer Source file</parameter><plain-text-body>
 
-#include &quot;AdvisoryProducer.h&quot;
+#include "AdvisoryProducer.h"
 
 #include &lt;cms/Topic.h&gt;
 #include &lt;cms/Message.h&gt;
@@ -172,13 +163,13 @@ AdvisoryProducer::AdvisoryProducer( cms::Session* session ) : shutdownLatch(1) {
 
     if( session == NULL ) {
         throw NullPointerException(
-            __FILE__, __LINE__, &quot;Session Object passed was Null.&quot; );
+            __FILE__, __LINE__, "Session Object passed was Null." );
     }
 
     std::auto_ptr&lt;cms::Topic&gt; destination( session-&gt;createTopic(
-        &quot;HEART-BEAT-CHANNEL&quot; ) );
+        "HEART-BEAT-CHANNEL" ) );
     std::auto_ptr&lt;cms::Topic&gt; advisories( session-&gt;createTopic(
-        &quot;ActiveMQ.Advisory.Consumer.Topic.HEART-BEAT-CHANNEL&quot; ) );
+        "ActiveMQ.Advisory.Consumer.Topic.HEART-BEAT-CHANNEL" ) );
 
     this-&gt;shutdown = false;
     this-&gt;consumerOnline = false;
@@ -207,7 +198,7 @@ void AdvisoryProducer::run() {
         if( this-&gt;consumerOnline ) {
 
             std::auto_ptr&lt;cms::TextMessage&gt; message(
-                this-&gt;session-&gt;createTextMessage( &quot;Alive&quot; ) );
+                this-&gt;session-&gt;createTextMessage( "Alive" ) );
 
             this-&gt;producer-&gt;send( message.get() );
 
@@ -221,63 +212,59 @@ void AdvisoryProducer::run() {
 ////////////////////////////////////////////////////////////////////////////////
 void AdvisoryProducer::onMessage( const cms::Message* message ) {
 
-    if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
+    if( message-&gt;getCMSType() == "Advisory" ) {
 
-        std::cout &lt;&lt; &quot;Received an Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received an Advisory Message!" &lt;&lt; std::endl;
 
-        if( message-&gt;propertyExists( &quot;consumerCount&quot; ) ) {
+        if( message-&gt;propertyExists( "consumerCount" ) ) {
 
-            std::string consumerCount = message-&gt;getStringProperty( &quot;consumerCount&quot; );
-            std::cout &lt;&lt; &quot;Number of Consumers = &quot; &lt;&lt; consumerCount &lt;&lt; std::endl;
+            std::string consumerCount = message-&gt;getStringProperty( "consumerCount" );
+            std::cout &lt;&lt; "Number of Consumers = " &lt;&lt; consumerCount &lt;&lt; std::endl;
             this-&gt;consumerOnline = Integer::parseInt( consumerCount ) &gt; 0 ? true : false;
         }
 
     } else {
-        std::cout &lt;&lt; &quot;Received a Non-Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received a Non-Advisory Message!" &lt;&lt; std::endl;
     }
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HandlingAdvisoryMessages-*AdvancedTopic*DealingwithCommandObjectsinAdvisories">*<strong>Advanced Topic</strong>* Dealing with Command Objects in Advisories </h3>
+<h3>*<strong>Advanced Topic</strong>* Dealing with Command Objects in Advisories </h3>
 
-<p>If you read the ActiveMQ Advisory Message <a shape="rect" href="../advisory-message.xml">article</a> mentioned at the start of this tutorial then you know that certain advisory messages can contain an embedded command object.  If you didn't read that <a shape="rect" href="../advisory-message.xml">article</a> then this section is going to be very confusing, so go read it.  We can access those command object in CMS with a little work which means we can take full advantage of the Advisory Message feature.</p>
+<p>If you read the ActiveMQ Advisory Message <link><page ri:content-title="Advisory Message" ri:space-key="ActiveMQ"></page><link-body>article</link-body></link> mentioned at the start of this tutorial then you know that certain advisory messages can contain an embedded command object.  If you didn't read that <link><page ri:content-title="Advisory Message" ri:space-key="ActiveMQ"></page><link-body>article</link-body></link> then this section is going to be very confusing, so go read it.  We can access those command object in CMS with a little work which means we can take full advantage of the Advisory Message feature.</p>
 
-<p>All Advisory Messages are sent as a basic ActiveMQMessage to your client.  The underlying type hierarchy in ActiveMQ-CPP is the same as that of ActiveMQ so the names of the embedded command objects you saw in the Advisory <a shape="rect" href="../advisory-message.xml">article</a> are the same and they contain mostly the same information, although sometimes the information is encoded in a more C++ friendly or unfriendly way depending on your point of view. </p>
+<p>All Advisory Messages are sent as a basic ActiveMQMessage to your client.  The underlying type hierarchy in ActiveMQ-CPP is the same as that of ActiveMQ so the names of the embedded command objects you saw in the Advisory <link><page ri:content-title="Advisory Message" ri:space-key="ActiveMQ"></page><link-body>article</link-body></link> are the same and they contain mostly the same information, although sometimes the information is encoded in a more C++ friendly or unfriendly way depending on your point of view. </p>
 
 <p>To demonstrate how we can access the command objects lets try and create a client application that listens to the Broker for advisories that indicate that Temporary Destinations have either been created or destroyed.  The Broker will publish advisory messages to the "ActiveMQ.Advisory.TempTopic" and "ActiveMQ.Advisory.TempQueue" Topics whenever the corresponding Temporary Destination is created or destroyed and the command object will be of type DestinationInfo.  The DestinationInfo object contains a Destination object describing the Destination in question and an Operation Type value telling whether the command is a create or destroy command.  First lets look at how we subscribe to this Advisory Topic:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Subscribing to a Composite Advisory Topic</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f9da7b3c-4eca-4a1b-809e-4775cc6a1abb" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Subscribing to a Composite Advisory Topic</parameter><plain-text-body>
 
 std::auto_ptr&lt;cms::Topic&gt; advisories( session-&gt;createTopic(
-    &quot;ActiveMQ.Advisory.TempTopic,ActiveMQ.Advisory.TempQueue&quot; ) );
+    "ActiveMQ.Advisory.TempTopic,ActiveMQ.Advisory.TempQueue" ) );
 
 std::auto_ptr&lt;cms::MessageConsumer&gt; consumer;
 consumer.reset( session-&gt;createConsumer( advisories.get() ) );
 consumer-&gt;setMessageListener( this );
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>As you can see in the above code snippet we just create a new Topic object whose name is a composite of the two Topics we want to subscribe on, this will allow our single <strong>MessageConsumer</strong> instance to receive both Temporary Topic and Temporary Queue advisories.  As before we also create a <strong>MessageConsumer</strong> and register our class' instance as the asynchronous listener.  Now all that's left is to implement the <strong>onMessage</strong> method of the <strong>MessageListener</strong> interface, lets take a look at that code now:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Processing an Advisory message with an embedded command object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="dd78c039-6792-46b6-abf3-1a4163c4b4da" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Processing an Advisory message with an embedded command object</parameter><plain-text-body>
 
 ////////////////////////////////////////////////////////////////////////////////
 void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) {
 
-    if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
+    if( message-&gt;getCMSType() == "Advisory" ) {
 
-        std::cout &lt;&lt; &quot;Received an Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received an Advisory Message!" &lt;&lt; std::endl;
 
         const ActiveMQMessage* amqMessage =
             dynamic_cast&lt;const ActiveMQMessage*&gt;( message );
 
         if( amqMessage != NULL &amp;&amp; amqMessage-&gt;getDataStructure() != NULL ) {
-            std::cout &lt;&lt; &quot;Advisory Message contains a Command Object!&quot; &lt;&lt; std::endl;
+            std::cout &lt;&lt; "Advisory Message contains a Command Object!" &lt;&lt; std::endl;
 
             try {
 
@@ -287,43 +274,41 @@ void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) {
                 unsigned char operationType = info-&gt;getOperationType();
 
                 if( operationType == ActiveMQConstants::DESTINATION_REMOVE_OPERATION ) {
-                    std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+                    std::cout &lt;&lt; "Temporary Destination {"
                               &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                              &lt;&lt; &quot;} Removed.&quot;
+                              &lt;&lt; "} Removed."
                               &lt;&lt; std::endl;
                 } else if( operationType == ActiveMQConstants::DESTINATION_ADD_OPERATION ) {
-                    std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+                    std::cout &lt;&lt; "Temporary Destination {"
                               &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                              &lt;&lt; &quot;} Added.&quot;
+                              &lt;&lt; "} Added."
                               &lt;&lt; std::endl;
                 } else {
-                    std::cout &lt;&lt; &quot;ERROR: I have no Idea what just happened!&quot;
+                    std::cout &lt;&lt; "ERROR: I have no Idea what just happened!"
                               &lt;&lt; std::endl;
                 }
 
             } catch( ClassCastException&amp; ex ) {
-                std::cout &lt;&lt; &quot;ERROR: Expected the Command to be a DestinationInfo, &quot;
-                          &lt;&lt; &quot;it wasn&#39;t so PANIC!!&quot;
+                std::cout &lt;&lt; "ERROR: Expected the Command to be a DestinationInfo, "
+                          &lt;&lt; "it wasn't so PANIC!!"
                           &lt;&lt; std::endl;
             }
         }
 
     } else {
-        std::cout &lt;&lt; &quot;Received a Non-Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received a Non-Advisory Message!" &lt;&lt; std::endl;
     }
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Fortunately for use the code above looks more complicated than it really is, lets walk through it a bit more slowly now to understand what is going on:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Getting to the ActiveMQMessage object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="acb1797e-d657-4a65-8b8a-54144ec26fa3" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Getting to the ActiveMQMessage object</parameter><plain-text-body>
 
-if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
+if( message-&gt;getCMSType() == "Advisory" ) {
 
-    std::cout &lt;&lt; &quot;Received an Advisory Message!&quot; &lt;&lt; std::endl;
+    std::cout &lt;&lt; "Received an Advisory Message!" &lt;&lt; std::endl;
 
     const ActiveMQMessage* amqMessage =
         dynamic_cast&lt;const ActiveMQMessage*&gt;( message );
@@ -331,26 +316,22 @@ if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
     ... Other scary code comes next...
 
 else {
-    std::cout &lt;&lt; &quot;Received a Non-Advisory Message!&quot; &lt;&lt; std::endl;
+    std::cout &lt;&lt; "Received a Non-Advisory Message!" &lt;&lt; std::endl;
 }
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>The first thing we need to do is check that we received an advisory message, ActiveMQ encodes the Message Type as "Advisory" so that's easy enough.  We don't technically need to do this here since our consumer only listens on an advisory Topic but its not a bad idea to check.  Once we know its an advisory message we know that the message pointer should be of type ActiveMQMessage under that generic cms::Message disguise its wearing so we use a <strong>dynamic_cast</strong> to convert it.  Now that we've converted to an ActiveMQMessage what's next, well lets take a look:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Checking for an embedded command object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="e2c6ec28-d857-4f19-bdfa-58b3b4d1ec3d" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Checking for an embedded command object</parameter><plain-text-body>
 
 if( amqMessage != NULL &amp;&amp; amqMessage-&gt;getDataStructure() != NULL ) {
-    std::cout &lt;&lt; &quot;Advisory Message contains a Command Object!&quot; &lt;&lt; std::endl;
+    std::cout &lt;&lt; "Advisory Message contains a Command Object!" &lt;&lt; std::endl;
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Every ActiveMQMessage derived object has a method called <strong>getDataStructure</strong> which can be used for all sorts of useful things, here we are trying to see if there is a command object contained in this message, and you guessed it, the getDataStructure method will tell us if there is one.  If there is then we can move onto checking for a DestinationInfo object:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Getting to the DestinationInfo object</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="63c3b5de-08b6-4727-a368-2e9ae4602a8a" ac:name="code" ac:schema-version="1"><parameter ac:name="title">Getting to the DestinationInfo object</parameter><plain-text-body>
 
 try{
 
@@ -360,37 +341,35 @@ try{
     unsigned char operationType = info-&gt;getOperationType();
 
     if( operationType == ActiveMQConstants::DESTINATION_REMOVE_OPERATION ) {
-        std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+        std::cout &lt;&lt; "Temporary Destination {"
                   &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                  &lt;&lt; &quot;} Removed.&quot;
+                  &lt;&lt; "} Removed."
                   &lt;&lt; std::endl;
     } else if( operationType == ActiveMQConstants::DESTINATION_ADD_OPERATION ) {
-        std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+        std::cout &lt;&lt; "Temporary Destination {"
                   &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                  &lt;&lt; &quot;} Added.&quot;
+                  &lt;&lt; "} Added."
                   &lt;&lt; std::endl;
      } else {
-        std::cout &lt;&lt; &quot;ERROR: I have no Idea what just happened!&quot;
+        std::cout &lt;&lt; "ERROR: I have no Idea what just happened!"
                   &lt;&lt; std::endl;
      }
 
 } catch( ClassCastException&amp; ex ) {
-    std::cout &lt;&lt; &quot;ERROR: Expected the Command to be a DestinationInfo, &quot;
-              &lt;&lt; &quot;it wasn&#39;t so PANIC!!&quot;
+    std::cout &lt;&lt; "ERROR: Expected the Command to be a DestinationInfo, "
+              &lt;&lt; "it wasn't so PANIC!!"
               &lt;&lt; std::endl;
 }
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>First thing you are probably asking about this code snippet is "what is that Pointer thing?", that is a thread safe smart pointer that is used internally by ActiveMQ-CPP to manage all the pointers that make up the cms::Message objects among other things.  We create an instance of a Pointer&lt;DestinationInfo&gt; type which will pointer to our DestinationInfo command if the dynamicCast method is able to make that conversion, if not a ClassCastException is thrown.  Once we have the DestinationInfo pointer we can retrieve the Operation Type of the command and then compare it to the constants in ActiveMQConstants to see what is being done to the Destination.  There are only two operation types, add and remove, but since the DestinationInfo object encodes the operation type value as an unsigned char we provide a fall-back case to alert us to that error.  We are almost done now, all that remains is to output what happened, and also let the user know what the name of the Destination is,
  the <strong>getPhysicalName</strong> method in the Destination class tells us that.  You could also find out whether the Destination is a Topic or a Queue using the Destination object, we leave that as an exercise to the reader.</p>
 
-<h3 id="HandlingAdvisoryMessages-CompleteExample:ConsumerthatlistensforCreationandDestructionofTemporaryDestinations"><strong>Complete Example: Consumer that listens for Creation and Destruction of Temporary Destinations</strong></h3>
+<h3><strong>Complete Example: Consumer that listens for Creation and Destruction of Temporary Destinations</strong></h3>
 
 <p>The complete code of our client application is shown below, you can also find this code as well as a simple client that creates both a Temporary Topic and a Temporary Queue in the examples folder in the source distribution.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>TempDestinationAdvisoryConsumer Header File</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="2068fff3-c58c-4fa8-86b4-98f4a0c68521" ac:name="code" ac:schema-version="1"><parameter ac:name="title">TempDestinationAdvisoryConsumer Header File</parameter><plain-text-body>
 
 #ifndef _ACTIVEMQCPP_EXAMPLES_ADVISORIES_TEMPDESTINATIONADVISORYCONSUMER_H_
 #define _ACTIVEMQCPP_EXAMPLES_ADVISORIES_TEMPDESTINATIONADVISORYCONSUMER_H_
@@ -436,13 +415,11 @@ namespace advisories {
 
 #endif /* _ACTIVEMQCPP_EXAMPLES_ADVISORIES_TEMPDESTINATIONADVISORYCONSUMER_H_ */
 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>TempDestinationAdvisoryConsumer Source File</b></div><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="0270a8c8-0536-45aa-af59-f5e69fbdcd5b" ac:name="code" ac:schema-version="1"><parameter ac:name="title">TempDestinationAdvisoryConsumer Source File</parameter><plain-text-body>
 
-#include &quot;TempDestinationAdvisoryConsumer.h&quot;
+#include "TempDestinationAdvisoryConsumer.h"
 
 #include &lt;cms/Topic.h&gt;
 #include &lt;cms/Message.h&gt;
@@ -470,11 +447,11 @@ TempDestinationAdvisoryConsumer::TempDestinationAdvisoryConsumer( cms::Session*
 
     if( session == NULL ) {
         throw NullPointerException(
-            __FILE__, __LINE__, &quot;Session Object passed was Null.&quot; );
+            __FILE__, __LINE__, "Session Object passed was Null." );
     }
 
     std::auto_ptr&lt;cms::Topic&gt; advisories( session-&gt;createTopic(
-        &quot;ActiveMQ.Advisory.TempTopic,ActiveMQ.Advisory.TempQueue&quot; ) );
+        "ActiveMQ.Advisory.TempTopic,ActiveMQ.Advisory.TempQueue" ) );
 
     this-&gt;session = session;
     this-&gt;consumer.reset( session-&gt;createConsumer( advisories.get() ) );
@@ -488,15 +465,15 @@ TempDestinationAdvisoryConsumer::~TempDestinationAdvisoryConsumer() {
 ////////////////////////////////////////////////////////////////////////////////
 void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) {
 
-    if( message-&gt;getCMSType() == &quot;Advisory&quot; ) {
+    if( message-&gt;getCMSType() == "Advisory" ) {
 
-        std::cout &lt;&lt; &quot;Received an Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received an Advisory Message!" &lt;&lt; std::endl;
 
         const ActiveMQMessage* amqMessage =
             dynamic_cast&lt;const ActiveMQMessage*&gt;( message );
 
         if( amqMessage != NULL &amp;&amp; amqMessage-&gt;getDataStructure() != NULL ) {
-            std::cout &lt;&lt; &quot;Advisory Message contains a Command Object!&quot; &lt;&lt; std::endl;
+            std::cout &lt;&lt; "Advisory Message contains a Command Object!" &lt;&lt; std::endl;
 
             try {
 
@@ -506,32 +483,31 @@ void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) {
                 unsigned char operationType = info-&gt;getOperationType();
 
                 if( operationType == ActiveMQConstants::DESTINATION_REMOVE_OPERATION ) {
-                    std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+                    std::cout &lt;&lt; "Temporary Destination {"
                               &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                              &lt;&lt; &quot;} Removed.&quot;
+                              &lt;&lt; "} Removed."
                               &lt;&lt; std::endl;
                 } else if( operationType == ActiveMQConstants::DESTINATION_ADD_OPERATION ) {
-                    std::cout &lt;&lt; &quot;Temporary Destination {&quot;
+                    std::cout &lt;&lt; "Temporary Destination {"
                               &lt;&lt; info-&gt;getDestination()-&gt;getPhysicalName()
-                              &lt;&lt; &quot;} Added.&quot;
+                              &lt;&lt; "} Added."
                               &lt;&lt; std::endl;
                 } else {
-                    std::cout &lt;&lt; &quot;ERROR: I have no Idea what just happened!&quot;
+                    std::cout &lt;&lt; "ERROR: I have no Idea what just happened!"
                               &lt;&lt; std::endl;
                 }
 
             } catch( ClassCastException&amp; ex ) {
-                std::cout &lt;&lt; &quot;ERROR: Expected the Command to be a DestinationInfo, &quot;
-                          &lt;&lt; &quot;it wasn&#39;t so PANIC!!&quot;
+                std::cout &lt;&lt; "ERROR: Expected the Command to be a DestinationInfo, "
+                          &lt;&lt; "it wasn't so PANIC!!"
                           &lt;&lt; std::endl;
             }
         }
 
     } else {
-        std::cout &lt;&lt; &quot;Received a Non-Advisory Message!&quot; &lt;&lt; std::endl;
+        std::cout &lt;&lt; "Received a Non-Advisory Message!" &lt;&lt; std::endl;
     }
 }
 
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/how-do-i-prevent-autoconf-from-enabling-openssl-support.xml
----------------------------------------------------------------------
diff --git a/cms/how-do-i-prevent-autoconf-from-enabling-openssl-support.xml b/cms/how-do-i-prevent-autoconf-from-enabling-openssl-support.xml
index 99c203f..d490535 100644
--- a/cms/how-do-i-prevent-autoconf-from-enabling-openssl-support.xml
+++ b/cms/how-do-i-prevent-autoconf-from-enabling-openssl-support.xml
@@ -1,7 +1,6 @@
 <div class="wiki-content maincontent"><p>In some cases you may not want to build in support for OpenSSL, since the Autotools script do this automatically we have provided a means to disable this, just add the <em>disable-ssl</em> options to your configure and no SSL support will be added:</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>./configure --disable-ssl
-</pre>
-</div></div></div>
+<structured-macro ac:macro-id="b274ecb8-c81f-4c58-93c0-7c845fe29265" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+./configure --disable-ssl
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/how-do-i-use-the-ssl-transport.xml
----------------------------------------------------------------------
diff --git a/cms/how-do-i-use-the-ssl-transport.xml b/cms/how-do-i-use-the-ssl-transport.xml
index b32da0f..0e0054f 100644
--- a/cms/how-do-i-use-the-ssl-transport.xml
+++ b/cms/how-do-i-use-the-ssl-transport.xml
@@ -1,33 +1,30 @@
-<div class="wiki-content maincontent"><p>The first thing you need to do in order to use the SSL Transport in ActiveMQ-CPP is to build the library with SSL support enabled, for that see the <a shape="rect" href="building-faqs.xml">Build FAQs</a>.</p>
+<div class="wiki-content maincontent"><p>The first thing you need to do in order to use the SSL Transport in ActiveMQ-CPP is to build the library with SSL support enabled, for that see the <link><page ri:content-title="Building FAQs"></page><link-body>Build FAQs</link-body></link>.</p>
 
 <p>Once you have a build that supports the SSL protocol then its pretty simple, just replace the use of the <em>TCP</em> Transport in your connection URI with SSL, for example:  </p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>tcp://broker1:61616
-</pre>
-</div></div>
+<structured-macro ac:macro-id="52f589ed-9f33-48fd-967b-efabc07ffa0c" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+tcp://broker1:61616
+</plain-text-body></structured-macro>
 
 <p>becomes:</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>ssl://broker1:61616
-</pre>
-</div></div>
+<structured-macro ac:macro-id="859b73ed-9e01-48b7-86ce-19bcdab4acb2" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+ssl://broker1:61616
+</plain-text-body></structured-macro>
 
 <p>You should note that in order to validate that the certificate that the broker sends is the one we want we must validate the "Common Name (CN)" field from the certificate against the host-name in the URI.  If you have trouble connecting to the broker one of the first things to check it if your host-name matches the broker certificate common name.</p>
 
 <p>That's almost it, there's just a couple other things you need might need to do.  The SSL transport needs to know whether or not to trust the certificate that the Broker sends to it, for this you need to set a property in the Decaf library (this is the native library ActiveMQ-CPP uses for cross platform support).  The property you set tells the library where to find either the Broker's Certificate or the Certificate of the Authority that signed the broker's certificate.  If you are using the Failover Transport (which you should be) in conjunction with the SSL Transport then its best to set the property to point to the certificate that signed all your broker's certificates.  Here's what the code looks like:</p>
 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>
+<structured-macro ac:macro-id="f9f78a4d-7595-4914-843a-687c8868dfd4" ac:name="noformat" ac:schema-version="1"><plain-text-body>
+
 #include &lt;decaf/lang/System.h&gt;
 
 ...
 
 decaf::lang::System::setProperty( "decaf.net.ssl.trustStore", "&lt;path to Certificate file&gt;/certificate.pem" );
 
-</pre>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>One thing to note here is that since we are using OpenSSL as our SSL Engine the Certificate needs to be in PEM format.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/index.xml
----------------------------------------------------------------------
diff --git a/cms/index.xml b/cms/index.xml
index 7407747..3df83c7 100644
--- a/cms/index.xml
+++ b/cms/index.xml
@@ -1,84 +1,2 @@
-<div class="wiki-content maincontent"><p>CMS (stands for C++ Messaging Service) is a JMS-like API for C++ for interfacing with Message Brokers such as <a shape="rect" class="external-link" href="http://activemq.apache.org">Apache ActiveMQ</a>. CMS helps to make your C++ client code much neater and easier to follow. To get a better feel for CMS try the <a shape="rect" href="api.xml">API</a> Reference. ActiveMQ-CPP is a client only library, a message broker such as <a shape="rect" class="external-link" href="http://activemq.apache.org">Apache ActiveMQ</a> is still needed for your clients to communicate.</p><p>Our implementation of CMS is called ActiveMQ-CPP, which has an architecture that allows for pluggable transports and wire formats. Currently we support the <a shape="rect" href="openwire-support.xml">OpenWire</a> and <a shape="rect" href="stomp-support.xml">Stomp</a> protocols, both over TCP and SSL, we also now support a Failover Transport for more reliable client operation. In 
 addition to CMS, ActiveMQ-CPP also provides a robust set of classes that support platform independent constructs such as threading, I/O, sockets, etc. You may find many of these utilities very useful, such as a Java like Thread class or the "synchronized" macro that let's you use a Java-like synchronization on any object that implements the activemq::concurrent::Synchronizable interface. ActiveMQ-CPP is released under the <a shape="rect" class="external-link" href="http://www.apache.org/">Apache</a> <a shape="rect" class="external-link" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="index.data/ActiveMQ-CPP.png" data-image-src="/confluence/download/attachments/45919/ActiveMQ-CPP.png?version=3&amp;modificationDate=1176898417000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="4180" data-linked-resource-version="3" data-linked-resource-type="att
 achment" data-linked-resource-default-alias="ActiveMQ-CPP.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="45919" data-linked-resource-container-version="55"></span></p><h3 id="Index-LatestNewsItems.">Latest News Items.</h3><p>    
-
-    
-        
-</p><div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/02/24/activemq-cpp-v394-released.xml">ActiveMQ-CPP v3.9.4 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Feb 24, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-394-release.html">here</a>.</p></div></div></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2016/04/01/activemq-cpp-v393-released.xml">ActiveMQ-CPP v3.9.3 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Apr 01, 2016</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-393-release.html">here</a>.</p></div></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2016/02/09/activemq-cpp-v392-released.xml">ActiveMQ-CPP v3.9.2 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Feb 09, 2016</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small STOMP protocol fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-392-release.html">here</a>.</p></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2015/12/04/activemq-cpp-v391-released.xml">ActiveMQ-CPP v3.9.1 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Dec 04, 2015</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-391-release.html">here</a>.</p></div></div></div>
-    </div>
-    
-        
-    </div>
-    <h3 id="Index-ToseeolderNewspostings.">To see older News postings.</h3><ul><li><a shape="rect" href="news.xml">Get all the Apache ActiveMQ-CPP News Here!</a></li></ul></div>
+<div class="wiki-content maincontent"><p>CMS (stands for C++ Messaging Service) is a JMS-like API for C++ for interfacing with Message Brokers such as <a shape="rect" href="http://activemq.apache.org">Apache ActiveMQ</a>. CMS helps to make your C++ client code much neater and easier to follow. To get a better feel for CMS try the <link><page ri:content-title="API"></page></link> Reference. ActiveMQ-CPP is a client only library, a message broker such as <a shape="rect" href="http://activemq.apache.org">Apache ActiveMQ</a> is still needed for your clients to communicate.</p><p>Our implementation of CMS is called ActiveMQ-CPP, which has an architecture that allows for pluggable transports and wire formats. Currently we support the <link><page ri:content-title="OpenWire Support"></page><plain-text-link-body>OpenWire</plain-text-link-body></link> and <link><page ri:content-title="Stomp Support"></page><plain-text-link-body>Stomp</plain-text-link-body></link> protocols, both over TCP and 
 SSL, we also now support a Failover Transport for more reliable client operation. In addition to CMS, ActiveMQ-CPP also provides a robust set of classes that support platform independent constructs such as threading, I/O, sockets, etc. You may find many of these utilities very useful, such as a Java like Thread class or the "synchronized" macro that let's you use a Java-like synchronization on any object that implements the activemq::concurrent::Synchronizable interface. ActiveMQ-CPP is released under the <a shape="rect" href="http://www.apache.org/">Apache</a> <a shape="rect" href="http://www.apache.org/licenses/LICENSE-2.0.html">2.0 License</a></p><p><image><attachment ri:filename="ActiveMQ-CPP.png"></attachment></image></p><h3>Latest News Items.</h3><p><structured-macro ac:macro-id="6bca84f5-0f2c-4d7e-b7b6-b55e56478097" ac:name="blog-posts" ac:schema-version="1"><parameter ac:name="">4</parameter></structured-macro></p><h3>To see older News postings.</h3><ul><li><link><page ri:co
 ntent-title="News"></page><plain-text-link-body>Get all the Apache ActiveMQ-CPP News Here!</plain-text-link-body></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/mailing-lists.xml
----------------------------------------------------------------------
diff --git a/cms/mailing-lists.xml b/cms/mailing-lists.xml
index 240f33b..075cb46 100644
--- a/cms/mailing-lists.xml
+++ b/cms/mailing-lists.xml
@@ -1,11 +1,11 @@
-<div class="wiki-content maincontent"><p>The following mailing lists are available. Before posting you might want to read the <a shape="rect" class="unresolved" href="#">Tips for getting help</a>.</p>
+<div class="wiki-content maincontent"><p>The following mailing lists are available. Before posting you might want to read the <link><page ri:content-title="Tips for getting help"></page></link>.</p>
 
-<h2 id="MailingLists-ApacheMailingLists">Apache Mailing Lists</h2>
+<h2>Apache Mailing Lists</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> List Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Subscribe </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Unsubscribe </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Archive </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Nabble (Online Forums) </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> activemq User List </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:users-subscribe@activemq.apache.org" rel="nofollow">Subscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:users-unsubscribe@activemq.apache.org" rel="nofollow">Unsubscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://ma
 il-archives.apache.org/mod_mbox/activemq-users/">Archive</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.nabble.com/ActiveMQ---User-f2356.html" rel="nofollow">Nabble</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> activemq Developer List </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:dev-subscribe@activemq.apache.org" rel="nofollow">Subscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:dev-unsubscribe@activemq.apache.org" rel="nofollow">Unsubscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://mail-archives.apache.org/mod_mbox/activemq-dev/">Archive</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.nabble.com
 /ActiveMQ---Dev-f2355.html" rel="nofollow">Nabble</a> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> activemq SCM List </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:commits-subscribe@activemq.apache.org" rel="nofollow">Subscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="mailto:commits-unsubscribe@activemq.apache.org" rel="nofollow">Unsubscribe</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://mail-archives.apache.org/mod_mbox/activemq-commits/">Archive</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> List Name </p></th><th colspan="1" rowspan="1"><p> Subscribe </p></th><th colspan="1" rowspan="1"><p> Unsubscribe </p></th><th colspan="1" rowspan="1"><p> Archive </p></th><th colspan="1" rowspan="1"><p> Nabble (Online Forums) </p></th></tr><tr><td colspan="1" rowspan="1"><p> activemq User List </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:users-subscribe@activemq.apache.org">Subscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:users-unsubscribe@activemq.apache.org">Unsubscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://mail-archives.apache.org/mod_mbox/activemq-users/">Archive</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.nabble.com/ActiveMQ---User-f2356.html">Nabble</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> activemq Developer List </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:dev-
 subscribe@activemq.apache.org">Subscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:dev-unsubscribe@activemq.apache.org">Unsubscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://mail-archives.apache.org/mod_mbox/activemq-dev/">Archive</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://www.nabble.com/ActiveMQ---Dev-f2355.html">Nabble</a> </p></td></tr><tr><td colspan="1" rowspan="1"><p> activemq SCM List </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:commits-subscribe@activemq.apache.org">Subscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="mailto:commits-unsubscribe@activemq.apache.org">Unsubscribe</a> </p></td><td colspan="1" rowspan="1"><p> <a shape="rect" href="http://mail-archives.apache.org/mod_mbox/activemq-commits/">Archive</a> </p></td><td colspan="1" rowspan="1"><p>&#160;</p></td></tr></tbody></table>
 
 
-<h3 id="MailingLists-DiscussionForums">Discussion Forums</h3>
+<h3>Discussion Forums</h3>
 
-<p>If you prefer you could use our <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> which are sync'd with the above mailing lists.</p></div>
+<p>If you prefer you could use our <link><page ri:content-title="Discussion Forums"></page></link> which are sync'd with the above mailing lists.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/navigation.xml
----------------------------------------------------------------------
diff --git a/cms/navigation.xml b/cms/navigation.xml
index 20c7883..2a377e9 100644
--- a/cms/navigation.xml
+++ b/cms/navigation.xml
@@ -1,40 +1,41 @@
-<div class="wiki-content maincontent"><h3 id="Navigation-Overview"><a shape="rect" href="index.xml">Overview</a></h3>
+<div class="wiki-content maincontent"><h3><link><page ri:content-title="Index"></page><link-body>Overview</link-body></link></h3>
 
-<ul class="alternate"><li><a shape="rect" href="index.xml">Index</a></li><li><a shape="rect" href="news.xml">News</a></li><li><a shape="rect" href="getting-started.xml">Getting Started</a></li><li><a shape="rect" href="tutorials.xml">Tutorials</a></li><li><a shape="rect" href="api.xml">API</a></li><li><a shape="rect" href="faq.xml">FAQ</a></li><li><a shape="rect" href="download.xml">Download</a></li></ul>
+<ul class="alternate"><li><link><page ri:content-title="Index"></page></link></li><li><link><page ri:content-title="News"></page></link></li><li><link><page ri:content-title="Getting Started"></page></link></li><li><link><page ri:content-title="Tutorials"></page></link></li><li><link><page ri:content-title="API"></page></link></li><li><link><page ri:content-title="FAQ"></page></link></li><li><link><page ri:content-title="Download"></page></link></li></ul>
 
 
-<h3 id="Navigation-Connectivity"><a shape="rect" href="connectivity.xml">Connectivity</a></h3>
+<h3><link><page ri:content-title="Connectivity"></page></link></h3>
 
-<ul class="alternate"><li><a shape="rect" href="stomp-support.xml">Stomp</a></li><li><a shape="rect" href="openwire-support.xml">OpenWire</a></li></ul>
+<ul class="alternate"><li><link><page ri:content-title="Stomp Support"></page><link-body>Stomp</link-body></link></li><li><link><page ri:content-title="OpenWire Support"></page><link-body>OpenWire</link-body></link></li></ul>
 
 
-<h3 id="Navigation-UsingActiveMQ-CPP"><a shape="rect" href="using-activemq-cpp.xml">Using ActiveMQ-CPP</a></h3>
+<h3><link><page ri:content-title="Using ActiveMQ-CPP"></page></link></h3>
 
-<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>
+<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>
 
 
-<h3 id="Navigation-Search">Search</h3>
+<h3>Search</h3>
 
-<p></p><p>
-</p><div>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<p></p>
+<p></p><p><structured-macro ac:macro-id="a6958b0d-f81f-414e-a092-9833bafc9aea" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;DIV&gt;
+&lt;FORM action="http://www.google.com/search" method="get" style="font-size: 10px;"&gt;
+&lt;INPUT name="ie" type="hidden" value="UTF-8"&gt;&lt;/INPUT&gt;
+&lt;INPUT name="oe" type="hidden" value="UTF-8"&gt;&lt;/INPUT&gt;
+  &lt;INPUT maxlength="255" name="q" size="15" type="text" value&gt;&lt;/INPUT&gt;&lt;BR&gt;&lt;/BR&gt;
+  &lt;INPUT name="btnG" type="submit" value="Search"&gt;&lt;/INPUT&gt;
+  &lt;INPUT name="domains" type="hidden" value="activemq.apache.org"&gt;&lt;/INPUT&gt;
+  &lt;INPUT name="sitesearch" type="hidden" value="activemq.apache.org"&gt;&lt;/INPUT&gt;
+&lt;/FORM&gt;
+&lt;/DIV&gt;
+</plain-text-body></structured-macro></p><p></p>
 
-<h3 id="Navigation-Community"><a shape="rect" href="community.xml">Community</a></h3>
+<h3><link><page ri:content-title="Community"></page></link></h3>
 
-<ul class="alternate"><li><a shape="rect" href="support.xml">Support</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/contributing.html">Contributing</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" class="external-link" href="irc://irc.codehaus.org/activemq" rel="nofollow">IRC</a></li><li><a shape="rect" class="external-link" href="http://servlet.uwyn.com/drone/log/hausbot/activemq" rel="nofollow">IRC Log</a></li><li><a shape="rect" href="site.xml">Site</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/team.html">Team</a></li></ul>
+<ul class="alternate"><li><link><page ri:content-title="Support"></page></link></li><li><a shape="rect" href="http://activemq.apache.org/contributing.html">Contributing</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><a shape="rect" href="irc://irc.codehaus.org/activemq">IRC</a></li><li><a shape="rect" href="http://servlet.uwyn.com/drone/log/hausbot/activemq">IRC Log</a></li><li><link><page ri:content-title="Site"></page></link></li><li><a shape="rect" href="http://activemq.apache.org/team.html">Team</a></li></ul>
 
 
 
-<h3 id="Navigation-Developers"><a shape="rect" href="developers.xml">Developers</a></h3>
+<h3><link><page ri:content-title="Developers"></page></link></h3>
 
-<ul class="alternate"><li><a shape="rect" href="source.xml">Source</a></li><li><a shape="rect" href="building.xml">Building</a></li><li><a shape="rect" href="creating-distributions.xml">Creating Distributions</a></li></ul></div>
+<ul class="alternate"><li><link><page ri:content-title="Source"></page></link></li><li><link><page ri:content-title="Building"></page></link></li><li><link><page ri:content-title="Creating Distributions"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/news.xml
----------------------------------------------------------------------
diff --git a/cms/news.xml b/cms/news.xml
index 60beb7f..e9dd923 100644
--- a/cms/news.xml
+++ b/cms/news.xml
@@ -1,206 +1,4 @@
-<div class="wiki-content maincontent"><h3 id="News-ActiveMQ-CPPNews">ActiveMQ-CPP News</h3>
+<div class="wiki-content maincontent"><h3>ActiveMQ-CPP News</h3>
 
-    
-
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2017/02/24/activemq-cpp-v394-released.xml">ActiveMQ-CPP v3.9.4 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Feb 24, 2017</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-394-release.html">here</a>.</p></div></div></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2016/04/01/activemq-cpp-v393-released.xml">ActiveMQ-CPP v3.9.3 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Apr 01, 2016</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small fix to ensure failed producer create throws an exception, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-393-release.html">here</a>.</p></div></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2016/02/09/activemq-cpp-v392-released.xml">ActiveMQ-CPP v3.9.2 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Feb 09, 2016</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a small STOMP protocol fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-392-release.html">here</a>.</p></div></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2015/12/04/activemq-cpp-v391-released.xml">ActiveMQ-CPP v3.9.1 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Dec 04, 2015</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-391-release.html">here</a>.</p></div></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2015/08/16/activemq-cpp-v390-released.xml">ActiveMQ-CPP v3.9.0 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Aug 16, 2015</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/activemq-cpp-390-release.html">here</a>.</p></div></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2014/07/18/activemq-cpp-v383-released.xml">ActiveMQ-CPP v3.8.3 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Jul 18, 2014</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <div class="wiki-content"><p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.8.3+Release">here</a>.</p></div>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2013/12/10/activemq-cpp-v382-released.xml">ActiveMQ-CPP v3.8.2 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Dec 10, 2013</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="activemq-cpp-382-release.xml">here</a>.</p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2013/09/19/activemq-cpp-v381-released.xml">ActiveMQ-CPP v3.8.1 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Sep 19, 2013</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The next release of ActiveMQ-CPP is out featuring a critical memory leak fix, grab the source bundle <a shape="rect" href="activemq-cpp-381-release.xml">here</a>.</p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="/confluence/pages/viewpage.action?pageId=34019221">ActiveMQ-CPP v3.8.0 Released.</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Sep 07, 2013</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes and a few new features. Download your copy from <a shape="rect" href="activemq-cpp-380-release.xml">here</a>.</p>
-    </div>
-    
-        
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="/images/confluence/icons/profilepics/default.png" alt="User icon: tabish121" title="tabish121">
-           </a>            </span>
-            <span class="blogHeading">
-                <a shape="rect" class="blogHeading" href="2013/05/19/activemq-cpp-v370-released.xml">ActiveMQ-CPP v3.7.0 Released</a>
-                </span><div class="page-metadata not-personal">    <a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on May 19, 2013</div>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The next release of ActiveMQ-CPP is out featuring a lot of stability fixes. Download your copy from <a shape="rect" href="activemq-cpp-370-release.xml">here</a>.</p>
-    </div>
-    
-        
-    </div>
-    </div>
+<structured-macro ac:macro-id="e56c7a5a-74fb-481b-8683-b438708ab851" ac:name="blog-posts" ac:schema-version="1"><parameter ac:name="">10</parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cms/openssl-support.xml
----------------------------------------------------------------------
diff --git a/cms/openssl-support.xml b/cms/openssl-support.xml
index 5240f0f..efe67f2 100644
--- a/cms/openssl-support.xml
+++ b/cms/openssl-support.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent"><p>This section covers building the ActiveMQ-CPP Library with support for SSL using the OpenSSL library</p>
-<ul class="childpages-macro"><li><a shape="rect" href="enable-openssl-support-with-autotools.xml">Enable OpenSSL support with autotools</a></li><li><a shape="rect" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.xml">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.xml">How to enable SSL support on Windows</a></li></ul></div>
+<structured-macro ac:macro-id="91699896-dbbe-43e4-b0fe-3ca45b430706" 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/cms/openwire-support.xml
----------------------------------------------------------------------
diff --git a/cms/openwire-support.xml b/cms/openwire-support.xml
index 4fe5ea4..e99adf5 100644
--- a/cms/openwire-support.xml
+++ b/cms/openwire-support.xml
@@ -1,5 +1,6 @@
-<div class="wiki-content maincontent"><h2 id="OpenWireSupport-ActiveMQ-CPPOpenWireSupport">ActiveMQ-CPP OpenWire Support</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ-CPP OpenWire Support</h2>
 
-<p><a shape="rect" class="external-link" href="http://activemq.apache.org/openwire.html">OpenWire</a> is the native protocol used by the <a shape="rect" class="external-link" href="http://activemq.apache.org/">ActiveMQ</a>.  As of version 2.0, ActiveMQ-CPP supports the OpenWire protocol, with a few exceptions.</p>
-<ul><li>ObjectMessage - We cannot reconstruct the object(s) contained in an ObjectMessage in C++, so if your application is subscribed to a queue or topic that has an ObjectMessage sent to it, you will receive the message but will not be able to extract an Object from it.</li></ul></div>
+<p><a shape="rect" href="http://activemq.apache.org/openwire.html">OpenWire</a> is the native protocol used by the <a shape="rect" href="http://activemq.apache.org/">ActiveMQ</a>.  As of version 2.0, ActiveMQ-CPP supports the OpenWire protocol, with a few exceptions.</p>
+<ul><li>ObjectMessage - We cannot reconstruct the object(s) contained in an ObjectMessage in C++, so if your application is subscribed to a queue or topic that has an ObjectMessage sent to it, you will receive the message but will not be able to extract an Object from it.</li></ul>
+</div>
 


[12/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-contribute.xml
----------------------------------------------------------------------
diff --git a/how-can-i-contribute.xml b/how-can-i-contribute.xml
index dbc4eb9..3f34ff5 100644
--- a/how-can-i-contribute.xml
+++ b/how-can-i-contribute.xml
@@ -1,17 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIcontribute-HowcanIcontributetoApacheActiveMQ?">How can I contribute to Apache ActiveMQ?</h2>
+<div class="wiki-content maincontent"><h2>How can I contribute to Apache ActiveMQ?</h2>
 
-There are many ways you can help make ActiveMQ a better piece of software - please dive in and help!<p>Try surf the documentation - if somethings confusing or not clear, let us know. Download the code &amp; try it out and see what you think. Browse the source code. Got an itch to scratch, want to tune some operation or add some feature?</p><p>Want to do some hacking on ActiveMQ? Try surfing to our <a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/AMQ">issue tracker</a> for open issues or features that need to be implemented, take ownership of an issue and try fix it.</p><h2 id="HowcanIcontribute-Gettingintouch">Getting in touch</h2><p>There are various ways of communicating with the ActiveMQ community.</p><ul class="alternate"><li>join us on the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> or subscribe to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> and take part in any conversations</li><li><p>pop by on <span>in
  <a shape="rect" href="irc.xml">irc</a> and say hi</span></p></li><li>add some comments to the <a shape="rect" href="navigation.xml">wiki</a></li></ul><h2 id="HowcanIcontribute-Ifyoufindabugorproblem">If you find a bug or problem</h2><p>Please raise a new issue in our <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a></p><p>If you can create a JUnit test case then your issue is more likely to be resolved quicker.<br clear="none"> e.g. take a look at some of the existing <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tree;f=activemq-unit-tests/src/test;h=185a655c5200ed30fd2964bc236c18c5bde534c4;hb=refs/heads/master">unit tests cases</a></p><p>Then we can add your issue to the test suite and then we'll know when its really fixed and we can ensure that the problem <strong>stays fixed</strong> in future releases.</p><h2 id="HowcanIcontribute-Ifyouwanttohelpoutwiththedocumentation"
 >If you want to help out with the documentation</h2><p>If you want to contribute to the ActiveMQ documentation you should first subscribe our <a shape="rect" class="external-link" href="mailto:dev-subscribe@activemq.apache.org" rel="nofollow">dev@</a>&#160;where ActiveMQ developers interact with each other. If you want edit rights on the ActiveMQ site, create an account in the <a shape="rect" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ">ActiveMQ wiki</a> and fill in and submit an ICLA to the ASF (see the&#160;<a shape="rect" href="becoming-a-committer.xml">Committer Guide</a>). Then ask on the dev@ list to be granted edit rights and an admin will do so fairly quickly. If you want to just contribute the content, please submit the content on the dev@ list or create an issue and attach it there. <strong>All</strong> contributions are highly appreciated.</p><h2 id="HowcanIcontribute-Workingonthecode">Working on the code</h2><p>Grab the <a shape="rect" href="source.xml">So
 urce</a> from git</p><p>Build the project.</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[export MAVEN_OPTS=&quot;-Xmx512M -XX:MaxPermSize=128M&quot;
-mvn -Dtest=false install
-]]></script>
-</div></div><p>PS: You might need to build multiple times (if you get a build error) because sometimes maven fails to download all the files.</p><p>Create a project in your IDE. e.g. if you are using Eclipse the following should do the trick.</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[mvn eclipse:eclipse
-]]></script>
-</div></div><p>Then import the projects into your workspace.</p><h2 id="HowcanIcontribute-Creatingpatches">Creating patches</h2><p>We gladly accept patches if you can find ways to improve, tune or fix ActiveMQ in some way.</p><p>Most IDEs can create nice patches now very easily. e.g. in Eclipse just right click on a file/directory and select Team -&gt; Create Patch. Then just save the patch as a file and then submit it. (You may have to click on Team -&gt; Share... first to enable the Subversion options).</p><p>If you're a command line person try the following to create the patch</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[diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[git diff Main.java &gt;&gt; patchfile.txt
-]]></script>
-</div></div><h2 id="HowcanIcontribute-Submittingpatches">Submitting patches</h2><p>The easiest way to submit a patch is to create a new JIRA issue, attach the patch and tick the ASF license grant check box, tick the Patch Attached button on the issue then fire off an email to the <a shape="rect" href="mailing-lists.xml">Mailing Lists</a> or <a shape="rect" href="discussion-forums.xml">Discussion Forums</a>.</p><h2 id="HowcanIcontribute-Becomingacommmitter">Becoming a commmitter</h2><p>Once you've got involved as above, we may well invite you to be a committer. See <a shape="rect" href="becoming-a-committer.xml">Becoming a committer</a> for more details.</p><h2 id="HowcanIcontribute-Usingtheissuetracker">Using the issue tracker</h2><p>Before you can raise an issue in the issue tracker you need to register with it. This is quick &amp; painless.</p><p>If you want to have a go at fixing an issue you need to be in the list of activemq-developers on the issue tracker. To join the group, p
 lease mail the&#160;<a shape="rect" class="external-link" href="mailto:dev@activemq.apache.org" rel="nofollow">dev@activemq.apache.org</a> mail list with the email address you used to register with the issue tracker and we'll add you to the group.</p><p>Why not dive in the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">issue tracker</a>, and try tackle some of our outstanding issues?</p><h2 id="HowcanIcontribute-Becomingacommitter">Becoming a committer</h2><p>The first step is contributing to the project; if you want to take that a step forward and become a fellow committer on the project then see the <a shape="rect" href="becoming-a-committer.xml">Committer Guide</a></p></div>
+<structured-macro ac:macro-id="6092c4fa-bda2-400b-b3d2-ddfb8e0596b2" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Contributing"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-enable-detailed-logging.xml
----------------------------------------------------------------------
diff --git a/how-can-i-enable-detailed-logging.xml b/how-can-i-enable-detailed-logging.xml
index a376434..d938d0f 100644
--- a/how-can-i-enable-detailed-logging.xml
+++ b/how-can-i-enable-detailed-logging.xml
@@ -1,30 +1,26 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIenabledetailedlogging-HowcanIenabledetailedlogging">How can I enable detailed logging</h2>
+<div class="wiki-content maincontent"><h2>How can I enable detailed logging</h2>
 
-<p>We use <a shape="rect" class="unresolved" href="#">slf4j</a> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
+<p>We use <link><page ri:content-title="www.slf4j.org"></page><link-body>slf4j</link-body></link> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
 By default we ship with log4j but feel free to make your own choice.</p>
 
-<p>If you've got log4j.jar on your classpath you can use a log4j.properties file to configure the logging levels. See the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/log4j.properties">log4j.properties example</a> for the kind of thing you'll need.</p>
+<p>If you've got log4j.jar on your classpath you can use a log4j.properties file to configure the logging levels. See the <a shape="rect" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/log4j.properties">log4j.properties example</a> for the kind of thing you'll need.</p>
 
 <p>e.g. adding the following to your log4j.properties will enable tracing of ActiveMQ code:</p>
 
 <p>in 4.x</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="ddc0a6c6-949f-4615-9978-88251129510c" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.apache.activemq=INFO
 log4j.logger.org.apache.activemq.spring=WARN
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>in 3.x</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="47d1fb82-e709-4a6c-9d6a-bb2429076cbc" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.activemq=TRACE
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HowcanIenabledetailedlogging-Gettinghelponlog4j">Getting help on log4j</h3>
+<h3>Getting help on log4j</h3>
 
-<p>If you are new to log4j please see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual</a></p></div>
+<p>If you are new to log4j please see the <a shape="rect" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml b/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
index 7f162b6..df0c927 100644
--- a/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
+++ b/how-can-i-get-a-list-of-the-topics-and-queues-in-a-broker.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIgetalistofthetopicsandqueuesinabroker-HowcanIgetalistofthetopicsandqueuesinabroker?">How can I get a list of the topics and queues in a broker?</h2>
+<div class="wiki-content maincontent"><h2>How can I get a list of the topics and queues in a broker?</h2>
 
-<p>As of 5.1.0 you can use the new <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.</p>
+<p>As of 5.1.0 you can use the new <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html">DestinationSource</a> on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted.</p>
 
-<p>You can use <a shape="rect" href="jmx.xml">JMX</a> to browse the available topics and queues in a broker together with the connectors and connections along with their statistics etc.</p>
+<p>You can use <link><page ri:content-title="JMX"></page></link> to browse the available topics and queues in a broker together with the connectors and connections along with their statistics etc.</p>
 
-<p>Or you can access statistics <a shape="rect" href="how-can-i-see-what-destinations-are-used.xml">programmatically</a>.</p>
+<p>Or you can access statistics <link><page ri:content-title="How can I see what destinations are used"></page><link-body>programmatically</link-body></link>.</p>
 
-<p>Finally you could just use the <a shape="rect" href="web-console.xml">Web Console</a></p></div>
+<p>Finally you could just use the <link><page ri:content-title="Web Console"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-help.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-help.xml b/how-can-i-get-help.xml
index 396d244..4ea6bbc 100644
--- a/how-can-i-get-help.xml
+++ b/how-can-i-get-help.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIgethelp-GettingHelp">Getting Help</h2><p>If you are experiencing problems using ActiveMQ then please report your problem to our <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/browse/AMQ">Issue Tracker</a>. You may also find it useful to discuss your issues with the community on the <a shape="rect" href="discussion-forums.xml">Discussion Forums</a> or join one of our <a shape="rect" href="mailing-lists.xml">Mailing Lists</a>.</p><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ">Issue Tracker</a></li><li><a shape="rect" href="discussion-forums.xml">Discussion Forums</a></li><li><a shape="rect" href="mailing-lists.xml">Mailing Lists</a></li><li><a shape="rect" href="faq.xml">FAQ</a></li></ul><h3 id="HowcanIgethelp-Howtogethelp">How to get help</h3><p>Before you report a problem you might want to read the <a shape="rect" href="faq.xml">FAQ</a>.<br clear="none"
 > Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution.</p><ul><li>Which <a shape="rect" class="external-link" href="http://activemq.apache.org/download.html">version</a> of ActiveMQ</li><li>What platform of Java (e.g., Java SE 6 with JRE/<a shape="rect" class="unresolved" href="#">JDK</a> 1.6.0 or J2SE 5 with JRE/<a shape="rect" class="unresolved" href="#">JDK</a> 1.5.0)</li><li>Any particular application/web server or container being used - if so what version?</li><li>Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.</li><li>Log output (e.g., <code>data/activemq.log</code>) can be useful too; sometimes <a shape="rect" href="how-do-i-cha
 nge-the-logging.xml">enabling DEBUG logging</a> can help</li><li>Your code &amp; configuration files are often useful</li></ul><h3 id="HowcanIgethelp-Howtogethelpfaster">How to get help faster</h3><p>We can help you much quicker if you try the following</p><ul><li>Provide us with a JUnit test case that demonstrates your issue. e.g. if you think you've found a bug, can you create a test case to demonstrate the bug?</li><li><a shape="rect" href="contributing.xml">Submit a patch</a> fixing the bug! (We also buy you beer when we meet you if you submit bug fixes <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"> )</li><li>For memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if it's huge) to the JIRA we can normally fix things much faster. e.g. 
 you could run <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/share/jmap.html" rel="nofollow">jmap</a>/<a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/technotes/tools/share/jhat.html" rel="nofollow">jhat</a>, JProfiler or YourKit on your code and send us the output. To find memory leaks it's quicker to resolve if you can tell us what classes are taking up all of the RAM; we can normally figure out what's wrong from that.</li></ul><h2 id="HowcanIgethelp-CommercialSupport">Commercial Support</h2><p>This is an open source project, so the amount of time we have available to help resolve your issue is often limited as all help is provided on a volunteer basis. If you want to get priority help, need to get up to speed quickly, require some training or mentoring, or need full 24 x 7 production support you should contact a commercial company specializing in ActiveMQ support such as...</p><ul><li><a shape="rect" class="ex
 ternal-link" href="https://apifocal.com" rel="nofollow">apifocal</a>&#160;is a Professional Services company. Headquartered near Washington, DC, USA, APIfocal&#160;provides consulting and training for leveraging the Apache Integration stack and commercial ESBs at large scale, adding automation and devops capabilities.</li><li><a shape="rect" class="external-link" href="http://mediadriver.com" rel="nofollow">Media Driver</a> provides consulting services and management tools for Apache ActiveMQ and the Apache Integration stack for both the commercial and public sector. &#160;We bring a full suite of project delivery services including business and technical analysis, proof of concepts, architectural guidance, best practice integration, and project management. &#160;Media Driver offers training classes for developers and administrators, as well as middleware management software.</li><li><a shape="rect" class="external-link" href="http://www.openlogic.com/" rel="nofollow">Rogue Wave / O
 penLogic</a>&#160;<span style="line-height: 1.4285715;">has a dedicated team of OSS experts offering&#160;</span><span style="line-height: 1.4285715;">round-the-clock Production Support with competitive SLAs for&#160;</span><span style="line-height: 1.4285715;">troubleshooting ActiveMQ issues and outages. Rogue&#160;</span><span style="line-height: 1.4285715;">Wave offers a comprehensive week-long instructor-led training program for&#160;</span><span style="line-height: 1.4285715;">developers and admins. Rogue Wave OpenLogic also provides Architecture&#160;</span><span style="line-height: 1.4285715;">and Design Consulting, and a Developer Support contract to assist in the&#160;</span><span style="line-height: 1.4285715;">development of messaging applications.</span></li><li><a shape="rect" class="external-link" href="http://www.redhat.com/products/jbossenterprisemiddleware/amq/" rel="nofollow">Red Hat</a>&#160;offers JBoss A-MQ, a supported distribution of Apache ActiveMQ, that incl
 ude Enterprise Developer and Production Support, and offer training and consultancy for enterprise deployments.</li><li><a shape="rect" class="external-link" href="http://www.savoirtech.com" rel="nofollow">Savoir Technologies, Inc</a> provides enterprise consulting, training and support for ActiveMQ and a host of other Apache service containers. Savoir can provide best practice mentoring for developing with ActiveMQ, as well as architectural/design reviews, troubleshooting and SOA infrastructure implementations. Savoir's staff includes some of the contributors of ActiveMQ who are on the ground consulting and are familiar with real world implementations and issues.</li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/" rel="nofollow">Total Transaction Management (TTM)</a> provides ActiveMQ consulting and support, as well as security and <a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AM
 on.php/" rel="nofollow">monitoring</a> add-on products and <a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">reference guide</a> for ActiveMQ.</li><li><a shape="rect" class="external-link" href="http://tomitribe.com" rel="nofollow">Tomitribe</a>&#160;are experts in Tomcat and ActiveMQ integration, champions of Open Source and Java EE. &#160;Tomitribe offers consulting, training and support for TomEE, Tomcat, ActiveMQ, CXF and more.</li><li><a shape="rect" class="external-link" href="http://www.tytoease.com/activemq" rel="nofollow">TytoEASE</a> offers support, consulting and training on enterprise ready open source projects including ActiveMQ.&#160; &#160;Support offerings are at three levels with guaranteed SLA's. The company's consulting work is short term to help troubleshoot, fine-tune, do architectural reviews or help with initial design.&#160; TytoEASE's focus is on the Enterprise with how custom
 ers integrate open source with their current technologies.</li></ul></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="f2f78dc4-e6c3-4cfe-bb52-7f9da4f178fd" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Support"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-get-the-source-code-from-subversion.xml
----------------------------------------------------------------------
diff --git a/how-can-i-get-the-source-code-from-subversion.xml b/how-can-i-get-the-source-code-from-subversion.xml
index 927a7cb..e9ea712 100644
--- a/how-can-i-get-the-source-code-from-subversion.xml
+++ b/how-can-i-get-the-source-code-from-subversion.xml
@@ -1,13 +1,3 @@
 <div class="wiki-content maincontent">
-<h1 id="HowcanIgetthesourcecodefromsubversion-ActiveMQ5">ActiveMQ 5</h1><h2 id="HowcanIgetthesourcecodefromsubversion-WebBrowsingofthegitRepo">Web Browsing of the git Repo</h2><p>To browse via the web:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git">https://git-wip-us.apache.org/repos/asf?p=activemq.git</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-CheckingoutfromthegitRepo">Checking out from the git Repo</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf/activemq.git">https://git-wip-us.apache.org/repos/asf/activemq.git</a></p>
-</div></div><p>Only project developers can commit to the git repo via this method. SSH must be installed on your client machine. Enter your site password when prompted.</p><h2 id="HowcanIgetthesourcecodefromsubversion-Buildingthecode">Building the code</h2><p>To then build the code, see <a shape="rect" href="building.xml">Building</a>.</p><p>&#160;</p><h1 id="HowcanIgetthesourcecodefromsubversion-ActiveMQArtemis">ActiveMQ Artemis</h1><h2 id="HowcanIgetthesourcecodefromsubversion-WebBrowsingoftheASFgitRepo">Web Browsing of the ASF git Repo</h2><p>To browse via the web:</p><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git">https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-BrowsingtheGithubRepo">Browsing the Github Repo&#160;</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">https://github.com/apache/activemq-artemis</a></p>
-</div></div><h2 id="HowcanIgetthesourcecodefromsubversion-CheckingoutfromtheGithubRepo">Checking out from the Github Repo</h2><div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>git clone <a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">https://github.com/apache/activemq-artemis</a></p>
-</div></div><p><strong>Committers:</strong> Please follow the instructions for properly configuring the&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/SUMMARY.md" rel="nofollow">Instructions for Core Contributors/Hacking Guide</a></p><p><strong>Contributors:</strong> Please create a&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis" rel="nofollow">pull request</a> to contribute changes to the source code.&#160;</p><h2 id="HowcanIgetthesourcecodefromsubversion-Buildingthecode.1">Building the code</h2><p>To then build the code, take a look at&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/building.md" rel="nofollow">Building the distribution</a></p></div>
+<structured-macro ac:macro-id="e2378983-65b6-4f96-968f-ccb50c499e06" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Source"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-make-activemq-faster.xml
----------------------------------------------------------------------
diff --git a/how-can-i-make-activemq-faster.xml b/how-can-i-make-activemq-faster.xml
index 6a2e768..7602045 100644
--- a/how-can-i-make-activemq-faster.xml
+++ b/how-can-i-make-activemq-faster.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>See the <a shape="rect" href="performance.xml">Performance</a> page for information about the performance of ActiveMQ and it's tuning parameters.</p></div>
+<div class="wiki-content maincontent"><p>See the <link><page ri:content-title="Performance"></page></link> page for information about the performance of ActiveMQ and it's tuning parameters.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-monitor-activemq.xml
----------------------------------------------------------------------
diff --git a/how-can-i-monitor-activemq.xml b/how-can-i-monitor-activemq.xml
index b455827..c7f219a 100644
--- a/how-can-i-monitor-activemq.xml
+++ b/how-can-i-monitor-activemq.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="HowcanImonitorActiveMQ-HowcanImonitorActiveMQ">How can I monitor ActiveMQ</h2><p>Starting with ActiveMQ 5.8.0&#160;<a shape="rect" class="external-link" href="http://www.jolokia.org/" rel="nofollow">Jolokia</a> is bundled which provides a&#160;RESTful interface to ActiveMQ's JMX capabilities. An open source third party tool that connects via Jolokia is&#160;<a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawt.io</a>, an HTML-5 web console with an ActiveMQ plugin that is at least worth being familiar with as&#160;<span style="line-height: 1.4285715;">ActiveMQ and hawt.io share developers.</span></p><p>In ActiveMQ 4.x you can monitor the broker to see what destinations are being used, their activity along with connections and subscriptions using the following tools</p><ul><li><a shape="rect" href="jmx.xml">JMX</a> and a JMX console such as <a shape="rect" class="external-link" href="http://java.sun.com/developer
 /technicalArticles/J2SE/jconsole.html" rel="nofollow">jConsole</a></li><li>The <a shape="rect" href="web-console.xml">Web Console</a></li><li>the <a shape="rect" href="advisory-message.xml">Advisory Message</a> feature (using JMS messages to monitor the system)</li><li>The <a shape="rect" href="command-agent.xml">Command Agent</a>; ActiveMQ.Agent topic that you query for status</li><li>The <a shape="rect" href="visualisation.xml">Visualisation</a> plug-in</li><li>The <a shape="rect" class="external-link" href="http://activemq.apache.org/statisticsplugin.html">Statistics</a> plug-in (from 5.3)</li></ul><h3 id="HowcanImonitorActiveMQ-ThirdPartyTools">Third Party Tools</h3><ul><li><a shape="rect" class="external-link" href="https://github.com/jmxtrans/jmxtrans" rel="nofollow">jmxtrans</a> which can be used to continuously query ActiveMQ via JMX and write to a chosen output. For instance, write to a graphite database file which can then be used to graph trends over time and be queried b
 y Nagios to alarm should your thresholds be exceeded.</li><li><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php" rel="nofollow">ActiveMQ Monitor (AMon)</a></li><li><a shape="rect" class="external-link" href="http://sourceforge.net/projects/activemqbrowser/" rel="nofollow">Apache ActiveMQBrowser</a></li><li><a shape="rect" class="external-link" href="http://www.hermesjms.com/confluence/display/HJMS/Home" rel="nofollow">HermesJMS</a></li><li><a shape="rect" class="external-link" href="http://www.soapui.org/JMS/working-with-jms-messages.html" rel="nofollow">HermesJMS/soapUI</a></li><li><a shape="rect" class="external-link" href="http://www.hyperic.com/products/open-source-systems-monitoring" rel="nofollow">Hyperic HQ</a> and <a shape="rect" class="external-link" href="http://www.hyperic.com/products/enterprise-systems-monitoring" rel="nofollow">Hyperic HQ Enterprise</a></li><li><a shape="rect" class="externa
 l-link" href="http://fusesource.com/products/fuse-hq/" rel="nofollow">FuseHQ</a> (based on Hyperic HQ Enterprise)</li><li><a shape="rect" class="external-link" href="http://www.itko.com/products/jms.jsp" rel="nofollow">iTKO LISA Test</a></li><li><a shape="rect" class="external-link" href="https://cwiki.apache.org/GMOxDOC11/geronimo-administration-console.html#GeronimoAdministrationConsole-JMSServer">Geronimo Administration Console</a> (JMS Resources)</li><li><a shape="rect" class="external-link" href="https://mediadriver.com/software/" rel="nofollow">Media Driver Integrated Console</a> can manage and monitor ActiveMQ, IBM MQ and Tibco EMS</li></ul><h3 id="HowcanImonitorActiveMQ-SeeAlso">See Also</h3><ul><li><a shape="rect" href="how-can-i-monitor-the-connection-with-the-broker.xml">How can I monitor the connection with the broker</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>How can I monitor ActiveMQ</h2><p>Starting with ActiveMQ 5.8.0&#160;<a shape="rect" href="http://www.jolokia.org/">Jolokia</a> is bundled which provides a&#160;RESTful interface to ActiveMQ's JMX capabilities. An open source third party tool that connects via Jolokia is&#160;<a shape="rect" href="http://hawt.io/">hawt.io</a>, an HTML-5 web console with an ActiveMQ plugin that is at least worth being familiar with as&#160;<span style="line-height: 1.4285715;">ActiveMQ and hawt.io share developers.</span></p><p>In ActiveMQ 4.x you can monitor the broker to see what destinations are being used, their activity along with connections and subscriptions using the following tools</p><ul><li><link><page ri:content-title="JMX"></page></link> and a JMX console such as <a shape="rect" href="http://java.sun.com/developer/technicalArticles/J2SE/jconsole.html">jConsole</a></li><li>The <link><page ri:content-title="Web Console"></page></link></li><li>the <l
 ink><page ri:content-title="Advisory Message"></page></link> feature (using JMS messages to monitor the system)</li><li>The <link><page ri:content-title="Command Agent"></page></link>; ActiveMQ.Agent topic that you query for status</li><li>The <link><page ri:content-title="Visualisation"></page></link> plug-in</li><li>The <a shape="rect" href="http://activemq.apache.org/statisticsplugin.html">Statistics</a> plug-in (from 5.3)</li></ul><h3>Third Party Tools</h3><ul><li><a shape="rect" href="https://github.com/jmxtrans/jmxtrans">jmxtrans</a> which can be used to continuously query ActiveMQ via JMX and write to a chosen output. For instance, write to a graphite database file which can then be used to graph trends over time and be queried by Nagios to alarm should your thresholds be exceeded.</li><li><a shape="rect" href="http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php">ActiveMQ Monitor (AMon)</a></li><li><a shape="rect" href="http://sourceforge.net/
 projects/activemqbrowser/">Apache ActiveMQBrowser</a></li><li><a shape="rect" href="http://www.hermesjms.com/confluence/display/HJMS/Home">HermesJMS</a></li><li><a shape="rect" href="http://www.soapui.org/JMS/working-with-jms-messages.html">HermesJMS/soapUI</a></li><li><a shape="rect" href="http://www.hyperic.com/products/open-source-systems-monitoring">Hyperic HQ</a> and <a shape="rect" href="http://www.hyperic.com/products/enterprise-systems-monitoring">Hyperic HQ Enterprise</a></li><li><a shape="rect" href="http://fusesource.com/products/fuse-hq/">FuseHQ</a> (based on Hyperic HQ Enterprise)</li><li><a shape="rect" href="http://www.itko.com/products/jms.jsp">iTKO LISA Test</a></li><li><a shape="rect" href="https://cwiki.apache.org/GMOxDOC11/geronimo-administration-console.html#GeronimoAdministrationConsole-JMSServer">Geronimo Administration Console</a> (JMS Resources)</li><li><a shape="rect" href="https://mediadriver.com/software/">Media Driver Integrated Console</a> can manage an
 d monitor ActiveMQ, IBM MQ and Tibco EMS</li></ul><h3>See Also</h3><ul><li><link><page ri:content-title="How can I monitor the connection with the broker"></page></link></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-monitor-the-connection-with-the-broker.xml
----------------------------------------------------------------------
diff --git a/how-can-i-monitor-the-connection-with-the-broker.xml b/how-can-i-monitor-the-connection-with-the-broker.xml
index 3a12fda..58a8080 100644
--- a/how-can-i-monitor-the-connection-with-the-broker.xml
+++ b/how-can-i-monitor-the-connection-with-the-broker.xml
@@ -1,11 +1,12 @@
-<div class="wiki-content maincontent"><h2 id="HowcanImonitortheconnectionwiththebroker-HowcanImonitortheconnectionwiththebroker">How can I monitor the connection with the broker</h2>
+<div class="wiki-content maincontent"><h2>How can I monitor the connection with the broker</h2>
 
-<p>You can monitor the status of the connection with the broker via the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html#addTransportListener%28org.apache.activemq.transport.TransportListener">addTransportListener() method on the ActiveMQConnection</a>. </p>
+<p>You can monitor the status of the connection with the broker via the <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/ActiveMQConnection.html#addTransportListener%28org.apache.activemq.transport.TransportListener">addTransportListener() method on the ActiveMQConnection</a>. </p>
 
-<p>This method takes a <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> which is notified as the connection is established &amp; dropped. It also allows you to work with the <a shape="rect" href="failover-transport-reference.xml">Failover Transport</a> yet still know the status of the connection.</p>
+<p>This method takes a <a shape="rect" href="http://activemq.apache.org/maven/apidocs/org/apache/activemq/transport/TransportListener.html">TransportListener</a> which is notified as the connection is established &amp; dropped. It also allows you to work with the <link><page ri:content-title="Failover Transport Reference"></page><link-body>Failover Transport</link-body></link> yet still know the status of the connection.</p>
 
 
-<h3 id="HowcanImonitortheconnectionwiththebroker-SeeAlso">See Also</h3>
+<h3>See Also</h3>
 
-<ul><li><a shape="rect" href="how-can-i-monitor-activemq.xml">How can I monitor ActiveMQ</a></li></ul></div>
+<ul><li><link><page ri:content-title="How can I monitor ActiveMQ"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-see-what-destinations-are-used.xml
----------------------------------------------------------------------
diff --git a/how-can-i-see-what-destinations-are-used.xml b/how-can-i-see-what-destinations-are-used.xml
index f54208e..e069008 100644
--- a/how-can-i-see-what-destinations-are-used.xml
+++ b/how-can-i-see-what-destinations-are-used.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The easiest way is to use <a shape="rect" href="jmx.xml">JMX</a> by pointing your JMX console or JConsole at the broker JVM.</p><p>You can also get all of the active destinations from the broker using Java code via <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinations%28org.apache.activemq.command.ActiveMQDestination%29">getDestinations()</a>.</p><p>You can also get a Map of all the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Destination.html">Destination</a> objects indexed by ActiveMQDestination via <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinationMap%28%29">getDestinationMap()</a>. This allows you to look at the individual destination details such as the queue de
 pths and so forth</p></div>
+<div class="wiki-content maincontent"><p>The easiest way is to use <link><page ri:content-title="JMX"></page></link> by pointing your JMX console or JConsole at the broker JVM.</p><p>You can also get all of the active destinations from the broker using Java code via <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinations%28org.apache.activemq.command.ActiveMQDestination%29">getDestinations()</a>.</p><p>You can also get a Map of all the <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Destination.html">Destination</a> objects indexed by ActiveMQDestination via <a shape="rect" href="http://activemq.apache.org/maven/5.8.0/apidocs/org/apache/activemq/broker/region/Region.html#getDestinationMap%28%29">getDestinationMap()</a>. This allows you to look at the individual destination details such as the queue depths and so forth</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-support-auto-reconnection.xml
----------------------------------------------------------------------
diff --git a/how-can-i-support-auto-reconnection.xml b/how-can-i-support-auto-reconnection.xml
index 0ca8b41..1fcdcb7 100644
--- a/how-can-i-support-auto-reconnection.xml
+++ b/how-can-i-support-auto-reconnection.xml
@@ -1,19 +1,17 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIsupportautoreconnection-HowcanIsupportautoreconnection?">How can I support auto reconnection?</h2>
+<div class="wiki-content maincontent"><h2>How can I support auto reconnection?</h2>
 
 <p>Networks are unreliable and sockets do get dropped from time to time (it could be a network glitch, dodgy router, firewall, or someone could even just restart a broker).</p>
 
 <p>You often want a JMS client to automatically handle the fact that the connection to the broker was lost such that the JMS client either reconnnects to the same broker when it becomes available, or reconnects to another broker in the cluster.</p>
 
-<p>Its easy to perform auto-reconnection. In Apache ActiveMQ using the <a shape="rect" href="failover-transport-reference.xml">failover transport</a> in which the JMS client (connection) will automatically reconnect to the broker if there is a socket exception. </p>
+<p>Its easy to perform auto-reconnection. In Apache ActiveMQ using the <link><page ri:content-title="Failover Transport Reference"></page><link-body>failover transport</link-body></link> in which the JMS client (connection) will automatically reconnect to the broker if there is a socket exception. </p>
 
 <p>Just use the following connection URI (setting the brokerURL in the ActiveMQConnectionFactory)</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="b7cbcc04-7a5f-4161-8a80-f101a8c31ead" ac:name="code" ac:schema-version="1"><plain-text-body>
 failover:tcp://host:port 
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 
-<p>You can use a list of URIs to specify which machines to connect to and use discovery to find the brokers to connect to. More details on this see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p></div>
+<p>You can use a list of URIs to specify which machines to connect to and use discovery to find the brokers to connect to. More details on this see <link><page ri:content-title="Configuring Transports"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-support-priority-queues.xml
----------------------------------------------------------------------
diff --git a/how-can-i-support-priority-queues.xml b/how-can-i-support-priority-queues.xml
index 71a8dd3..b0c5d41 100644
--- a/how-can-i-support-priority-queues.xml
+++ b/how-can-i-support-priority-queues.xml
@@ -1,59 +1,51 @@
-<div class="wiki-content maincontent"><h2 id="HowcanIsupportpriorityqueues-HowcanIsupportpriorityqueues?">How can I support priority queues?</h2>
+<div class="wiki-content maincontent"><h2>How can I support priority queues?</h2>
 
-<h3 id="HowcanIsupportpriorityqueues-UseMessagePriority">Use Message Priority</h3>
+<h3>Use Message Priority</h3>
 
 <p>A common requirement is to support priority consumption; so high priority messages are consumed before low priority.</p>
 
-<p>In version 5.4 priority queues are supported. Both the message cursors and the message stores (KahaDB and JDBC) support message priority. The support is disabled by default so it needs to be be enabled using <a shape="rect" href="per-destination-policies.xml">per destination policies</a> through xml configuration, in the example below, 'prioritizedMessages' is enabled for all queues. </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[
+<p>In version 5.4 priority queues are supported. Both the message cursors and the message stores (KahaDB and JDBC) support message priority. The support is disabled by default so it needs to be be enabled using <link><page ri:content-title="per destination policies"></page></link> through xml configuration, in the example below, 'prioritizedMessages' is enabled for all queues. </p>
+<structured-macro ac:macro-id="d0404155-3918-434f-b576-8f72b792b667" ac:name="code" ac:schema-version="1"><plain-text-body>
  &lt;destinationPolicy&gt;
    &lt;policyMap&gt;
      &lt;policyEntries&gt;
-       &lt;policyEntry queue=&quot;&gt;&quot; prioritizedMessages=&quot;true&quot;/&gt;
+       &lt;policyEntry queue="&gt;" prioritizedMessages="true"/&gt;
     ...
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>The full range of priority values (0-9) are supported by the <a shape="rect" href="jdbc-support.xml">JDBC</a> message store. For <a shape="rect" href="kahadb.xml">KahaDB</a> three priority categories are supported, Low (&lt; 4), Default (= 4) and High (&gt; 4).</p>
+<p>The full range of priority values (0-9) are supported by the <link><page ri:content-title="jdbc support"></page><link-body>JDBC</link-body></link> message store. For <link><page ri:content-title="KahaDB"></page></link> three priority categories are supported, Low (&lt; 4), Default (= 4) and High (&gt; 4).</p>
 
 <p>Since the message cursors (and client side) implement strict ordering of priorities, it's possible to observe strict priority ordering if message dispatching can happen from the cache and not have to hit the disk (i.e., your consumers are fast enough to keep up with producers), or if you're using non-persistent messages that never have to flush to disk (using the FilePendingMessageCursor). However, once you hit a situation where consumers are slow, or producers are just significantly faster, you'll observe that the cache will fill up (possibly with lower priority messages) while higher priority messages get stuck on disk and not available until they're paged in. In this case, you can make a decision to tradeoff optimized message dispatching for priority enforcement. You can disable the cache, message expiration check, and lower you consumer prefetch to 1 to ensure getting the high priority messages from the store ahead of lower priority messages Note, this sort of tradeoff can ha
 ve significant performance implications, so you must test your scenarios thoroughly. :</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="11e4935d-0104-4709-a871-c3467bedb529" ac:name="code" ac:schema-version="1"><plain-text-body>
  &lt;destinationPolicy&gt;
    &lt;policyMap&gt;
      &lt;policyEntries&gt;
-       &lt;policyEntry queue=&quot;&gt;&quot; prioritizedMessages=&quot;true&quot; useCache=&quot;false&quot; expireMessagesPeriod=&quot;0&quot; queuePrefetch=&quot;1&quot; /&gt;
+       &lt;policyEntry queue="&gt;" prioritizedMessages="true" useCache="false" expireMessagesPeriod="0" queuePrefetch="1" /&gt;
     ...
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="HowcanIsupportpriorityqueues-Alternativestrategies">Alternative strategies</h3>
-<h4 id="HowcanIsupportpriorityqueues-UseSelectors">Use Selectors</h4>
+<h3>Alternative strategies</h3>
+<h4>Use Selectors</h4>
 
 <p>You can have say 100 consumers using a selector to find the high priority stuff</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="ce5db972-0df5-47c1-92be-39bf60b456f7" ac:name="code" ac:schema-version="1"><plain-text-body>
 JMSPriority &gt; 6
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>then have 50 consumers doing average or 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="0fc1e06f-98b9-4e33-8552-2e3bd2cfa13e" ac:name="code" ac:schema-version="1"><plain-text-body>
 JMSPriority &gt;= 4
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Then say 10 consumers consuming all messages (so all priorities). Then this way you'll have a pool of threads always processing high priority messages - giving you very efficient priority based dispatching of messages without ActiveMQ having to batch up messages and reorder them before dispatching them.</p>
 
-<h4 id="HowcanIsupportpriorityqueues-UseResequencer">Use Resequencer</h4>
+<h4>Use Resequencer</h4>
 
 <p>You can reorder messages on some input queue A and send them to queue B in sorted order to avoid having to change your clients. This avoids the need to use selectors in your application as shown above.</p>
 
-<p>To do this use the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/resequencer.html">Resequencer</a> from the <a shape="rect" href="enterprise-integration-patterns.xml">Enterprise Integration Patterns</a></p></div>
+<p>To do this use the <a shape="rect" href="http://activemq.apache.org/camel/resequencer.html">Resequencer</a> from the <link><page ri:content-title="Enterprise Integration Patterns"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-can-i-use-different-network-protocols.xml
----------------------------------------------------------------------
diff --git a/how-can-i-use-different-network-protocols.xml b/how-can-i-use-different-network-protocols.xml
index cb25761..ef8bed5 100644
--- a/how-can-i-use-different-network-protocols.xml
+++ b/how-can-i-use-different-network-protocols.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>For easy configuration, ActiveMQ supports a configurable URL to denote the connection mechanism to other clients. There is an example of how to do this along with a description of the available protocols in the <a shape="rect" href="uri-protocols.xml">Protocols overview</a></p></div>
+<p>For easy configuration, ActiveMQ supports a configurable URL to denote the connection mechanism to other clients. There is an example of how to do this along with a description of the available protocols in the <link><page ri:content-title="URI Protocols"></page><link-body>Protocols overview</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-distributed-queues-work.xml
----------------------------------------------------------------------
diff --git a/how-do-distributed-queues-work.xml b/how-do-distributed-queues-work.xml
index 08ed62a..9949e03 100644
--- a/how-do-distributed-queues-work.xml
+++ b/how-do-distributed-queues-work.xml
@@ -1,32 +1,32 @@
-<div class="wiki-content maincontent"><p>There are various <a shape="rect" href="topologies.xml">Topologies</a> that you can employ with ActiveMQ, where clients are connected to message brokers in various ways like</p>
+<div class="wiki-content maincontent"><p>There are various <link><page ri:content-title="Topologies"></page></link> that you can employ with ActiveMQ, where clients are connected to message brokers in various ways like</p>
 
 <ul><li>peer based</li><li>client server</li><li>hub and spoke</li></ul>
 
 
-<p>Each client communicates with a broker using some kind of <a shape="rect" href="cross-language-clients.xml">client library and network protocol</a>. </p>
+<p>Each client communicates with a broker using some kind of <link><page ri:content-title="Cross Language Clients"></page><link-body>client library and network protocol</link-body></link>. </p>
 
 <p>To create distributed queues or topics we need to have the message brokers communicate with each other. There are two different types of broker to broker communication...</p>
 
-<h2 id="Howdodistributedqueueswork-Master/SlaveforHighAvailability">Master/Slave for High Availability</h2>
+<h2>Master/Slave for High Availability</h2>
 
-<p>A <a shape="rect" href="masterslave.xml">Master/Slave Cluster</a> is used for <a shape="rect" href="ha.xml">HA</a>. Basically it means that all messages are replicated across each broker in the master/slave cluster. If the Master goes down, the clients can automatically failover to a slave which will have all the messages already, so each message is highly available. The Slave(s) provide a hot standby broker which will always be in sync ready to take over if the master goes away due to hardware failure etc.</p>
+<p>A <link><page ri:content-title="MasterSlave"></page><link-body>Master/Slave Cluster</link-body></link> is used for <link><page ri:content-title="HA"></page></link>. Basically it means that all messages are replicated across each broker in the master/slave cluster. If the Master goes down, the clients can automatically failover to a slave which will have all the messages already, so each message is highly available. The Slave(s) provide a hot standby broker which will always be in sync ready to take over if the master goes away due to hardware failure etc.</p>
 
 <p>Master/Slave works by having some form of replication; each message is owned by every broker in the logical cluster. A master/slave cluster then acts as one logical message broker which could then be connected via store and forward to other brokers (as we'll see in the next section).</p>
 
-<h3 id="Howdodistributedqueueswork-DistributedQueuesandTopics">Distributed Queues and Topics</h3>
+<h3>Distributed Queues and Topics</h3>
 
 <p>In Master/Slave, queues and topics are all replicated between each broker in the cluster (so often to a master and maybe a single slave). So each broker in the cluster has exactly the same messages available at any time so if a master fails, clients failover to a slave and you don't loose a message.</p>
 
-<h2 id="Howdodistributedqueueswork-Storeandforwardnetworksofbrokers">Store and forward networks of brokers</h2>
+<h2>Store and forward networks of brokers</h2>
 
-<p>A <a shape="rect" href="networks-of-brokers.xml">Store and Forward Network of Brokers</a> means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time. When a JMS producer sends a message to a JMS consumer, it may travel through several brokers to reach its final destination. ActiveMQ uses <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> so that local JMS consumers are always higher priority than remote brokers in a store and forward network.</p>
+<p>A <link><page ri:content-title="Networks of Brokers"></page><link-body>Store and Forward Network of Brokers</link-body></link> means the messages travel from broker to broker until they reach a consumer; with each message being owned by a single broker at any point in time. When a JMS producer sends a message to a JMS consumer, it may travel through several brokers to reach its final destination. ActiveMQ uses <link><page ri:content-title="Consumer Priority"></page></link> so that local JMS consumers are always higher priority than remote brokers in a store and forward network.</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">
-<p>Note though that a store and forward network is not a solution for message <a shape="rect" href="ha.xml">HA</a>; if a broker fails in a Store and Forward network, the messages owned by that broker remain inside the broker's persistent store until the broker comes back online. If you need <a shape="rect" href="ha.xml">HA</a> of messages then you need to use Master/Slave described above.</p></div></div>
+<structured-macro ac:macro-id="170ca14d-b8a6-4564-be68-bd68a0f854bc" ac:name="info" ac:schema-version="1"><parameter ac:name="">Store and Forward is not HA</parameter><rich-text-body>
+<p>Note though that a store and forward network is not a solution for message <link><page ri:content-title="HA"></page></link>; if a broker fails in a Store and Forward network, the messages owned by that broker remain inside the broker's persistent store until the broker comes back online. If you need <link><page ri:content-title="HA"></page></link> of messages then you need to use Master/Slave described above.</p></rich-text-body></structured-macro>
 
 <p>Store and forward is often used in large networks where producers are on one LAN and consumers are on another LAN and you wish to use a broker on each LAN as a kind of network concentrator to minimise chattiness over the WAN between them (and to minimise the number of connections required across the WAN too). Similar uses of store and forward can be found when using firewalls or SSL across certain networks etc. One other use case for store and forward networks is if your OS does not support many sockets (and you can't reconfigure that) you could use a store and forward network to connect massive numbers of clients together in one logical network.</p>
 
-<h3 id="Howdodistributedqueueswork-DistributedQueuesinStore/Forward">Distributed Queues in Store/Forward</h3>
+<h3>Distributed Queues in Store/Forward</h3>
 <p>When we publish a message on a queue, it is stored in the persistent store of the broker that the publisher is communicating. Then if that broker is configured to store/foward to other brokers and clients, the broker will send it to <em>one</em> of these clients (which could be a node or a broker depending on the dispatch algorithm). This dispatch algorithm continues until the message is finally dispatched and consumed by a client.</p>
 
 <p>At any point in time the message will only exist in one broker's store until its consumed. Note that messages are only distributed onto other brokers if there is a consumer on those brokers.</p>
@@ -34,10 +34,11 @@
 <p>e.g. if we had broker A, B, C and a publisher on a queue on A. If we have consumers on the queue on A and B then messages for the queue will be spread across both brokers A and B; some messages going to B, some being consumed on A, none going to C. If a consumer on the queue starts <br clear="none">
 on C, then messages will flow there too. If the consumer stops then no more messages will be dispatched to C.</p>
 
-<h2 id="Howdodistributedqueueswork-DistributedTopicsinStore/Forward">Distributed Topics in Store/Forward</h2>
+<h2>Distributed Topics in Store/Forward</h2>
 <p>For topics the above algorithm is followed except, every interested client receives a copy of the message - plus ActiveMQ will check for loops (to avoid a message flowing infinitely around a ring of brokers).</p>
 
-<h3 id="Howdodistributedqueueswork-SeeAlso">See Also</h3>
+<h3>See Also</h3>
 
-<ul><li><a shape="rect" href="how-do-i-configure-distributed-queues-or-topics.xml">How do I configure distributed queues or topics</a></li><li><a shape="rect" href="masterslave.xml">MasterSlave</a></li><li><a shape="rect" href="networks-of-brokers.xml">Networks of Brokers</a></li></ul></div>
+<ul><li><link><page ri:content-title="How do I configure distributed queues or topics"></page></link></li><li><link><page ri:content-title="MasterSlave"></page></link></li><li><link><page ri:content-title="Networks of Brokers"></page></link></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-durable-queues-and-topics-work.xml
----------------------------------------------------------------------
diff --git a/how-do-durable-queues-and-topics-work.xml b/how-do-durable-queues-and-topics-work.xml
index ce50c4d..c4dacaa 100644
--- a/how-do-durable-queues-and-topics-work.xml
+++ b/how-do-durable-queues-and-topics-work.xml
@@ -10,5 +10,5 @@
 
 <p>So for durable topic subscription, the JMS provider needs to be able to identify S when it shuts down and later on in the future reconnects, so it can know what messages to send to it while it was not running. JMS specification dictates that the identification of S is done by a combination of the clientID and the durable subscriber name. This is so that the JMS connection S uses can have many different durable subscriptions on different topics or on the same topic with different selectors - yet the JMS provider can know which message for which subscription to keep around for it.</p>
 
-<p>So setting the clientID on a JMS connection is vital (along with using a sensible durable consumer name) for durable topic subscription. Its not an issue for other <a shape="rect" href="qos.xml">QoS</a></p></div>
+<p>So setting the clientID on a JMS connection is vital (along with using a sensible durable consumer name) for durable topic subscription. Its not an issue for other <link><page ri:content-title="QoS"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-c.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-c.xml b/how-do-i-access-activemq-from-c.xml
index a1db78a..15d8c1e 100644
--- a/how-do-i-access-activemq-from-c.xml
+++ b/how-do-i-access-activemq-from-c.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>See the <a shape="rect" href="c-integration.xml">C Integration</a> page for the available options.</p></div>
+<p>See the <link><page ri:content-title="C Integration"></page></link> page for the available options.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-csharp-or-dotnet.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-csharp-or-dotnet.xml b/how-do-i-access-activemq-from-csharp-or-dotnet.xml
index c755e54..7a3b862 100644
--- a/how-do-i-access-activemq-from-csharp-or-dotnet.xml
+++ b/how-do-i-access-activemq-from-csharp-or-dotnet.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<div class="error"><span class="error">Unable to render {include}</span> The included page could not be found.</div></div>
+<structured-macro ac:macro-id="c77675b8-b961-4f54-b311-d7206e0d6d0d" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="dot Net"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-access-activemq-from-ruby-perl-python-php.xml
----------------------------------------------------------------------
diff --git a/how-do-i-access-activemq-from-ruby-perl-python-php.xml b/how-do-i-access-activemq-from-ruby-perl-python-php.xml
index 75ad58e..e899d23 100644
--- a/how-do-i-access-activemq-from-ruby-perl-python-php.xml
+++ b/how-do-i-access-activemq-from-ruby-perl-python-php.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Use <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> which is a simple to implement client protocol for working with ActiveMQ and other messaging systems.</p></div>
+<p>Use <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> which is a simple to implement client protocol for working with ActiveMQ and other messaging systems.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-add-my-own-plugins.xml
----------------------------------------------------------------------
diff --git a/how-do-i-add-my-own-plugins.xml b/how-do-i-add-my-own-plugins.xml
index 90bd8d4..bf12f95 100644
--- a/how-do-i-add-my-own-plugins.xml
+++ b/how-do-i-add-my-own-plugins.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>See <a shape="rect" href="developing-plugins.xml">Developing Plugins</a> for how to add your own functionality into Apache ActiveMQ</p></div>
+<div class="wiki-content maincontent"><p>See <link><page ri:content-title="Developing Plugins"></page></link> for how to add your own functionality into Apache ActiveMQ</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-avoid-maven-downloading-latest-jars.xml
----------------------------------------------------------------------
diff --git a/how-do-i-avoid-maven-downloading-latest-jars.xml b/how-do-i-avoid-maven-downloading-latest-jars.xml
index 106876f..8af0743 100644
--- a/how-do-i-avoid-maven-downloading-latest-jars.xml
+++ b/how-do-i-avoid-maven-downloading-latest-jars.xml
@@ -1,15 +1,11 @@
 <div class="wiki-content maincontent">
 <p>You can use the -o switch (for offline mode) to avoid maven auto-downloading new snapshot jars (e.g. the Geronimo jars at the time of writing).</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="6dd5d712-dd1e-4985-b705-e469d0c5769b" ac:name="code" ac:schema-version="1"><plain-text-body>
 maven -o
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>or to run a server  go to the \assembly module and run</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="306141b6-06de-44f5-8fd1-ecc0dab0ab1c" ac:name="code" ac:schema-version="1"><plain-text-body>
 maven -o server
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-bridge-different-jms-providers.xml
----------------------------------------------------------------------
diff --git a/how-do-i-bridge-different-jms-providers.xml b/how-do-i-bridge-different-jms-providers.xml
index 23b7ecf..4947f45 100644
--- a/how-do-i-bridge-different-jms-providers.xml
+++ b/how-do-i-bridge-different-jms-providers.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>To bridge from ActiveMQ to another JMS provider use the <a shape="rect" href="jms-to-jms-bridge.xml">JMS bridge</a>. </p>
+<div class="wiki-content maincontent"><p>To bridge from ActiveMQ to another JMS provider use the <link><page ri:content-title="jms to jms bridge"></page><link-body>JMS bridge</link-body></link>. </p>
 
-<p>To bridge to another kind of transport completely, use <a shape="rect" class="external-link" href="http://camel.apache.org">Camel</a> or <a shape="rect" class="external-link" href="http://servicemix.apache.org">ServiceMix</a></p></div>
+<p>To bridge to another kind of transport completely, use <a shape="rect" href="http://camel.apache.org">Camel</a> or <a shape="rect" href="http://servicemix.apache.org">ServiceMix</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-build-but-disable-the-unit-tests.xml
----------------------------------------------------------------------
diff --git a/how-do-i-build-but-disable-the-unit-tests.xml b/how-do-i-build-but-disable-the-unit-tests.xml
index 74346b3..ce1e503 100644
--- a/how-do-i-build-but-disable-the-unit-tests.xml
+++ b/how-do-i-build-but-disable-the-unit-tests.xml
@@ -1,12 +1,10 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIbuildbutdisabletheunittests-HowdoIbuildbutdisabletheunittests">How do I build but disable the unit tests</h2>
+<div class="wiki-content maincontent"><h2>How do I build but disable the unit tests</h2>
 
-<p>The test cases in ActiveMQ can take a very long time to run! <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>The test cases in ActiveMQ can take a very long time to run! <emoticon ac:name="smile"></emoticon></p>
 
 <p>To disable this you can try 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="a89a4ffe-28f9-4290-86b1-bbb13431bbc4" ac:name="code" ac:schema-version="1"><plain-text-body>
 mvn install -Dmaven.test.skip=true
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-dispatch-policy.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-dispatch-policy.xml b/how-do-i-change-dispatch-policy.xml
index e14c15a..d0de7e0 100644
--- a/how-do-i-change-dispatch-policy.xml
+++ b/how-do-i-change-dispatch-policy.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><p>This is much simpler and more powerful in ActiveMQ 4.0 - you can configure different <a shape="rect" href="dispatch-policies.xml">Dispatch Policies</a> directly. </p>
+<div class="wiki-content maincontent"><p>This is much simpler and more powerful in ActiveMQ 4.0 - you can configure different <link><page ri:content-title="Dispatch Policies"></page></link> directly. </p>
 
-<p>For now in ActiveMQ 3.x we have a <a shape="rect" href="what-is-the-prefetch-limit-for.xml">PrefetchPolicy configuration</a>. This allows a certain number of messages to be dispatched to a consumer before they are acknowledged. This feature is to achieve high performance; the higher the value the less likely it is that a client has to wait for messages to arrive before processing the message and so the higher the throughput.</p>
+<p>For now in ActiveMQ 3.x we have a <link><page ri:content-title="What is the Prefetch Limit For?"></page><link-body>PrefetchPolicy configuration</link-body></link>. This allows a certain number of messages to be dispatched to a consumer before they are acknowledged. This feature is to achieve high performance; the higher the value the less likely it is that a client has to wait for messages to arrive before processing the message and so the higher the throughput.</p>
 
 <p>e.g. under heavy load of a busy system you probably want to dispatch 1000 or so messages to a consumer, so as soon as its ready to receive a message, there are a bunch of them in memory waiting to be used - rather than having a slow request-response RPC each time.</p>
 
@@ -8,16 +8,15 @@
 
 <p>In ActiveMQ 3.x or later a work around for this issue is to reconfigure the PrefetchPolicy on the ConnectionFactory/Connection so that the broker only prefetches a single message per consumer; though this will greatly reduce the performance and throughput of the system.</p>
 
-<h3 id="HowdoIchangedispatchpolicy-ConfiguringthedispatchpolicyinActiveMQ4.x">Configuring the dispatch policy in ActiveMQ 4.x</h3>
+<h3>Configuring the dispatch policy in ActiveMQ 4.x</h3>
 
 <p>In AMQ 4.x, the dispatch policy can now be configured on the xml configuration file (ie. activemq.xml)<br clear="none">
 ie.</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="b215a33e-7bd9-4d85-83b6-523f38286caa" ac:name="code" ac:schema-version="1"><plain-text-body>
 &lt;destinationPolicy&gt;
    &lt;policyMap&gt;&lt;policyEntries&gt; 
-      &lt;policyEntry topic=&quot;COMMAND.&gt;&quot;&gt;
+      &lt;policyEntry topic="COMMAND.&gt;"&gt;
          &lt;dispatchPolicy&gt;
            &lt;strictOrderDispatchPolicy /&gt;
          &lt;/dispatchPolicy&gt;
@@ -27,6 +26,5 @@ ie.</p>
       &lt;/policyEntry&gt;
    &lt;/policyEntries&gt;&lt;/policyMap&gt;
 &lt;/destinationPolicy&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-the-logging.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-the-logging.xml b/how-do-i-change-the-logging.xml
index 7fa1bd1..3397942 100644
--- a/how-do-i-change-the-logging.xml
+++ b/how-do-i-change-the-logging.xml
@@ -1,37 +1,30 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIchangethelogging-HowdoIchangethelogging">How do I change the logging</h2>
+<div class="wiki-content maincontent"><h2>How do I change the logging</h2>
 
-<p>We use <a shape="rect" class="unresolved" href="#">slf4j</a> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
+<p>We use <link><page ri:content-title="www.slf4j.org"></page><link-body>slf4j</link-body></link> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
 
 <p>You can disable the ActiveMQ logging by editing the <strong>conf/log4j.properties</strong> file to disable all INFO level logging for activemq by adding this line</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="7662763d-89e4-4530-a809-80b4837b9ac5" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.logger.org.apache.activemq=WARN
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>or to disable stdout logging all together change this line</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="329e6a3c-02be-4370-a6d9-ae07172450c1" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, stdout, out
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>to</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="5bfdd37d-318b-4c45-87c0-76fc34ea3276" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, out
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h2 id="HowdoIchangethelogging-HowDoIChangetheLoggingatRuntime?">How Do I Change the Logging at Runtime? </h2>
+<h2>How Do I Change the Logging at Runtime? </h2>
 
 <p>The default logging level in ActiveMQ is INFO. This can be seen by starting up the default ActiveMQ binary in a terminal. In doing so, you will see the output shown below: </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="f615105d-e205-4750-b028-693bb3957169" ac:name="code" ac:schema-version="1"><plain-text-body>
 $ ./bin/activemq
 ACTIVEMQ_HOME: /Users/bsnyder/amq/apache-activemq-5.1.0
 ACTIVEMQ_BASE: /Users/bsnyder/amq/apache-activemq-5.1.0
@@ -56,25 +49,23 @@ INFO  BrokerService                  - ActiveMQ JMS Message Broker (localhost, I
 INFO  log                            - Logging to org.slf4j.impl.JCLLoggerAdapter(org.mortbay.log) via org.mortbay.log.Slf4jLog
 INFO  log                            - jetty-6.1.9
 INFO  WebConsoleStarter              - ActiveMQ WebConsole initialized.
-INFO  /admin                         - Initializing Spring FrameworkServlet &#39;dispatcher&#39;
+INFO  /admin                         - Initializing Spring FrameworkServlet 'dispatcher'
 INFO  log                            - ActiveMQ Console at http://0.0.0.0:8161/admin
 INFO  log                            - ActiveMQ Web Demos at http://0.0.0.0:8161/demo
 INFO  log                            - RESTful file access application at http://0.0.0.0:8161/fileserver
 INFO  log                            - Started SelectChannelConnector@0.0.0.0:8161
 INFO  FailoverTransport              - Successfully connected to tcp://localhost:61616
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>But stopping ActiveMQ to change the logging level is not always feasible. There are many cases where the logging level and other configuration details may need to be changed at runtime. Using a JMX tool such as jconsole, the logging configuration file can be changed and reloaded without shutting down ActiveMQ. </p>
 
 <p>To change the ActiveMQ logging level from INFO to DEBUG while ActiveMQ is running, start up jconsole, point to the ActiveMQ instance and navigate to the Broker object's Operations tab as shown below: </p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-do-i-change-the-logging.data/reloadLog4jProperties1.png" data-image-src="/confluence/download/attachments/35929/reloadLog4jProperties1.png?version=2&amp;modificationDate=1224001802000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="9148" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="reloadLog4jProperties1.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35929" data-linked-resource-container-version="7"></span> </p>
+<p><image><attachment ri:filename="reloadLog4jProperties1.png"></attachment></image> </p>
 
 <p>To enable debug level logging in ActiveMQ, edit the <code>conf/log4j.properties</code> file that is part of the ActiveMQ binary distribution to disable INFO level logging and enable DEBUG level logging from 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[
+<structured-macro ac:macro-id="69566c36-e040-447f-b6a7-c3b605598339" ac:name="code" ac:schema-version="1"><plain-text-body>
 log4j.rootLogger=INFO, stdout, out
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
@@ -84,13 +75,11 @@ log4j.logger.org.apache.xbean.spring=WARN
 # comment out the above lines and uncomment the next.
 
 #log4j.rootLogger=DEBUG, out, stdout
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>to 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[
+<structured-macro ac:macro-id="3d1df33e-61ff-437d-8f1f-6f8966109da9" ac:name="code" ac:schema-version="1"><plain-text-body>
 #log4j.rootLogger=INFO, stdout, out
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
@@ -100,19 +89,17 @@ log4j.logger.org.apache.xbean.spring=WARN
 # comment out the above lines and uncomment the next.
 
 log4j.rootLogger=DEBUG, out, stdout
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Notice that the line <code>log4j.rootLogger=INFO, stdout, out</code> has been commented out and the line <code>log4j.rootLogger=DEBUG, out, stdout</code> has been uncommented. Save this change and then, in jconsole, click the button named <strong>reloadLog4jProperties</strong> as shown below: </p>
 
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-do-i-change-the-logging.data/reloadLog4jProperties2.png" data-image-src="/confluence/download/attachments/35929/reloadLog4jProperties2.png?version=2&amp;modificationDate=1224001802000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="9147" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="reloadLog4jProperties2.png" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/png" data-linked-resource-container-id="35929" data-linked-resource-container-version="7"></span> </p>
+<p><image><attachment ri:filename="reloadLog4jProperties2.png"></attachment></image> </p>
 
 <p>After clicking the <strong>reloadLog4jProperties</strong> button, the dialog pops up stating, 'Method successfully invoked'. This just lets you know that the <code>reloadLog4jProperties</code> method was invoked to reload the <code>conf/log4j.properties</code> file. Now notice in the terminal where ActiveMQ is running that the logging that is being output is now DEBUG: </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="4254803e-e312-467b-819b-c303a0be9254" ac:name="code" ac:schema-version="1"><plain-text-body>
 INFO  WebConsoleStarter              - ActiveMQ WebConsole initialized.
-INFO  /admin                         - Initializing Spring FrameworkServlet &#39;dispatcher&#39;
+INFO  /admin                         - Initializing Spring FrameworkServlet 'dispatcher'
 INFO  log                            - ActiveMQ Console at http://0.0.0.0:8161/admin
 INFO  log                            - ActiveMQ Web Demos at http://0.0.0.0:8161/demo
 INFO  log                            - RESTful file access application at http://0.0.0.0:8161/fileserver
@@ -134,8 +121,7 @@ DEBUG TransportConnection            - Connection Stopped: /127.0.0.1:56512
 DEBUG InactivityMonitor              - 9999 ms elapsed since last write check.
 DEBUG InactivityMonitor              - 10000 ms elapsed since last write check.
 DEBUG InactivityMonitor              - 29999 ms elapsed since last read check.
-]]></script>
-</div></div> 
+</plain-text-body></structured-macro> 
 
 <p>Disabling DEBUG level logging and enabling INFO level logging is done by editing the <code>log4j.properties</code> file and clicking the <strong>reloadLog4jProperties</strong> button again. </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml b/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
index 6a9e0e4..1cb7992 100644
--- a/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
+++ b/how-do-i-change-the-message-store-directory-for-an-embedded-broker.xml
@@ -1,5 +1,3 @@
-<div class="wiki-content maincontent"><p>Embedded brokers create an ActiveMQ directory under the current working directory to store it's persistent message data. To change the location of the directory used by the message store, set the <strong>activemq.store.dir</strong> system property to the directory you want it to use.</p><p>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[java -Dactivemq.store.dir=/temp your.Application
-]]></script>
-</div></div></div>
+<div class="wiki-content maincontent"><p>Embedded brokers create an ActiveMQ directory under the current working directory to store it's persistent message data. To change the location of the directory used by the message store, set the <strong>activemq.store.dir</strong> system property to the directory you want it to use.</p><p>Example:</p><structured-macro ac:macro-id="1086a0e9-3648-4f5a-aa24-ce29a6c1cd3b" ac:name="code" ac:schema-version="1"><plain-text-body>java -Dactivemq.store.dir=/temp your.Application
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-compile-from-the-source.xml
----------------------------------------------------------------------
diff --git a/how-do-i-compile-from-the-source.xml b/how-do-i-compile-from-the-source.xml
index b3bac0c..d97d72e 100644
--- a/how-do-i-compile-from-the-source.xml
+++ b/how-do-i-compile-from-the-source.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="HowdoIcompilefromthesource-HowdoIcompilefromthesourcecode?">How do I compile from the source code?</h2>
+<div class="wiki-content maincontent"><h2>How do I compile from the source code?</h2>
 
-<p>See the <a shape="rect" href="building.xml">Building</a> page</p></div>
+<p>See the <link><page ri:content-title="Building"></page></link> page</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
----------------------------------------------------------------------
diff --git a/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml b/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
index 7207486..01b03cd 100644
--- a/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
+++ b/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker.xml
@@ -1,11 +1,2 @@
-<div class="wiki-content maincontent"><p>Scaling to tens of thousands of Queues in a single broker is relatively straightforward - but requires some configuration changes from the default.</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-ReducingThreads">Reducing Threads</h2><p>With the default configuration, ActiveMQ is configured to use a dispatch thread per Queue - you can use set the optimizedDispatch property on the destination policy entry - see <a shape="rect" href="per-destination-policies.xml">configuring Queues</a>.</p><p>ActiveMQ can optionally use internally a thread pool to control dispatching of messages - but as a lot of deployment operating systems are good at handling a large number of threads, this is off by default. To enable this option, either set the ACTIVEMQ_OPTS to disable dedicated task runners in the start up script, INSTALL_DIR/bin/activemq -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[ACTIVEMQ_OPTS=&quot;-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=false&quot;  
-]]></script>
-</div></div><p>or you can set ACTIVEMQ_OPTS in /etc/activemq.conf.</p><p><strong>Note:</strong> From ActiveMQ 5.6 onwards the dedicated task runner is disabled by default (see 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-3667?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/improvement.png">AMQ-3667</a>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
-).</p><p>To reduce the number of threads used for the transport - take a look at using the NIO transport - see <a shape="rect" href="configuring-transports.xml">Configuring Transports</a></p><p>Here is an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml">example</a> of this in use in one of the provided sample broker configuration files.</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-ReducingMemoryConsumption">Reducing Memory Consumption</h2><p>Reduce the memory used per thread - see <a shape="rect" href="javalangoutofmemory.xml">reducing memory consumption</a></p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-Reducenumberoffiledescriptors">Reduce number of file descriptors</h2><p>ActiveMQ uses the amqPersistenceAdapter by default for persistent messages. Unfortunately, this persistence adapter (as well as the kahaPersistenceAdapter) opens a file descriptor for each que
 ue. When creating large numbers of queues, you'll quickly run into the limit for your OS.</p><p>You can either choose another <a shape="rect" href="persistence.xml">persistence option</a></p><p>or - try out the new <a shape="rect" href="kahadb.xml">KahaDB</a> in version 5.3 and higher</p><h2 id="HowdoIconfigure10sof1000sofQueuesinasinglebroker-Increasethelimitonfiledescriptorsperprocess">Increase the limit on file descriptors per process</h2><p>Try <a shape="rect" class="external-link" href="http://tinyurl.com/o9qs2f" rel="nofollow">googling for the OS you are using</a></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="636bff55-db89-48bb-be51-893e883ae03e" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Scaling Queues"></page></link></parameter></structured-macro></p></div>
 


[21/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
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>
 


[40/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-590-release.xml
----------------------------------------------------------------------
diff --git a/activemq-590-release.xml b/activemq-590-release.xml
index 4e7e845..5ae6dd6 100644
--- a/activemq-590-release.xml
+++ b/activemq-590-release.xml
@@ -1,34 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.9.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.9.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">more than 200 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p></p><ul><li><a shape="rect" href="replicated-leveldb-store.xml">Replicated LevelDB Store</a> for shared nothing Master/Slave.</li><li><a shape="rect" href="runtime-configuration.xml">Runtime Configuration</a></li><li>Generic JMS XA connection pool in activemq-jms-pool module (has no ActiveMQ dependency)</li><li>MQTT over WebSockets support</li><li><a shape="rect" href="broker-camel-component.xml"><strong>broker</strong></a> Apache Camel component</li><li>Broker auto-restart upon losing master status</li><li>AMQP Hardening</li><li>LevelDB Hardening</li></ul> There are some changes in 5.9 that may require user interventi
 on
-
-<ol><li>Schema change to JDBC Persistence Adapter. XID column type change.</li></ol>
-<ul><li>If you use XA transactions you need to ensure there are no XA transactions pending completion before you upgrade. Some mode detail in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4628">AMQ-4628</a></li></ul><h2 id="ActiveMQ5.9.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.zip">apache-activemq-5.9.0-bin.zip</a></p></td><td colspan="1" rows
 pan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.zip.asc">apache-activemq-5.9.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz">apache-activemq-5.9.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz.asc">apache-activemq-5.9.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.9.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the download
 ed files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.9.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="a9618579-f987-426c-99c3-608419c36a11" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.9.0 resolves <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.9.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">more than 200 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p><structured-macro ac:macro-id="1773bc8e-5c39-47f9-8d48-2a0bed14e6a7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.9"></page></link></parameter></structured-macro> <structured-macro ac:macro-id="ecff5725-a121-4a6f-912e-f363c0be03b7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="5.9 Migration Guide"></page></link></parameter></structured-macro></p><h2>Getting the Binary D
 istributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.zip">apache-activemq-5.9.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.zip.asc">apache-activemq-5.9.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz">apache-activemq-5.9.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://ar
 chive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz.asc">apache-activemq-5.9.0-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="3efc85fe-93ec-47a7-a8f0-9b59c18f6490" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="9f7474f0-146e-46f1-ad4c-5e9d74a02845" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.9.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.9.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.9.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/activemq-parent-5.9.0-source-release.zip">activemq-parent-5.9.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/activemq-parent-5.9.0-source-release.zip.asc"
 >activemq-parent-5.9.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.9.0Release-SVNTagCheckout">SVN Tag Checkout</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[https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.9.0
-]]></script>
-</div></div><h2 id="ActiveMQ5.9.0Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323932">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-580-release.xml">ActiveMQ 5.8.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="f8a3a341-f39e-4877-b2e7-f3fa729b0384" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/activemq-parent-5.9.0-source-release.zip">activemq-parent-5.9.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/activemq-parent-5.9.0-source-release.zip.asc">activemq-parent-5.9.0-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="de29d22d-2a2e-4
 108-bbd8-b1550d9f3342" ac:name="code" ac:schema-version="1"><plain-text-body>https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.9.0
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323932">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.8.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-591-release.xml
----------------------------------------------------------------------
diff --git a/activemq-591-release.xml b/activemq-591-release.xml
index 8b86959..611bf97 100644
--- a/activemq-591-release.xml
+++ b/activemq-591-release.xml
@@ -1,34 +1,9 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>Apache ActiveMQ 5.9.1 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.9.1%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">more than 120 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p></p><ul><li><a shape="rect" href="replicated-leveldb-store.xml">Replicated LevelDB Store</a> for shared nothing Master/Slave.</li><li><a shape="rect" href="runtime-configuration.xml">Runtime Configuration</a></li><li>Generic JMS XA connection pool in activemq-jms-pool module (has no ActiveMQ dependency)</li><li>MQTT over WebSockets support</li><li><a shape="rect" href="broker-camel-component.xml"><strong>broker</strong></a> Apache Camel component</li><li>Broker auto-restart upon losing master status</li><li>AMQP Hardening</li><li>LevelDB Hardening</li></ul> There are some changes in 5.9 that may require user interventi
 on
-
-<ol><li>Schema change to JDBC Persistence Adapter. XID column type change.</li></ol>
-<ul><li>If you use XA transactions you need to ensure there are no XA transactions pending completion before you upgrade. Some mode detail in <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-4628">AMQ-4628</a></li></ul><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Note that the Hawtio console was removed in this release.</p></div></div><p>&#160;</p><h2 id="ActiveMQ5.9.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rows
 pan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/apache-activemq-5.9.1-bin.zip">apache-activemq-5.9.1-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.9.1/apache-activemq-5.9.1-bin.zip.asc">apache-activemq-5.9.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/apache-activemq-5.9.1-bin.tar.gz">apache-activemq-5.9.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.9.1/apache-activemq-5
 .9.1-bin.tar.gz.asc">apache-activemq-5.9.1-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.9.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.9.1Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in y
 our maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="8d355e45-970c-48cd-af6f-454a439cf7b1" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body>
+<p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>Apache ActiveMQ 5.9.1 resolves <a shape="rect" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.9.1%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&amp;mode=hide">more than 120 issues</a>, mostly bug fixes and improvements. It has the following new features:</p><p><structured-macro ac:macro-id="120e6c87-3ea9-4365-bd44-51df6e367d5e" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="New Features in 5.9"></page></link></parameter></structured-macro> <structured-macro ac:macro-id="a3f9de48-94da-4894-90ff-da409aebb365" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="5.9 Migration Guide"></page></link></parameter></structured-macro></p><structured-macro ac:mac
 ro-id="c273c1b3-0a32-4da9-a425-b28b85797307" ac:name="note" ac:schema-version="1"><rich-text-body><p>Note that the Hawtio console was removed in this release.</p></rich-text-body></structured-macro><p>&#160;</p><h2>Getting the Binary Distributions</h2><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/apache-activemq-5.9.1-bin.zip">apache-activemq-5.9.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.9.1/apache-activemq-5.9.1-bin.zip.asc">apache-activemq-5.9.1-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rec
 t" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/apache-activemq-5.9.1-bin.tar.gz">apache-activemq-5.9.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.9.1/apache-activemq-5.9.1-bin.tar.gz.asc">apache-activemq-5.9.1-bin.tar.gz.asc</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="8580a58a-f79f-4dd8-b3b6-c65ca018adab" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><structured-macro ac:macro-id="48da5127-7d2f-4e50-8a21-4e3ee60bcd87" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><pl
 ain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.9.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><div></div>
-
-
-<h2 id="ActiveMQ5.9.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.9.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/activemq-parent-5.9.1-source-release.zip">activemq-parent-5.9.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/5.9.1/activemq-parent-5.9.1-source-release.zip.asc">activemq-parent-5.9.1-
 source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.9.1Release-SVNTagCheckout">SVN Tag Checkout</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[https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.9.1
-]]></script>
-</div></div><h2 id="ActiveMQ5.9.1Release-Changelog">Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323932">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-580-release.xml">ActiveMQ 5.8.0 Release</a></p></div>
+</plain-text-body></structured-macro><structured-macro ac:macro-id="28b32446-5faf-42c6-8905-2eb3bc630177" ac:name="div" ac:schema-version="1"></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/activemq-parent-5.9.1-source-release.zip">activemq-parent-5.9.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://www.apache.org/dist/activemq/5.9.1/activemq-parent-5.9.1-source-release.zip.asc">activemq-parent-5.9.1-source-release.zip.asc</a></p></td></tr></tbody></table><h3>SVN Tag Checkout</h3><structured-macro ac:macro-id="477248c5-d8d4-4559-a0b4-45455c37ca95" 
 ac:name="code" ac:schema-version="1"><plain-text-body>https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.9.1
+</plain-text-body></structured-macro><h2>Changelog</h2><p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12323932">release notes</a></p><p>Also see the previous <link><page ri:content-title="ActiveMQ 5.8.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-artemis-roadmap.xml
----------------------------------------------------------------------
diff --git a/activemq-artemis-roadmap.xml b/activemq-artemis-roadmap.xml
index b1c8735..f2e618f 100644
--- a/activemq-artemis-roadmap.xml
+++ b/activemq-artemis-roadmap.xml
@@ -1,58 +1,2 @@
-<div class="wiki-content maincontent"><p>The goal of this page is to identify the outstanding issues that must be addressed by Artemis in order to achieve some level of feature parity with ActiveMQ 5.x. The overall objective for working toward feature parity between ActiveMQ 5.x and Artemis is for Artemis to eventually become ActiveMQ 6.x. This page exists so that we can work together as a group to achieve this goal.</p><p></p><div class="toc-macro client-side-toc-macro" data-headerelements="H1,H2,H3,H4,H5,H6,H7"></div><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Work in Progress</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">This page is a work in progress and will be updated frequently.</div></div><h1 id="ActiveMQArtemisRoadmap-Usingthispage">Using this page</h1><p>Feature items can be listed, with links to JIRA tickets for longer c
 onversation and hashing out specific feature details</p><h1 id="ActiveMQArtemisRoadmap-Features/Scenarios">Features/Scenarios</h1><p>This section should be used to identify all the ActiveMQ 5.x features that Artemis needs. This should include&#160;<strong>all</strong>&#160;Artemis features that we can identify, including those from ActiveMQ that Artemis has already implemented. This will help us to more clearly track everything that Artemis needs.</p><p>&#160;</p><h3 id="ActiveMQArtemisRoadmap-AdvisorySupport">Advisory Support</h3><ul><li>Support for broker state change advisories (master -&gt; slave, slave -&gt; master)</li><li>Support for connection advisories (connect, disconnect, unclean disconnect, authn fail, authz fail)</li><li>Support for consumer advisories (new consumer, closed, slow consumer)</li><li>Support for producer advisories (new producer, closed, fast producer, message size exceeded, memoryLimit reached, storage limit reached)</li><li>Support for destination advis
 ories (new dest, deleted)</li></ul><h3 id="ActiveMQArtemisRoadmap-BrokerClustering">Broker Clustering</h3><ul><li>Support full-duplex broker-to-broker cluster connections&#160;[
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-838?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/newfeature.png">ARTEMIS-838</a>
-                    -
-            <span class="summary">Support full duplex cluster-connections</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li></ul><h3 id="ActiveMQArtemisRoadmap-ActiveMQ5.xClientCompatibility">ActiveMQ 5.x Client Compatibility</h3><ul><li>Full support of Openwire (TODO: specifically, which versions)</li></ul><h3 id="ActiveMQArtemisRoadmap-DestinationInterceptors">Destination Interceptors</h3><ul><li>Virtual Topic equivalent support&#160;[
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-550?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/improvement.png">ARTEMIS-550</a>
-                    -
-            <span class="summary">Add support for virtual topic consumers</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li></ul><h3 id="ActiveMQArtemisRoadmap-DestinationFeatures">Destination Features</h3><ul><li>Destination Policy: Garbage collection and advisory support for that activity [
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-1148?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/newfeature.png">ARTEMIS-1148</a>
-                    -
-            <span class="summary">Artemis ServerPlugin support for Address changes</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li><li>Exclusive consumer support [
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-854?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/subtask_alternate.png">ARTEMIS-854</a>
-                    -
-            <span class="summary">Create basic exclusive consumer support within the broker</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li><li>Exclusive consumer features: consumersBeforeDispatchStarts, timeBeforeDispatchStarts [
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-856?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/subtask_alternate.png">ARTEMIS-856</a>
-                    -
-            <span class="summary">Support advanced exclusive consumer config options</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li></ul><h3 id="ActiveMQArtemisRoadmap-PluginSupport">Plugin Support</h3><ul><li>Destination Policies (there is a slew of functionality in ActiveMQ 5.x dest policies that should be detailed out)</li></ul><h3 id="ActiveMQArtemisRoadmap-StorageBackend">Storage Backend</h3><ul><li>Support for multiple shared persistence stores similar to multi-kahadb (allow for storage across multiple disk volumes.. ie.&#160; queue://ORDER.&gt; on /mnt/order queue://BILLING.&gt; on /mnt/billing, etc)&#160;[
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-839?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/newfeature.png">ARTEMIS-839</a>
-                    -
-            <span class="summary">Support multiple backend data stores</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</li></ul><h1 id="ActiveMQArtemisRoadmap-Migration">Migration</h1><p>This section should help to answer the end user question, <em>'How do I migrate from ActiveMQ 5.x to Artemis?'</em>. This should include the identification of any tools that can help make this easier, as well as documenting information and procedures specific to migrating.</p><p>&#160;</p><p>&#160;</p><h1 id="ActiveMQArtemisRoadmap-Wishlist">Wishlist</h1><h3 id="ActiveMQArtemisRoadmap-Protocolfeatures">Protocol features</h3><ul><li><p>Exclusive consumer support across all protocols STOMP, MQTT, AMQP, etc. [
-    <span class="jira-issue">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/ARTEMIS-855?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/subtask_alternate.png">ARTEMIS-855</a>
-                    -
-            <span class="summary">Support exclusive consumer over non-JMS protocols</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf">Open</span>
-            </span>
-]</p></li></ul><h3 id="ActiveMQArtemisRoadmap-KahaDBMigrationTool">KahaDB Migration Tool</h3><ul><li>Support exporting messages from KahaDB format to Artemis</li></ul><h3 id="ActiveMQArtemisRoadmap-Over-the-wiremigrationtool">Over-the-wire migration tool</h3><ul><li>Support a tool for migrating messages from ActiveMQ 5.x brokers to Artemis-based brokers (for non-standard backends)<ul><li>Goal: preserve messageId</li></ul></li></ul></div>
+<div class="wiki-content maincontent"><p>The goal of this page is to identify the outstanding issues that must be addressed by Artemis in order to achieve some level of feature parity with ActiveMQ 5.x. The overall objective for working toward feature parity between ActiveMQ 5.x and Artemis is for Artemis to eventually become ActiveMQ 6.x. This page exists so that we can work together as a group to achieve this goal.</p><p><structured-macro ac:macro-id="69b5e409-31ec-491e-ba71-9c7954ea6395" ac:name="toc" ac:schema-version="1"></structured-macro></p><structured-macro ac:macro-id="d030f30b-14a9-4ac7-a081-82d6602e5687" ac:name="note" ac:schema-version="1"><parameter ac:name="title">Work in Progress</parameter><rich-text-body>This page is a work in progress and will be updated frequently.</rich-text-body></structured-macro><h1>Using this page</h1><p>Feature items can be listed, with links to JIRA tickets for longer conversation and hashing out specific feature details</p><h1>Features/Sc
 enarios</h1><p>This section should be used to identify all the ActiveMQ 5.x features that Artemis needs. This should include&#160;<strong>all</strong>&#160;Artemis features that we can identify, including those from ActiveMQ that Artemis has already implemented. This will help us to more clearly track everything that Artemis needs.</p><p>&#160;</p><h3>Advisory Support</h3><ul><li>Support for broker state change advisories (master -&gt; slave, slave -&gt; master)</li><li>Support for connection advisories (connect, disconnect, unclean disconnect, authn fail, authz fail)</li><li>Support for consumer advisories (new consumer, closed, slow consumer)</li><li>Support for producer advisories (new producer, closed, fast producer, message size exceeded, memoryLimit reached, storage limit reached)</li><li>Support for destination advisories (new dest, deleted)</li></ul><h3>Broker Clustering</h3><ul><li>Support full-duplex broker-to-broker cluster connections&#160;[<structured-macro ac:macro-id=
 "2adc9b54-8b9c-4e98-a888-aa9f78c8d562" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-838</parameter></structured-macro>]</li></ul><h3>ActiveMQ 5.x Client Compatibility</h3><ul><li>Full support of Openwire (TODO: specifically, which versions)</li></ul><h3>Destination Interceptors</h3><ul><li>Virtual Topic equivalent support&#160;[<structured-macro ac:macro-id="e29ce835-58d9-4501-8ce5-376c1855df9c" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-550</parameter></structured-macro>]</li></ul><h3>Destination Features</h3><ul><li>Destination Policy: Garbage collection and advisory support for that activity [<structured-macro ac:macro-id="a0f4810f-33d9-4fae-996d-1110d7192dfa" ac:name="jira" ac:sch
 ema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-1148</parameter></structured-macro>]</li><li>Exclusive consumer support [<structured-macro ac:macro-id="dbcbe533-86db-44be-bcd2-ced38d521fb9" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-854</parameter></structured-macro>]</li><li>Exclusive consumer features: consumersBeforeDispatchStarts, timeBeforeDispatchStarts [<structured-macro ac:macro-id="992343df-cd81-403f-a240-70ed09c45ed2" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-856</parameter></structured-macro>]</li></ul><h3>Plugin Support</h3><ul><li>Destination P
 olicies (there is a slew of functionality in ActiveMQ 5.x dest policies that should be detailed out)</li></ul><h3>Storage Backend</h3><ul><li>Support for multiple shared persistence stores similar to multi-kahadb (allow for storage across multiple disk volumes.. ie.&#160; queue://ORDER.&gt; on /mnt/order queue://BILLING.&gt; on /mnt/billing, etc)&#160;[<structured-macro ac:macro-id="045abe40-7168-41f9-b3ca-95fea254ad44" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-839</parameter></structured-macro>]</li></ul><h1>Migration</h1><p>This section should help to answer the end user question, <em>'How do I migrate from ActiveMQ 5.x to Artemis?'</em>. This should include the identification of any tools that can help make this easier, as well as documenting information and procedures specific to migrating.</p><p>&#160;</p><p>&#160;</p><h1>Wish
 list</h1><h3>Protocol features</h3><ul><li><p>Exclusive consumer support across all protocols STOMP, MQTT, AMQP, etc. [<structured-macro ac:macro-id="206ce9fb-b130-409f-abeb-7b12907c5245" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">ARTEMIS-855</parameter></structured-macro>]</p></li></ul><h3>KahaDB Migration Tool</h3><ul><li>Support exporting messages from KahaDB format to Artemis</li></ul><h3>Over-the-wire migration tool</h3><ul><li>Support a tool for migrating messages from ActiveMQ 5.x brokers to Artemis-based brokers (for non-standard backends)<ul><li>Goal: preserve messageId</li></ul></li></ul></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-c-clients.xml
----------------------------------------------------------------------
diff --git a/activemq-c-clients.xml b/activemq-c-clients.xml
index 9e54bc3..c8e897f 100644
--- a/activemq-c-clients.xml
+++ b/activemq-c-clients.xml
@@ -1,4 +1,5 @@
-<div class="wiki-content maincontent"><h2 id="ActiveMQC++Clients-ActiveMQC++Integration">ActiveMQ C++ Integration</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ C++ Integration</h2>
 
-<p><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">CMS</a> is an easy-to-use JMS 1.1-like API. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</p></div>
+<p><a shape="rect" href="http://activemq.apache.org/cms/">CMS</a> is an easy-to-use JMS 1.1-like API. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-c-development.xml
----------------------------------------------------------------------
diff --git a/activemq-c-development.xml b/activemq-c-development.xml
index 9aa399e..fb86781 100644
--- a/activemq-c-development.xml
+++ b/activemq-c-development.xml
@@ -1,16 +1,16 @@
-<div class="wiki-content maincontent"><h1 id="ActiveMQCDevelopment-ActiveMQCPPDevelopmentPage">ActiveMQ CPP Development Page</h1>
+<div class="wiki-content maincontent"><h1>ActiveMQ CPP Development Page</h1>
 
 <p>This page documents current and planned development of ActiveMQ CPP.&#160; The table below lists development tasks and their current status</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Development Activeity <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Status <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Openwire Support <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> in-progress <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Development Activeity <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Status <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1"><p> Openwire Support <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> in-progress <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table>
 
 
-<h3 id="ActiveMQCDevelopment-OpenwireSupport">&#160;Openwire Support</h3>
+<h3>&#160;Openwire Support</h3>
 
 <p>This task adds support for the OpenWire protocol to ActiveMQ CPP.&#160; The tasks involves the addition of new code, the activities are listed below, as well as who is working on them and what the status of each is.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Task Description <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Assigned to <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Status <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Task Info <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Openwire Command / Marshallers generation scripts <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> In-Progress <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Loo
 se Marshalling works, Tight still not working <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> WireFormat Negotiation Framework <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Mimic the DotNet version? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Primitives Map <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Nate Mittler <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Needs 
 more testing for memory leaks and performance. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Primitive Map Marshalling <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Needs more testing, for leaks etc.&#160; Add nested maps, lists. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> BaseDataStreamMarshallers Port <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> In-Progress <br clear="none" clas
 s="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Done, but serious unit testing is needed <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> BooleanStream Port <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Done <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> OpenWire Connector Framework Classes <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim / Nate <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed <b
 r clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Needs lots of testing <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> DataInputStreams / DataOutputStreams <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Done </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Task Description <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Assigned to <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Status <br clear="none" class="atl-forced-newline"> </p></th><th colspan="1" rowspan="1"><p> Task Info <br clear="none" class="atl-forced-newline"> </p></th></tr><tr><td colspan="1" rowspan="1"><p> Openwire Command / Marshallers generation scripts <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> In-Progress <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Loose Marshalling works, Tight still not working <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> WireFormat Negotiation Framework <br clear="none" class="atl-forced-newline
 "> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Mimic the DotNet version? <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Primitives Map <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Nate Mittler <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed </p></td><td colspan="1" rowspan="1"><p> Needs more testing for memory leaks and performance. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> Primitive Map Marshalling <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed <br clear="none" class="a
 tl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Needs more testing, for leaks etc.&#160; Add nested maps, lists. <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> BaseDataStreamMarshallers Port <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> In-Progress <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Done, but serious unit testing is needed <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> BooleanStream Port <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Done <br clear="none" class="atl-f
 orced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> OpenWire Connector Framework Classes <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim / Nate <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Needs lots of testing <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> DataInputStreams / DataOutputStreams <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Tim Bish <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Completed <br clear="none" class="atl-forced-newline"> </p></td><td colspan="1" rowspan="1"><p> Done </p></td></tr></tbody></table>
 
 
-<h2 id="ActiveMQCDevelopment-OutstandingIssues">Outstanding Issues</h2>
+<h2>Outstanding Issues</h2>
 
 <p>This section document issues that are outstanding...TDB</p></div>
 


[36/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/advisory-message.xml
----------------------------------------------------------------------
diff --git a/advisory-message.xml b/advisory-message.xml
index dc77ee1..fd86b03 100644
--- a/advisory-message.xml
+++ b/advisory-message.xml
@@ -1,5 +1,4 @@
-<div class="wiki-content maincontent"><p>ActiveMQ supports advisory messages which allows you to watch the system using regular JMS messages. Currently we have advisory messages that support:</p><ul><li>consumers, producers and connections starting and stopping</li><li>temporary destinations being created and destroyed</li><li>messages expiring on topics and queues</li><li>brokers sending messages to destinations with no consumers.</li><li>connections starting and stopping</li></ul><p>Advisory messages can be thought as some kind of administrative channel where you receive information regarding what is happening on your JMS provider along with what's happening with producers, consumers and destinations. When you look at a broker via <a shape="rect" href="jmx.xml">JMX</a> you will see the advisory topics prefixed with <strong><code>ActiveMQ.Advisory.</code></strong>.</p><p>Every Advisory has the message <strong>type</strong> 'Advisory' and some predefined message properties:</p><div 
 class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Property</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Type</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Version</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>originBrokerId</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The id of the broker where the advisory originated.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.x</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>originBrokerName</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The name of the broker where the advisory originated.</p></td>
 <td colspan="1" rowspan="1" class="confluenceTd"><p>5.x</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>originBrokerURL</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The first URL of the broker where the advisory originated.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.2</p></td></tr></tbody></table></div><p>In addition, some messages carry a&#160;<strong><code>Command</code></strong> object, which carries additional information about the nature of the advisory, e.g., a subscription to each of the destination returns an <strong><code>ActiveMQMessage</code></strong>. Specific&#160;<strong><code>DataStructure</code></strong> objects, e.g.,. <strong><code>ConsumerInfo</code>, <code>ProducerInfo</code></strong>, <strong><code>ConnectionInfo</code></strong> can be retrieved using <strong><code>ActiveMQMessage.getDataStructure()</code></s
 trong>.</p><p>For 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[Destination advisoryDestination = AdvisorySupport.getProducerAdvisoryTopic(destination)
+<div class="wiki-content maincontent"><p>ActiveMQ supports advisory messages which allows you to watch the system using regular JMS messages. Currently we have advisory messages that support:</p><ul><li>consumers, producers and connections starting and stopping</li><li>temporary destinations being created and destroyed</li><li>messages expiring on topics and queues</li><li>brokers sending messages to destinations with no consumers.</li><li>connections starting and stopping</li></ul><p>Advisory messages can be thought as some kind of administrative channel where you receive information regarding what is happening on your JMS provider along with what's happening with producers, consumers and destinations. When you look at a broker via <link><page ri:content-title="JMX"></page></link> you will see the advisory topics prefixed with <strong><code>ActiveMQ.Advisory.</code></strong>.</p><p>Every Advisory has the message <strong>type</strong> 'Advisory' and some predefined message propertie
 s:</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Property</p></th><th colspan="1" rowspan="1"><p>Type</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Version</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>originBrokerId</code></p></td><td colspan="1" rowspan="1"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1"><p>The id of the broker where the advisory originated.</p></td><td colspan="1" rowspan="1"><p>5.x</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>originBrokerName</code></p></td><td colspan="1" rowspan="1"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1"><p>The name of the broker where the advisory originated.</p></td><td colspan="1" rowspan="1"><p>5.x</p></td></tr><tr><td colspan="1" rowspan="1"><p><code>originBrokerURL</code></p></td><td colspan="1" rowspan="1"><p><code>StringProperty</code></p></td><td colspan="1" rowspan="1"><p>The first URL of the broker where the advisory ori
 ginated.</p></td><td colspan="1" rowspan="1"><p>5.2</p></td></tr></tbody></table><p>In addition, some messages carry a&#160;<strong><code>Command</code></strong> object, which carries additional information about the nature of the advisory, e.g., a subscription to each of the destination returns an <strong><code>ActiveMQMessage</code></strong>. Specific&#160;<strong><code>DataStructure</code></strong> objects, e.g.,. <strong><code>ConsumerInfo</code>, <code>ProducerInfo</code></strong>, <strong><code>ConnectionInfo</code></strong> can be retrieved using <strong><code>ActiveMQMessage.getDataStructure()</code></strong>.</p><p>For example:</p><structured-macro ac:macro-id="44dc8e29-8077-4e45-bfef-b8553dac52a1" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>Destination advisoryDestination = AdvisorySupport.getProducerAdvisoryTopic(destination)
 MessageConsumer consumer = session.createConsumer(advisoryDestination);
 consumer.setMessageListener(this);
 
@@ -10,41 +9,27 @@ public void onMessage(Message msg){
              ProducerInfo prod = (ProducerInfo) aMsg.getDataStructure();
         } 
         catch(JMSException e) {
-            log.error(&quot;Failed to process message: &quot; + msg);
+            log.error("Failed to process message: " + msg);
         }
     }
 }
-]]></script>
-</div></div><h2 id="AdvisoryMessage-Thefollowingadvisorytopicsaresupported">The following advisory topics are supported</h2><h3 id="AdvisoryMessage-Clientbasedadvisories">Client based advisories</h3><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Tip</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>These are always generated.</p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Connection</code></p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p>Connection start &amp; stop messages.</p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ConnectionInfo</code>,&#160;<code>RemoveInfo</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Producer.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Producer start &amp; stop messages on a Queue.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='producerCount'</code> - the number of producers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ProducerInfo</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Producer.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Producer start &amp; stop messages on a Topic.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='producerCount'</code>&#160;- the numbe
 r of producers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ProducerInfo</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Consumer.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Consumer start &amp; stop messages on a Queue.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='consumerCount'</code> - the number of Consumers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ConnectionInfo</code>,&#160;<code>RemoveInfo</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Consumer.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Consumer start &amp; stop messages on a Topic.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='consumerCount'</code>&#160;- the number of Consumers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ConnectionInfo</cod
 e>,&#160;<code>RemoveInfo</code></p></td></tr></tbody></table></div><p>Note that the consumer start/stop advisory messages also have a&#160;<strong><code>consumerCount</code></strong> header to indicate the number of active consumers on the destination when the advisory message was sent. This means you can use the following selector to be notified when there are no active consumers on a given 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[consumerCount = 0
-]]></script>
-</div></div><h3 id="AdvisoryMessage-DestinationandMessagebasedadvisories">Destination and Message based advisories</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PolicyEntry Property</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Queue create &amp; destroy.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>DestinationInfo</code></p></td><td cols
 pan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Topic create &amp; destroy.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.TempQueue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Temporary Queue create &amp; destroy.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceT
 d"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.TempTopic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Temporary Topic create &amp; destroy.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Expired.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Expired messages on a Queue.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String
 ='orignalMessageId'</code> - the expired id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.Expired.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Expired messages on a Topic.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code> - the expired id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.NoConsumer.Queue</code></p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p>No consumer is available to process messages being sent on a Queue.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sendAdvisoryIfNoConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.NoConsumer.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>No consumer is available to process messages being sent on a Topic.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sendAdvisoryIfNoConsumers<
 /code></p></td></tr></tbody></table></div><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Tip</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong><code>NoConsumer</code></strong> topic advisories are sent only for non-persistent messages.</p></div></div><h3 id="AdvisoryMessage-Newadvisoriesinversion5.2">New advisories in version 5.2</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PolicyEntry Property</p><
 /th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.SlowConsumer.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Slow Queue Consumer.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='consumerId'</code> - the consumer id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ConsumerInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForSlowConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.SlowConsumer.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Slow Topic Consumer.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='consumerId'</code>&#160;- the consumer id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ConsumerInfo</code></p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForSlowConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.FastProducer.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Fast Queue producer.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='producerId'</code> - the producer id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ProducerInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisdoryForFastProducers</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory. FastProducer.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Fast Topic producer.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Str
 ing='consumerId'</code>' - the producer id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ProducerInfo</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisdoryForFastProducers</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDiscarded.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message discarded.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code> - the discarded id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForDiscardingMessages</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDiscard
 ed.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message discarded.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the discarded id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForDiscardingMessages</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDelivered.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message delivered to the broker.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colsp
 an="1" rowspan="1" class="confluenceTd"><p><code>advisoryForDelivery</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDelivered.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message delivered to the broker.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForDelivery</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageConsumed.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message consumed by a client.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the deliver
 ed id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageConsumed.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message consumed by a client.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.FULL</code></p></td><td colspan="1" rowspan="1" class="co
 nfluenceTd"><p>A Usage resource is at its limit.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='usageName'</code> - the name of Usage resource</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryWhenFull</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MasterBroker</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A broker is now the master in a master/slave configuration.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>null</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>true</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>none</code></p></td></tr></tbody></table></div>
 <h3 id="AdvisoryMessage-NewAdvisoriesin5.4">New Advisories in 5.4</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PolicyEntry Property</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDLQd.Queue</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message sent to DLQ.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code> - the delivered id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rows
 pan="1" class="confluenceTd"><p>Always on</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.MessageDLQd.Topic</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Message sent to DLQ.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Message</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Always on</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>advisoryForConsumed</code></p></td></tr></tbody></table></div><h3 id="AdvisoryMessage-Networkbridgeadvisories">Network bridge advisories</h3><p>Starting with ActiveMQ version 5.5 you can watch advisory topics for events related to the status of network bridges. You can get advisory messages when the network bridge is star
 ted or stopped.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Advisory Topics</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Properties</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Data Structure</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>ActiveMQ.Advisory.NetworkBridge</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Network bridge being stopped or started.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>Boolean="started"</code>&#160;-&#160;<strong><code>true</code></strong> if bridge is started,&#160;<strong><code>false</code></strong> if it is stopped.<br clear="none"><code>Boolean="createdByDuplex"</code>&#160;-&#160;<strong><code>true</code></strong> if the bridge is creat
 ed by remote network connector.</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>BrokerInfo</code> - provides data of the remote broker</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Always on</p></td></tr></tbody></table></div><h3 id="AdvisoryMessage-EnablingAdvisoriesDisabledbyDefault">Enabling Advisories Disabled by Default</h3><p>The advisories that are not turned on by default (see the last column) can be enabled on a&#160;<strong><code>PolicyEntry</code></strong> in the ActiveMQ Broker Configuration, e.g., to enable a message consumed advisory you can configure the following:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;destinationPolicy&gt;
+</plain-text-body></structured-macro><h2>The following advisory topics are supported</h2><h3>Client based advisories</h3><structured-macro ac:macro-id="2c5ea69f-8a07-4ac7-bdf3-8dd608099786" ac:name="tip" ac:schema-version="1"><parameter ac:name="title">Tip</parameter><rich-text-body><p>These are always generated.</p></rich-text-body></structured-macro><table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Connection</code></p></td><td colspan="1" rowspan="1"><p>Connection start &amp; stop messages.</p></td><td colspan="1" rowspan="1">&#160;</td><td colspan="1" rowspan="1"><p><code>ConnectionInfo</code>,&#160;<code>RemoveInfo</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Producer.Queue</code></p></td><td colspan="1" ro
 wspan="1"><p>Producer start &amp; stop messages on a Queue.</p></td><td colspan="1" rowspan="1"><p><code>String='producerCount'</code> - the number of producers</p></td><td colspan="1" rowspan="1"><p><code>ProducerInfo</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Producer.Topic</code></p></td><td colspan="1" rowspan="1"><p>Producer start &amp; stop messages on a Topic.</p></td><td colspan="1" rowspan="1"><p><code>String='producerCount'</code>&#160;- the number of producers</p></td><td colspan="1" rowspan="1"><p><code>ProducerInfo</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Consumer.Queue</code></p></td><td colspan="1" rowspan="1"><p>Consumer start &amp; stop messages on a Queue.</p></td><td colspan="1" rowspan="1"><p><code>String='consumerCount'</code> - the number of Consumers</p></td><td colspan="1" rowspan="1"><p><code>ConnectionInfo</code>,&#160;<code>RemoveInfo</code></p></td></tr><tr><td colspan="1" rowspan="
 1"><p><code>ActiveMQ.Advisory.Consumer.Topic</code></p></td><td colspan="1" rowspan="1"><p>Consumer start &amp; stop messages on a Topic.</p></td><td colspan="1" rowspan="1"><p><code>String='consumerCount'</code>&#160;- the number of Consumers</p></td><td colspan="1" rowspan="1"><p><code>ConnectionInfo</code>,&#160;<code>RemoveInfo</code></p></td></tr></tbody></table><p>Note that the consumer start/stop advisory messages also have a&#160;<strong><code>consumerCount</code></strong> header to indicate the number of active consumers on the destination when the advisory message was sent. This means you can use the following selector to be notified when there are no active consumers on a given destination:</p><structured-macro ac:macro-id="c7af55a6-e07f-47e3-873e-b6af6e1ccd70" ac:name="code" ac:schema-version="1"><plain-text-body>consumerCount = 0
+</plain-text-body></structured-macro><h3>Destination and Message based advisories</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>PolicyEntry Property</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Queue</code></p></td><td colspan="1" rowspan="1"><p>Queue create &amp; destroy.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Topic</code></p></td><td colspan="1" rowspan="1"><p>Topic create &amp; destroy.</p></td><td colspan="1" rowspan="1"><p><c
 ode>null</code></p></td><td colspan="1" rowspan="1"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.TempQueue</code></p></td><td colspan="1" rowspan="1"><p>Temporary Queue create &amp; destroy.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.TempTopic</code></p></td><td colspan="1" rowspan="1"><p>Temporary Topic create &amp; destroy.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>DestinationInfo</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>n
 one</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Expired.Queue</code></p></td><td colspan="1" rowspan="1"><p>Expired messages on a Queue.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code> - the expired id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.Expired.Topic</code></p></td><td colspan="1" rowspan="1"><p>Expired messages on a Topic.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code> - the expired id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.NoConsumer.Queue</code></p></td><td colspan="1" rowspa
 n="1"><p>No consumer is available to process messages being sent on a Queue.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>sendAdvisoryIfNoConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.NoConsumer.Topic</code></p></td><td colspan="1" rowspan="1"><p>No consumer is available to process messages being sent on a Topic.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>sendAdvisoryIfNoConsumers</code></p></td></tr></tbody></table><structured-macro ac:macro-id="76e55271-1de0-476c-b8f4-207dc9f3cc7a" ac:name="tip" ac:schema-version="1"><parameter ac:name="title">Tip</parameter><rich-text-body><p><strong><code>No
 Consumer</code></strong> topic advisories are sent only for non-persistent messages.</p></rich-text-body></structured-macro><h3>New advisories in version 5.2</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>PolicyEntry Property</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.SlowConsumer.Queue</code></p></td><td colspan="1" rowspan="1"><p>Slow Queue Consumer.</p></td><td colspan="1" rowspan="1"><p><code>String='consumerId'</code> - the consumer id</p></td><td colspan="1" rowspan="1"><p><code>ConsumerInfo</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForSlowConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>Active
 MQ.Advisory.SlowConsumer.Topic</code></p></td><td colspan="1" rowspan="1"><p>Slow Topic Consumer.</p></td><td colspan="1" rowspan="1"><p><code>String='consumerId'</code>&#160;- the consumer id</p></td><td colspan="1" rowspan="1"><p><code>ConsumerInfo</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForSlowConsumers</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.FastProducer.Queue</code></p></td><td colspan="1" rowspan="1"><p>Fast Queue producer.</p></td><td colspan="1" rowspan="1"><p><code>String='producerId'</code> - the producer id</p></td><td colspan="1" rowspan="1"><p><code>ProducerInfo</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisdoryForFastProducers</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory. FastProducer.Topic</code></p></td><td colspan="1" rowspan="1"><p>Fast Topic produc
 er.</p></td><td colspan="1" rowspan="1"><p><code>String='consumerId'</code>' - the producer id</p></td><td colspan="1" rowspan="1"><p><code>ProducerInfo</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisdoryForFastProducers</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDiscarded.Queue</code></p></td><td colspan="1" rowspan="1"><p>Message discarded.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code> - the discarded id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForDiscardingMessages</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDiscarded.Topic</code></p></td><td colspan="1" rowspan="1"><p>Message discarded.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code>&#160;-
  the discarded id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForDiscardingMessages</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDelivered.Queue</code></p></td><td colspan="1" rowspan="1"><p>Message delivered to the broker.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForDelivery</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDelivered.Topic</code></p></td><td colspan="1" rowspan="1"><p>Message delivered to the broker.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1"><
 p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForDelivery</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageConsumed.Queue</code></p></td><td colspan="1" rowspan="1"><p>Message consumed by a client.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageConsumed.Topic</code></p></td><td colspan="1" rowspan="1"><p>Message consumed by a client.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code>&#160;- the delivered id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p><code>false
 </code></p></td><td colspan="1" rowspan="1"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.FULL</code></p></td><td colspan="1" rowspan="1"><p>A Usage resource is at its limit.</p></td><td colspan="1" rowspan="1"><p><code>String='usageName'</code> - the name of Usage resource</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>false</code></p></td><td colspan="1" rowspan="1"><p><code>advisoryWhenFull</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MasterBroker</code></p></td><td colspan="1" rowspan="1"><p>A broker is now the master in a master/slave configuration.</p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>null</code></p></td><td colspan="1" rowspan="1"><p><code>true</code></p></td><td colspan="1" rowspan="1"><p><code>none</code></p></td></tr></tbody></table><h3>New Advisories in 5.4</h
 3><table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th><th colspan="1" rowspan="1"><p>Default</p></th><th colspan="1" rowspan="1"><p>PolicyEntry Property</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDLQd.Queue</code></p></td><td colspan="1" rowspan="1"><p>Message sent to DLQ.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code> - the delivered id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p>Always on</p></td><td colspan="1" rowspan="1"><p><code>advisoryForConsumed</code></p></td></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.MessageDLQd.Topic</code></p></td><td colspan="1" rowspan="1"><p>Message sent to DLQ.</p></td><td colspan="1" rowspan="1"><p><code>String='orignalMessageId'</code
 >&#160;- the delivered id</p></td><td colspan="1" rowspan="1"><p><code>Message</code></p></td><td colspan="1" rowspan="1"><p>Always on</p></td><td colspan="1" rowspan="1"><p><code>advisoryForConsumed</code></p></td></tr></tbody></table><h3>Network bridge advisories</h3><p>Starting with ActiveMQ version 5.5 you can watch advisory topics for events related to the status of network bridges. You can get advisory messages when the network bridge is started or stopped.</p><table><tbody><tr><th colspan="1" rowspan="1"><p>Advisory Topics</p></th><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Properties</p></th><th colspan="1" rowspan="1"><p>Data Structure</p></th><th colspan="1" rowspan="1"><p>Default</p></th></tr><tr><td colspan="1" rowspan="1"><p><code>ActiveMQ.Advisory.NetworkBridge</code></p></td><td colspan="1" rowspan="1"><p>Network bridge being stopped or started.</p></td><td colspan="1" rowspan="1"><p><code>Boolean="started"</code>&#160;-&#160;<str
 ong><code>true</code></strong> if bridge is started,&#160;<strong><code>false</code></strong> if it is stopped.<br clear="none"><code>Boolean="createdByDuplex"</code>&#160;-&#160;<strong><code>true</code></strong> if the bridge is created by remote network connector.</p></td><td colspan="1" rowspan="1"><p><code>BrokerInfo</code> - provides data of the remote broker</p></td><td colspan="1" rowspan="1"><p>Always on</p></td></tr></tbody></table><h3>Enabling Advisories Disabled by Default</h3><p>The advisories that are not turned on by default (see the last column) can be enabled on a&#160;<strong><code>PolicyEntry</code></strong> in the ActiveMQ Broker Configuration, e.g., to enable a message consumed advisory you can configure the following:</p><structured-macro ac:macro-id="9502ed06-6214-4cb7-aa22-717b7fd2a4a9" ac:name="code" ac:schema-version="1"><parameter ac:name="language">xml</parameter><plain-text-body>&lt;destinationPolicy&gt;
     &lt;policyMap&gt;
        &lt;policyEntries&gt; 
-           &lt;policyEntry topic=&quot;&gt;&quot; advisoryForConsumed=&quot;true&quot;/&gt;
+           &lt;policyEntry topic="&gt;" advisoryForConsumed="true"/&gt;
        &lt;/policyEntries&gt;
     &lt;/policyMap&gt;
 &lt;/destinationPolicy&gt;
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Hint</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The&#160;<strong><code>&gt;</code></strong> character matches all topics - you can use wild-card matches for setting a destination policy - see <a shape="rect" href="wildcards.xml">Wildcards</a></p></div></div><h3 id="AdvisoryMessage-DisablingAdvisoryMessages">Disabling Advisory Messages</h3><p>The use of advisory messages incurs a small overhead in terms of memory and connection resources that is related to the number of destinations in your system. In some cases it can make sense to disable all advisories.</p><p>Advisories need to be disabled both on the Broker, via XML Configuration</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;broker advisorySupport=&quot;false&quot;&gt;
-]]></script>
-</div></div><p>or from 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();
+</plain-text-body></structured-macro><structured-macro ac:macro-id="ec51dc63-3e9c-481f-8962-6583fa4f8651" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Hint</parameter><rich-text-body><p>The&#160;<strong><code>&gt;</code></strong> character matches all topics - you can use wild-card matches for setting a destination policy - see <link><page ri:content-title="Wildcards"></page></link></p></rich-text-body></structured-macro><h3>Disabling Advisory Messages</h3><p>The use of advisory messages incurs a small overhead in terms of memory and connection resources that is related to the number of destinations in your system. In some cases it can make sense to disable all advisories.</p><p>Advisories need to be disabled both on the Broker, via XML Configuration</p><structured-macro ac:macro-id="52656f76-8b75-4ef0-9135-c8522bb3b2d5" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;broker advisorySupport="false"&gt;
+</plain-text-body></structured-macro><p>or from java code:</p><structured-macro ac:macro-id="ecc0e18b-00a0-468a-b1c0-3179f4e488e2" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>BrokerService broker = new BrokerService();
 broker.setAdvisorySupport(false);
 // ...
 broker.start();
-]]></script>
-</div></div><p><em>and</em> on your&#160;<strong><code>ActiveMQConnectionFactory</code></strong> (because a subscription to an advisory topic will auto create it) via the <strong><code>brokerUrl</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[tcp://localhost:61616?jms.watchTopicAdvisories=false
-]]></script>
-</div></div><p>or via java code using the&#160;<strong><code>watchTopicAdvisories</code></strong> attribute on the <strong><code>ActiveMQConnectionFactory</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[ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
+</plain-text-body></structured-macro><p><em>and</em> on your&#160;<strong><code>ActiveMQConnectionFactory</code></strong> (because a subscription to an advisory topic will auto create it) via the <strong><code>brokerUrl</code></strong>:</p><structured-macro ac:macro-id="5fc78a1d-aa00-4204-9ee7-7c4d2f237104" ac:name="code" ac:schema-version="1"><plain-text-body>tcp://localhost:61616?jms.watchTopicAdvisories=false
+</plain-text-body></structured-macro><p>or via java code using the&#160;<strong><code>watchTopicAdvisories</code></strong> attribute on the <strong><code>ActiveMQConnectionFactory</code></strong>.</p><structured-macro ac:macro-id="3778eeca-7501-4303-9374-fda2e63aa39e" ac:name="code" ac:schema-version="1"><parameter ac:name="language">java</parameter><plain-text-body>ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
 factory.setWatchTopicAdvisories(false);
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Advisory messages are required for <a shape="rect" href="networks-of-brokers.xml">dynamic network broker topologies</a> as&#160;<code>NetworkConnectors</code> subscribe to advisory messages. In the absence of advisories, a network must be statically configured.</p></div></div><h3 id="AdvisoryMessage-UsingtheDestinations">Using the Destinations</h3><p>All of the above destinations are really prefixes which are appended with important information (like the actual topic or queue, the client ID, producer ID, consumer ID etc). This allows you to reuse the power of publish/subscribe, <a shape="rect" href="wildcards.xml">Wildcards</a> and <a shape="rect" href="selectors.xml">Selectors</a> to filter the advisory messages as you 
 see fit.</p><p>For example if you want to subscribe to expired messages on a topic&#160;<strong><code>FOO.BAR</code></strong> you could subscribe to <strong><code>ActiveMQ.Advisory.Expired.Topic.FOO.BAR</code></strong>. To subscribe to all messages of a certain kind of advisory just append <strong><code>.&gt;</code></strong> to the topic, e.g., to subscribe to all the consumers starting and stopping to topics and queues subscribe to <strong><code>ActiveMQ.Advisory.Consumer..&gt;</code></strong>.</p><h3 id="AdvisoryMessage-HelperMethods">Helper Methods</h3><p>Methods to get the advisory destination objects are available in <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/advisory/AdvisorySupport.html">AdvisorySupport</a> through the following methods.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[AdvisorySupport.getConsumerAdvisoryTopic()
+</plain-text-body></structured-macro><structured-macro ac:macro-id="535675d0-77ca-4a56-9600-69cccc65d3cc" ac:name="warning" ac:schema-version="1"><parameter ac:name="title">Warning</parameter><rich-text-body><p>Advisory messages are required for <link><page ri:content-title="Networks of Brokers"></page><plain-text-link-body>dynamic network broker topologies</plain-text-link-body></link> as&#160;<code>NetworkConnectors</code> subscribe to advisory messages. In the absence of advisories, a network must be statically configured.</p></rich-text-body></structured-macro><h3>Using the Destinations</h3><p>All of the above destinations are really prefixes which are appended with important information (like the actual topic or queue, the client ID, producer ID, consumer ID etc). This allows you to reuse the power of publish/subscribe, <link><page ri:content-title="Wildcards"></page></link> and <link><page ri:content-title="Selectors"></page></link> to filter the advisory messages as you see f
 it.</p><p>For example if you want to subscribe to expired messages on a topic&#160;<strong><code>FOO.BAR</code></strong> you could subscribe to <strong><code>ActiveMQ.Advisory.Expired.Topic.FOO.BAR</code></strong>. To subscribe to all messages of a certain kind of advisory just append <strong><code>.&gt;</code></strong> to the topic, e.g., to subscribe to all the consumers starting and stopping to topics and queues subscribe to <strong><code>ActiveMQ.Advisory.Consumer..&gt;</code></strong>.</p><h3>Helper Methods</h3><p>Methods to get the advisory destination objects are available in <a shape="rect" href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/org/apache/activemq/advisory/AdvisorySupport.html">AdvisorySupport</a> through the following methods.</p><structured-macro ac:macro-id="11781ec9-61c0-4bb9-bd46-ea59d7e54c35" ac:name="code" ac:schema-version="1"><plain-text-body>AdvisorySupport.getConsumerAdvisoryTopic()
 AdvisorySupport.getProducerAdvisoryTopic()
 AdvisorySupport.getExpiredTopicMessageAdvisoryTopic()
 AdvisorySupport.getExpiredQueueMessageAdvisoryTopic()
@@ -65,6 +50,5 @@ AdvisorySupport.getMessageDeliveredAdvisoryTopic()
 AdvisorySupport.getMessageConsumedAdvisoryTopic()
 AdvisorySupport.getMasterBrokerAdvisoryTopic()
 AdvisorySupport.getFullAdvisoryTopic()
-]]></script>
-</div></div><p>Some helper classes to deal with advisory messages are available in the <a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/package-summary.html">advisories</a> package.</p></div>
+</plain-text-body></structured-macro><p>Some helper classes to deal with advisory messages are available in the <a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/package-summary.html">advisories</a> package.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/ajax.xml
----------------------------------------------------------------------
diff --git a/ajax.xml b/ajax.xml
index 74f33f1..475c3da 100644
--- a/ajax.xml
+++ b/ajax.xml
@@ -1,16 +1,15 @@
-<div class="wiki-content maincontent"><h1 id="Ajax-Introduction">Introduction</h1>
+<div class="wiki-content maincontent"><h1>Introduction</h1>
 
-<p>ActiveMQ supports <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Ajax_%28programming%29" rel="nofollow">Ajax</a> which is an Asychronous Javascript And Xml mechanism for real time web applications. This means you can create highly real time web applications taking full advantage of the publish/subscribe nature of ActiveMQ</p>
+<p>ActiveMQ supports <a shape="rect" href="http://en.wikipedia.org/wiki/Ajax_%28programming%29">Ajax</a> which is an Asychronous Javascript And Xml mechanism for real time web applications. This means you can create highly real time web applications taking full advantage of the publish/subscribe nature of ActiveMQ</p>
 
-<p>Ajax allows a regular DHTML client (with JavaScript and a modern version 5 or later web browser) to send and receive messages over the web. Ajax support in ActiveMQ builds on the same basis as the <a shape="rect" href="rest.xml">REST</a> connector for ActiveMQ which allows any web capable device to send or receive messages over JMS.</p>
+<p>Ajax allows a regular DHTML client (with JavaScript and a modern version 5 or later web browser) to send and receive messages over the web. Ajax support in ActiveMQ builds on the same basis as the <link><page ri:content-title="REST"></page></link> connector for ActiveMQ which allows any web capable device to send or receive messages over JMS.</p>
 
-<p>To see Ajax in action, try <a shape="rect" href="web-samples.xml">running the examples</a></p>
+<p>To see Ajax in action, try <link><page ri:content-title="Web Samples"></page><link-body>running the examples</link-body></link></p>
 
-<h1 id="Ajax-TheServlet">The Servlet</h1>
+<h1>The Servlet</h1>
 
 <p>The AMQ AjaxServlet needs to be installed in your webapplications to support JMS over Ajax:</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="cf8a34e3-339b-4d2e-abcd-14a0b1ec263c" ac:name="code" ac:schema-version="1"><plain-text-body>
 ...
   &lt;servlet&gt;
     &lt;servlet-name&gt;AjaxServlet&lt;/servlet-name&gt;
@@ -21,110 +20,99 @@
     &lt;servlet-name&gt;AjaxServlet&lt;/servlet-name&gt;
     &lt;url-pattern&gt;/amq/*&lt;/url-pattern&gt;
   &lt;/servlet-mapping&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>The servlet both serves the required js files and handles the JMS requests and responses.</p>
 
-<h1 id="Ajax-JavascriptAPI">Javascript API</h1>
+<h1>Javascript API</h1>
 
-<p>The ajax featues of amq are provided on the client side by the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq.js</a> script.  Beginning with ActiveMQ 5.4, this script utilizes one of three different adapters to support ajax communication with the server.  Current <a shape="rect" class="external-link" href="http://jquery.org" rel="nofollow">jQuery</a>, <a shape="rect" class="external-link" href="http://prototypejs.org" rel="nofollow">Prototype</a>, and <a shape="rect" class="external-link" href="http://www.dojotoolkit.org" rel="nofollow">Dojo</a> are supported, and recent versions of all three libraries are shipped with ActiveMQ.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;script type=&quot;text/javascript&quot; src=&quot;js/jquery-1.4.2.min.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot; src=&quot;js/amq_jquery_adapter.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot; src=&quot;js/amq.js&quot;&gt;&lt;/script&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
+<p>The ajax featues of amq are provided on the client side by the <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq.js</a> script.  Beginning with ActiveMQ 5.4, this script utilizes one of three different adapters to support ajax communication with the server.  Current <a shape="rect" href="http://jquery.org">jQuery</a>, <a shape="rect" href="http://prototypejs.org">Prototype</a>, and <a shape="rect" href="http://www.dojotoolkit.org">Dojo</a> are supported, and recent versions of all three libraries are shipped with ActiveMQ.</p>
+<structured-macro ac:macro-id="ea161b97-6cb1-43f7-a745-306923234dd2" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;script type="text/javascript" src="js/jquery-1.4.2.min.js"&gt;&lt;/script&gt;
+&lt;script type="text/javascript" src="js/amq_jquery_adapter.js"&gt;&lt;/script&gt;
+&lt;script type="text/javascript" src="js/amq.js"&gt;&lt;/script&gt;
+&lt;script type="text/javascript"&gt;
   var amq = org.activemq.Amq;
   amq.init({ 
-    uri: &#39;amq&#39;, 
+    uri: 'amq', 
     logging: true,
     timeout: 20
   });
 &lt;/script&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>Including these scripts results in the creation of a javascript object called <code>amq</code>, which provides the API to send messages and to subscribe to channels and topics.</p>
 
-<h2 id="Ajax-Sendingamessage">Sending a message</h2>
+<h2>Sending a message</h2>
 
 <p>All that is required to send a JMS message from the javascript client, is to call the method:</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="8b2d1f60-54ee-4a0f-bc71-dd9306c9cf82" ac:name="code" ac:schema-version="1"><plain-text-body>
 amq.sendMessage(myDestination,myMessage);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>where <code>myDestination</code> is the URL string address of the destination (e.g. "topic://MY.NAME"  or "channel://MY.NAME") and <code>myMessage</code> is any well formed XML or plain text encoded as XML content.</p>
 
-<h2 id="Ajax-Receivingmessages">Receiving messages</h2>
+<h2>Receiving messages</h2>
 
-<p>To receive messages, the client must define a message handling function and register it with the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq</a> object. For 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[
+<p>To receive messages, the client must define a message handling function and register it with the <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq</a> object. For example:</p>
+<structured-macro ac:macro-id="a977b685-ac94-4ee9-847d-a46f1e798cff" ac:name="code" ac:schema-version="1"><plain-text-body>
 var myHandler =
 {
   rcvMessage: function(message)
   {
-     alert(&quot;received &quot;+message);
+     alert("received "+message);
   }
 };
 
 amq.addListener(myId,myDestination,myHandler.rcvMessage);
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>where <code>myId</code> is a string identifier that can be used for a later call to <code>amq.removeHandler(myId)</code> and <code>myDestination</code> is a URL string address of the destination (e.g. "topic://MY.NAME"  or "channel://MY.NAME").  When a message is received, a call back to the <code>myHandler.rcvMessage</code> function passes the message to your handling code.<br clear="none">
 The "message" is actually a text of the Text message or a String representation (<code>toString()</code>) in case of Object messages.</p>
 
-<p>Be aware that, by default, messages published via <a shape="rect" class="external-link" href="http://activemq.apache.org/stomp.html">Stomp</a> which include a <code>content-length</code> header will be converted by ActiveMQ to binary messages, and will not be visible to your web clients.  Beginning with ActiveMQ 5.4.0, you can resolve this problem by always setting the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/AMQ-2833"><code>amq-msg-type</code> header</a> to <code>text</code> in messages which will may be consumed by web clients.</p>
+<p>Be aware that, by default, messages published via <a shape="rect" href="http://activemq.apache.org/stomp.html">Stomp</a> which include a <code>content-length</code> header will be converted by ActiveMQ to binary messages, and will not be visible to your web clients.  Beginning with ActiveMQ 5.4.0, you can resolve this problem by always setting the <a shape="rect" href="https://issues.apache.org/jira/browse/AMQ-2833"><code>amq-msg-type</code> header</a> to <code>text</code> in messages which will may be consumed by web clients.</p>
 
-<h3 id="Ajax-Selectorsupport">Selector support</h3>
+<h3>Selector support</h3>
 
-<p>By default, an ajax client will receive all messages on a topic or queue it is subscribed to.  In <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-541-release.html">ActiveMQ 5.4.1</a> amq.js supports <a shape="rect" class="external-link" href="http://activemq.apache.org/selectors.html">JMS selectors</a> since it is frequently useful to receive only a subset of these messages.  Selectors are supplied to an <code>amq.addListener</code> call by way of an optional 4th parameter.</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[
-amq.addListener( myId, myDestination, myHandler.rcvMessage, { selector:&quot;identifier=&#39;TEST&#39;&quot; } );
-]]></script>
-</div></div>
+<p>By default, an ajax client will receive all messages on a topic or queue it is subscribed to.  In <a shape="rect" href="http://activemq.apache.org/activemq-541-release.html">ActiveMQ 5.4.1</a> amq.js supports <a shape="rect" href="http://activemq.apache.org/selectors.html">JMS selectors</a> since it is frequently useful to receive only a subset of these messages.  Selectors are supplied to an <code>amq.addListener</code> call by way of an optional 4th parameter.</p>
+<structured-macro ac:macro-id="d3cf34a9-2e36-44e3-8610-62926d13eb50" ac:name="code" ac:schema-version="1"><plain-text-body>
+amq.addListener( myId, myDestination, myHandler.rcvMessage, { selector:"identifier='TEST'" } );
+</plain-text-body></structured-macro>
 <p>When used in this way, the Javascript client will receive only messages containing an <code>identifier</code> header set to the value <code>TEST</code>.</p>
 
-<h2 id="Ajax-UsingAMQAjaxinMultipleBrowserWindows">Using AMQ Ajax in Multiple Browser Windows</h2>
+<h2>Using AMQ Ajax in Multiple Browser Windows</h2>
 
-<p>All windows or tabs in a single browser share the same <code>JSESSIONID</code> on the ActiveMQ server.  Unless the server can distinguish listeners from multiple windows, messages which were intended for 1 window will be delivered to another one instead.  Effectively, this means that amq.js could be active in only a single browser window at any given time.  Beginning in <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-542-release.html">ActiveMQ 5.4.2</a>, this is resolved by allowing each call to <code>amq.init</code> to specify a unique <code>clientId</code>.  When this is done, multiple windows in the same browser can happily co-exist.  Each can have a separate set of message subscriptions on the broker with no interactions between them.</p>
+<p>All windows or tabs in a single browser share the same <code>JSESSIONID</code> on the ActiveMQ server.  Unless the server can distinguish listeners from multiple windows, messages which were intended for 1 window will be delivered to another one instead.  Effectively, this means that amq.js could be active in only a single browser window at any given time.  Beginning in <a shape="rect" href="http://activemq.apache.org/activemq-542-release.html">ActiveMQ 5.4.2</a>, this is resolved by allowing each call to <code>amq.init</code> to specify a unique <code>clientId</code>.  When this is done, multiple windows in the same browser can happily co-exist.  Each can have a separate set of message subscriptions on the broker with no interactions between them.</p>
 
-<p>In this example, we use the current time (at the time the web page is loaded) as a unique identifier.  This is effective as long as two browser windows are not opened within the same millisecond, and is the approach used by the example <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/chat.html">chat.html</a> included with ActiveMQ.  Other schemes to ensure the uniqueness of <code>clientId</code> can easily be devised.  Note that this <code>clientId</code> need only be unique within a single session.  (Browser windows opened in the same millisecond in separate browsers will not interact, since they are in different sessions.)</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[
+<p>In this example, we use the current time (at the time the web page is loaded) as a unique identifier.  This is effective as long as two browser windows are not opened within the same millisecond, and is the approach used by the example <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/chat.html">chat.html</a> included with ActiveMQ.  Other schemes to ensure the uniqueness of <code>clientId</code> can easily be devised.  Note that this <code>clientId</code> need only be unique within a single session.  (Browser windows opened in the same millisecond in separate browsers will not interact, since they are in different sessions.)</p>
+<structured-macro ac:macro-id="0bed7262-f3fb-4f5b-8df6-0036f4e9432c" ac:name="code" ac:schema-version="1"><plain-text-body>
 org.activemq.Amq.init({
-  uri: &#39;amq&#39;, 
+  uri: 'amq', 
   logging: true, 
   timeout: 45, 
   clientId:(new Date()).getTime().toString() 
 });
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
 <p>Note that this <code>clientId</code> is common to all message subscriptions in a single tab or window, and is entirely different from the <code>clientId</code> which is supplied as a first argument in <code>amq.addListener</code> calls.</p>
 <ul><li>In <code>amq.init</code>, <code>clientId</code> serves to distinguish different web clients sharing the same <code>JSESSIONID</code>.  All windows in a single browser need a unique <code>clientId</code> when they call <code>amq.init</code>.</li><li>In <code>amq.addListener</code>, <code>clientId</code> is used to associate a message subscription with the callback function which should be invoked when a message is received for that subscription.  These <code>clientId</code> values are internal to each web page, and do not need to be unique across multiple windows or tabs.</li></ul>
 
 
-<h1 id="Ajax-Howitworks">How it works</h1>
+<h1>How it works</h1>
 
 
-<h2 id="Ajax-AjaxServletandMessageListenerServlet">AjaxServlet and MessageListenerServlet</h2>
+<h2>AjaxServlet and MessageListenerServlet</h2>
 
-<p>The ajax featues of amq are handled on the server side  by the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java">AjaxServlet</a> which extends the <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java">MessageListenerServlet</a>.  This servlet is responsible for tracking the existing clients (using a HttpSesssion) and lazily creating the AMQ and javax.jms objects required by the client to send and receive messages (eg. Destination, MessageConsumer, MessageAVailableListener). This servlet should be mapped to <code>/amq/*</code> in the web application context serving the Ajax client (this can be changed, but the client javascript <code>amq.uri</code> field needs to be updated to match.)</p>
+<p>The ajax featues of amq are handled on the server side  by the <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java">AjaxServlet</a> which extends the <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java">MessageListenerServlet</a>.  This servlet is responsible for tracking the existing clients (using a HttpSesssion) and lazily creating the AMQ and javax.jms objects required by the client to send and receive messages (eg. Destination, MessageConsumer, MessageAVailableListener). This servlet should be mapped to <code>/amq/*</code> in the web application context serving the Ajax client (this can be changed, but the client javascript <code>amq.uri</code> field needs to be updated to match.)</p>
 
-<h2 id="Ajax-ClientSendingmessages">Client Sending messages</h2>
+<h2>Client Sending messages</h2>
 
-<p>When a message is sent from the client it is encoded as the content of a POST request, using the API of one of the supported connection adapters (jQuery, Prototype, or Dojo) for <a shape="rect" class="external-link" href="http://jibbering.com/2002/4/httprequest.html" rel="nofollow">XmlHttpRequest</a>.  The <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq</a> object may combine several sendMessage calls into a single POST if it can do so without adding additional delays (see polling below).</p>
+<p>When a message is sent from the client it is encoded as the content of a POST request, using the API of one of the supported connection adapters (jQuery, Prototype, or Dojo) for <a shape="rect" href="http://jibbering.com/2002/4/httprequest.html">XmlHttpRequest</a>.  The <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-web-demo/src/main/webapp/js/amq.js">amq</a> object may combine several sendMessage calls into a single POST if it can do so without adding additional delays (see polling below).</p>
 
 <p>When the MessageListenerServlet receives a POST, the messages are decoded as <code>application/x-www-form-urlencoded</code> parameters with their type (in this case <code>send</code> as opposed to <code>listen</code> or <code>unlisten</code> see below) and destination.  If a destination channel or topic do not exist, it is created. The message is sent to the destination as a TextMessage.</p>
 
-<h2 id="Ajax-Listeningformessages">Listening for messages</h2>
+<h2>Listening for messages</h2>
 
 <p>When a client registers a listener, a message subscription request is sent from the client to the server in a POST in the same way as a message, but with a type of <code>listen</code>.  When the MessageListenerServlet receives a <code>listen</code> message, it lazily creates a MessageAvailableConsumer and registers a Listener on it.</p>
 
-<h2 id="Ajax-WaitingPollformessages">Waiting Poll for messages</h2>
+<h2>Waiting Poll for messages</h2>
 
 <p>When a Listener created by the MessageListenerServlet is called to indicate that a message is available, due to the limitations of the HTTP client-server model, it is not possible to send that message directly to the ajax client.   Instead the client must perform a special type of <strong>Poll</strong> for messages.  Polling normally means periodically making a request to see if there are messages available and there is a trade off: either the poll frequency is high and excessive load is generated when the system is idle; or the frequency is low and the latency for detecting new messages is high.</p>
 
@@ -140,11 +128,11 @@ org.activemq.Amq.init({
 
 <p>The client is able to asynchronously send a message to the server by creating  (or using an existing) second connection to the server.  However, during the processing of the poll response, normal client message sending is suspended, so that all messages to be sent are queued and sent as a single POST with the poll that will be sent (with no delay) at the end of the processing. This ensures that only two connections are required between client and server (the normal for most browsers).</p>
 
-<h2 id="Ajax-ThreadlessWaiting">Threadless Waiting</h2>
+<h2>Threadless Waiting</h2>
 
-<p>The waiting poll described above is implemented using the <a shape="rect" class="external-link" href="http://docs.codehaus.org/display/JETTY/Continuations" rel="nofollow">Jetty 6 Continuations</a> mechanism.  This allows the thread associated with the request to be released during the wait, so that the container does not need to have a thread per client (which may be a large number).   If another servlet container is used, the Continuation mechanism falls back to use a wait and the thread is not released.</p>
+<p>The waiting poll described above is implemented using the <a shape="rect" href="http://docs.codehaus.org/display/JETTY/Continuations">Jetty 6 Continuations</a> mechanism.  This allows the thread associated with the request to be released during the wait, so that the container does not need to have a thread per client (which may be a large number).   If another servlet container is used, the Continuation mechanism falls back to use a wait and the thread is not released.</p>
 
-<h1 id="Ajax-ComparisontoPushlets">Comparison to Pushlets</h1>
+<h1>Comparison to Pushlets</h1>
 
 <p>Firstly we could easily add support for pushlets to ActiveMQ. However we prefer the Ajax approach for various reasons</p>
 <ul><li>using Ajax means that we use a distinct HTTP request for each send/receive which is much more friendly to web infrastructure (firewalls, proxies, caches and so forth) rather than having an infinitely-long GET.</li></ul>
@@ -165,5 +153,6 @@ org.activemq.Amq.init({
 <ul><li>pushlets assume the server knows what functions are used on the client side as the server basically writes JavaScript function calls down the scoket - it's better for us to send generic XML packets (or strings or whatever the message format is) and let the JavaScript client side be totally decoupled from the server side</li></ul>
 
 
-<ul><li>Ajax supports clean XML support allowing full XML documents to be streamed to the client for rich messages which are easy to process via standard JavaScript DOM support</li></ul></div>
+<ul><li>Ajax supports clean XML support allowing full XML documents to be streamed to the client for rich messages which are easy to process via standard JavaScript DOM support</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/all-forums.xml
----------------------------------------------------------------------
diff --git a/all-forums.xml b/all-forums.xml
index 1f979a9..9496f55 100644
--- a/all-forums.xml
+++ b/all-forums.xml
@@ -1,5 +1,5 @@
-<div class="wiki-content maincontent"><p>
-<a shape="rect" id="nabblelink" href="http://www.nabble.com/ActiveMQ-f2354.html">ActiveMQ</a>
-<script src="http://www.nabble.com/embed/f2354"></script>
-</p><p></p></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="142a1ce5-7f1e-4ba8-956a-a28c34d2732a" ac:name="html" ac:schema-version="1"><plain-text-body>
+&lt;a id="nabblelink" href="http://www.nabble.com/ActiveMQ-f2354.html"&gt;ActiveMQ&lt;/a&gt;
+&lt;script src="http://www.nabble.com/embed/f2354"&gt;&lt;/script&gt;
+</plain-text-body></structured-macro></p><p></p></div>
 


[44/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5134-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5134-release.xml b/activemq-5134-release.xml
index cc78fc1..f6fa09b 100644
--- a/activemq-5134-release.xml
+++ b/activemq-5134-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.13.4Release-ActiveMQ5.13.4Release">ActiveMQ 5.13.4 Release</h2><p>Apache ActiveMQ 5.13.4 includes 30 resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335661&amp;projectId=12311210">&#160;issues</a>&#160;and improvements.</p><h3 id="ActiveMQ5.13.4Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip">apache-activemq-5.13.4
 -bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz">apache-activemq-5.13.4-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz.a
 sc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.13.4Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.13.4Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.13.4 Release</h2><p>Apache ActiveMQ 5.13.4 includes 30 resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335661&amp;projectId=12311210">&#160;issues</a>&#160;and improvements.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" 
 href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip">apache-activemq-5.13.4-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz">apache-activemq-5.13.4-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apa
 che-activemq-5.13.4-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/apache-activemq-5.13.4-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.13.4&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.13.4Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.13.4Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip">activemq-parent-5.13.4-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.13.4Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.4">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.4</a></p><h2 id="ActiveMQ5.13.4Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335661&amp;projectId=12311210">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5133-release.xml">ActiveMQ 5.13.3 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip">activemq-parent-5.13.4-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-p
 arent-5.13.4-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.13.4/activemq-parent-5.13.4-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.4">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.4</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335661&amp;projectId=12311210">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="b9818866-8541-4ef2-a060-90d6c813094b" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.13.3 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5140-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5140-release.xml b/activemq-5140-release.xml
index 1b4e702..6696b0f 100644
--- a/activemq-5140-release.xml
+++ b/activemq-5140-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.0Release-ActiveMQ5.14.0Release">ActiveMQ 5.14.0 Release</h2><p>Apache ActiveMQ 5.14.0 includes many resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334188">&#160;issues</a>, and&#160;provides several new features including AMQP over WebSockets and improved support durable subscriptions over a network bridge.</p><h3 id="ActiveMQ5.14.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="externa
 l-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip">apache-activemq-5.14.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz">apache-activemq-5.14.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="r
 ect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, dep
 ending on your use of PGP or GPG:</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[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.0Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.0 Release</h2><p>Apache ActiveMQ 5.14.0 includes many resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334188">&#160;issues</a>, and&#160;provides several new features including AMQP over WebSockets and improved support durable subscriptions over a network bridge.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th>
 </tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip">apache-activemq-5.14.0-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz">apache-activemq-5.14.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apach
 e-activemq-5.14.0-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.0&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip">activemq-parent-5.14.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.0Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.0</a></p><h2 id="ActiveMQ5.14.0Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334188">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5134-release.xml">ActiveMQ 5.13.4 Release</a></p><p>&#160;</p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip">activemq-parent-5.14.0-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-p
 arent-5.14.0-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.0/activemq-parent-5.14.0-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.0">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.0</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12334188">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="dadebb1a-1e2e-438a-bb1f-3cc886c34f12" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.13.4 Release"></page></link></p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5141-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5141-release.xml b/activemq-5141-release.xml
index 23c2c3b..6f1627b 100644
--- a/activemq-5141-release.xml
+++ b/activemq-5141-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.1Release-ActiveMQ5.14.1Release">ActiveMQ 5.14.1 Release</h2><p>Apache ActiveMQ 5.14.1 includes many resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338124">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.14.1Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip">apache-activemq-5.14.1-
 bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz">apache-activemq-5.14.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.as
 c">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.1Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent p
 anelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.1Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.1 Release</h2><p>Apache ActiveMQ 5.14.1 includes many resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338124">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" h
 ref="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip">apache-activemq-5.14.1-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz">apache-activemq-5.14.1-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apac
 he-activemq-5.14.1-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.1&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.1Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.1Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip">activemq-parent-5.14.1-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.1Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.1</a></p><h2 id="ActiveMQ5.14.1Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338124">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5140-release.xml">ActiveMQ 5.14.0 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip">activemq-parent-5.14.1-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-p
 arent-5.14.1-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.1">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.1</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338124">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="d76d3a07-cefd-42e0-a549-2d68cb893a80" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.0 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5142-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5142-release.xml b/activemq-5142-release.xml
index ad67b01..5b9ff3d 100644
--- a/activemq-5142-release.xml
+++ b/activemq-5142-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.2Release-ActiveMQ5.14.2Release">ActiveMQ 5.14.2 Release</h2><p>Apache ActiveMQ 5.14.2 includes many resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338329">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.14.2Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip">apache-activemq-5.14.2-
 bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz">apache-activemq-5.14.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz.as
 c">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.2Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent p
 anelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.2Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.2 Release</h2><p>Apache ActiveMQ 5.14.2 includes many resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338329">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" h
 ref="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip">apache-activemq-5.14.2-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz">apache-activemq-5.14.2-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apac
 he-activemq-5.14.2-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/apache-activemq-5.14.2-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.2&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.2Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.2Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip">activemq-parent-5.14.2-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.2Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.2</a></p><h2 id="ActiveMQ5.14.2Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338329">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5141-release.xml">ActiveMQ 5.14.1 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip">activemq-parent-5.14.2-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-p
 arent-5.14.2-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.2/activemq-parent-5.14.2-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.2">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.2</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338329">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="1d77b94e-dec6-4b0c-95b8-ec1808dbd878" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.1 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5143-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5143-release.xml b/activemq-5143-release.xml
index b4f18ed..9b8e386 100644
--- a/activemq-5143-release.xml
+++ b/activemq-5143-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.3Release-ActiveMQ5.14.3Release">ActiveMQ 5.14.3 Release</h2><p>Apache ActiveMQ 5.14.3 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338822">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.14.3Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip">apache-activemq-5.14
 .3-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz">apache-activemq-5.14.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz
 .asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.3Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeConten
 t panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.3Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.3 Release</h2><p>Apache ActiveMQ 5.14.3 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338822">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip">apache-activemq-5.14.3-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz">apache-activemq-5.14.3-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/a
 pache-activemq-5.14.3-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/apache-activemq-5.14.3-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.3&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.3Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.3Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip">activemq-parent-5.14.3-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.3Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.3</a></p><h2 id="ActiveMQ5.14.3Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338822">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5142-release.xml">ActiveMQ 5.14.2 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip">activemq-parent-5.14.3-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-p
 arent-5.14.3-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.3/activemq-parent-5.14.3-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.3">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.3</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338822">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="aaded409-2824-4b78-b519-30e72bc5e113" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.2 Release"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/activemq-5144-release.xml
----------------------------------------------------------------------
diff --git a/activemq-5144-release.xml b/activemq-5144-release.xml
index 5504c35..cdb9dc5 100644
--- a/activemq-5144-release.xml
+++ b/activemq-5144-release.xml
@@ -1,35 +1,7 @@
-<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></span></p></div>
-
-
-<p>&#160;</p><h2 id="ActiveMQ5.14.4Release-ActiveMQ5.14.4Release">ActiveMQ 5.14.4 Release</h2><p>Apache ActiveMQ 5.14.4 includes several resolved<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">&#160;issues</a>&#160;and bug fixes.</p><h3 id="ActiveMQ5.14.4Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip">apache-activemq-5.14
 .4-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz">apache-activemq-5.14.4-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz
 .asc">ASC</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.14.4Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads</h2><p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps:</p><ol><li>Download the <a shape="rect" class="external-link" href="http://www.apache.org/dist/activemq/KEYS">KEYS</a></li><li>Download the asc signature file for the relevant distribution</li><li><p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeConten
 t panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[$ pgpk -a KEYS
-$ pgpv apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ pgp -ka KEYS
-$ pgp apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div><p>or</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[$ gpg --import KEYS
-$ gpg --verify apache-activemq-&lt;version&gt;-bin.tar.gz.asc
-]]></script>
-</div></div></li></ol><p>(Where &lt;version&gt; is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.).</p><p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs:</p><ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.14.4Release-GettingtheBinariesusingMaven3">Getting the Binaries using Maven 3</h2><p>To use this release in 
 your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;dependency&gt;
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="0d3bbe74-1dd7-4c5b-a81e-f58906b1e1ab" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;margin-left:-20px;</parameter><rich-text-body><p><image><url ri:value="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png"></url></image></p></rich-text-body></structured-macro><p>&#160;</p><h2>ActiveMQ 5.14.4 Release</h2><p>Apache ActiveMQ 5.14.4 includes several resolved<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">&#160;issues</a>&#160;and bug fixes.</p><h3>Getting the Binary Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p><em>Verify</em></p></th></tr><tr><td colspan="1" rowspan="1"><p>Windows Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect
 " href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip">apache-activemq-5.14.4-bin.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.zip.sha1">SHA1</a></p></td></tr><tr><td colspan="1" rowspan="1"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz">apache-activemq-5.14.4-bin.tar.gz</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/a
 pache-activemq-5.14.4-bin.tar.gz.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/apache-activemq-5.14.4-bin.tar.gz.sha1">SHA1</a></p></td></tr></tbody></table><p><structured-macro ac:macro-id="0b3139dd-d993-4394-9aa9-9be1a51f8ca7" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Verify Downloads"></page></link></parameter></structured-macro></p><h2>Getting the Binaries using Maven 3</h2><p>To use this release in your maven project, the simplest dependency that you can use in your&#160;<a shape="rect" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a>&#160;is:</p><structured-macro ac:macro-id="ec406dc7-2a01-4e93-829c-542486399e50" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.activemq&lt;/groupId&gt;
   &lt;artifactId&gt;activemq-all&lt;/artifactId&gt;
   &lt;version&gt;5.14.4&lt;/version&gt;
 &lt;/dependency&gt;
-]]></script>
-</div></div><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><div>&#160;</div>
-
-
-<h2 id="ActiveMQ5.14.4Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.14.4Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip">activemq-parent-5.14.4-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip.asc">ASC</a>, <a shape="rect" class="external-link"
  href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip.md5">MD5</a>, <a shape="rect" class="external-link" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.14.4Release-GitTag">Git Tag</h3><p><a shape="rect" class="external-link" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.4">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.4</a></p><h2 id="ActiveMQ5.14.4Release-ChangeLog">Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">release notes</a></p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-e
 rror confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release affects applications using ObjectMessages. Please refer to <a shape="rect" class="external-link" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and 
-    <span class="jira-issue resolved">
-        <a shape="rect" class="jira-issue-key" href="https://issues.apache.org/jira/browse/AMQ-6013?src=confmacro"><img class="icon" src="https://issues.apache.org/jira/images/icons/issuetypes/bug.png">AMQ-6013</a>
-                    -
-            <span class="summary">Restrict classes that can be serialized in ObjectMessages</span>
-                
-                                            <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-success jira-macro-single-issue-export-pdf">Resolved</span>
-            </span>
- for more information.</p></div></div><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<a shape="rect" href="activemq-5143-release.xml">ActiveMQ 5.14.3 Release</a></p></div>
+</plain-text-body></structured-macro><p>If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc.</p><structured-macro ac:macro-id="a2795b6b-929c-4360-b469-a02d8079ca4f" ac:name="div" ac:schema-version="1"><rich-text-body>&#160;</rich-text-body></structured-macro><h2>Getting the Source Code</h2><h3>Source Distributions</h3><table><tbody><tr><th colspan="1" rowspan="1"><p>Description</p></th><th colspan="1" rowspan="1"><p>Download Link</p></th><th colspan="1" rowspan="1"><p>Verify</p></th></tr><tr><td colspan="1" rowspan="1"><p>Source Release</p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip">activemq-parent-5.14.4-source-release.zip</a></p></td><td colspan="1" rowspan="1"><p><a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-p
 arent-5.14.4-source-release.zip.asc">ASC</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip.md5">MD5</a>, <a shape="rect" href="https://archive.apache.org/dist/activemq/5.14.4/activemq-parent-5.14.4-source-release.zip.sha1">SHA1</a></p></td></tr></tbody></table><h3>Git Tag</h3><p><a shape="rect" href="https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.4">https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.4</a></p><h2>Change Log</h2><p>For a more detailed view of new features and bug fixes, see the&#160;<a shape="rect" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&amp;version=12338909">release notes</a></p><structured-macro ac:macro-id="d4a0b50c-6902-45e0-a632-d3556603b45d" ac:name="warning" ac:schema-version="1"><rich-text-body><p>This release affects applications using ObjectMessages. Please refer to <a shape="re
 ct" href="http://activemq.apache.org/objectmessage.html">http://activemq.apache.org/objectmessage.html</a> and <structured-macro ac:macro-id="98b6d6b8-a3a3-4bc9-94d8-4b9ffb9c9552" ac:name="jira" ac:schema-version="1"><parameter ac:name="server">ASF JIRA</parameter><parameter ac:name="serverId">5aa69414-a9e9-3523-82ec-879b028fb15b</parameter><parameter ac:name="key">AMQ-6013</parameter></structured-macro> for more information.</p></rich-text-body></structured-macro><p>&#160;</p><p>&#160;</p><p>Also see the previous&#160;<link><page ri:content-title="ActiveMQ 5.14.3 Release"></page></link></p></div>
 


[17/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cross-language-clients.xml
----------------------------------------------------------------------
diff --git a/cross-language-clients.xml b/cross-language-clients.xml
index 4ace01e..311eef4 100644
--- a/cross-language-clients.xml
+++ b/cross-language-clients.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ is a message broker written in Java with JMS, <a shape="rect" href="rest.xml">REST</a> and <a shape="rect" href="websockets.xml">WebSocket</a> interfaces, however it supports protocols like <a shape="rect" href="amqp.xml">AMQP</a>, <a shape="rect" href="mqtt.xml">MQTT</a>,&#160;<a shape="rect" href="openwire.xml">OpenWire</a>&#160;and&#160;<a shape="rect" href="stomp.xml">STOMP</a>&#160;that can be used by applications in different languages.</p><h2 id="CrossLanguageClients-Libraries">Libraries</h2><ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">.NET</a></li><li><a shape="rect" class="external-link" href="http://docs.codehaus.org/display/STOMP/C" rel="nofollow">C</a><span>&#160;(defunct)</span></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">C++</a></li><li><a shape="rect" class="external-link" href="https://github.com/igb/Erlang-STOMP-Client" rel="nofol
 low">Erlang</a></li><li><a shape="rect" class="external-link" href="https://github.com/go-stomp/stomp" rel="nofollow">Go</a></li><li><a shape="rect" class="external-link" href="https://github.com/toschoo/mom" rel="nofollow">Haskell</a></li><li><a shape="rect" class="external-link" href="https://code.google.com/p/hxstomp" rel="nofollow">Haxe</a>&#160;(defunct)</li><li><a shape="rect" class="external-link" href="https://github.com/fribeiro1/jekpro-activemq-library" rel="nofollow">Jekejeke Prolog</a></li><li><a shape="rect" class="external-link" href="https://github.com/fribeiro1/ActiveMQ-Extension" rel="nofollow">NetLogo</a></li><li><a shape="rect" class="external-link" href="https://github.com/gdaws/node-stomp" rel="nofollow">Node.js</a></li><li><a shape="rect" class="external-link" href="http://search.cpan.org/%7Elcons/Net-STOMP-Client/" rel="nofollow">Perl 5</a></li><li><a shape="rect" class="external-link" href="https://github.com/hww3/pike_modules-public_protocols_stomp" rel="nof
 ollow">Pike</a></li><li><a shape="rect" class="external-link" href="https://github.com/jasonrbriggs/stomp.py" rel="nofollow">Python</a></li><li><a shape="rect" class="external-link" href="https://github.com/tonyg/racket-stomp" rel="nofollow">Racket</a></li><li><a shape="rect" class="external-link" href="https://github.com/kookster/activemessaging" rel="nofollow">Ruby on Rails</a></li><li><a shape="rect" class="external-link" href="https://github.com/siemens/tstomp" rel="nofollow">Tcl/Tk</a></li></ul><h2 id="CrossLanguageClients-CodeSamples">Code Samples</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Language</th><th colspan="1" rowspan="1" class="confluenceTh">Variant</th><th colspan="1" rowspan="1" class="confluenceTh">Interface</th><th colspan="1" rowspan="1" class="confluenceTh">Protocol</th><th colspan="1" rowspan="1" class="confluenceTh">Links</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Aw
 k</td><td colspan="1" rowspan="1" class="confluenceTd">Gawk</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-queue-with-gawk/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-topic-with-gawk/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-gawk/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-gawk/" rel="nofol
 low">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">C/C++</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd"><span>Library</span></td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-queue-with-cc/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-topic-with-cc/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-queue-with-cc/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simp
 lesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-topic-with-cc/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">COBOL</td><td colspan="1" rowspan="1" class="confluenceTd">GNU COBOL</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-cobol/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-cobol/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-que
 ue-with-gnu-cobol/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-cobol/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">COBOL</td><td colspan="1" rowspan="1" class="confluenceTd">Visual COBOL</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-queue-with-visual-cobol/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-topic-with-visual-cobol/" rel="nofollow">Send to Topic</a></li><li><a sh
 ape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-visual-cobol/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-topic-with-visual-cobol/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Ceylon</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/28/how-to-send-a-message-to-an-apache-activemq-queue-with-ceylon/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.c
 om/2013/12/28/how-to-send-a-message-to-an-apache-activemq-topic-with-ceylon/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/28/how-to-receive-a-message-from-an-apache-activemq-queue-with-ceylon/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/28/how-to-receive-a-message-from-an-apache-activemq-topic-with-ceylon/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Clojure</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-queue-with-clojure/" rel
 ="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-clojure/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-clojure/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-clojure/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">D</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="ht
 tps://simplesassim.wordpress.com/2015/12/02/how-to-send-a-message-to-an-apache-activemq-queue-with-d/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/02/how-to-send-a-message-to-an-apache-activemq-topic-with-d/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/03/how-to-receive-a-message-from-an-apache-activemq-queue-with-d/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/03/how-to-receive-a-message-from-an-apache-activemq-topic-with-d/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Dylan</td><td colspan="1" rowspan="1" class="confluenceTd">Open Dylan</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td c
 olspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/06/how-to-send-a-message-to-an-apache-activemq-queue-with-open-dylan/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/06/how-to-send-a-message-to-an-apache-activemq-topic-with-open-dylan/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-open-dylan/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-open-dylan/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Efene</td><td colspan="1" rowspan="1" class="confluenceTd">None</
 td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/11/how-to-send-a-message-to-an-apache-activemq-queue-with-efene/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/11/how-to-send-a-message-to-an-apache-activemq-topic-with-efene/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/11/how-to-receive-a-message-from-an-apache-activemq-queue-with-efene/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/11/how-to-receive-a-message-from-an-apache-activemq-topic-with-efene/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td co
 lspan="1" rowspan="1" class="confluenceTd">Eiffel</td><td colspan="1" rowspan="1" class="confluenceTd">EiffelStudio</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/24/how-to-send-a-message-to-an-apache-activemq-queue-with-eiffelstudio/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/24/how-to-send-a-message-to-an-apache-activemq-topic-with-eiffelstudio/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/24/how-to-receive-a-message-from-an-apache-activemq-queue-with-eiffelstudio/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/
 24/how-to-receive-a-message-from-an-apache-activemq-queue-with-eiffelstudio/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Eiffel</td><td colspan="1" rowspan="1" class="confluenceTd">GNU Eiffel</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/25/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-eiffel/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/25/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-eiffel/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/25/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-eiffe
 l/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/25/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-eiffel/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Elixir</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/09/how-to-send-a-message-to-an-apache-activemq-queue-with-elixir/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/09/how-to-send-a-message-to-an-apache-activemq-topic-with-elixir/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="ex
 ternal-link" href="https://simplesassim.wordpress.com/2014/02/09/how-to-receive-a-message-from-an-apache-activemq-queue-with-elixir/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/09/how-to-receive-a-message-from-an-apache-activemq-topic-with-elixir/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Erlang</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/06/how-to-send-a-message-to-an-apache-activemq-queue-with-erlang/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/06/how-
 to-send-a-message-to-an-apache-activemq-topic-with-erlang/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/07/how-to-receive-a-message-from-an-apache-activemq-queue-with-erlang/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/07/how-to-receive-a-message-from-an-apache-activemq-topic-with-erlang/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Factor</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/13/how-to-send-a-message-to-an-apache-activemq-queue-with-factor/" rel="nofo
 llow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/13/how-to-send-a-message-to-an-apache-activemq-topic-with-factor/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-factor/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/13/how-to-receive-a-message-from-an-apache-activemq-topic-with-factor/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Fantom</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" 
 href="https://simplesassim.wordpress.com/2014/01/11/how-to-send-a-message-to-an-apache-activemq-queue-with-fantom/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/11/how-to-send-a-message-to-an-apache-activemq-topic-with-fantom/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/11/how-to-receive-a-message-from-an-apache-activemq-queue-with-fantom/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/11/how-to-receive-a-message-from-an-apache-activemq-topic-with-fantom/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Frege</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class
 ="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/06/how-to-send-a-message-to-an-apache-activemq-queue-with-frege/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/06/how-to-send-a-message-to-an-apache-activemq-topic-with-frege/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-frege/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-frege/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Go</td><td colspan="1" rowspan="1" class="confluenc
 eTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/16/how-to-send-a-message-to-an-apache-activemq-queue-with-go/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/16/how-to-send-a-message-to-an-apache-activemq-topic-with-go/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/16/how-to-receive-a-message-from-an-apache-activemq-queue-with-go/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/16/how-to-receive-a-message-from-an-apache-activemq-topic-with-go/" rel="nofollow">Receive from Topic</a></li></ul></td></t
 r><tr><td colspan="1" rowspan="1" class="confluenceTd">Golo</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-send-a-message-to-an-apache-activemq-queue-with-golo/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-send-a-message-to-an-apache-activemq-topic-with-golo/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-receive-a-message-from-an-apache-activemq-queue-with-golo/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-
 receive-a-message-from-an-apache-activemq-topic-with-golo/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Gosu</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-send-a-message-to-an-apache-activemq-queue-with-gosu/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-gosu/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-gosu/" rel="nofollow">Receive from 
 Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-gosu/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Groovy</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-send-a-message-to-an-apache-activemq-queue-with-groovy/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-send-a-message-to-an-apache-activemq-topic-with-groovy/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim
 .wordpress.com/2014/01/01/how-to-receive-a-message-from-an-apache-activemq-queue-with-groovy/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-receive-a-message-from-an-apache-activemq-topic-with-groovy/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Haxe</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/12/how-to-send-a-message-to-an-apache-activemq-queue-with-haxe/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/12/how-to-send-a-message-to-an-apache-activemq-top
 ic-with-haxe/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/12/how-to-receive-a-message-from-an-apache-activemq-queue-with-haxe/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/12/how-to-receive-a-message-from-an-apache-activemq-topic-with-haxe/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Haskell</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/14/how-to-send-a-message-to-an-apache-activemq-queue-with-haskell/" rel="nofollow">Send to Queue</a></li><li><a shape="rect"
  class="external-link" href="https://simplesassim.wordpress.com/2014/02/14/how-to-send-a-message-to-an-apache-activemq-topic-with-haskell/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/14/how-to-receive-a-message-from-an-apache-activemq-queue-with-haskell/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/14/how-to-receive-a-message-from-an-apache-activemq-topic-with-haskell/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Interfix</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/12/ho
 w-to-send-a-message-to-an-apache-activemq-queue-with-interfix/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/12/how-to-send-a-message-to-an-apache-activemq-topic-with-interfix/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/12/how-to-receive-a-message-from-an-apache-activemq-queue-with-interfix/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/12/how-to-receive-a-message-from-an-apache-activemq-topic-with-interfix/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Ioke</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1
 " rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/10/how-to-send-a-message-to-an-apache-activemq-queue-with-ioke/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/10/how-to-send-a-message-to-an-apache-activemq-topic-with-ioke/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/10/how-to-receive-a-message-from-an-apache-activemq-queue-with-ioke/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/10/how-to-receive-a-message-from-an-apache-activemq-topic-with-ioke/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Java</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" ro
 wspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/19/how-to-send-a-message-to-an-apache-activemq-queue-with-java/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/19/how-to-send-a-message-to-an-apache-activemq-topic-with-java/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/10/how-to-receive-a-message-from-an-apache-activemq-queue-with-java/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/10/how-to-receive-a-message-from-an-apache-activemq-topic-with-java/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" row
 span="1" class="confluenceTd">Java</td><td colspan="1" rowspan="1" class="confluenceTd">Apache Camel</td><td colspan="1" rowspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/21/how-to-send-a-message-to-an-apache-activemq-queue-with-apache-camel/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/21/how-to-send-a-message-to-an-apache-activemq-topic-with-apache-camel/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/21/how-to-receive-a-message-from-an-apache-activemq-queue-with-apache-camel/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/21/
 how-to-receive-a-message-from-an-apache-activemq-topic-with-apache-camel/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Java</td><td colspan="1" rowspan="1" class="confluenceTd">JAX-RS</td><td colspan="1" rowspan="1" class="confluenceTd">REST</td><td colspan="1" rowspan="1" class="confluenceTd">REST</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/07/how-to-send-a-message-to-an-apache-activemq-queue-with-jax-rs/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/07/how-to-send-a-message-to-an-apache-activemq-topic-with-jax-rs/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/07/how-to-receive-a-message-from-an-apache-activemq-queue-with-jax-rs/" rel="nofollow">Receiv
 e from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/11/07/how-to-receive-a-message-from-an-apache-activemq-topic-with-jax-rs/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Java</td><td colspan="1" rowspan="1" class="confluenceTd">Java API for WebSocket</td><td colspan="1" rowspan="1" class="confluenceTd">WebSocket</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/23/how-to-send-a-message-to-an-apache-activemq-queue-with-the-java-api-for-websocket/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/23/how-to-send-a-message-to-an-apache-activemq-topic-with-the-java-api-for-websocket/" rel="nofollow">Send to Topic</a></li><li><a shape=
 "rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/23/how-to-receive-a-message-from-an-apache-activemq-queue-with-the-java-api-for-websocket/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/23/how-to-receive-a-message-from-an-apache-activemq-topic-with-the-java-api-for-websocket/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">JavaScript</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">WebSocket</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/02/how-to-send-a-message-to-an-apache-activemq-queue-with-javascript/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" hre
 f="https://simplesassim.wordpress.com/2016/02/02/how-to-send-a-message-to-an-apache-activemq-topic-with-javascript/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/02/how-to-receive-a-message-from-an-apache-activemq-queue-with-javascript/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/02/02/how-to-receive-a-message-from-an-apache-activemq-topic-with-javascript/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">JavaScript</td><td colspan="1" rowspan="1" class="confluenceTd">DynJS</td><td colspan="1" rowspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/02/how-
 to-send-a-message-to-an-apache-activemq-queue-with-dynjs/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/02/how-to-send-a-message-to-an-apache-activemq-topic-with-dynjs/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/02/how-to-receive-a-message-from-an-apache-activemq-queue-with-dynjs/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/02/how-to-receive-a-message-from-an-apache-activemq-topic-with-dynjs/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">JavaScript</td><td colspan="1" rowspan="1" class="confluenceTd">Rhino</td><td colspan="1" rowspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="
 1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-queue-with-rhino/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-rhino/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-rhino/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-rhino/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">JavaScript</td><td colspan="1" rowspan="1" class="confluenceTd">Nashorn</td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-queue-with-nashorn/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-nashorn/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-nashorn/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-nashorn/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" ro
 wspan="1" class="confluenceTd">JavaScript</td><td colspan="1" rowspan="1" class="confluenceTd">Node.js</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/03/13/how-to-send-a-message-to-an-apache-activemq-queue-with-node-js/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/03/13/how-to-send-a-message-to-an-apache-activemq-topic-with-node-js/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/03/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-node-js/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/03/13/how-to-receive-a-message-
 from-an-apache-activemq-topic-with-node-js/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">JudoScript</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/10/how-to-send-a-message-to-an-apache-activemq-queue-with-judoscript/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/10/how-to-send-a-message-to-an-apache-activemq-topic-with-judoscript/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/10/how-to-receive-a-message-from-an-apache-activemq-queue-with-judoscript/" rel="nofollow">Receive from Queu
 e</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/10/how-to-receive-a-message-from-an-apache-activemq-topic-with-judoscript/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Julia</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/02/how-to-send-a-message-to-an-apache-activemq-queue-with-julia/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/02/how-to-send-a-message-to-an-apache-activemq-topic-with-julia/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.co
 m/2016/01/02/how-to-receive-a-message-from-an-apache-activemq-queue-with-julia/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2016/01/02/how-to-receive-a-message-from-an-apache-activemq-topic-with-julia/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Kotlin</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-send-a-message-to-an-apache-activemq-queue-with-kotlin/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-send-a-message-to-an-apache-activemq-topic-with-kotlin/" rel="nof
 ollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-receive-a-message-from-an-apache-activemq-queue-with-kotlin/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/10/how-to-receive-a-message-from-an-apache-activemq-topic-with-kotlin/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">ABCL</td><td colspan="1" rowspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-send-a-message-to-an-apache-activemq-queue-with-abcl/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-li
 nk" href="https://simplesassim.wordpress.com/2014/04/02/how-to-send-a-message-to-an-apache-activemq-topic-with-abcl/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-receive-a-message-from-an-apache-activemq-queue-with-abcl/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-receive-a-message-from-an-apache-activemq-topic-with-abcl/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Allegro CL</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/05/how-to-send-a-message
 -to-an-apache-activemq-queue-with-allegro-cl/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/05/how-to-send-a-message-to-an-apache-activemq-topic-with-allegro-cl/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/05/how-to-receive-a-message-from-an-apache-activemq-queue-with-allegro-cl/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/05/how-to-receive-a-message-from-an-apache-activemq-topic-with-allegro-cl/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Bigloo</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" clas
 s="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-send-a-message-to-an-apache-activemq-queue-with-bigloo/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-send-a-message-to-an-apache-activemq-topic-with-bigloo/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-receive-a-message-from-an-apache-activemq-queue-with-bigloo/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/02/how-to-receive-a-message-from-an-apache-activemq-topic-with-bigloo/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">GNU CLISP</td><td colspan="1" rowspan="1" c
 lass="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-clisp/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-clisp/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-clisp/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-clisp/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspa
 n="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">JScheme</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-send-a-message-to-an-apache-activemq-queue-with-jscheme/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-send-a-message-to-an-apache-activemq-topic-with-jscheme/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-receive-a-message-from-an-apache-activemq-queue-with-jscheme/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-receive-a-message-from
 -an-apache-activemq-topic-with-jscheme/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Joxa</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-send-a-message-to-an-apache-activemq-queue-with-joxa/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-send-a-message-to-an-apache-activemq-topic-with-joxa/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-receive-a-message-from-an-apache-activemq-queue-with-joxa/" rel="nofollow">Receive from Queue</a></li><li><a sha
 pe="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-receive-a-message-from-an-apache-activemq-topic-with-joxa/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Kawa</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-send-a-message-to-an-apache-activemq-queue-with-kawa/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-send-a-message-to-an-apache-activemq-topic-with-kawa/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-rec
 eive-a-message-from-an-apache-activemq-queue-with-kawa/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-kawa/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">LFE</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-send-a-message-to-an-apache-activemq-queue-with-lfe/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-send-a-message-to-an-apache-activemq-topic-with-lfe/" rel="nofollow">Send to Topic</a></
 li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-receive-a-message-from-an-apache-activemq-queue-with-lfe/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/11/how-to-receive-a-message-from-an-apache-activemq-topic-with-lfe/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">MIT/GNU Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/24/how-to-send-a-message-to-an-apache-activemq-queue-with-mitgnu-scheme/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simples
 assim.wordpress.com/2014/03/24/how-to-send-a-message-to-an-apache-activemq-topic-with-mitgnu-scheme/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/25/how-to-receive-a-message-from-an-apache-activemq-queue-with-mitgnu-scheme/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/25/how-to-receive-a-message-from-an-apache-activemq-topic-with-mitgnu-scheme/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">Racket</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/29/how-to-send-a-message-t
 o-an-apache-activemq-queue-with-racket/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/29/how-to-send-a-message-to-an-apache-activemq-topic-with-racket/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/29/how-to-receive-a-message-from-an-apache-activemq-queue-with-racket/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/29/how-to-receive-a-message-from-an-apache-activemq-topic-with-racket/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lisp/Scheme</td><td colspan="1" rowspan="1" class="confluenceTd">SISC</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul>
 <li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/06/how-to-send-a-message-to-an-apache-activemq-queue-with-sisc/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/06/how-to-send-a-message-to-an-apache-activemq-topic-with-sisc/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-sisc/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/04/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-sisc/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Logo</td><td colspan="1" rowspan="1" class="confluenceTd">NetLogo</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspa
 n="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/06/how-to-send-a-message-to-an-apache-activemq-queue-with-netlogo/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/06/how-to-send-a-message-to-an-apache-activemq-topic-with-netlogo/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-netlogo/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/12/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-netlogo/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lua</td><td colspan=
 "1" rowspan="1" class="confluenceTd">Lua</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/13/how-to-send-a-message-to-an-apache-activemq-queue-with-lua/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/13/how-to-send-a-message-to-an-apache-activemq-topic-with-lua/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-lua/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/13/how-to-receive-a-message-from-an-apache-activemq-topic-with-lua/" rel="nofollow">Receive from Topic
 </a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Lua</td><td colspan="1" rowspan="1" class="confluenceTd">Luaj</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/25/how-to-send-a-message-to-an-apache-activemq-queue-with-luaj/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/25/how-to-send-a-message-to-an-apache-activemq-topic-with-luaj/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/25/how-to-receive-a-message-from-an-apache-activemq-queue-with-luaj/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/25
 /how-to-receive-a-message-from-an-apache-activemq-topic-with-luaj/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">ML</td><td colspan="1" rowspan="1" class="confluenceTd">OCaml</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/21/how-to-send-a-message-to-an-apache-activemq-queue-with-ocaml/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/22/how-to-send-a-message-to-an-apache-activemq-topic-with-ocaml/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/22/how-to-receive-a-message-from-an-apache-activemq-queue-with-ocaml/" rel="nofollow">Receive from Qu
 eue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/22/how-to-receive-a-message-from-an-apache-activemq-topic-with-ocaml/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">ML</td><td colspan="1" rowspan="1" class="confluenceTd">OCaml-Java</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/15/how-to-send-a-message-to-an-apache-activemq-queue-with-ocaml-java/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/15/how-to-send-a-message-to-an-apache-activemq-topic-with-ocaml-java/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wor
 dpress.com/2015/02/15/how-to-receive-a-message-from-an-apache-activemq-queue-with-ocaml-java/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/02/15/how-to-receive-a-message-from-an-apache-activemq-topic-with-ocaml-java/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Mirah</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/30/how-to-send-a-message-to-an-apache-activemq-queue-with-mirah/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/30/how-to-send-a-message-to-an-apache-activem
 q-topic-with-mirah/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/30/how-to-receive-a-message-from-an-apache-activemq-queue-with-mirah/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/30/how-to-receive-a-message-from-an-apache-activemq-topic-with-mirah/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Perl</td><td colspan="1" rowspan="1" class="confluenceTd"><span>Perl 5</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/08/how-to-send-a-message-to-an-apache-activemq-queue-with-perl-5/" rel="nofollow">Send to Queue</a></li><li><a shape=
 "rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/08/how-to-send-a-message-to-an-apache-activemq-topic-with-perl-5/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/08/how-to-receive-a-message-from-an-apache-activemq-queue-with-perl-5/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/08/how-to-receive-a-message-from-an-apache-activemq-topic-with-perl-5/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Pike</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2
 014/03/16/how-to-send-a-message-to-an-apache-activemq-queue-with-pike/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/16/how-to-send-a-message-to-an-apache-activemq-topic-with-pike/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/16/how-to-receive-a-message-from-an-apache-activemq-queue-with-pike/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/16/how-to-receive-a-message-from-an-apache-activemq-topic-with-pike/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Prolog</td><td colspan="1" rowspan="1" class="confluenceTd">JIProlog</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" c
 lass="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/14/how-to-send-a-message-to-an-apache-activemq-queue-with-jiprolog/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/14/how-to-send-a-message-to-an-apache-activemq-topic-with-jiprolog/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/14/how-to-receive-a-message-from-an-apache-activemq-queue-with-jiprolog/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/14/how-to-receive-a-message-from-an-apache-activemq-topic-with-jiprolog/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Prolog</td><td colspan="1" rowspan="1" class="confluenceTd">Jekejeke Prolog</td><td colspan="1" r
 owspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/26/how-to-send-a-message-to-an-apache-activemq-queue-with-jekejeke-prolog/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/26/how-to-send-a-message-to-an-apache-activemq-topic-with-jekejeke-prolog/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/26/how-to-receive-a-message-from-an-apache-activemq-queue-with-jekejeke-prolog/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/26/how-to-receive-a-message-from-an-apache-activemq-topic-with-jekejeke-prolog/" rel="nofollow">Receive from Topic</a></li></
 ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Prolog</td><td colspan="1" rowspan="1" class="confluenceTd">tuProlog</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/21/how-to-send-a-message-to-an-apache-activemq-queue-with-tuprolog/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/21/how-to-send-a-message-to-an-apache-activemq-topic-with-tuprolog/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/21/how-to-receive-a-message-from-an-apache-activemq-queue-with-tuprolog/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/20
 15/01/21/how-to-receive-a-message-from-an-apache-activemq-topic-with-tuprolog/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Python</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/14/how-to-send-a-message-to-an-apache-activemq-queue-with-python/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/14/how-to-send-a-message-to-an-apache-activemq-topic-with-python/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/14/how-to-receive-a-message-from-an-apache-activemq-queue-with-python/" rel="nofollo
 w">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/14/how-to-receive-a-message-from-an-apache-activemq-topic-with-python/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Python</td><td colspan="1" rowspan="1" class="confluenceTd">Jython</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-send-a-message-to-an-apache-activemq-queue-with-jython/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-send-a-message-to-an-apache-activemq-topic-with-jython/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simpl
 esassim.wordpress.com/2013/12/30/how-to-receive-a-message-from-an-apache-activemq-queue-with-jython/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-receive-a-message-from-an-apache-activemq-topic-with-jython/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">R</td><td colspan="1" rowspan="1" class="confluenceTd">GNU R</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/19/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-r/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/19/how-to-send-a-message-to-an-apache-activemq-topic-with-
 gnu-r/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/19/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-r/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/19/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-r/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">R</td><td colspan="1" rowspan="1" class="confluenceTd">Renjin</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-send-a-message-to-an-apache-activemq-queue-with-renjin/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" h
 ref="https://simplesassim.wordpress.com/2014/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-renjin/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-renjin/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-renjin/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Rebol</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/11/28/how-to-send-a-messa
 ge-to-an-apache-activemq-queue-with-rebol/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/11/28/how-to-send-a-message-to-an-apache-activemq-topic-with-rebol/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/11/28/how-to-receive-a-message-from-an-apache-activemq-queue-with-rebol/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/11/28/how-to-receive-a-message-from-an-apache-activemq-topic-with-rebol/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Rexx</td><td colspan="1" rowspan="1" class="confluenceTd">BSF4ooRexx</td><td colspan="1" rowspan="1" class="confluenceTd"><span>JMS</span></td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="conflu
 enceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-send-a-message-to-an-apache-activemq-queue-with-bsf4oorexx/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-send-a-message-to-an-apache-activemq-topic-with-bsf4oorexx/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/22/how-to-receive-a-message-from-an-apache-activemq-queue-with-bsf4oorexx/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/22/how-to-receive-a-message-from-an-apache-activemq-topic-with-bsf4oorexx/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Rexx</td><td colspan="1" rowspan="1" class="confluenceTd">NetRexx</td><td colspan="1" rowspan="1" cla
 ss="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/17/how-to-send-a-message-to-an-apache-activemq-queue-with-netrexx/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/17/how-to-send-a-message-to-an-apache-activemq-topic-with-netrexx/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/17/how-to-receive-a-message-from-an-apache-activemq-queue-with-netrexx/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-netrexx/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class
 ="confluenceTd">Rexx</td><td colspan="1" rowspan="1" class="confluenceTd">ooRexx</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-send-a-message-to-an-apache-activemq-queue-with-oorexx/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-send-a-message-to-an-apache-activemq-topic-with-oorexx/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-receive-a-message-from-an-apache-activemq-queue-with-oorexx/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/21/how-to-receive-a-message-from-an-apache-activemq-t
 opic-with-oorexx/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Ruby</td><td colspan="1" rowspan="1" class="confluenceTd">None</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/02/how-to-send-a-message-to-an-apache-activemq-queue-with-ruby/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/03/how-to-send-a-message-to-an-apache-activemq-topic-with-ruby/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/03/how-to-receive-a-message-from-an-apache-activemq-queue-with-ruby/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-lin
 k" href="https://simplesassim.wordpress.com/2014/02/03/how-to-receive-a-message-from-an-apache-activemq-topic-with-ruby/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Ruby</td><td colspan="1" rowspan="1" class="confluenceTd">Ruby on Rails</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/27/how-to-send-a-message-to-an-apache-activemq-queue-with-ruby-on-rails/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/27/how-to-send-a-message-to-an-apache-activemq-topic-with-ruby-on-rails/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/27/how-to-receive-a-m
 essage-from-an-apache-activemq-queue-with-ruby-on-rails/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/27/how-to-receive-a-message-from-an-apache-activemq-topic-with-ruby-on-rails/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Ruby</td><td colspan="1" rowspan="1" class="confluenceTd">JRuby</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-send-a-message-to-an-apache-activemq-queue-with-jruby/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-send-a-message-to-an-apache-activemq-topic-with-jruby/" rel="nofollow">Send to Top
 ic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-receive-a-message-from-an-apache-activemq-queue-with-jruby/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/30/how-to-receive-a-message-from-an-apache-activemq-topic-with-jruby/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Rust</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/16/how-to-send-a-message-to-an-apache-activemq-queue-with-rust/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesa
 ssim.wordpress.com/2015/01/16/how-to-send-a-message-to-an-apache-activemq-topic-with-rust/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/16/how-to-receive-a-message-from-an-apache-activemq-queue-with-rust/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2015/01/16/how-to-receive-a-message-from-an-apache-activemq-topic-with-rust/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Scala</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-que
 ue-with-scala/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-send-a-message-to-an-apache-activemq-topic-with-scala/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-queue-with-scala/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2013/12/31/how-to-receive-a-message-from-an-apache-activemq-topic-with-scala/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Smalltalk</td><td colspan="1" rowspan="1" class="confluenceTd">GNU Smalltalk</td><td colspan="1" rowspan="1" class="confluenceTd">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" 
 class="external-link" href="https://simplesassim.wordpress.com/2014/03/28/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-smalltalk/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/28/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-smalltalk/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/28/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-smalltalk/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/28/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-smalltalk/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Smalltalk</td><td colspan="1" rowspan="1" class="confluenceTd">Squeak</td><td colspan="1" rowspan="1" class="confluenceTd
 ">Sockets</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-send-a-message-to-an-apache-activemq-queue-with-squeak/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-send-a-message-to-an-apache-activemq-topic-with-squeak/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-receive-a-message-from-an-apache-activemq-queue-with-squeak/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/03/30/how-to-receive-a-message-from-an-apache-activemq-topic-with-squeak/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Tcl
 </td><td colspan="1" rowspan="1" class="confluenceTd">Tcl/Tk</td><td colspan="1" rowspan="1" class="confluenceTd">Library</td><td colspan="1" rowspan="1" class="confluenceTd">STOMP</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/27/how-to-send-a-message-to-an-apache-activemq-queue-with-tcltk/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/27/how-to-send-a-message-to-an-apache-activemq-topic-with-tcltk/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/27/how-to-receive-a-message-from-an-apache-activemq-queue-with-tcltk/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/02/27/how-to-receive-a-message-from-an-apache-activemq-topic-with-tcltk/" rel="
 nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Tcl</td><td colspan="1" rowspan="1" class="confluenceTd">Tcl/Java</td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/24/how-to-send-a-message-to-an-apache-activemq-queue-with-tcljava/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/24/how-to-send-a-message-to-an-apache-activemq-topic-with-tcljava/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/08/24/how-to-receive-a-message-from-an-apache-activemq-queue-with-tcljava/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="http
 s://simplesassim.wordpress.com/2014/08/24/how-to-receive-a-message-from-an-apache-activemq-topic-with-tcljava/" rel="nofollow">Receive from Topic</a></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">Xtend</td><td colspan="1" rowspan="1" class="confluenceTd"><span>None</span></td><td colspan="1" rowspan="1" class="confluenceTd">JMS</td><td colspan="1" rowspan="1" class="confluenceTd">OpenWire</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-send-a-message-to-an-apache-activemq-queue-with-xtend/" rel="nofollow">Send to Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-send-a-message-to-an-apache-activemq-topic-with-xtend/" rel="nofollow">Send to Topic</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-receive-a-message-from-an-apache-
 activemq-queue-with-xtend/" rel="nofollow">Receive from Queue</a></li><li><a shape="rect" class="external-link" href="https://simplesassim.wordpress.com/2014/01/01/how-to-receive-a-message-from-an-apache-activemq-topic-with-xtend/" rel="nofollow">Receive from Topic</a></li></ul></td></tr></tbody></table></div></div>
+<div class="wiki-content maincontent"><p>Apache ActiveMQ is a message broker written in Java with JMS, <link><page ri:content-title="REST"></page></link> and <link><page ri:content-title="WebSockets"></page><plain-text-link-body>WebSocket</plain-text-link-body></link> interfaces, however it supports protocols like <link><page ri:content-title="AMQP"></page></link>, <link><page ri:content-title="MQTT"></page></link>,&#160;<link><page ri:content-title="OpenWire"></page></link>&#160;and&#160;<link><page ri:content-title="Stomp"></page><plain-text-link-body>STOMP</plain-text-link-body></link>&#160;that can be used by applications in different languages.</p><h2>Libraries</h2><ul><li><a shape="rect" href="http://activemq.apache.org/nms/">.NET</a></li><li><a shape="rect" href="http://docs.codehaus.org/display/STOMP/C">C</a><span>&#160;(defunct)</span></li><li><a shape="rect" href="http://activemq.apache.org/cms/">C++</a></li><li><a shape="rect" href="https://github.com/igb/Erlang-STOMP-Cli
 ent">Erlang</a></li><li><a shape="rect" href="https://github.com/go-stomp/stomp">Go</a></l

<TRUNCATED>

[50/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/08/25/activemq-31-released-with-ruby-and-perl-support.xml
----------------------------------------------------------------------
diff --git a/2005/08/25/activemq-31-released-with-ruby-and-perl-support.xml b/2005/08/25/activemq-31-released-with-ruby-and-perl-support.xml
index 89a7402..9308802 100644
--- a/2005/08/25/activemq-31-released-with-ruby-and-perl-support.xml
+++ b/2005/08/25/activemq-31-released-with-ruby-and-perl-support.xml
@@ -1,9 +1,9 @@
 <div class="wiki-content maincontent">
-<p>The long awaited <a shape="rect" href="../../../activemq-31-release.xml">ActiveMQ 3.1 Release</a> is finally out. Who-hoo! Many thanks to all those on the <a shape="rect" href="../../../team.xml">Team</a> who've helped.</p>
+<p>The long awaited <link><page ri:content-title="ActiveMQ 3.1 Release"></page></link> is finally out. Who-hoo! Many thanks to all those on the <link><page ri:content-title="Team"></page></link> who've helped.</p>
 
-<p>This release includes support for Ruby and Perl thanks to the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> project together with <a shape="rect" href="../../../activemq-31-release.xml">heaps of new features</a> such as better persistence, journalling and integration with JNDI, JCA, Servlets, Spring, WebLogic and JBoss. </p>
+<p>This release includes support for Ruby and Perl thanks to the <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> project together with <link><page ri:content-title="ActiveMQ 3.1 Release"></page><link-body>heaps of new features</link-body></link> such as better persistence, journalling and integration with JNDI, JCA, Servlets, Spring, WebLogic and JBoss. </p>
 
-<p>Go on, <a shape="rect" href="../../../download.xml">Download</a> it today!</p>
+<p>Go on, <link><page ri:content-title="Download"></page></link> it today!</p>
 
 <p>Enjoy!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/09/14/activemq-integrates-with-openrico-ajax-library.xml
----------------------------------------------------------------------
diff --git a/2005/09/14/activemq-integrates-with-openrico-ajax-library.xml b/2005/09/14/activemq-integrates-with-openrico-ajax-library.xml
index 100badb..486b0ef 100644
--- a/2005/09/14/activemq-integrates-with-openrico-ajax-library.xml
+++ b/2005/09/14/activemq-integrates-with-openrico-ajax-library.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
-<p>We've now migrated our real time portfolio <a shape="rect" href="../../../ajax.xml">Ajax</a> demo to use the <a shape="rect" class="external-link" href="http://openrico.org/" rel="nofollow">OpenRico</a> library. Cool Beans!</p>
+<p>We've now migrated our real time portfolio <link><page ri:content-title="Ajax"></page></link> demo to use the <a shape="rect" href="http://openrico.org/">OpenRico</a> library. Cool Beans!</p>
 
 <p>This means you can now use an off the self Ajax library such as Rico for the browser side, then use ActiveMQ as the message broker on the server side for handling your scalable asynchronous messaging.</p>
 
-<p>I'm sure we're only scratching the surface of the <a shape="rect" href="../../../ajax.xml">Ajax</a> possibilities as we start to integrate asynchronous messaging and real time eventing into web applications.</p></div>
+<p>I'm sure we're only scratching the surface of the <link><page ri:content-title="Ajax"></page></link> possibilities as we start to integrate asynchronous messaging and real time eventing into web applications.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/10/11/activemq-adds-xbean-support-for-custom-spring-xml-processing.xml
----------------------------------------------------------------------
diff --git a/2005/10/11/activemq-adds-xbean-support-for-custom-spring-xml-processing.xml b/2005/10/11/activemq-adds-xbean-support-for-custom-spring-xml-processing.xml
index ba47148..9749ebf 100644
--- a/2005/10/11/activemq-adds-xbean-support-for-custom-spring-xml-processing.xml
+++ b/2005/10/11/activemq-adds-xbean-support-for-custom-spring-xml-processing.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<p>Craig has a <a shape="rect" class="external-link" href="http://jroller.com/page/habuma/20051011" rel="nofollow">great post</a> which describes how XBean can really help provide a <a shape="rect" class="external-link" href="http://docs.codehaus.org/display/XB/Custom+XML" rel="nofollow">customized XML language</a> with Spring XML configuration extensibility. We're really happy with it so far and have moved away from XSLT and custom DOM processing to the simpler XBean model in ActiveMQ and <a shape="rect" class="external-link" href="http://jencks.org" rel="nofollow">Jencks</a> with <a shape="rect" class="external-link" href="http://servicemix.org" rel="nofollow">ServiceMix</a> to follow suit real soon now.</p>
+<p>Craig has a <a shape="rect" href="http://jroller.com/page/habuma/20051011">great post</a> which describes how XBean can really help provide a <a shape="rect" href="http://docs.codehaus.org/display/XB/Custom+XML">customized XML language</a> with Spring XML configuration extensibility. We're really happy with it so far and have moved away from XSLT and custom DOM processing to the simpler XBean model in ActiveMQ and <a shape="rect" href="http://jencks.org">Jencks</a> with <a shape="rect" href="http://servicemix.org">ServiceMix</a> to follow suit real soon now.</p>
 
-<p>Whats cool is we've just about got a working XBean Ant task to auto-generate the configuration, the XSD and HTML documentaiton now. e.g. here's the <a shape="rect" class="external-link" href="http://codehaus.org/~jstrachan/servicemix.xsd.html" rel="nofollow">current</a> ServiceMix generated documentation.</p></div>
+<p>Whats cool is we've just about got a working XBean Ant task to auto-generate the configuration, the XSD and HTML documentaiton now. e.g. here's the <a shape="rect" href="http://codehaus.org/~jstrachan/servicemix.xsd.html">current</a> ServiceMix generated documentation.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/10/26/activemq-32-released-with-stomp-10-and-improved-ajax.xml
----------------------------------------------------------------------
diff --git a/2005/10/26/activemq-32-released-with-stomp-10-and-improved-ajax.xml b/2005/10/26/activemq-32-released-with-stomp-10-and-improved-ajax.xml
index 88ec4de..ae3f2a8 100644
--- a/2005/10/26/activemq-32-released-with-stomp-10-and-improved-ajax.xml
+++ b/2005/10/26/activemq-32-released-with-stomp-10-and-improved-ajax.xml
@@ -1,8 +1,8 @@
 <div class="wiki-content maincontent">
 <p>This new release includes the following</p>
 
-<ul><li>Improved <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
+<ul><li>Improved <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> 1.0 support to make it easy to create cross language clients such as for C, C#, Python, Ruby, Perl and Pike.</li><li>Ajax support now uses OpenRico as the default Ajax library</li><li>the Resource Adaptor now supports batching</li><li>demand based store and forward in networks</li><li>support for Informix JDBC</li><li>updated DTD for the latest Spring</li><li>various performance enhancements and bug fixes</li></ul>
 
 
-<p>For more details please see the <a shape="rect" href="../../../activemq-32-release.xml">Release Notes</a></p></div>
+<p>For more details please see the <link><page ri:content-title="ActiveMQ 3.2 Release"></page><link-body>Release Notes</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/11/09/new-features-in-40-exclusive-consumers-and-message-groups.xml
----------------------------------------------------------------------
diff --git a/2005/11/09/new-features-in-40-exclusive-consumers-and-message-groups.xml b/2005/11/09/new-features-in-40-exclusive-consumers-and-message-groups.xml
index b921235..bc3b26e 100644
--- a/2005/11/09/new-features-in-40-exclusive-consumers-and-message-groups.xml
+++ b/2005/11/09/new-features-in-40-exclusive-consumers-and-message-groups.xml
@@ -1,8 +1,8 @@
 <div class="wiki-content maincontent">
-<p>We've documented some of the new features coming along in <a shape="rect" href="../../../changes-in-40.xml">the 4.x branch of ActiveMQ</a>. In particular the things I'm particularly happy about are</p>
+<p>We've documented some of the new features coming along in <link><page ri:content-title="Changes in 4.0"></page><link-body>the 4.x branch of ActiveMQ</link-body></link>. In particular the things I'm particularly happy about are</p>
 
-<ul><li><a shape="rect" href="../../../exclusive-consumer.xml">Exclusive Consumer</a></li><li><a shape="rect" href="../../../message-groups.xml">Message Groups</a></li></ul>
+<ul><li><link><page ri:content-title="Exclusive Consumer"></page></link></li><li><link><page ri:content-title="Message Groups"></page></link></li></ul>
 
 
-<p>I really love <a shape="rect" href="../../../message-groups.xml">Message Groups</a>, they totally rock! <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)"> Its well worth reading the overview of what they are and how they can be useful making a partitioned high performance grid style distributed system with ordering or fast caching etc.</p></div>
+<p>I really love <link><page ri:content-title="Message Groups"></page></link>, they totally rock! <emoticon ac:name="smile"></emoticon> Its well worth reading the overview of what they are and how they can be useful making a partitioned high performance grid style distributed system with ordering or fast caching etc.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/11/23/new-discussion-forum-available.xml
----------------------------------------------------------------------
diff --git a/2005/11/23/new-discussion-forum-available.xml b/2005/11/23/new-discussion-forum-available.xml
index 3effae1..148b778 100644
--- a/2005/11/23/new-discussion-forum-available.xml
+++ b/2005/11/23/new-discussion-forum-available.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Various users don't like joining busy email lists - we all get enough email as it is <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)"> - so we've setup a <a shape="rect" class="external-link" href="http://forums.logicblaze.com/forums/show/1.page" rel="nofollow">discussion forum</a> you can use as an alternative to the mail lists. Enjoy!</p></div>
+<p>Various users don't like joining busy email lists - we all get enough email as it is <emoticon ac:name="smile"></emoticon> - so we've setup a <a shape="rect" href="http://forums.logicblaze.com/forums/show/1.page">discussion forum</a> you can use as an alternative to the mail lists. Enjoy!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/12/09/activemq-4x-codebase-has-moved-to-apache.xml
----------------------------------------------------------------------
diff --git a/2005/12/09/activemq-4x-codebase-has-moved-to-apache.xml b/2005/12/09/activemq-4x-codebase-has-moved-to-apache.xml
index 78d26ac..546be04 100644
--- a/2005/12/09/activemq-4x-codebase-has-moved-to-apache.xml
+++ b/2005/12/09/activemq-4x-codebase-has-moved-to-apache.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 <p>You can surf it at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/activemq/">https://svn.apache.org/repos/asf/incubator/activemq/</a>.</p>
 
-<p>For more details see <a shape="rect" href="../../../source.xml">Source</a>.</p></div>
+<p>For more details see <link><page ri:content-title="Source"></page></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2006/03/23/new-discussion-forums-available-at-nabble.xml
----------------------------------------------------------------------
diff --git a/2006/03/23/new-discussion-forums-available-at-nabble.xml b/2006/03/23/new-discussion-forums-available-at-nabble.xml
index e91e60a..fd5c615 100644
--- a/2006/03/23/new-discussion-forums-available-at-nabble.xml
+++ b/2006/03/23/new-discussion-forums-available-at-nabble.xml
@@ -1,14 +1,3 @@
 <div class="wiki-content maincontent">
-Before posting you might want to read the <a shape="rect" href="../../../tips-for-getting-help.xml">Tips for getting help</a>.
-
-<p>Many users prefer to use online forums rather than joining a mail list which can lead to lots more email traffic so we use the online forums at <a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">Nabble forums</a> which also work with our <a shape="rect" href="../../../mailing-lists.xml">Mailing Lists</a> so that both stay completely in sync. Use either the mailing lists or online forums, its completely up to you.</p>
-
-<h3 id="NewDiscussionForumsAvailableatNabble-ActiveMQForums"><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/" rel="nofollow">ActiveMQ Forums</a></h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html" rel="nofollow">ActiveMQ User Forum</a></li><li><a shape="rect" class="external-link" href="http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html" rel="nofollow">ActiveMQ Developer Forum</a></li></ul>
-
-
-<h3 id="NewDiscussionForumsAvailableatNabble-MailingLists">Mailing Lists</h3>
-
-<p>If you prefer to use a mailing list instead then check out our <a shape="rect" href="../../../mailing-lists.xml">Mailing Lists</a>. Note that the Forums and <a shape="rect" href="../../../mailing-lists.xml">Mailing Lists</a> are kept in sync so its your choice which you use.</p></div>
+<structured-macro ac:macro-id="ece36784-c0df-42dd-9196-629185ecbe7e" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Discussion Forums"></page></link></parameter></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2006/06/16/performance-tuning-guide-available.xml
----------------------------------------------------------------------
diff --git a/2006/06/16/performance-tuning-guide-available.xml b/2006/06/16/performance-tuning-guide-available.xml
index 708c8b1..281ec51 100644
--- a/2006/06/16/performance-tuning-guide-available.xml
+++ b/2006/06/16/performance-tuning-guide-available.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>We've created a <a shape="rect" class="external-link" href="http://devzone.logicblaze.com/site/apache-activemq-performance-tuning-guide.html" rel="nofollow">performance tuning guide</a> which takes you through the various different configurations and quality of service settings you can use to help tune your use of Apache ActiveMQ. Enjoy!</p></div>
+<div class="wiki-content maincontent"><p>We've created a <a shape="rect" href="http://devzone.logicblaze.com/site/apache-activemq-performance-tuning-guide.html">performance tuning guide</a> which takes you through the various different configurations and quality of service settings you can use to help tune your use of Apache ActiveMQ. Enjoy!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2006/11/17/apache-activemq-402-released.xml
----------------------------------------------------------------------
diff --git a/2006/11/17/apache-activemq-402-released.xml b/2006/11/17/apache-activemq-402-released.xml
index 17f7331..e2030e8 100644
--- a/2006/11/17/apache-activemq-402-released.xml
+++ b/2006/11/17/apache-activemq-402-released.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>We are pleased to announce the release of <a shape="rect" class="external-link" href="http://incubator.apache.org/activemq/activemq-402-release.html">Apache ActiveMQ 4.0.2</a> please grab it while its hot!</p>
+<div class="wiki-content maincontent"><p>We are pleased to announce the release of <a shape="rect" href="http://incubator.apache.org/activemq/activemq-402-release.html">Apache ActiveMQ 4.0.2</a> please grab it while its hot!</p>
 
 <p>This is primarily a bug fix release; we recommend all users of Apache ActiveMQ 4.x or later to upgrade. Enjoy!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007-april.xml
----------------------------------------------------------------------
diff --git a/2007-april.xml b/2007-april.xml
index d9f0d5d..18af662 100644
--- a/2007-april.xml
+++ b/2007-april.xml
@@ -1,4 +1,5 @@
-<div class="wiki-content maincontent"><h2 id="id-2007April-April2007Report">April 2007 Report</h2>
+<div class="wiki-content maincontent"><h2>April 2007 Report</h2>
 
-<ul><li><a shape="rect" class="unresolved" href="#">ActiveMQ 4.1.1 Released</a></li><li>voted in a new committer, John Heitmann</li><li>the developer and user lists continue to be very active</li></ul></div>
+<ul><li><link><page ri:content-title="ActiveMQ 4.1.1 Released"></page></link></li><li>voted in a new committer, John Heitmann</li><li>the developer and user lists continue to be very active</li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/01/19/activemq-410-released.xml
----------------------------------------------------------------------
diff --git a/2007/01/19/activemq-410-released.xml b/2007/01/19/activemq-410-released.xml
index b517a6d..a98524c 100644
--- a/2007/01/19/activemq-410-released.xml
+++ b/2007/01/19/activemq-410-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Grab it while its hot! Download <a shape="rect" href="../../../activemq-410-release.xml">ActiveMQ 4.1.0 Release</a> now!</p></div>
+<div class="wiki-content maincontent"><p>Grab it while its hot! Download <link><page ri:content-title="ActiveMQ 4.1.0 Release"></page></link> now!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/03/02/using-rails-and-activemq-with-activemessaging.xml
----------------------------------------------------------------------
diff --git a/2007/03/02/using-rails-and-activemq-with-activemessaging.xml b/2007/03/02/using-rails-and-activemq-with-activemessaging.xml
index a4828ec..08997bb 100644
--- a/2007/03/02/using-rails-and-activemq-with-activemessaging.xml
+++ b/2007/03/02/using-rails-and-activemq-with-activemessaging.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Andrew Kuklewicz just published a great article, <a shape="rect" class="external-link" href="http://www.infoq.com/articles/intro-active-messaging-rails" rel="nofollow">an introduction to ActiveMessaging, using Rails with ActiveMQ and Stomp</a> over on <a shape="rect" class="external-link" href="http://www.infoq.com" rel="nofollow">InfoQ</a>. Cool beans! </p></div>
+<div class="wiki-content maincontent"><p>Andrew Kuklewicz just published a great article, <a shape="rect" href="http://www.infoq.com/articles/intro-active-messaging-rails">an introduction to ActiveMessaging, using Rails with ActiveMQ and Stomp</a> over on <a shape="rect" href="http://www.infoq.com">InfoQ</a>. Cool beans! </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/03/09/java-c-c-csharp-vb-perl-python-php-ruby-pike-and-now-smalltalk.xml
----------------------------------------------------------------------
diff --git a/2007/03/09/java-c-c-csharp-vb-perl-python-php-ruby-pike-and-now-smalltalk.xml b/2007/03/09/java-c-c-csharp-vb-perl-python-php-ruby-pike-and-now-smalltalk.xml
index 0ceeb2e..b973274 100644
--- a/2007/03/09/java-c-c-csharp-vb-perl-python-php-ruby-pike-and-now-smalltalk.xml
+++ b/2007/03/09/java-c-c-csharp-vb-perl-python-php-ruby-pike-and-now-smalltalk.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>We've always had lots of support for <a shape="rect" href="../../../cross-language-clients.xml">Cross Language Clients and Protocols</a>  but now there is a <a shape="rect" class="external-link" href="http://stomp.codehaus.org/Smalltalk" rel="nofollow">Smalltalk client</a> <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></div>
+<div class="wiki-content maincontent"><p>We've always had lots of support for <link><page ri:content-title="Cross Language Clients"></page><link-body>Cross Language Clients and Protocols</link-body></link>  but now there is a <a shape="rect" href="http://stomp.codehaus.org/Smalltalk">Smalltalk client</a> <emoticon ac:name="smile"></emoticon></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/03/28/nms-support-in-springnet-available-for-download.xml
----------------------------------------------------------------------
diff --git a/2007/03/28/nms-support-in-springnet-available-for-download.xml b/2007/03/28/nms-support-in-springnet-available-for-download.xml
index c1d1414..28b66a7 100644
--- a/2007/03/28/nms-support-in-springnet-available-for-download.xml
+++ b/2007/03/28/nms-support-in-springnet-available-for-download.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p><a shape="rect" class="external-link" href="http://activemq.apache.org/nms/">Apache NMS</a> is an API for messaging on the .Net platform in C# or VB.Net. Spring.Net offers several features to make it easier to work with .Net like the Spring Framework does for Java. Now the Spring.Messaging.Net library can be used to make it easier to work with NMS. For example it includes the NmsTemplate class (like the JmsTemplate class in Java) or the DefaultMessageListenerContainer.</p>
+<div class="wiki-content maincontent"><p><a shape="rect" href="http://activemq.apache.org/nms/">Apache NMS</a> is an API for messaging on the .Net platform in C# or VB.Net. Spring.Net offers several features to make it easier to work with .Net like the Spring Framework does for Java. Now the Spring.Messaging.Net library can be used to make it easier to work with NMS. For example it includes the NmsTemplate class (like the JmsTemplate class in Java) or the DefaultMessageListenerContainer.</p>
 
-<p>There is now a <a shape="rect" class="external-link" href="http://www.springframework.net/downloads/Spring.Messaging.Nms/" rel="nofollow">binary download of Spring.Messaging.NMS available</a>. Get it while its hot!</p></div>
+<p>There is now a <a shape="rect" href="http://www.springframework.net/downloads/Spring.Messaging.Nms/">binary download of Spring.Messaging.NMS available</a>. Get it while its hot!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/04/03/activemq-feathercast-available.xml
----------------------------------------------------------------------
diff --git a/2007/04/03/activemq-feathercast-available.xml b/2007/04/03/activemq-feathercast-available.xml
index 40e3581..ebb5647 100644
--- a/2007/04/03/activemq-feathercast-available.xml
+++ b/2007/04/03/activemq-feathercast-available.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>James Strachan was interviewed for this months <a shape="rect" class="external-link" href="http://feathercast.org/?p=42" rel="nofollow">feathercast</a> discussing all things Apache ActiveMQ.</p></div>
+<div class="wiki-content maincontent"><p>James Strachan was interviewed for this months <a shape="rect" href="http://feathercast.org/?p=42">feathercast</a> discussing all things Apache ActiveMQ.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/04/03/apache-activemq-411-released.xml
----------------------------------------------------------------------
diff --git a/2007/04/03/apache-activemq-411-released.xml b/2007/04/03/apache-activemq-411-released.xml
index 75b9466..dcba5b3 100644
--- a/2007/04/03/apache-activemq-411-released.xml
+++ b/2007/04/03/apache-activemq-411-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>We're proud to announce the <a shape="rect" href="../../../activemq-411-release.xml">ActiveMQ 4.1.1 Release</a> has just gone out with numberous bug fixes. Grab it while its hot!</p></div>
+<div class="wiki-content maincontent"><p>We're proud to announce the <link><page ri:content-title="ActiveMQ 4.1.1 Release"></page></link> has just gone out with numberous bug fixes. Grab it while its hot!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/04/18/how-can-i-send-a-message-to-multiple-destinations-using-a-messageproducer.xml
----------------------------------------------------------------------
diff --git a/2007/04/18/how-can-i-send-a-message-to-multiple-destinations-using-a-messageproducer.xml b/2007/04/18/how-can-i-send-a-message-to-multiple-destinations-using-a-messageproducer.xml
index e7e30d6..cb0863d 100644
--- a/2007/04/18/how-can-i-send-a-message-to-multiple-destinations-using-a-messageproducer.xml
+++ b/2007/04/18/how-can-i-send-a-message-to-multiple-destinations-using-a-messageproducer.xml
@@ -1,10 +1,8 @@
 <div class="wiki-content maincontent"><p>How can I send a message to multiple Destinations using a MessageProducer? The trick is to pass null in for the destination when you create it; then you can specify the destination on each send.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="1b0481f4-3aba-4bc2-a3a0-2ddac58514b0" ac:name="code" ac:schema-version="1"><plain-text-body>
 MessageProducer producer = session.createProducer(null);
 ...
 producer.send(destination, message);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/06/08/integrating-activemq-web-console.xml
----------------------------------------------------------------------
diff --git a/2007/06/08/integrating-activemq-web-console.xml b/2007/06/08/integrating-activemq-web-console.xml
index f051661..c1d3499 100644
--- a/2007/06/08/integrating-activemq-web-console.xml
+++ b/2007/06/08/integrating-activemq-web-console.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>There's an itneresting article on <a shape="rect" class="external-link" href="http://www.oreillynet.com/onjava/blog/2007/06/integrating_activemq_web_conso.html" rel="nofollow">Integrating ActiveMQ Web Console</a> by <a shape="rect" class="external-link" href="http://www.oreillynet.com/pub/au/1763" rel="nofollow">Dejan Bosanac</a> which is well worth a read. The next version of ActiveMQ, 5.0, will include the Web Console by default which should simplify things somewhat.</p></div>
+<div class="wiki-content maincontent"><p>There's an itneresting article on <a shape="rect" href="http://www.oreillynet.com/onjava/blog/2007/06/integrating_activemq_web_conso.html">Integrating ActiveMQ Web Console</a> by <a shape="rect" href="http://www.oreillynet.com/pub/au/1763">Dejan Bosanac</a> which is well worth a read. The next version of ActiveMQ, 5.0, will include the Web Console by default which should simplify things somewhat.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/06/27/more-articles-on-apache-activemq-activemessaging-and-rails.xml
----------------------------------------------------------------------
diff --git a/2007/06/27/more-articles-on-apache-activemq-activemessaging-and-rails.xml b/2007/06/27/more-articles-on-apache-activemq-activemessaging-and-rails.xml
index acad14d..3cfe103 100644
--- a/2007/06/27/more-articles-on-apache-activemq-activemessaging-and-rails.xml
+++ b/2007/06/27/more-articles-on-apache-activemq-activemessaging-and-rails.xml
@@ -1,6 +1,6 @@
-<div class="wiki-content maincontent"><p>There's been more interesting <a shape="rect" href="../../../articles.xml">Articles</a> lately on <a shape="rect" href="../../../index.xml">Apache ActiveMQ</a>, [ActiveMessaging and rails...</p>
+<div class="wiki-content maincontent"><p>There's been more interesting <link><page ri:content-title="Articles"></page></link> lately on <link><page ri:content-title="Index"></page><link-body>Apache ActiveMQ</link-body></link>, [ActiveMessaging and rails...</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://notdennisbyrne.blogspot.com/2007/06/integrating-rails-and-activemq-with.html" rel="nofollow">Integrating Rails and ActiveMQ with ActiveMessaging/REST</a> by <a shape="rect" class="external-link" href="http://notdennisbyrne.blogspot.com/" rel="nofollow">(not) Dennis Byrne</a></li><li><a shape="rect" class="external-link" href="http://beechbonanza.blogspot.com/2007/06/asynchronous-messaging-with-rails.html" rel="nofollow">Asynchronous Messaging with Rails</a> by <a shape="rect" class="external-link" href="http://beechbonanza.blogspot.com/" rel="nofollow">Shane Harvie</a></li></ul>
+<ul><li><a shape="rect" href="http://notdennisbyrne.blogspot.com/2007/06/integrating-rails-and-activemq-with.html">Integrating Rails and ActiveMQ with ActiveMessaging/REST</a> by <a shape="rect" href="http://notdennisbyrne.blogspot.com/">(not) Dennis Byrne</a></li><li><a shape="rect" href="http://beechbonanza.blogspot.com/2007/06/asynchronous-messaging-with-rails.html">Asynchronous Messaging with Rails</a> by <a shape="rect" href="http://beechbonanza.blogspot.com/">Shane Harvie</a></li></ul>
 
 
 <p>Check them out, they're both great.</p></div>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2007/12/15/apache-activemq-500-released.xml
----------------------------------------------------------------------
diff --git a/2007/12/15/apache-activemq-500-released.xml b/2007/12/15/apache-activemq-500-released.xml
index d17e0da..07661b8 100644
--- a/2007/12/15/apache-activemq-500-released.xml
+++ b/2007/12/15/apache-activemq-500-released.xml
@@ -1,7 +1,7 @@
-<div class="wiki-content maincontent"><p>I'm pleased to announce the Apache <a shape="rect" href="../../../activemq-500-release.xml">ActiveMQ 5.0.0 Release</a> has been made! Its packed with <a shape="rect" href="../../../new-features-in-50.xml">a ton of new features</a> such as:</p>
+<div class="wiki-content maincontent"><p>I'm pleased to announce the Apache <link><page ri:content-title="ActiveMQ 5.0.0 Release"></page></link> has been made! Its packed with <link><page ri:content-title="New Features in 5.0"></page><link-body>a ton of new features</link-body></link> such as:</p>
 
-<ul><li><a shape="rect" href="../../../amq-message-store.xml">AMQ Message Store</a> (Faster Persistence!)</li><li><a shape="rect" href="../../../message-cursors.xml">Message Cursors</a> (Producers don't block if you have a slow consumer)</li><li><a shape="rect" href="../../../blob-messages.xml">Blob Messages</a></li><li><a shape="rect" href="../../../command-agent.xml">Command Agent</a></li><li><a shape="rect" href="../../../enterprise-integration-patterns.xml">Enterprise Integration Patterns</a> via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel Integration</a></li><li><a shape="rect" href="../../../logging-a-warning-if-you-forget-to-start-a-connection.xml">Logging a warning if you forget to start a Connection</a></li><li><a shape="rect" href="../../../message-transformation.xml">Message Transformation</a></li><li><a shape="rect" href="../../../mirrored-queues.xml">Mirrored Queues</a></li><li><a shape="rect" href="../../../producer-flow-control
 .xml">Producer Flow Control</a></li></ul>
+<ul><li><link><page ri:content-title="AMQ Message Store"></page></link> (Faster Persistence!)</li><li><link><page ri:content-title="Message Cursors"></page></link> (Producers don't block if you have a slow consumer)</li><li><link><page ri:content-title="Blob Messages"></page></link></li><li><link><page ri:content-title="Command Agent"></page></link></li><li><link><page ri:content-title="Enterprise Integration Patterns"></page></link> via <a shape="rect" href="http://activemq.apache.org/camel/">Camel Integration</a></li><li><link><page ri:content-title="Logging a warning if you forget to start a Connection"></page></link></li><li><link><page ri:content-title="Message Transformation"></page></link></li><li><link><page ri:content-title="Mirrored Queues"></page></link></li><li><link><page ri:content-title="Producer Flow Control"></page></link></li></ul>
 
 
-<p><a shape="rect" href="../../../activemq-500-release.xml">Download it</a> today!</p></div>
+<p><link><page ri:content-title="ActiveMQ 5.0.0 Release"></page><link-body>Download it</link-body></link> today!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2008/04/28/javaone-meetup-2008.xml
----------------------------------------------------------------------
diff --git a/2008/04/28/javaone-meetup-2008.xml b/2008/04/28/javaone-meetup-2008.xml
index 763c8b8..1ab857e 100644
--- a/2008/04/28/javaone-meetup-2008.xml
+++ b/2008/04/28/javaone-meetup-2008.xml
@@ -1,11 +1,11 @@
-<div class="wiki-content maincontent"><h1 id="JavaOneMeetup2008-JavaOneMeetup2008">JavaOne Meetup 2008 </h1>
+<div class="wiki-content maincontent"><h1>JavaOne Meetup 2008 </h1>
 
-<h2 id="JavaOneMeetup2008-ComemeetwiththefolksbehindApacheActiveMQ,Camel,CXFandServiceMixatJavaOne!">Come meet with the folks behind Apache ActiveMQ, Camel, CXF and ServiceMix at JavaOne! </h2>
+<h2>Come meet with the folks behind Apache ActiveMQ, Camel, CXF and ServiceMix at JavaOne! </h2>
 
-<div class="sectionColumnWrapper"><div class="sectionMacro">
-<div class="sectionMacroRow"><div class="columnMacro">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="javaone-meetup-2008.data/javaone-logo.gif" data-image-src="/confluence/download/attachments/84434/javaone-logo.gif?version=1&amp;modificationDate=1209384762000&amp;api=v2" data-unresolved-comment-count="0" data-linked-resource-id="59672124" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="javaone-logo.gif" data-base-url="https://cwiki.apache.org/confluence" data-linked-resource-content-type="image/gif" data-linked-resource-container-id="84434" data-linked-resource-container-version="5"></span></p></div>
-<div class="columnMacro">
-<p>Please join us for an evening of food, drinks, conversation and open source antics at the <a shape="rect" class="external-link" href="http://www.zebulonsf.com/" rel="nofollow">Zebulon Cafe</a> - (<a shape="rect" class="external-link" href="http://maps.google.com/maps?f=q&amp;hl=en&amp;geocode=&amp;q=83+Natoma+St,+San+Francisco,+CA&amp;sll=37.787187,-122.399256&amp;sspn=0.003705,0.003868&amp;ie=UTF8&amp;ll=37.785266,-122.401578&amp;spn=0.014822,0.015471&amp;t=h&amp;z=16" rel="nofollow">Google Map</a>) in San Francisco on Monday, May 5, 2008 from 6-9PM. Some of the Apache committers behind these dynamic projects that will be there include Dan Kulp, Hiram Chirino, Guillaume Nodet, Rob Davies, Chris Custine and Bruce Snyder. ActiveMQ and Camel are each readying the next releases, CXF just graduated from the Incubator and the shiny, new ServiceMix 4.0 release is right around the corner. A big thanks to <a shape="rect" class="external-link" href="http://open.iona.com/" rel="nofollow">I
 ONA Technologies</a> for sponsoring this event. We hope to see you there! </p></div></div></div></div>
-<p>In an attempt to help predict the head count, please <a shape="rect" class="external-link" href="http://tinyurl.com/3jmztl" rel="nofollow"><strong>add your name to the registration page</strong></a>. </p></div>
+<structured-macro ac:macro-id="6f2a684d-1242-465f-a1be-7bae4c02e8e3" ac:name="section" ac:schema-version="1"><rich-text-body>
+<structured-macro ac:macro-id="d37d7aa0-da35-4496-a655-3768daafc5c9" ac:name="column" ac:schema-version="1"><rich-text-body>
+<p><image><attachment ri:filename="javaone-logo.gif"></attachment></image></p></rich-text-body></structured-macro>
+<structured-macro ac:macro-id="861a23e3-45cf-414d-8f48-7170fdd7be94" ac:name="column" ac:schema-version="1"><rich-text-body>
+<p>Please join us for an evening of food, drinks, conversation and open source antics at the <a shape="rect" href="http://www.zebulonsf.com/">Zebulon Cafe</a> - (<a shape="rect" href="http://maps.google.com/maps?f=q&amp;hl=en&amp;geocode=&amp;q=83+Natoma+St,+San+Francisco,+CA&amp;sll=37.787187,-122.399256&amp;sspn=0.003705,0.003868&amp;ie=UTF8&amp;ll=37.785266,-122.401578&amp;spn=0.014822,0.015471&amp;t=h&amp;z=16">Google Map</a>) in San Francisco on Monday, May 5, 2008 from 6-9PM. Some of the Apache committers behind these dynamic projects that will be there include Dan Kulp, Hiram Chirino, Guillaume Nodet, Rob Davies, Chris Custine and Bruce Snyder. ActiveMQ and Camel are each readying the next releases, CXF just graduated from the Incubator and the shiny, new ServiceMix 4.0 release is right around the corner. A big thanks to <a shape="rect" href="http://open.iona.com/">IONA Technologies</a> for sponsoring this event. We hope to see you there! </p></rich-text-body></structured-mac
 ro></rich-text-body></structured-macro>
+<p>In an attempt to help predict the head count, please <a shape="rect" href="http://tinyurl.com/3jmztl"><strong>add your name to the registration page</strong></a>. </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2008/05/07/activemq-510-released.xml
----------------------------------------------------------------------
diff --git a/2008/05/07/activemq-510-released.xml b/2008/05/07/activemq-510-released.xml
index 2a607a7..60a6546 100644
--- a/2008/05/07/activemq-510-released.xml
+++ b/2008/05/07/activemq-510-released.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-510-release.html">ActiveMQ 5.1.0 Release</a>. <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-510-release.html">ActiveMQ 5.1.0</a> is a much more stable message broker than 5.0.0 and we highly encourage all the 5.0.0 users to upgrade to this release.</p>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the <a shape="rect" href="http://activemq.apache.org/activemq-510-release.html">ActiveMQ 5.1.0 Release</a>. <a shape="rect" href="http://activemq.apache.org/activemq-510-release.html">ActiveMQ 5.1.0</a> is a much more stable message broker than 5.0.0 and we highly encourage all the 5.0.0 users to upgrade to this release.</p>
 
-<p>For more details on the fixed issues see the <a shape="rect" class="external-link" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11802&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a>.</p></div>
+<p>For more details on the fixed issues see the <a shape="rect" href="http://issues.apache.org/activemq/secure/ReleaseNote.jspa?version=11802&amp;styleName=Html&amp;projectId=10520&amp;Create=Create">release notes</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2008/11/21/apache-activemq-520-released.xml
----------------------------------------------------------------------
diff --git a/2008/11/21/apache-activemq-520-released.xml b/2008/11/21/apache-activemq-520-released.xml
index 02ec3ef..e89725a 100644
--- a/2008/11/21/apache-activemq-520-released.xml
+++ b/2008/11/21/apache-activemq-520-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.2.0. Full details of the release and download links can be found in the <a shape="rect" href="../../../activemq-520-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.2.0. Full details of the release and download links can be found in the <link><page ri:content-title="ActiveMQ 5.2.0 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/01/12/activemq-in-action-free-chapters-available.xml
----------------------------------------------------------------------
diff --git a/2009/01/12/activemq-in-action-free-chapters-available.xml b/2009/01/12/activemq-in-action-free-chapters-available.xml
index 84be6e4..86ae3d0 100644
--- a/2009/01/12/activemq-in-action-free-chapters-available.xml
+++ b/2009/01/12/activemq-in-action-free-chapters-available.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p><span class="confluence-embedded-file-wrapper image-right-wrapper"><img class="confluence-embedded-image confluence-external-resource image-right" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span></p>
+<div class="wiki-content maincontent"><p><image ac:align="right"><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image></p>
 
 <p><em>ActiveMQ in Action</em> is a thorough, practical guide to implementing message-oriented systems in Java using ActiveMQ. The book lays out the core of ActiveMQ in clear language, starting with the anatomy of a JMS message and moving quickly through connectors, message persistence, authentication and authorization. With the basics well in hand, you move into interesting examples of ActiveMQ at work, following a running Stock Portfolio application. You'll integrate ActiveMQ with containers like Geronimo and JBoss and learn to tie into popular Java-based technologies like Spring Framework.</p>
 
@@ -11,5 +11,5 @@
 <ul><li>High-level designers of loosely-coupled distributed systems that follow a Service Oriented Architecture (SOA)</li><li>Software developers creating applications that use the ActiveMQ message broker</li><li>System administrators that must maintain a software system based on the ActiveMQ message broker</li></ul>
 
 
-<p><a shape="rect" class="external-link" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140" rel="nofollow">Grab your copy of ActiveMQ in Action now!</a> </p></div>
+<p><a shape="rect" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140">Grab your copy of ActiveMQ in Action now!</a> </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/03/10/40-off-of-activemq-in-action.xml
----------------------------------------------------------------------
diff --git a/2009/03/10/40-off-of-activemq-in-action.xml b/2009/03/10/40-off-of-activemq-in-action.xml
index 4a24a97..53264eb 100644
--- a/2009/03/10/40-off-of-activemq-in-action.xml
+++ b/2009/03/10/40-off-of-activemq-in-action.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><p><span class="confluence-embedded-file-wrapper image-left-wrapper"><img class="confluence-embedded-image confluence-external-resource image-left" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span></p>
+<div class="wiki-content maincontent"><p><image ac:align="left"><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image></p>
 
-<h3 id="id-40%OffofActiveMQinAction!-Getitwhileit'shot!">Get it while it's hot! </h3>
+<h3>Get it while it's hot! </h3>
 
-<p>For a limited time you can get the definitive book on ActiveMQ at a 40% discount! This discount applies to either the print+ebook or just the ebook. Though we're still hard at work on the <a shape="rect" class="external-link" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140" rel="nofollow">ActiveMQ in Action</a> book, you can download the chapters as we write them from the Manning Early Access Program today. For the 40% discount, just use the coupon code <strong>activemq40</strong> at the time of checkout. Hurry and get this discounted price while it lasts because this offer expires on Monday, 23 March 2009. </p>
+<p>For a limited time you can get the definitive book on ActiveMQ at a 40% discount! This discount applies to either the print+ebook or just the ebook. Though we're still hard at work on the <a shape="rect" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140">ActiveMQ in Action</a> book, you can download the chapters as we write them from the Manning Early Access Program today. For the 40% discount, just use the coupon code <strong>activemq40</strong> at the time of checkout. Hurry and get this discounted price while it lasts because this offer expires on Monday, 23 March 2009. </p>
 
-<h3 id="id-40%OffofActiveMQinAction!-IwanttopurchaseActiveMQinActiontoday!"><a shape="rect" class="external-link" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140" rel="nofollow">I want to purchase ActiveMQ in Action today!</a></h3></div>
+<h3><a shape="rect" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140">I want to purchase ActiveMQ in Action today!</a></h3></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/04/17/continuous-integration-server.xml
----------------------------------------------------------------------
diff --git a/2009/04/17/continuous-integration-server.xml b/2009/04/17/continuous-integration-server.xml
index fbd6d1b..4195321 100644
--- a/2009/04/17/continuous-integration-server.xml
+++ b/2009/04/17/continuous-integration-server.xml
@@ -1,8 +1,7 @@
-<div class="wiki-content maincontent"><p>ActiveMQ has been added to <a shape="rect" class="external-link" href="http://hudson.dev.java.net/" rel="nofollow">Hudson continuous-integration server</a> instance at Apache <a shape="rect" class="external-link" href="http://hudson.zones.apache.org/hudson/job/ActiveMQ/">http://hudson.zones.apache.org/hudson/job/ActiveMQ/</a>. Now you can have more insight into test runs and snapshot builds. Hudson will also send failure reports to our dev mailing list, making us address them promptly.<br clear="none">
+<div class="wiki-content maincontent"><p>ActiveMQ has been added to <a shape="rect" href="http://hudson.dev.java.net/">Hudson continuous-integration server</a> instance at Apache <a shape="rect" href="http://hudson.zones.apache.org/hudson/job/ActiveMQ/">http://hudson.zones.apache.org/hudson/job/ActiveMQ/</a>. Now you can have more insight into test runs and snapshot builds. Hudson will also send failure reports to our dev mailing list, making us address them promptly.<br clear="none">
 As a part of this change, the snapshots location and Maven repository has changed. If you're using ActiveMQ snapshots in your projects, be sure to add the following repository to your Maven configuration:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;repositories&gt;
+<structured-macro ac:macro-id="325943c3-a50e-4541-b3ee-d6876648c825" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>&lt;repositories&gt;
   &lt;repository&gt;
     &lt;id&gt;hudson.snapshots&lt;/id&gt;
     &lt;url&gt;https://repository.apache.org/content/repositories/snapshots/&lt;/url&gt;
@@ -10,6 +9,5 @@ As a part of this change, the snapshots location and Maven repository has change
       &lt;enabled&gt;false&lt;/enabled&gt;
     &lt;/releases&gt;
   &lt;/repository&gt;
-&lt;/repositories&gt;]]></script>
-</div></div></div>
+&lt;/repositories&gt;</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/08/07/activemq-reference-guide-kit-from-ttm-solutions-now-available.xml
----------------------------------------------------------------------
diff --git a/2009/08/07/activemq-reference-guide-kit-from-ttm-solutions-now-available.xml b/2009/08/07/activemq-reference-guide-kit-from-ttm-solutions-now-available.xml
index 8d6dba2..d47fbee 100644
--- a/2009/08/07/activemq-reference-guide-kit-from-ttm-solutions-now-available.xml
+++ b/2009/08/07/activemq-reference-guide-kit-from-ttm-solutions-now-available.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h3 id="ActiveMQReferenceGuideKitfromTTMSolutionsNowAvailable-ActiveMQReferenceGuideKitfromTTMSolutionsNowAvailable">ActiveMQ Reference Guide Kit from TTM Solutions Now Available </h3>
+<div class="wiki-content maincontent"><h3>ActiveMQ Reference Guide Kit from TTM Solutions Now Available </h3>
 
 <p>The Apache ActiveMQ Reference Guide Kit from Total Transaction Management (TTM) is an excellent programmers resource to help you implement, deploy, administer, and tune Apache ActiveMQ based systems.</p>
 
 <p>Besides the Reference Guide, you will also receive sample applications called SecureChat and StockWatch, and a file based Security Plugin. The annual $20 subscription includes updates and enhancements throughout the year, as the Reference Guide Kit is updated to reflect Apache ActiveMQ changes and enhancements.</p>
 
-<p><a shape="rect" class="external-link" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php" rel="nofollow">Click here for the ActiveMQ Reference Guide Kit</a></p></div>
+<p><a shape="rect" href="http://www.ttmsolutions.com/Apache_Software/ActiveMQ_Reference_Guide.php">Click here for the ActiveMQ Reference Guide Kit</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/10/13/activemq-530-released.xml
----------------------------------------------------------------------
diff --git a/2009/10/13/activemq-530-released.xml b/2009/10/13/activemq-530-released.xml
index 8b6f5f8..f659df1 100644
--- a/2009/10/13/activemq-530-released.xml
+++ b/2009/10/13/activemq-530-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.0. Full details of the release and download links can be found in the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-530-release.html">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.0. Full details of the release and download links can be found in the <a shape="rect" href="http://activemq.apache.org/activemq-530-release.html">release page</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2009/10/13/apache-activemq-530-has-an-official-specjms2007-result.xml
----------------------------------------------------------------------
diff --git a/2009/10/13/apache-activemq-530-has-an-official-specjms2007-result.xml b/2009/10/13/apache-activemq-530-has-an-official-specjms2007-result.xml
index 4490fd4..a92f330 100644
--- a/2009/10/13/apache-activemq-530-has-an-official-specjms2007-result.xml
+++ b/2009/10/13/apache-activemq-530-has-an-official-specjms2007-result.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.3.0 has an official <a shape="rect" class="external-link" href="http://www.spec.org/jms2007/" rel="nofollow">SPECjms2007&#174;</a> result, thanks to some great work by <a shape="rect" class="external-link" href="http://www.dvs.tu-darmstadt.de/staff/ksachs/" rel="nofollow">Kai Sachs</a> from the <a shape="rect" class="external-link" href="http://www.dvs.tu-darmstadt.de/" rel="nofollow">Databases and Distributed Systems Group</a> at the Technical University Darmstadt in Germany. Complete details can be found in the official results submission that is linked from the <a shape="rect" class="external-link" href="http://www.dvs.tu-darmstadt.de/news/specjms2007Results.html" rel="nofollow">announcement</a>.<br clear="none">
+<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.3.0 has an official <a shape="rect" href="http://www.spec.org/jms2007/">SPECjms2007&#174;</a> result, thanks to some great work by <a shape="rect" href="http://www.dvs.tu-darmstadt.de/staff/ksachs/">Kai Sachs</a> from the <a shape="rect" href="http://www.dvs.tu-darmstadt.de/">Databases and Distributed Systems Group</a> at the Technical University Darmstadt in Germany. Complete details can be found in the official results submission that is linked from the <a shape="rect" href="http://www.dvs.tu-darmstadt.de/news/specjms2007Results.html">announcement</a>.<br clear="none">
 Needless to say, 5.3.0 does nicely in both horizontal (number of destinations) and vertical (load per destination) scalability.<br clear="none">
 It is fitting to see Apache ActiveMQ being used in the world's first SPECjms2007 submission.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/03/23/activemq-531-released.xml
----------------------------------------------------------------------
diff --git a/2010/03/23/activemq-531-released.xml b/2010/03/23/activemq-531-released.xml
index 9ca3c52..096b310 100644
--- a/2010/03/23/activemq-531-released.xml
+++ b/2010/03/23/activemq-531-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.1. Full details of the release and download links can be found in the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-531-release.html">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.1. Full details of the release and download links can be found in the <a shape="rect" href="http://activemq.apache.org/activemq-531-release.html">release page</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/05/11/activemq-532-released.xml
----------------------------------------------------------------------
diff --git a/2010/05/11/activemq-532-released.xml b/2010/05/11/activemq-532-released.xml
index a58d41d..c62c01e 100644
--- a/2010/05/11/activemq-532-released.xml
+++ b/2010/05/11/activemq-532-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.2. Full details of the release and download links can be found on the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-532-release.html">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.3.2. Full details of the release and download links can be found on the <a shape="rect" href="http://activemq.apache.org/activemq-532-release.html">release page</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/05/18/50-off-activemq-in-action.xml
----------------------------------------------------------------------
diff --git a/2010/05/18/50-off-activemq-in-action.xml b/2010/05/18/50-off-activemq-in-action.xml
index 5896ce5..54373a4 100644
--- a/2010/05/18/50-off-activemq-in-action.xml
+++ b/2010/05/18/50-off-activemq-in-action.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><p><span class="confluence-embedded-file-wrapper image-left-wrapper"><img class="confluence-embedded-image confluence-external-resource image-left" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span> </p>
+<div class="wiki-content maincontent"><p><image ac:align="left"><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image> </p>
 
-<h3 id="id-50%OffActiveMQInAction!-50%OffActiveMQInAction!">50% Off ActiveMQ In Action! </h3>
+<h3>50% Off ActiveMQ In Action! </h3>
 
-<p>The <a shape="rect" class="external-link" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140" rel="nofollow">ActiveMQ In Action</a> book has made available a new early access release before going into final review and copy editing. All 14 chapters are included in this MEAP release. </p>
+<p>The <a shape="rect" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140">ActiveMQ In Action</a> book has made available a new early access release before going into final review and copy editing. All 14 chapters are included in this MEAP release. </p>
 
 <p>For a limited time you can get the definitive book on ActiveMQ at a 50% discount! Just use the coupon code <strong>activemq50</strong> at the time of checkout. Hurry and get this discounted price while it lasts because this offer expires on Monday, May 31, 2010. </p>
 
-<h3 id="id-50%OffActiveMQInAction!-IwanttopurchaseActiveMQinActiontoday!"><a shape="rect" class="external-link" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140" rel="nofollow">I want to purchase ActiveMQ in Action today!</a> </h3></div>
+<h3><a shape="rect" href="http://www.manning.com/affiliate/idevaffiliate.php?id=1063_140">I want to purchase ActiveMQ in Action today!</a> </h3></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/06/29/free-excerpt-from-activemq-in-action.xml
----------------------------------------------------------------------
diff --git a/2010/06/29/free-excerpt-from-activemq-in-action.xml b/2010/06/29/free-excerpt-from-activemq-in-action.xml
index 0050ebe..44eccdd 100644
--- a/2010/06/29/free-excerpt-from-activemq-in-action.xml
+++ b/2010/06/29/free-excerpt-from-activemq-in-action.xml
@@ -1,3 +1,3 @@
-<div class="wiki-content maincontent"><div class="sectionColumnWrapper"><div class="sectionMacro"><div class="sectionMacroRow"><div class="columnMacro"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span> <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.manning.com/ibsen/ibsen_cover150.jpg" data-image-src="http://www.manning.com/ibsen/ibsen_cover150.jpg"></span></p></div><div class="columnMacro"><p> <a shape="rect" class="external-link" href="http://fusesource.com" rel="nofollow">FuseSource</a> is offering a free excerpt from <a shape="rect" class="external-link" href="http://manning.com/snyder" rel="nofollow">ActiveMQ in Action</a> and <a shape="rect" class="external-link" href="http://manning.com/ibsen" rel=
 "nofollow">Camel in Action</a> books at <a shape="rect" class="external-link" href="http://fusesource.com/fuse/apache-books/" rel="nofollow">http://fusesource.com/fuse/apache-books/</a>. <br clear="none">
-Find out more on how ActiveMQ stores messages and what's the role of transactions in Camel and get your discount.</p></div></div></div></div></div>
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="3d2a508e-ad39-4a9b-94f4-c7017a450eeb" ac:name="section" ac:schema-version="1"><rich-text-body><structured-macro ac:macro-id="9d2cd6de-f0f3-4393-9aec-a11bd1b1a104" ac:name="column" ac:schema-version="1"><rich-text-body><p><image><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image> <image><url ri:value="http://www.manning.com/ibsen/ibsen_cover150.jpg"></url></image></p></rich-text-body></structured-macro><structured-macro ac:macro-id="d06eb367-ccf4-4718-a8bf-a4f49c9f0972" ac:name="column" ac:schema-version="1"><rich-text-body><p> <a shape="rect" href="http://fusesource.com">FuseSource</a> is offering a free excerpt from <a shape="rect" href="http://manning.com/snyder">ActiveMQ in Action</a> and <a shape="rect" href="http://manning.com/ibsen">Camel in Action</a> books at <a shape="rect" href="http://fusesource.com/fuse/apache-books/">http://fusesource.com/fuse/apache-books/</a>. <br clear="
 none">
+Find out more on how ActiveMQ stores messages and what's the role of transactions in Camel and get your discount.</p></rich-text-body></structured-macro></rich-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/08/17/apache-activemq-540-released.xml
----------------------------------------------------------------------
diff --git a/2010/08/17/apache-activemq-540-released.xml b/2010/08/17/apache-activemq-540-released.xml
index 68cc171..819f2bd 100644
--- a/2010/08/17/apache-activemq-540-released.xml
+++ b/2010/08/17/apache-activemq-540-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.4.0. Full details of the release and download links can be found on the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-540-release.html">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce ActiveMQ 5.4.0. Full details of the release and download links can be found on the <a shape="rect" href="http://activemq.apache.org/activemq-540-release.html">release page</a>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/09/03/official-activemq-540-specjms2007-result-confirms-45-60-performance-improvement.xml
----------------------------------------------------------------------
diff --git a/2010/09/03/official-activemq-540-specjms2007-result-confirms-45-60-performance-improvement.xml b/2010/09/03/official-activemq-540-specjms2007-result-confirms-45-60-performance-improvement.xml
index 2cef375..f35deec 100644
--- a/2010/09/03/official-activemq-540-specjms2007-result-confirms-45-60-performance-improvement.xml
+++ b/2010/09/03/official-activemq-540-specjms2007-result-confirms-45-60-performance-improvement.xml
@@ -1,3 +1,3 @@
-<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.4.0 has an official <a shape="rect" class="external-link" href="http://www.spec.org/jms2007/" rel="nofollow">SPECjms2007&#174;</a> result, thanks to the <a shape="rect" class="external-link" href="http://www.dvs.tu-darmstadt.de/" rel="nofollow">Databases and Distributed Systems Group</a> at the Technical University Darmstadt in Germany. Complete details can be found in the official result submissions: <a shape="rect" class="external-link" href="http://www.spec.org/jms2007/results/res2010q3/jms2007-20100802-00021.html" rel="nofollow">227 SPECjms2007@Vertical</a> and <a shape="rect" class="external-link" href="http://www.spec.org/jms2007/results/res2010q3/jms2007-20100802-00022.html" rel="nofollow">100 SPECjms2007@Horizontal</a>.<br clear="none">
+<div class="wiki-content maincontent"><p>Apache ActiveMQ 5.4.0 has an official <a shape="rect" href="http://www.spec.org/jms2007/">SPECjms2007&#174;</a> result, thanks to the <a shape="rect" href="http://www.dvs.tu-darmstadt.de/">Databases and Distributed Systems Group</a> at the Technical University Darmstadt in Germany. Complete details can be found in the official result submissions: <a shape="rect" href="http://www.spec.org/jms2007/results/res2010q3/jms2007-20100802-00021.html">227 SPECjms2007@Vertical</a> and <a shape="rect" href="http://www.spec.org/jms2007/results/res2010q3/jms2007-20100802-00022.html">100 SPECjms2007@Horizontal</a>.<br clear="none">
 If you were happy with the performance of version 5.3.0, 5.4.0 will make you smile brighter, depending on your work load it will be between 45% and 60% better.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/09/22/apache-activemq-541-released.xml
----------------------------------------------------------------------
diff --git a/2010/09/22/apache-activemq-541-released.xml b/2010/09/22/apache-activemq-541-released.xml
index f07e001..97e8317 100644
--- a/2010/09/22/apache-activemq-541-released.xml
+++ b/2010/09/22/apache-activemq-541-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the ActiveMQ 5.4.1 maintenance release. Full details of the release and download links can be found on the <a shape="rect" href="../../../activemq-541-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the ActiveMQ 5.4.1 maintenance release. Full details of the release and download links can be found on the <link><page ri:content-title="ActiveMQ 5.4.1 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2010/12/02/apache-activemq-542-released.xml
----------------------------------------------------------------------
diff --git a/2010/12/02/apache-activemq-542-released.xml b/2010/12/02/apache-activemq-542-released.xml
index 03e04fc..5151152 100644
--- a/2010/12/02/apache-activemq-542-released.xml
+++ b/2010/12/02/apache-activemq-542-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the ActiveMQ 5.4.2 maintenance release. Full details of the release and download links can be found on the <a shape="rect" href="../../../activemq-542-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is pleased to announce the ActiveMQ 5.4.2 maintenance release. Full details of the release and download links can be found on the <link><page ri:content-title="ActiveMQ 5.4.2 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2011/04/01/apache-activemq-550-released.xml
----------------------------------------------------------------------
diff --git a/2011/04/01/apache-activemq-550-released.xml b/2011/04/01/apache-activemq-550-released.xml
index 1775801..d08e060 100644
--- a/2011/04/01/apache-activemq-550-released.xml
+++ b/2011/04/01/apache-activemq-550-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce ActiveMQ 5.5.0. Full details of the release and download links can be found on the <a shape="rect" href="../../../activemq-550-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce ActiveMQ 5.5.0. Full details of the release and download links can be found on the <link><page ri:content-title="ActiveMQ 5.5.0 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2011/04/04/activemq-in-action-is-now-available-in-print-and-e-book.xml
----------------------------------------------------------------------
diff --git a/2011/04/04/activemq-in-action-is-now-available-in-print-and-e-book.xml b/2011/04/04/activemq-in-action-is-now-available-in-print-and-e-book.xml
index 5531d4d..078cee3 100644
--- a/2011/04/04/activemq-in-action-is-now-available-in-print-and-e-book.xml
+++ b/2011/04/04/activemq-in-action-is-now-available-in-print-and-e-book.xml
@@ -1,10 +1,10 @@
-<div class="wiki-content maincontent"><p><span class="confluence-embedded-file-wrapper image-left-wrapper"><img class="confluence-embedded-image confluence-external-resource image-left" src="http://www.manning.com/snyder/snyder_cover150.jpg" data-image-src="http://www.manning.com/snyder/snyder_cover150.jpg"></span> </p>
+<div class="wiki-content maincontent"><p><image ac:align="left"><url ri:value="http://www.manning.com/snyder/snyder_cover150.jpg"></url></image> </p>
 
-<h3 id="ActiveMQInActionisNowAvailableinPrintandE-Book!-ActiveMQInActionisNowAvailableinPrintandE-Book!">ActiveMQ In Action is Now Available in Print and E-Book! </h3>
+<h3>ActiveMQ In Action is Now Available in Print and E-Book! </h3>
 
-<p>The <a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ In Action</a> book has now been fully released in both e-book and in print &#8211; get your own copy today! </p>
+<p>The <a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ In Action</a> book has now been fully released in both e-book and in print &#8211; get your own copy today! </p>
 
-<p><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ In Action</a>, the definitive guide to master ActiveMQ is now available in print and ebook. ActiveMQ in Action starts from the anatomy of a JMS message and moves quickly through connectors, message persistence, authentication, and authorization. By following a running example (a stock portfolio app), you&#8217;ll pick up the best practices distilled by the authors from their long and deep involvement with this technology. Every Manning Publications print book purchase includes a complimentary ebook which comes in three formats: PDF, mobi, and epub when available. </p>
+<p><a shape="rect" href="http://bit.ly/2je6cQ">ActiveMQ In Action</a>, the definitive guide to master ActiveMQ is now available in print and ebook. ActiveMQ in Action starts from the anatomy of a JMS message and moves quickly through connectors, message persistence, authentication, and authorization. By following a running example (a stock portfolio app), you&#8217;ll pick up the best practices distilled by the authors from their long and deep involvement with this technology. Every Manning Publications print book purchase includes a complimentary ebook which comes in three formats: PDF, mobi, and epub when available. </p>
 
-<h3 id="ActiveMQInActionisNowAvailableinPrintandE-Book!-IwanttopurchaseActiveMQinActionnow!"><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">I want to purchase ActiveMQ in Action now!</a> </h3></div>
+<h3><a shape="rect" href="http://bit.ly/2je6cQ">I want to purchase ActiveMQ in Action now!</a> </h3></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/04/27/activemq-cpp-version-342-released.xml
----------------------------------------------------------------------
diff --git a/2012/04/27/activemq-cpp-version-342-released.xml b/2012/04/27/activemq-cpp-version-342-released.xml
index 3065cf4..2eb9707 100644
--- a/2012/04/27/activemq-cpp-version-342-released.xml
+++ b/2012/04/27/activemq-cpp-version-342-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="../../../cms/activemq-cpp-342-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.2 Release" ri:space-key="AMQCPP"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/05/04/apachenmsactivemq-v155-released.xml
----------------------------------------------------------------------
diff --git a/2012/05/04/apachenmsactivemq-v155-released.xml b/2012/05/04/apachenmsactivemq-v155-released.xml
index de0ec39..bd4c5fe 100644
--- a/2012/05/04/apachenmsactivemq-v155-released.xml
+++ b/2012/05/04/apachenmsactivemq-v155-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>Today marks the official release of <a shape="rect" href="../../../nms/download.xml">Apache.NMS.ActiveMQ</a> v1.5.5. We put a lot of work into this one fixing bugs that were found since the 1.5.4 release. This release features a fix for a critical issue related to connection failure. </p></div>
+<div class="wiki-content maincontent"><p>Today marks the official release of <link><page ri:content-title="Download" ri:space-key="NMS"></page><link-body>Apache.NMS.ActiveMQ</link-body></link> v1.5.5. We put a lot of work into this one fixing bugs that were found since the 1.5.4 release. This release features a fix for a critical issue related to connection failure. </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/05/07/apache-activemq-560-released.xml
----------------------------------------------------------------------
diff --git a/2012/05/07/apache-activemq-560-released.xml b/2012/05/07/apache-activemq-560-released.xml
index 71baf31..b232118 100644
--- a/2012/05/07/apache-activemq-560-released.xml
+++ b/2012/05/07/apache-activemq-560-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce ActiveMQ 5.6.0. Full details of the release and download links can be found on the <a shape="rect" href="../../../activemq-560-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce ActiveMQ 5.6.0. Full details of the release and download links can be found on the <link><page ri:content-title="ActiveMQ 5.6.0 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/06/02/activemq-cpp-version-343-released.xml
----------------------------------------------------------------------
diff --git a/2012/06/02/activemq-cpp-version-343-released.xml b/2012/06/02/activemq-cpp-version-343-released.xml
index f34c136..b575784 100644
--- a/2012/06/02/activemq-cpp-version-343-released.xml
+++ b/2012/06/02/activemq-cpp-version-343-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="../../../cms/activemq-cpp-343-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.3 Release" ri:space-key="AMQCPP"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/06/29/activemq-cpp-version-344-released.xml
----------------------------------------------------------------------
diff --git a/2012/06/29/activemq-cpp-version-344-released.xml b/2012/06/29/activemq-cpp-version-344-released.xml
index 2f534b5..244d3c8 100644
--- a/2012/06/29/activemq-cpp-version-344-released.xml
+++ b/2012/06/29/activemq-cpp-version-344-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="../../../cms/activemq-cpp-344-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of <a shape="rect" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.4.4 Release" ri:space-key="AMQCPP"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/10/08/apache-activemq-570-released.xml
----------------------------------------------------------------------
diff --git a/2012/10/08/apache-activemq-570-released.xml b/2012/10/08/apache-activemq-570-released.xml
index 4891c94..05fc721 100644
--- a/2012/10/08/apache-activemq-570-released.xml
+++ b/2012/10/08/apache-activemq-570-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce Apache ActiveMQ 5.7.0. All details of the release and download links can be found on the <a shape="rect" href="../../../activemq-570-release.xml">release page</a>.</p></div>
+<div class="wiki-content maincontent"><p>The ActiveMQ team is delighted to announce Apache ActiveMQ 5.7.0. All details of the release and download links can be found on the <link><page ri:content-title="ActiveMQ 5.7.0 Release"></page><link-body>release page</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/10/12/activemq-cpp-v345-released.xml
----------------------------------------------------------------------
diff --git a/2012/10/12/activemq-cpp-v345-released.xml b/2012/10/12/activemq-cpp-v345-released.xml
index 74a2ff3..5512671 100644
--- a/2012/10/12/activemq-cpp-v345-released.xml
+++ b/2012/10/12/activemq-cpp-v345-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can <a shape="rect" href="../../../cms/activemq-cpp-345-release.xml">download</a> the source bundles here.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can <link><page ri:content-title="ActiveMQ-CPP 3.4.5 Release" ri:space-key="AMQCPP"></page><link-body>download</link-body></link> the source bundles here.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2012/12/21/activemq-cpp-version-350-released.xml
----------------------------------------------------------------------
diff --git a/2012/12/21/activemq-cpp-version-350-released.xml b/2012/12/21/activemq-cpp-version-350-released.xml
index 001b439..99acc8a 100644
--- a/2012/12/21/activemq-cpp-version-350-released.xml
+++ b/2012/12/21/activemq-cpp-version-350-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="../../../cms/activemq-cpp-350-release.xml">here</a>.</p></div>
+<div class="wiki-content maincontent"><p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <link><page ri:content-title="ActiveMQ-CPP 3.5.0 Release" ri:space-key="AMQCPP"></page><link-body>here</link-body></link>.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2013/02/12/apache-activemq-580-released.xml
----------------------------------------------------------------------
diff --git a/2013/02/12/apache-activemq-580-released.xml b/2013/02/12/apache-activemq-580-released.xml
index de997a2..2441f45 100644
--- a/2013/02/12/apache-activemq-580-released.xml
+++ b/2013/02/12/apache-activemq-580-released.xml
@@ -1,8 +1,8 @@
 <div class="wiki-content maincontent"><p>The Apache ActiveMQ team is delighted to announce the release of Apache ActiveMQ 5.8.0.</p>
 
-<p>This release adds <a shape="rect" href="../../../amqp.xml">AMQP</a> support and resolves 160 issues and enhancements.</p>
+<p>This release adds <link><page ri:content-title="amqp"></page><link-body>AMQP</link-body></link> support and resolves 160 issues and enhancements.</p>
 
-<p>Full details and download link can be found in the <a shape="rect" href="../../../activemq-580-release.xml">release</a> page.</p>
+<p>Full details and download link can be found in the <link><page ri:content-title="activemq 5.8.0 release"></page><link-body>release</link-body></link> page.</p>
 
 <p>A big thanks to everyone who contributed to this release.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2013/06/10/apachenmsactivemq-v160-released.xml
----------------------------------------------------------------------
diff --git a/2013/06/10/apachenmsactivemq-v160-released.xml b/2013/06/10/apachenmsactivemq-v160-released.xml
index f6d15b0..18445da 100644
--- a/2013/06/10/apachenmsactivemq-v160-released.xml
+++ b/2013/06/10/apachenmsactivemq-v160-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>After almost a year we've <a shape="rect" class="external-link" href="http://activemq.apache.org/nms/apachenmsactivemq-v160.html">released v1.6.0</a> of Apache.NMS.ActiveMQ.  This version offers many new features and fixes many issues that were found over the course of the last year.  The release implement the Apache.NMS API v1.6.0</p></div>
+<div class="wiki-content maincontent"><p>After almost a year we've <a shape="rect" href="http://activemq.apache.org/nms/apachenmsactivemq-v160.html">released v1.6.0</a> of Apache.NMS.ActiveMQ.  This version offers many new features and fixes many issues that were found over the course of the last year.  The release implement the Apache.NMS API v1.6.0</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2013/10/21/apache-activemq-590-released.xml
----------------------------------------------------------------------
diff --git a/2013/10/21/apache-activemq-590-released.xml b/2013/10/21/apache-activemq-590-released.xml
index 33b812d..a3a702b 100644
--- a/2013/10/21/apache-activemq-590-released.xml
+++ b/2013/10/21/apache-activemq-590-released.xml
@@ -4,7 +4,7 @@
 <ul><li>New hawtio web console</li><li>Replicated leveldb message store</li><li>Runtime configuration</li></ul>
 
 
-<p>Full details and download link can be found in the <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-590-release.html">release page</a></p>
+<p>Full details and download link can be found in the <a shape="rect" href="http://activemq.apache.org/activemq-590-release.html">release page</a></p>
 
 <p>A big thanks to everyone who contributed to this release.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2014/06/10/apache-activemq-5100-released.xml
----------------------------------------------------------------------
diff --git a/2014/06/10/apache-activemq-5100-released.xml b/2014/06/10/apache-activemq-5100-released.xml
index 431f4ed..ba721f8 100644
--- a/2014/06/10/apache-activemq-5100-released.xml
+++ b/2014/06/10/apache-activemq-5100-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(0,0,0);">The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.0.</span></p><p><span style="color: rgb(0,0,0);">This release addresses over 200 issues and introduces many improvements particularly in MQTT and AMQP support.</span></p><p><span style="color: rgb(0,0,0);">&#160;</span></p><p>Full details and download link can be found in the&#160;<a shape="rect" href="../../../activemq-5100-release.xml">release page</a></p><p><span style="color: rgb(0,0,0);">&#160;</span></p><p>A big thanks to everyone who contributed to this release.</p><p><span style="color: rgb(0,0,0);"><br clear="none"></span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(0,0,0);">The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.0.</span></p><p><span style="color: rgb(0,0,0);">This release addresses over 200 issues and introduces many improvements particularly in MQTT and AMQP support.</span></p><p><span style="color: rgb(0,0,0);">&#160;</span></p><p>Full details and download link can be found in the&#160;<link><page ri:content-title="ActiveMQ 5.10.0 Release"></page><plain-text-link-body>release page</plain-text-link-body></link></p><p><span style="color: rgb(0,0,0);">&#160;</span></p><p>A big thanks to everyone who contributed to this release.</p><p><span style="color: rgb(0,0,0);"><br clear="none"></span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/01/22/apache-activemq-5101-released.xml
----------------------------------------------------------------------
diff --git a/2015/01/22/apache-activemq-5101-released.xml b/2015/01/22/apache-activemq-5101-released.xml
index 6c7a4ba..0fd6364 100644
--- a/2015/01/22/apache-activemq-5101-released.xml
+++ b/2015/01/22/apache-activemq-5101-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.1.</p><p>This release addresses several issues in the 5.10.0 release.</p><p>Thank you to all of the contributors, helping to make ActiveMQ more stable.</p><p>&#160;</p><p>Please see the&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5101-release.html">release page</a> for download links and more information!</p><p>&#160;</p></div>
+<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.1.</p><p>This release addresses several issues in the 5.10.0 release.</p><p>Thank you to all of the contributors, helping to make ActiveMQ more stable.</p><p>&#160;</p><p>Please see the&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5101-release.html">release page</a> for download links and more information!</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/02/04/apache-activemq-5110-released.xml
----------------------------------------------------------------------
diff --git a/2015/02/04/apache-activemq-5110-released.xml b/2015/02/04/apache-activemq-5110-released.xml
index 4a64c84..6536b38 100644
--- a/2015/02/04/apache-activemq-5110-released.xml
+++ b/2015/02/04/apache-activemq-5110-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of <a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5110-release.html">ActiveMQ 5.11.0</a></span></p><p><span style="color: rgb(34,34,34);line-height: 1.4285715;">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p><div><span style="color: rgb(34,34,34);"><br clear="none"></span></div><p><br clear="none"><span style="color: rgb(34,34,34);">&#160;</span></p></div>
+<div class="wiki-content maincontent"><p><span style="color: rgb(34,34,34);">The ActiveMQ team is delighted to announce the release of <a shape="rect" href="http://activemq.apache.org/activemq-5110-release.html">ActiveMQ 5.11.0</a></span></p><p><span style="color: rgb(34,34,34);line-height: 1.4285715;">A hearty thanks to everyone who contributed to this release.</span></p><p><span style="color: rgb(34,34,34);">We look forward to your feedback.</span></p><div><span style="color: rgb(34,34,34);"><br clear="none"></span></div><p><br clear="none"><span style="color: rgb(34,34,34);">&#160;</span></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2015/02/18/apache-activemq-5102-released.xml
----------------------------------------------------------------------
diff --git a/2015/02/18/apache-activemq-5102-released.xml b/2015/02/18/apache-activemq-5102-released.xml
index b53f9fc..b8c1d55 100644
--- a/2015/02/18/apache-activemq-5102-released.xml
+++ b/2015/02/18/apache-activemq-5102-released.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.2.</p><p>This release addresses bugs in the 5.10.1 release, including AMQ-5564 which addresses a potential memory leak.</p><p>Thank you to Timothy Bish and Claus Ibsen for promptly addressing AMQ-5564. &#160;And thank you to Hadrian Zbarcea for merging commits in preparation for the release.</p><p><span style="line-height: 1.4285715;">&#160;</span></p><p>Please see the&#160;<a shape="rect" class="external-link" href="http://activemq.apache.org/activemq-5102-release.html">release page</a>&#160;for download links and more information!</p></div>
+<div class="wiki-content maincontent"><p>The Apache ActiveMQ team is proud to announce the release of Apache ActiveMQ 5.10.2.</p><p>This release addresses bugs in the 5.10.1 release, including AMQ-5564 which addresses a potential memory leak.</p><p>Thank you to Timothy Bish and Claus Ibsen for promptly addressing AMQ-5564. &#160;And thank you to Hadrian Zbarcea for merging commits in preparation for the release.</p><p><span style="line-height: 1.4285715;">&#160;</span></p><p>Please see the&#160;<a shape="rect" href="http://activemq.apache.org/activemq-5102-release.html">release page</a>&#160;for download links and more information!</p></div>
 


[15/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/download-archives.xml
----------------------------------------------------------------------
diff --git a/download-archives.xml b/download-archives.xml
index 20974c9..7bfdd10 100644
--- a/download-archives.xml
+++ b/download-archives.xml
@@ -1,2 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="DownloadArchives-Downloadarchives">Download archives</h2><p>You can use the Apache Archives to download all the ActiveMQ releases.</p><ul class="alternate"><li><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/">http://archive.apache.org/dist/activemq/</a> - ActiveMQ releases</li><li><a shape="rect" class="external-link" href="http://archive.apache.org/dist/activemq/apache-activemq/">http://archive.apache.org/dist/activemq/apache-activemq/</a> - Even older ActiveMQ releases</li></ul><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Downloading</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The links below contains the release notes for all the ActiveMQ release. However if you want to download the release, you <strong>must</strong> use the download archiv
 es, which is the two links above.</p></div></div><p>All time Apache ActiveMQ releases notes:</p><p></p><ul class="childpages-macro"><li><a shape="rect" href="activemq-11-release.xml">ActiveMQ 1.1 Release</a></li><li><a shape="rect" href="activemq-12-release.xml">ActiveMQ 1.2 Release</a></li><li><a shape="rect" href="activemq-13-release.xml">ActiveMQ 1.3 Release</a></li><li><a shape="rect" href="activemq-14-release.xml">ActiveMQ 1.4 Release</a></li><li><a shape="rect" href="activemq-15-release.xml">ActiveMQ 1.5 Release</a></li><li><a shape="rect" href="activemq-20-release.xml">ActiveMQ 2.0 Release</a></li><li><a shape="rect" href="activemq-21-release.xml">ActiveMQ 2.1 Release</a></li><li><a shape="rect" href="activemq-30-release.xml">ActiveMQ 3.0 Release</a></li><li><a shape="rect" href="activemq-31-release.xml">ActiveMQ 3.1 Release</a></li><li><a shape="rect" href="activemq-321-release.xml">ActiveMQ 3.2.1 Release</a></li><li><a shape="rect" href="activemq-322-release.xml">ActiveMQ 3
 .2.2 Release</a></li><li><a shape="rect" href="activemq-32-release.xml">ActiveMQ 3.2 Release</a></li><li><a shape="rect" href="activemq-401-release.xml">ActiveMQ 4.0.1 Release</a></li><li><a shape="rect" href="activemq-402-release.xml">ActiveMQ 4.0.2 Release</a></li><li><a shape="rect" href="activemq-40-m4-release.xml">ActiveMQ 4.0 M4 Release</a></li><li><a shape="rect" href="activemq-40-rc2-release.xml">ActiveMQ 4.0 RC2 Release</a></li><li><a shape="rect" href="activemq-40-release.xml">ActiveMQ 4.0 Release</a></li><li><a shape="rect" href="activemq-410-release.xml">ActiveMQ 4.1.0 Release</a></li><li><a shape="rect" href="activemq-411-release.xml">ActiveMQ 4.1.1 Release</a></li><li><a shape="rect" href="activemq-412-release.xml">ActiveMQ 4.1.2 Release</a></li><li><a shape="rect" href="activemq-500-release.xml">ActiveMQ 5.0.0 Release</a></li><li><a shape="rect" href="activemq-510-release.xml">ActiveMQ 5.1.0 Release</a></li><li><a shape="rect" href="activemq-5100-release.xml">ActiveMQ
  5.10.0 Release</a></li><li><a shape="rect" href="activemq-5101-release.xml">ActiveMQ 5.10.1 Release</a></li><li><a shape="rect" href="activemq-5102-release.xml">ActiveMQ 5.10.2 Release</a></li><li><a shape="rect" href="activemq-5110-release.xml">ActiveMQ 5.11.0 Release</a></li><li><a shape="rect" href="activemq-5111-release.xml">ActiveMQ 5.11.1 Release</a></li><li><a shape="rect" href="activemq-5112-release.xml">ActiveMQ 5.11.2 Release</a></li><li><a shape="rect" href="activemq-5113-release.xml">ActiveMQ 5.11.3 Release</a></li><li><a shape="rect" href="activemq-5120-release.xml">ActiveMQ 5.12.0 Release</a></li><li><a shape="rect" href="activemq-5121-release.xml">ActiveMQ 5.12.1 Release</a></li><li><a shape="rect" href="activemq-5122-release.xml">ActiveMQ 5.12.2 Release</a></li><li><a shape="rect" href="activemq-5130-release.xml">ActiveMQ 5.13.0 Release</a></li><li><a shape="rect" href="activemq-5131-release.xml">ActiveMQ 5.13.1 Release</a></li><li><a shape="rect" href="activemq-513
 2-release.xml">ActiveMQ 5.13.2 Release</a></li><li><a shape="rect" href="activemq-5133-release.xml">ActiveMQ 5.13.3 Release</a></li><li><a shape="rect" href="activemq-5134-release.xml">ActiveMQ 5.13.4 Release</a></li><li><a shape="rect" href="activemq-5140-release.xml">ActiveMQ 5.14.0 Release</a></li><li><a shape="rect" href="activemq-5141-release.xml">ActiveMQ 5.14.1 Release</a></li><li><a shape="rect" href="activemq-5142-release.xml">ActiveMQ 5.14.2 Release</a></li><li><a shape="rect" href="activemq-5143-release.xml">ActiveMQ 5.14.3 Release</a></li><li><a shape="rect" href="activemq-5144-release.xml">ActiveMQ 5.14.4 Release</a></li><li><a shape="rect" href="activemq-5145-release.xml">ActiveMQ 5.14.5 Release</a></li><li><a shape="rect" href="activemq-5150-release.xml">ActiveMQ 5.15.0 Release</a></li><li><a shape="rect" href="activemq-5151-release.xml">ActiveMQ 5.15.1 Release</a></li><li><a shape="rect" href="activemq-5152-release.xml">ActiveMQ 5.15.2 Release</a></li><li><a shape="r
 ect" href="activemq-520-release.xml">ActiveMQ 5.2.0 Release</a></li><li><a shape="rect" href="activemq-530-release.xml">ActiveMQ 5.3.0 Release</a></li><li><a shape="rect" href="activemq-531-release.xml">ActiveMQ 5.3.1 Release</a></li><li><a shape="rect" href="activemq-532-release.xml">ActiveMQ 5.3.2 Release</a></li><li><a shape="rect" href="activemq-540-release.xml">ActiveMQ 5.4.0 Release</a></li><li><a shape="rect" href="activemq-541-release.xml">ActiveMQ 5.4.1 Release</a></li><li><a shape="rect" href="activemq-542-release.xml">ActiveMQ 5.4.2 Release</a></li><li><a shape="rect" href="activemq-543-release.xml">ActiveMQ 5.4.3 Release</a></li><li><a shape="rect" href="activemq-550-release.xml">ActiveMQ 5.5.0 Release</a></li><li><a shape="rect" href="activemq-551-release.xml">ActiveMQ 5.5.1 Release</a></li><li><a shape="rect" href="activemq-560-release.xml">ActiveMQ 5.6.0 Release</a></li><li><a shape="rect" href="activemq-570-release.xml">ActiveMQ 5.7.0 Release</a></li><li><a shape="re
 ct" href="activemq-580-release.xml">ActiveMQ 5.8.0 Release</a></li><li><a shape="rect" href="activemq-590-release.xml">ActiveMQ 5.9.0 Release</a></li><li><a shape="rect" href="activemq-591-release.xml">ActiveMQ 5.9.1 Release</a></li><li><a shape="rect" href="in-progress.xml">In Progress</a></li></ul></div>
+<div class="wiki-content maincontent"><h2>Download archives</h2><p>You can use the Apache Archives to download all the ActiveMQ releases.</p><ul class="alternate"><li><a shape="rect" href="http://archive.apache.org/dist/activemq/">http://archive.apache.org/dist/activemq/</a> - ActiveMQ releases</li><li><a shape="rect" href="http://archive.apache.org/dist/activemq/apache-activemq/">http://archive.apache.org/dist/activemq/apache-activemq/</a> - Even older ActiveMQ releases</li></ul><structured-macro ac:macro-id="32ec292d-4810-4e71-b56f-53b4642d6eb3" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Downloading</parameter><rich-text-body><p>The links below contains the release notes for all the ActiveMQ release. However if you want to download the release, you <strong>must</strong> use the download archives, which is the two links above.</p></rich-text-body></structured-macro><p>All time Apache ActiveMQ releases notes:</p><p><structured-macro ac:macro-id="3fb4e86e-9b48-45
 3e-b111-88ec01910c7a" ac:name="children" ac:schema-version="1"><parameter ac:name="page"><link><page ri:content-title="Download"></page></link></parameter><parameter ac:name="sort">title</parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/download.xml
----------------------------------------------------------------------
diff --git a/download.xml b/download.xml
index 1967eb5..a2b15fa 100644
--- a/download.xml
+++ b/download.xml
@@ -1,11 +1,2 @@
-<div class="wiki-content maincontent"><h2 id="Download-LatestReleases">Latest Releases</h2><div class="sectionColumnWrapper"><div class="sectionMacro"><div class="sectionMacroRow"><div class="columnMacro" style="width:20%;min-width:20%;max-width:20%;"><div style="padding-right:20px;float:left;"><p>&#160;</p></div>
-
-
-</div><div class="columnMacro" style="width:80%;min-width:80%;max-width:80%;"><div style="min-height:200px"><p>The latest stable release is the <a shape="rect" href="activemq-5152-release.xml">ActiveMQ 5.15.2 Release</a></p></div>
-
-
-</div></div></div></div><h2 id="Download-Gettingpastreleases">Getting past releases</h2><p>See the <a shape="rect" href="download-archives.xml">Download Archives</a> for all time releases.</p><p></p><h2 id="Download-ReleasesInProgress">Releases In Progress</h2>
-
-<p>The following releases are currently in progress</p>
-<h2 id="Download-MavenRepositories">Maven Repositories</h2><p>All ActiveMQ releases are available from the <a shape="rect" class="external-link" href="https://repository.apache.org/content/repositories/releases/org/apache/activemq/">Maven central repository</a>.</p><p>&#160;</p></div>
+<div class="wiki-content maincontent"><h2>Latest Releases</h2><structured-macro ac:macro-id="1cafbdbf-a2ac-46ef-af1e-3c5603c896b9" ac:name="section" ac:schema-version="1"><rich-text-body><structured-macro ac:macro-id="b12d1a16-bf7f-4e71-8a63-67e33d2b2579" ac:name="column" ac:schema-version="1"><parameter ac:name="width">20%</parameter><rich-text-body><structured-macro ac:macro-id="6b90137d-36ce-42e9-9b97-797a38374053" ac:name="div" ac:schema-version="1"><parameter ac:name="style">padding-right:20px;float:left;</parameter><rich-text-body><p>&#160;</p></rich-text-body></structured-macro></rich-text-body></structured-macro><structured-macro ac:macro-id="b08e84a5-b461-4325-afd8-c82570122d65" ac:name="column" ac:schema-version="1"><parameter ac:name="width">80%</parameter><rich-text-body><structured-macro ac:macro-id="c8e895e7-88d5-48aa-b0f8-b09da5f8983f" ac:name="div" ac:schema-version="1"><parameter ac:name="style">min-height:200px</parameter><rich-text-body><p>The latest stable releas
 e is the <link><page ri:content-title="ActiveMQ 5.15.2 Release"></page></link></p></rich-text-body></structured-macro></rich-text-body></structured-macro></rich-text-body></structured-macro><h2>Getting past releases</h2><p>See the <link><page ri:content-title="Download Archives"></page></link> for all time releases.</p><p><structured-macro ac:macro-id="35f66c4e-eeb1-47b0-bf37-fa3c8c6dcfc2" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="In Progress"></page></link></parameter></structured-macro></p><h2>Maven Repositories</h2><p>All ActiveMQ releases are available from the <a shape="rect" href="https://repository.apache.org/content/repositories/releases/org/apache/activemq/">Maven central repository</a>.</p><p>&#160;</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/downloading-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/downloading-activemq-cpp.xml b/downloading-activemq-cpp.xml
index 1f83ef7..051c039 100644
--- a/downloading-activemq-cpp.xml
+++ b/downloading-activemq-cpp.xml
@@ -1,20 +1,18 @@
-<div class="wiki-content maincontent"><p>ActiveMQ CPP distributions are source-only.  To get the source bundle for a particular release, go <a shape="rect" href="download.xml">here</a>.  Follow the instructions here only if you want the bleeding edge from trunk.</p>
+<div class="wiki-content maincontent"><p>ActiveMQ CPP distributions are source-only.  To get the source bundle for a particular release, go <link><page ri:content-title="Download"></page><link-body>here</link-body></link>.  Follow the instructions here only if you want the bleeding edge from trunk.</p>
 
-<h2 id="DownloadingActiveMQCPP-WebBrowsingofSVN">Web Browsing of SVN</h2>
+<h2>Web Browsing of SVN</h2>
 
 <p>To browse via the web use the ViewVC interface:</p>
 
-<p><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp">http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp</a></p>
+<p><a shape="rect" href="http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp">http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp</a></p>
 
 <p>Or to browse the source tree directly:</p>
 
-<p><a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/activemq-cpp">https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/activemq-cpp</a></p>
+<p><a shape="rect" href="https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/activemq-cpp">https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/activemq-cpp</a></p>
 
-<h2 id="DownloadingActiveMQCPP-CheckingoutfromSVN">Checking out from SVN&#160;</h2>
+<h2>Checking out from SVN&#160;</h2>
 
-<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="fc547fb7-41b2-4d66-963b-e98964f12385" ac:name="code" ac:schema-version="1"><plain-text-body>
 svn co https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk/
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/durable-queue-memory-management.xml
----------------------------------------------------------------------
diff --git a/durable-queue-memory-management.xml b/durable-queue-memory-management.xml
index ea57e74..afde918 100644
--- a/durable-queue-memory-management.xml
+++ b/durable-queue-memory-management.xml
@@ -3,31 +3,31 @@
 
 <p>This page outlines design the design proposal.</p>
 
-<h2 id="DurableQueueMemoryManagement-TargetArea">TargetArea</h2>
+<h2>TargetArea</h2>
 
 <p>Maintains TargetLists for each consumer (the messages that have matched one or more consumers's selectors and are gonna be used to try dispatch stuff to the consumer DispatchArea). TargetEntry objects are added to the TargetList as messages arrive from the Queue. </p>
 
 <p>A TargetEntry can have either a direct Message reference or a CacheReference to an entry in a cache.  </p>
 
-<h3 id="DurableQueueMemoryManagement-Eagerloading">Eager loading</h3>
+<h3>Eager loading</h3>
 
 <p>Each TargetList has a watermark to indicate the first TargetEntry which is a CacheReference. The idea is that under ideal scenarios, each TargetList has the watermark equal to the high water mark (i.e. that there are enough direct message references in RAM).</p>
 
 <p>So we can have a background thread increasing the watermark up to the ideal level - which means it starts at the current watermark and directly loads the objects; de-referencing the CacheReference and replacing with direct references. </p>
 
-<h3 id="DurableQueueMemoryManagement-PendingCache">PendingCache</h3>
+<h3>PendingCache</h3>
 
 <p>TargetEntry objects added to the TargetList which are above the high watermark have their Message objects evicted from direct references into the PendingCache.</p>
 
 <p>The Target eager loader will move objects from this cache to the TargetList when they are available. If they are not in the PendingCache, they are loaded from the QueueArea.</p>
 
-<h3 id="DurableQueueMemoryManagement-QueueArea">QueueArea</h3>
+<h3>QueueArea</h3>
 
 <p>This represents the actual queue messages. There's also a matching HeadQueueCache which is a simple memory bound queue. FIFO so newer stuff is evicted from the end.</p>
 
 <p>Back </p>
 
-<h3 id="DurableQueueMemoryManagement-LinkingtheCaches">Linking the Caches</h3>
+<h3>Linking the Caches</h3>
 
 <p>The PendingCache and HeadQueueCache are linked together, along with the TargetArea/DispatchArea so that there is a fixed amount of RAM used in all the caches.</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/encrypted-passwords.xml
----------------------------------------------------------------------
diff --git a/encrypted-passwords.xml b/encrypted-passwords.xml
index 26aa92b..346c10b 100644
--- a/encrypted-passwords.xml
+++ b/encrypted-passwords.xml
@@ -1,61 +1,41 @@
-<div class="wiki-content maincontent"><p>As of ActiveMQ 5.4.1 you can encrypt your passwords and safely store them in configuration files. To encrypt the password, you can use the newly added <code>encrypt</code> command like:</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[$ bin/activemq encrypt --password activemq --input mypassword
+<div class="wiki-content maincontent"><p>As of ActiveMQ 5.4.1 you can encrypt your passwords and safely store them in configuration files. To encrypt the password, you can use the newly added <code>encrypt</code> command like:</p><structured-macro ac:macro-id="a4cfbc62-bc63-4654-8acd-24413d0aa390" ac:name="code" ac:schema-version="1"><plain-text-body>$ bin/activemq encrypt --password activemq --input mypassword
 ...
-Encrypted text: eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp]]></script>
-</div></div><p>Where the password you want to encrypt is passed with the <code>input</code> argument, while the <code>password</code> argument is a secret used by the encryptor. In a similar fashion you can test-out your passwords like:</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[$ bin/activemq decrypt  --password activemq --input eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp
+Encrypted text: eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp</plain-text-body></structured-macro><p>Where the password you want to encrypt is passed with the <code>input</code> argument, while the <code>password</code> argument is a secret used by the encryptor. In a similar fashion you can test-out your passwords like:</p><structured-macro ac:macro-id="c62647f7-a774-4f0c-ace3-f26dc2e9ebc9" ac:name="code" ac:schema-version="1"><plain-text-body>$ bin/activemq decrypt  --password activemq --input eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp
 ...
-Decrypted text: mypassword]]></script>
-</div></div><p><strong>Note:</strong> It is recommended that you use only alphanumeric characters for the password. Special characters, such as <code>$/^&amp;</code>, are not supported.</p><p>The next step is to add the password to the appropriate configuration file, <code>$ACTIVEMQ_HOME/conf/credentials-enc.properties</code> by default.</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[activemq.username=system
+Decrypted text: mypassword</plain-text-body></structured-macro><p><strong>Note:</strong> It is recommended that you use only alphanumeric characters for the password. Special characters, such as <code>$/^&amp;</code>, are not supported.</p><p>The next step is to add the password to the appropriate configuration file, <code>$ACTIVEMQ_HOME/conf/credentials-enc.properties</code> by default.</p><structured-macro ac:macro-id="ee57e0c3-7e0c-4121-ba74-e8b2dc5b7b16" ac:name="code" ac:schema-version="1"><plain-text-body>activemq.username=system
 activemq.password=ENC(mYRkg+4Q4hua1kvpCCI2hg==)
 guest.password=ENC(Cf3Jf3tM+UrSOoaKU50od5CuBa8rxjoL)
 ...
 jdbc.password=ENC(eeWjNyX6FY8Fjp3E+F6qTytV11bZItDp)
-]]></script>
-</div></div><p>Note that we used <code>ENC()</code> to wrap our encrypted passwords. You can mix plain and encrypted passwords in your properties files, so encrypted ones must be wrapped this way.</p><p>Finally, you need to instruct your property loader to encrypt variables when it loads properties to the memory. Instead of standard property loader we'll use the special one (see <code>\$ACTIVEMQ_HOME/conf/activemq-security.xml</code>) to achieve 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[&lt;bean id=&quot;environmentVariablesConfiguration&quot; class=&quot;org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig&quot;&gt;
-  &lt;property name=&quot;algorithm&quot; value=&quot;PBEWithMD5AndDES&quot; /&gt;
-  &lt;property name=&quot;passwordEnvName&quot; value=&quot;ACTIVEMQ_ENCRYPTION_PASSWORD&quot; /&gt;
+</plain-text-body></structured-macro><p>Note that we used <code>ENC()</code> to wrap our encrypted passwords. You can mix plain and encrypted passwords in your properties files, so encrypted ones must be wrapped this way.</p><p>Finally, you need to instruct your property loader to encrypt variables when it loads properties to the memory. Instead of standard property loader we'll use the special one (see <code>\$ACTIVEMQ_HOME/conf/activemq-security.xml</code>) to achieve this.</p><structured-macro ac:macro-id="d8068f39-1db7-41d5-8520-5716dfa54be5" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig"&gt;
+  &lt;property name="algorithm" value="PBEWithMD5AndDES" /&gt;
+  &lt;property name="passwordEnvName" value="ACTIVEMQ_ENCRYPTION_PASSWORD" /&gt;
 &lt;/bean&gt;
                                                                      
-&lt;bean id=&quot;configurationEncryptor&quot; class=&quot;org.jasypt.encryption.pbe.StandardPBEStringEncryptor&quot;&gt;
-  &lt;property name=&quot;config&quot; ref=&quot;environmentVariablesConfiguration&quot; /&gt;
+&lt;bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"&gt;
+  &lt;property name="config" ref="environmentVariablesConfiguration" /&gt;
 &lt;/bean&gt; 
     
-&lt;bean id=&quot;propertyConfigurer&quot; class=&quot;org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer&quot;&gt; 
-  &lt;constructor-arg ref=&quot;configurationEncryptor&quot; /&gt; 
-  &lt;property name=&quot;location&quot; value=&quot;file:${activemq.base}/conf/credentials-enc.properties&quot;/&gt; 
-&lt;/bean&gt;]]></script>
-</div></div><p>With this configuration ActiveMQ will try to load your encryptor password from the <code>ACTIVEMQ_ENCRYPTION_PASSWORD</code> environment variable and then use it to decrypt passwords from <code>credential-enc.properties</code> file.</p><p>Alternative is to use a simple variant and store encryptor password in the xml file, 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[&lt;bean id=&quot;configurationEncryptor&quot; class=&quot;org.jasypt.encryption.pbe.StandardPBEStringEncryptor&quot;&gt;
-  &lt;property name=&quot;algorithm&quot; value=&quot;PBEWithMD5AndDES&quot;/&gt;
-  &lt;property name=&quot;password&quot; value=&quot;activemq&quot;/&gt;
-&lt;/bean&gt;]]></script>
-</div></div><p>but with that you'll lose the secrecy of the encryptor's secret. You may also consult <a shape="rect" class="external-link" href="http://www.jasypt.org/advancedconfiguration.html" rel="nofollow">http://www.jasypt.org/advancedconfiguration.html</a> for more ideas on how to configure Jasypt.</p><p>Finally, we can use properties like we'd normally do</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;simpleAuthenticationPlugin&gt;
+&lt;bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer"&gt; 
+  &lt;constructor-arg ref="configurationEncryptor" /&gt; 
+  &lt;property name="location" value="file:${activemq.base}/conf/credentials-enc.properties"/&gt; 
+&lt;/bean&gt;</plain-text-body></structured-macro><p>With this configuration ActiveMQ will try to load your encryptor password from the <code>ACTIVEMQ_ENCRYPTION_PASSWORD</code> environment variable and then use it to decrypt passwords from <code>credential-enc.properties</code> file.</p><p>Alternative is to use a simple variant and store encryptor password in the xml file, like this</p><structured-macro ac:macro-id="ed075f5b-2bb9-4b47-b0a2-6f7374fa0824" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"&gt;
+  &lt;property name="algorithm" value="PBEWithMD5AndDES"/&gt;
+  &lt;property name="password" value="activemq"/&gt;
+&lt;/bean&gt;</plain-text-body></structured-macro><p>but with that you'll lose the secrecy of the encryptor's secret. You may also consult <a shape="rect" href="http://www.jasypt.org/advancedconfiguration.html">http://www.jasypt.org/advancedconfiguration.html</a> for more ideas on how to configure Jasypt.</p><p>Finally, we can use properties like we'd normally do</p><structured-macro ac:macro-id="bc584b96-e1c6-4a03-bb9e-3a9b1a29a870" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;simpleAuthenticationPlugin&gt;
   &lt;users&gt;
-    &lt;authenticationUser username=&quot;system&quot; password=&quot;${activemq.password}&quot;
-      groups=&quot;users,admins&quot;/&gt;
-    &lt;authenticationUser username=&quot;user&quot; password=&quot;${guest.password}&quot;
-      groups=&quot;users&quot;/&gt;
-    &lt;authenticationUser username=&quot;guest&quot; password=&quot;${guest.password}&quot; groups=&quot;guests&quot;/&gt;
+    &lt;authenticationUser username="system" password="${activemq.password}"
+      groups="users,admins"/&gt;
+    &lt;authenticationUser username="user" password="${guest.password}"
+      groups="users"/&gt;
+    &lt;authenticationUser username="guest" password="${guest.password}" groups="guests"/&gt;
   &lt;/users&gt;
-&lt;/simpleAuthenticationPlugin&gt;]]></script>
-</div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[&lt;bean id=&quot;mysql-ds&quot; class=&quot;org.apache.commons.dbcp.BasicDataSource&quot; destroy-method=&quot;close&quot;&gt;
-  &lt;property name=&quot;driverClassName&quot; value=&quot;com.mysql.jdbc.Driver&quot;/&gt;
-  &lt;property name=&quot;url&quot; value=&quot;jdbc:mysql://localhost/activemq?relaxAutoCommit=true&quot;/&gt;
-  &lt;property name=&quot;username&quot; value=&quot;activemq&quot;/&gt;
-  &lt;property name=&quot;password&quot; value=&quot;${jdbc.password}&quot;/&gt;
-  &lt;property name=&quot;maxActive&quot; value=&quot;200&quot;/&gt;
-  &lt;property name=&quot;poolPreparedStatements&quot; value=&quot;true&quot;/&gt;
-&lt;/bean&gt;]]></script>
-</div></div><p>If you want to run the broker with this configuration, you need to do the following:</p><ul><li><p>Set environment variable:</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[$ export ACTIVEMQ_ENCRYPTION_PASSWORD=activemq]]></script>
-</div></div></li><li><p>Start 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[$ bin/activemq start xbean:conf/activemq-security.xml]]></script>
-</div></div></li><li><p>Unset the environment variable:</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[$ unset ACTIVEMQ_ENCRYPTION_PASSWORD]]></script>
-</div></div></li></ul><p>In this way your encryptor secret is never saved on your system and your encrypted passwords are safely stored in the configuration files.</p></div>
+&lt;/simpleAuthenticationPlugin&gt;</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="2a8d90c3-6bb9-480f-9fb8-164c7d94761f" ac:name="code" ac:schema-version="1"><plain-text-body>&lt;bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"&gt;
+  &lt;property name="driverClassName" value="com.mysql.jdbc.Driver"/&gt;
+  &lt;property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/&gt;
+  &lt;property name="username" value="activemq"/&gt;
+  &lt;property name="password" value="${jdbc.password}"/&gt;
+  &lt;property name="maxActive" value="200"/&gt;
+  &lt;property name="poolPreparedStatements" value="true"/&gt;
+&lt;/bean&gt;</plain-text-body></structured-macro><p>If you want to run the broker with this configuration, you need to do the following:</p><ul><li><p>Set environment variable:</p><structured-macro ac:macro-id="1ca2acff-d7df-4c4c-b8e9-4a4424beb0f1" ac:name="code" ac:schema-version="1"><plain-text-body>$ export ACTIVEMQ_ENCRYPTION_PASSWORD=activemq</plain-text-body></structured-macro></li><li><p>Start the broker:</p><structured-macro ac:macro-id="e3f2412b-28b1-4ecb-8821-0d369beb278b" ac:name="code" ac:schema-version="1"><plain-text-body>$ bin/activemq start xbean:conf/activemq-security.xml</plain-text-body></structured-macro></li><li><p>Unset the environment variable:</p><structured-macro ac:macro-id="4c104818-b20f-4a2f-80bc-f80afc233850" ac:name="code" ac:schema-version="1"><plain-text-body>$ unset ACTIVEMQ_ENCRYPTION_PASSWORD</plain-text-body></structured-macro></li></ul><p>In this way your encryptor secret is never saved on your system and your encrypted passwords are safely stor
 ed in the configuration files.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/enterprise-integration-patterns.xml
----------------------------------------------------------------------
diff --git a/enterprise-integration-patterns.xml b/enterprise-integration-patterns.xml
index 67c2f24..a7cec7d 100644
--- a/enterprise-integration-patterns.xml
+++ b/enterprise-integration-patterns.xml
@@ -1,55 +1,52 @@
-<div class="wiki-content maincontent"><h2 id="EnterpriseIntegrationPatterns-EnterpriseIntegrationPatterns">Enterprise Integration Patterns</h2>
+<div class="wiki-content maincontent"><h2>Enterprise Integration Patterns</h2>
 
-<p>Version 5.0 onwards of Apache ActiveMQ comes complete with full support for the <a shape="rect" class="external-link" href="http://www.enterpriseintegrationpatterns.com/toc.html" rel="nofollow">Enterprise Integration Patterns</a> (from the excellent book by <a shape="rect" class="external-link" href="http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&amp;search-type=ss&amp;index=books&amp;field-author=Gregor%20Hohpe" rel="nofollow">Gregor Hohpe</a> and <a shape="rect" class="external-link" href="http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&amp;search-type=ss&amp;index=books&amp;field-author=Bobby%20Woolf" rel="nofollow">Bobby Woolf</a>) via the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Apache Camel library</a>. </p>
+<p>Version 5.0 onwards of Apache ActiveMQ comes complete with full support for the <a shape="rect" href="http://www.enterpriseintegrationpatterns.com/toc.html">Enterprise Integration Patterns</a> (from the excellent book by <a shape="rect" href="http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&amp;search-type=ss&amp;index=books&amp;field-author=Gregor%20Hohpe">Gregor Hohpe</a> and <a shape="rect" href="http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&amp;search-type=ss&amp;index=books&amp;field-author=Bobby%20Woolf">Bobby Woolf</a>) via the <a shape="rect" href="http://activemq.apache.org/camel/">Apache Camel library</a>. </p>
 
-<p>You can easily add any of the supported <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/enterprise-integration-patterns.html">Enterprise Integration Patterns</a> into ActiveMQ (either on the JMS client or in the broker process) to support smart routing, transformation and a whole host of other powerful patterns. You can of course just embed <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel library</a> directly into your application, such as via <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/spring.html">Spring</a> as well..</p>
+<p>You can easily add any of the supported <a shape="rect" href="http://activemq.apache.org/camel/enterprise-integration-patterns.html">Enterprise Integration Patterns</a> into ActiveMQ (either on the JMS client or in the broker process) to support smart routing, transformation and a whole host of other powerful patterns. You can of course just embed <a shape="rect" href="http://activemq.apache.org/camel/">Camel library</a> directly into your application, such as via <a shape="rect" href="http://activemq.apache.org/camel/spring.html">Spring</a> as well..</p>
 
-<p>This also means you can cleanly integrate all of the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/components.html">Camel Components</a> into ActiveMQ so you can easily integrate with <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/cxf.html">CXF</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/file.html">Files</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/jbi.html">JBI</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/jpa.html">JPA</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/mail.html">Mail</a>,  <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/mina.html">MINA</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/quartz.html">Quartz</a>, <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/xmpp.html">XMPP<
 /a> and <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/components.html">many other protocols and transports!</a></p>
+<p>This also means you can cleanly integrate all of the <a shape="rect" href="http://activemq.apache.org/camel/components.html">Camel Components</a> into ActiveMQ so you can easily integrate with <a shape="rect" href="http://activemq.apache.org/camel/cxf.html">CXF</a>, <a shape="rect" href="http://activemq.apache.org/camel/file.html">Files</a>, <a shape="rect" href="http://activemq.apache.org/camel/jbi.html">JBI</a>, <a shape="rect" href="http://activemq.apache.org/camel/jpa.html">JPA</a>, <a shape="rect" href="http://activemq.apache.org/camel/mail.html">Mail</a>,  <a shape="rect" href="http://activemq.apache.org/camel/mina.html">MINA</a>, <a shape="rect" href="http://activemq.apache.org/camel/quartz.html">Quartz</a>, <a shape="rect" href="http://activemq.apache.org/camel/xmpp.html">XMPP</a> and <a shape="rect" href="http://activemq.apache.org/camel/components.html">many other protocols and transports!</a></p>
 
 
-<h3 id="EnterpriseIntegrationPatterns-UsingEIPintheActiveMQBroker">Using EIP in the ActiveMQ Broker</h3>
+<h3>Using EIP in the ActiveMQ Broker</h3>
 
 <p>The broker's <strong>activemq.xml</strong> file comes already configured to support Camel; you just need to customize the routing rules.</p>
 
-<h4 id="EnterpriseIntegrationPatterns-WritingEIPrulesusingJavacode">Writing EIP rules using Java code</h4>
+<h4>Writing EIP rules using Java code</h4>
 
-<p>To use <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/dsl.html">Java code to write EIP routing rules</a>, just put your classes on the classpath (such as in activemq/lib/myroutes/foo.jar). Then to get Camel to find your routes you need to edit the activemq.xml so that the <strong>packages</strong> attribute points to the package name (or a parent package name) to look for.</p>
+<p>To use <a shape="rect" href="http://activemq.apache.org/camel/dsl.html">Java code to write EIP routing rules</a>, just put your classes on the classpath (such as in activemq/lib/myroutes/foo.jar). Then to get Camel to find your routes you need to edit the activemq.xml so that the <strong>packages</strong> attribute points to the package name (or a parent package name) to look for.</p>
 
 <p>For example if all your routes are in the package org.acme.cheese; such as org.acme.cheese.whatnot.MyRouter then you could edit the XML to be...</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;camelContext xmlns=&quot;http://activemq.apache.org/camel/schema/spring&quot;&gt;
+<structured-macro ac:macro-id="08391332-f1a6-460a-bfe5-58a3b1d4cc39" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;camelContext xmlns="http://activemq.apache.org/camel/schema/spring"&gt;
  &lt;package&gt;org.acme.cheese&lt;/package&gt;
 &lt;/camelContext&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h4 id="EnterpriseIntegrationPatterns-WritingEIPrulesusingXML">Writing EIP rules using XML</h4>
+<h4>Writing EIP rules using XML</h4>
 
-<p>To use XML its even easier, as you can just embed whatever routing rules inside the &lt;camelContext&gt; element using Camel's <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/xml-configuration.html">Spring XML format</a>. Note that the XML is way more verbose than the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/dsl.html">Java DSL</a> but it is a bit simpler to deploy. e.g. for a trivial route...</p>
+<p>To use XML its even easier, as you can just embed whatever routing rules inside the &lt;camelContext&gt; element using Camel's <a shape="rect" href="http://activemq.apache.org/camel/xml-configuration.html">Spring XML format</a>. Note that the XML is way more verbose than the <a shape="rect" href="http://activemq.apache.org/camel/dsl.html">Java DSL</a> but it is a bit simpler to deploy. e.g. for a trivial route...</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;camelContext xmlns=&quot;http://activemq.apache.org/camel/schema/spring&quot;&gt;
+<structured-macro ac:macro-id="a14e2d08-d3c4-484d-8b0c-71443cb4ef06" ac:name="code" ac:schema-version="1"><plain-text-body>
+&lt;camelContext xmlns="http://activemq.apache.org/camel/schema/spring"&gt;
   &lt;route&gt;
-    &lt;from uri=&quot;activemq:com.acme.MyQueue&quot;/&gt;
-    &lt;to uri=&quot;activemq:com.acme.SomeOtherQueue&quot;/&gt;
+    &lt;from uri="activemq:com.acme.MyQueue"/&gt;
+    &lt;to uri="activemq:com.acme.SomeOtherQueue"/&gt;
   &lt;/route&gt;
 &lt;/camelContext&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="EnterpriseIntegrationPatterns-UsingEIPintheJMSclient">Using EIP in the JMS client</h3>
+<h3>Using EIP in the JMS client</h3>
 
-<p>You can use <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/">Camel</a> <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/endpoint.html">Endpoints</a> directly from your JMS client one of the following JMS destinations, depending on what JMS API you want it to use</p>
+<p>You can use <a shape="rect" href="http://activemq.apache.org/camel/">Camel</a> <a shape="rect" href="http://activemq.apache.org/camel/endpoint.html">Endpoints</a> directly from your JMS client one of the following JMS destinations, depending on what JMS API you want it to use</p>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelDestination.html">CamelDestination</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelQueue.html">CamelQueue</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelTopic.html">CamelTopic</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelDestination.html">CamelDestination</a></li><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelQueue.html">CamelQueue</a></li><li><a shape="rect" href="http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/camel/CamelTopic.html">CamelTopic</a></li></ul>
 
 
-<p>You can then use this destination like any other JMS destination when sending or receiving messages! This means you can use any of the <a shape="rect" class="external-link" href="http://activemq.apache.org/camel/components.html">large number of Camel components</a> from your JMS code, by just changing the Destination object!</p>
+<p>You can then use this destination like any other JMS destination when sending or receiving messages! This means you can use any of the <a shape="rect" href="http://activemq.apache.org/camel/components.html">large number of Camel components</a> from your JMS code, by just changing the Destination object!</p>
 
-<h3 id="EnterpriseIntegrationPatterns-SeeAlso">See Also</h3>
+<h3>See Also</h3>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/components.html">Camel Components</a></li><li><a shape="rect" class="external-link" href="http://activemq.apache.org/camel/xml-reference.html">Camel XML Reference</a></li></ul></div>
+<ul><li><a shape="rect" href="http://activemq.apache.org/camel/enterprise-integration-patterns.html">Enterprise Integration Patterns</a></li><li><a shape="rect" href="http://activemq.apache.org/camel/components.html">Camel Components</a></li><li><a shape="rect" href="http://activemq.apache.org/camel/xml-reference.html">Camel XML Reference</a></li></ul>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/errors.xml
----------------------------------------------------------------------
diff --git a/errors.xml b/errors.xml
index 32219c4..c24ff71 100644
--- a/errors.xml
+++ b/errors.xml
@@ -1,6 +1,6 @@
 <div class="wiki-content maincontent">
 
-<p>Questions on specific kinds of errors. If you have seen a specific exception then check the <a shape="rect" href="exceptions.xml">Exceptions</a></p>
+<p>Questions on specific kinds of errors. If you have seen a specific exception then check the <link><page ri:content-title="Exceptions"></page></link></p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="could-not-find-packetreader-for-packet-type-unknown-packet-type.xml">Could not find PacketReader for packet type - UNKNOWN PACKET TYPE</a></li><li><a shape="rect" href="exceptions.xml">Exceptions</a><ul class="childpages-macro"><li><a shape="rect" href="certificateunknown.xml">certificate_unknown</a></li><li><a shape="rect" href="ioexception-could-not-find-class-for-resource.xml">IOException - could not find class for resource</a></li><li><a shape="rect" href="javaiointerruptedioexception.xml">java.io.InterruptedIOException</a></li><li><a shape="rect" href="javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml">java.io.IOException Failed to create database 'derbydb', see the next exception for details</a></li><li><a shape="rect" href="javalangnosuchmethoderror.xml">java.lang.NoSuchMethodError</a></li><li><a shape="rect" href="javalangnosuchmethodexception-orgactivemqraactivemqresourceadapters
 etuseembeddedbroker.xml">java.lang.NoSuchMethodException org.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker</a></li><li><a shape="rect" href="javalangoutofmemory.xml">java.lang.OutOfMemory</a></li><li><a shape="rect" href="javaxjmsjmsexception-wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml">javax.jms.JMSException - Wire format negociation timeout - peer did not send his wire format.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI () needs 2.1 API.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (xxx) needs 2.1 API</a></li><li><a shape="rect" href="journal-is-already-opened-by-this-application.xml">Journal is already opened by this application</a></li><li><
 a shape="rect" href="noclassdeffounderror-orgspringframeworkcoreioresource.xml">NoClassDefFoundError - org.springframework.core.io.Resource</a></li><li><a shape="rect" href="no-suitable-driver.xml">No suitable driver</a></li></ul></li><li><a shape="rect" href="i-am-having-problems-with-the-spring-jmstemplate.xml">I am having problems with the Spring JmsTemplate</a></li><li><a shape="rect" href="i-am-not-receiving-any-messages-what-is-wrong.xml">I am not receiving any messages, what is wrong</a></li><li><a shape="rect" href="i-cannot-connect-to-activemq-from-jconsole.xml">I cannot connect to ActiveMQ from JConsole</a></li><li><a shape="rect" href="i-do-not-receive-messages-in-my-second-consumer.xml">I do not receive messages in my second consumer</a></li><li><a shape="rect" href="i-get-errors-building-the-code-whats-wrong.xml">I get errors building the code whats wrong</a></li><li><a shape="rect" href="log4j-warn-no-appenders-could-be-found-for-logger.xml">log4j-WARN No appenders cou
 ld be found for logger</a></li><li><a shape="rect" href="multicast-watch-out-for-ipv6-vs-ipv4-support-on-your-operating-system-or-distribution-or-network.xml">Multicast - Watch out for IPV6 vs IPV4 support on your operating system or distribution or network</a></li><li><a shape="rect" href="my-producer-blocks.xml">My producer blocks</a></li><li><a shape="rect" href="onmessage-method-of-messagelistener-is-never-called.xml">onMessage method of MessageListener is never called</a></li><li><a shape="rect" href="resource-adapter-does-not-seem-to-pool-connections.xml">Resource Adapter does not seem to pool connections</a></li><li><a shape="rect" href="slow-networks-drop-large-messages.xml">Slow networks drop large messages</a></li><li><a shape="rect" href="the-broker-will-not-start.xml">The Broker will not start</a></li><li><a shape="rect" href="the-vm-transport-starts-a-broker-before-my-configured-broker-starts.xml">The vm transport starts a broker before my configured broker starts</a></
 li><li><a shape="rect" href="why-do-i-not-get-all-of-the-messages-i-sent.xml">Why do I not get all of the messages I sent</a></li><li><a shape="rect" href="why-do-i-not-receive-messages-on-my-durable-topic-subscription.xml">Why do I not receive messages on my durable topic subscription</a></li><li><a shape="rect" href="why-do-kahadb-log-files-remain-after-cleanup.xml">Why do KahaDB log files remain after cleanup</a></li></ul></div>
+<structured-macro ac:macro-id="973fda2c-e36b-4969-941e-e4322b544111" 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/example-testing-scenario.xml
----------------------------------------------------------------------
diff --git a/example-testing-scenario.xml b/example-testing-scenario.xml
index 8993c80..da4b748 100644
--- a/example-testing-scenario.xml
+++ b/example-testing-scenario.xml
@@ -1,9 +1,9 @@
-<div class="wiki-content maincontent"><h2 id="ExampleTestingScenario-ActiveMQPerformanceModule">ActiveMQ Performance Module</h2>
+<div class="wiki-content maincontent"><h2>ActiveMQ Performance Module</h2>
 
-<ul><li><a shape="rect" href="activemq-performance-module-users-manual.xml">Users Manual</a></li></ul>
+<ul><li><link><page ri:content-title="ActiveMQ Performance Module Users Manual"></page><link-body>Users Manual</link-body></link></li></ul>
 
 
-<h2 id="ExampleTestingScenario-ExampleTestingScenario">Example Testing Scenario</h2>
+<h2>Example Testing Scenario</h2>
 
 <p>This page gives a simple example of the kinds of thing we wanna do.</p>
 
@@ -11,62 +11,58 @@
 
 <p>We'll try describe the different ways this could work and give each implementation style a name so we can start revving different ways to solve this...</p>
 
-<h3 id="ExampleTestingScenario-Headlessbuild">Headless build</h3>
+<h3>Headless build</h3>
 
 <p>In this version there is no 'controller'; each build is considered to be a totally separate build.</p>
 
 <p>Each build knows what to do; each test case generates an XML file which becomes a named deployment artifact.</p>
 
 <p>e.g. imagine the following builds (which are really just running Java executables within a POM for classpath)</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Box </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostB </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.broker.console.Main tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostC </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Consumer </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.test.ConsumerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostD </p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p> Producer </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.test.ProducerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Box </p></th><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1"><p> hostB </p></td><td colspan="1" rowspan="1"><p> Broker </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.broker.console.Main tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1"><p> hostC </p></td><td colspan="1" rowspan="1"><p> Consumer </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.test.ConsumerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1"><p> hostD </p></td><td colspan="1" rowspan="1"><p> Producer </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.test.ProducerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr></tbody></table>
 
 <p>In the above example - each build has to kinda wait for other things to start up to some time period. e.g. the producer and consumer wanna keep around for say 5 minutes trying to connect to the broker as they can be started in any order.</p>
 
 <p>Ideally we might wanna run this as 3 maven commands 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="38e63ecb-031a-4d14-af75-5f75f99487f0" ac:name="code" ac:schema-version="1"><plain-text-body>
 mvn activemq:broker
 mvn activemq:perf-producer -Dmessage-count=5000 -Dqueue=true -Ddestination=org.foo.bar -Durl=tcp://$hostA:61616
 mvn activemq:perf-consumer -Dmessage-count=5000 -Dqueue=true -Ddestination=org.foo.bar -Durl=tcp://$hostA:61616
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<h3 id="ExampleTestingScenario-Controllerbuild">Controller build</h3>
+<h3>Controller build</h3>
 
 <p>The idea with the controller version is one of the tests (which is spun off first to try help) tries to coordinate among the test nodes.</p>
 
 <p>e.g. we could spin the controller first...</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Box </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostA </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Controller </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> mvn test </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Box </p></th><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1"><p> hostA </p></td><td colspan="1" rowspan="1"><p> Controller </p></td><td colspan="1" rowspan="1"><p> mvn test </p></td></tr></tbody></table>
 
 <p>Then the test case fires off these processes while communicating with them...</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Box </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostB </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Broker </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.broker.console.Main tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostC </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Consumer </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.test.ConsumerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> hostD </p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p> Producer </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> java org.apache.activemq.test.ProducerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Box </p></th><th colspan="1" rowspan="1"><p> Description </p></th><th colspan="1" rowspan="1"><p> Command line </p></th></tr><tr><td colspan="1" rowspan="1"><p> hostB </p></td><td colspan="1" rowspan="1"><p> Broker </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.broker.console.Main tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1"><p> hostC </p></td><td colspan="1" rowspan="1"><p> Consumer </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.test.ConsumerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr><tr><td colspan="1" rowspan="1"><p> hostD </p></td><td colspan="1" rowspan="1"><p> Producer </p></td><td colspan="1" rowspan="1"><p> java org.apache.activemq.test.ProducerMain --message-count=5000 --queue=true --destination=org.foo.bar tcp://$hostA:61616 </p></td></tr></tbody></table>
 
 
-<h3 id="ExampleTestingScenario-Controllerfactorybuild">Controller factory build</h3>
+<h3>Controller factory build</h3>
 
 <p>Fairly soon we're gonna have tons of builds firing off. We may want a single project to build with a raft of different test suites. Each single distributed integration/system/performance test might have many sub-builds (processes) to run.</p>
 
 <p>So we might want to run a single JUnit test case which fires off different remote builds/processes.</p>
 
 <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[
+<structured-macro ac:macro-id="e913d0b3-10e0-47da-bfd9-a0e44571b677" ac:name="code" ac:schema-version="1"><plain-text-body>
 public class PerformanceTestSuite {
    public void testSmallMessages() {
-   	  buildQueue.start(&quot;broker&quot;, &quot;&quot;);
-   	  buildQueue.start(&quot;consumer&quot;, &quot;--messageCount=1000&quot;);
-   	  buildQueue.start(&quot;producer&quot;, &quot;--messageCount=1000&quot;);
+   	  buildQueue.start("broker", "");
+   	  buildQueue.start("consumer", "--messageCount=1000");
+   	  buildQueue.start("producer", "--messageCount=1000");
    	  buildQueue.join(5 * MINUTES);
    }
 
    public void testLargeMessages() {
-   	  buildQueue.start(&quot;broker&quot;, &quot;&quot;);
-   	  buildQueue.start(&quot;consumer&quot;, &quot;--messageCount=1000 --messageSize=1M&quot;);
-   	  buildQueue.start(&quot;producer&quot;, &quot;--messageCount=1000 --messageSize=1M&quot;);
+   	  buildQueue.start("broker", "");
+   	  buildQueue.start("consumer", "--messageCount=1000 --messageSize=1M");
+   	  buildQueue.start("producer", "--messageCount=1000 --messageSize=1M");
    	  buildQueue.join(10 * MINUTES);
    }
 }
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 <p>So these 2 test cases in JUnit in the controller build will each start 3 separate remote builds on the queue and wait for them to complete - or terminate them </p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/examples.xml
----------------------------------------------------------------------
diff --git a/examples.xml b/examples.xml
index 2dec1c9..ab6d915 100644
--- a/examples.xml
+++ b/examples.xml
@@ -1,34 +1,2 @@
-<div class="wiki-content maincontent"><p>Since version<strong> 5.12.0</strong>, Apache ActiveMQ comes with the new tool that can be used to produce and consume messages from the broker.</p><h2 id="Examples-Prerequisites"><span style="color: rgb(34,34,34);">Prerequisites</span></h2><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>Before running the examples you should try&#160;<a shape="rect" href="run-broker.xml">running a JMS broker</a>&#160;on your machine. Follow the&#160;<a shape="rect" href="installation.xml">Installation</a>&#160;instructions to use a binary distribution of ActiveMQ. To run the broker in a command shell, type:</p><p><span style="color: rgb(34,34,34);">&#160;</span></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[bin/activemq console
-]]></script>
-</div></div><p><span style="color: rgb(34,34,34);">&#160;</span></p><p>This starts up ActiveMQ.</p><h2 id="Examples-Running">Running</h2><p>From the<a shape="rect" href="unix-shell-script.xml"> command line</a> you can run</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[${ACTIVEMQ_HOME}/bin/activemq producer
-${ACTIVEMQ_HOME}/bin/activemq consumer]]></script>
-</div></div><p>&#160;</p><p>If you have <code>activemq-all</code> jar available you can achieve the same 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[java -jar activemq-all-5.x.x.jar producer
-java -jar activemq-all-5.x.x.jar consumer]]></script>
-</div></div><p>If you run inside <a shape="rect" href="osgi-integration.xml">Karaf</a>, you can run the commands as</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[activemq:producer
-activemq:consumer]]></script>
-</div></div><p>&#160;</p><h2 id="Examples-Options">Options</h2><p>For all options on the commands, run them with <code>--help</code>&#160;parameter. The up to date, options for&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq/blob/master/activemq-console/src/main/resources/org/apache/activemq/console/command/producer.txt" rel="nofollow">producer</a> and&#160;<a shape="rect" class="external-link" href="https://github.com/apache/activemq/blob/master/activemq-console/src/main/resources/org/apache/activemq/console/command/consumer.txt" rel="nofollow">consumer</a> can be found in the source.</p><h2 id="Examples-Examples">Examples</h2><p>Here are a couple of examples of more advanced features.</p><p>To send a text message with custom text 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[bin/activemq producer --message &quot;My message&quot; --messageCount 1
-]]></script>
-</div></div><p>To send byte message of custom length 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[bin/activemq producer --messageSize 100 --messageCount 1
-]]></script>
-</div></div><p>To send a text message with content obtained from an url</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[bin/activemq producer --payloadUrl http://activemq.apache.org/schema/core/activemq-core.xsd --messageCount 1]]></script>
-</div></div><p>To consume in transaction 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[bin/activemq consumer --transacted true
-]]></script>
-</div></div><p>To use client acknowledgment 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[bin/activemq consumer --ackMode CLIENT_ACKNOWLEDGE
-]]></script>
-</div></div><p>To use durable topic subscribers 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[bin/activemq consumer --durable true --clientId example --destination topic://TEST
-]]></script>
-</div></div><h2 id="Examples-Oldexamples">Old examples</h2><p>In older versions of ActiveMQ, the corresponding examples were located in <code>examples/</code> or&#160;<code>examples/openwire/swissarmy/</code> directories, where you can do the similar tasks with an ant script.</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[ant producer
-ant consumer]]></script>
-</div></div><h2 id="Examples-Otherexamples">Other examples</h2><p>In <code>examples/</code> directory (depending on the version) you can find more examples of using the broker with variety of protocols (mqtt, amqp, ...) and clients (Java, Ruby, JavaScript, ...), so it's the good place to start learning. Also, <code>examples/conf/</code> directory contains a lot of different configuration examples that you can use as a starting point for your deployment.</p><h2 id="Examples-SeeAlso">See Also</h2><ul><li><a shape="rect" href="web-samples.xml">Web Samples</a></li><li><a shape="rect" href="web-console.xml">Web Console</a></li><li><a shape="rect" href="jmx.xml">JMX</a></li></ul></div>
+<div class="wiki-content maincontent"><p><structured-macro ac:macro-id="0968c863-7ab1-4077-92f7-e8476aa32b06" ac:name="include" ac:schema-version="1"><parameter ac:name=""><link><page ri:content-title="Version 5 Examples"></page></link></parameter></structured-macro></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/exceptions.xml
----------------------------------------------------------------------
diff --git a/exceptions.xml b/exceptions.xml
index 9cc4439..8d7059d 100644
--- a/exceptions.xml
+++ b/exceptions.xml
@@ -2,5 +2,5 @@
 
 <p>Questions Java Exceptions (when you get a nasty stack trace while working with ActiveMQ)</p>
 
-<ul class="childpages-macro"><li><a shape="rect" href="certificateunknown.xml">certificate_unknown</a></li><li><a shape="rect" href="ioexception-could-not-find-class-for-resource.xml">IOException - could not find class for resource</a></li><li><a shape="rect" href="javaiointerruptedioexception.xml">java.io.InterruptedIOException</a></li><li><a shape="rect" href="javaioioexception-failed-to-create-database-derbydb-see-the-next-exception-for-details.xml">java.io.IOException Failed to create database 'derbydb', see the next exception for details</a></li><li><a shape="rect" href="javalangnosuchmethoderror.xml">java.lang.NoSuchMethodError</a></li><li><a shape="rect" href="javalangnosuchmethodexception-orgactivemqraactivemqresourceadaptersetuseembeddedbroker.xml">java.lang.NoSuchMethodException org.activemq.ra.ActiveMQResourceAdapter.setUseEmbeddedBroker</a></li><li><a shape="rect" href="javalangoutofmemory.xml">java.lang.OutOfMemory</a></li><li><a shape="rect" href="javaxjmsjmsexception-
 wire-format-negociation-timeout-peer-did-not-send-his-wire-format.xml">javax.jms.JMSException - Wire format negociation timeout - peer did not send his wire format.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI () needs 2.1 API.</a></li><li><a shape="rect" href="jaxb-20-api-is-being-loaded-from-the-bootstrap-classloader-but-this-ri-xxx-needs-21-api.xml">JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (xxx) needs 2.1 API</a></li><li><a shape="rect" href="journal-is-already-opened-by-this-application.xml">Journal is already opened by this application</a></li><li><a shape="rect" href="noclassdeffounderror-orgspringframeworkcoreioresource.xml">NoClassDefFoundError - org.springframework.core.io.Resource</a></li><li><a shape="rect" href="no-suitable-driver.xml">No suitable driver</a></li></ul></div>
+<structured-macro ac:macro-id="7157e88d-4129-4eae-8f4e-8e19923d3fa8" 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/exclusive-consumer.xml
----------------------------------------------------------------------
diff --git a/exclusive-consumer.xml b/exclusive-consumer.xml
index c14435d..6ffdc68 100644
--- a/exclusive-consumer.xml
+++ b/exclusive-consumer.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h3 id="ExclusiveConsumer-Background">Background</h3>
+<div class="wiki-content maincontent"><h3>Background</h3>
 
 <p>We maintain the order of messages in queues and dispatch them to consumers in order. However if you have multiple JMS Sessions and MessageConsumer instances consuming from the same queue (whether in the same JVM or not), you will loose the guarantee of processing the messages in order; since the messages with be processed concurrently in different threads.</p>
 
@@ -6,7 +6,7 @@
 
 <p>So what folks have to do in J2EE clusters is often to <em>pin</em> one particular JVM in the cluster to have <em>one</em> consumer on the queue to avoid loosing ordering. The problem with this is that if the particular pinned JVM goes down, no one is processing the queue any more, which can be problem.</p>
 
-<h3 id="ExclusiveConsumer-ExclusiveConsumer">Exclusive Consumer</h3>
+<h3>Exclusive Consumer</h3>
 
 <p>We have a new feature in 4.x called Exclusive Consumer or Exclusive Queues which avoids the end user having to <em>pin</em> anything. The broker will pick a single MessageConsumer to get all the messages for a queue to ensure ordering. If that consumer fails, the broker will auto failover and choose another consumer.</p>
 
@@ -14,14 +14,12 @@
 
 <p>For those who've struggled with pinning JMS consumers in J2EE clusters you'll immediately realize how useful this is to making clustered, high available distributed services.</p>
 
-<h3 id="ExclusiveConsumer-Example">Example</h3>
+<h3>Example</h3>
 
-<p>An Exclusive Consumer is created using <a shape="rect" href="destination-options.xml">Destination Options</a> as follows:</p>
+<p>An Exclusive Consumer is created using <link><page ri:content-title="Destination Options"></page></link> as follows:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-queue = new ActiveMQQueue(&quot;TEST.QUEUE?consumer.exclusive=true&quot;);
+<structured-macro ac:macro-id="d264c935-8140-47cb-beee-f71ddae49a5a" ac:name="code" ac:schema-version="1"><parameter ac:name="">java</parameter><plain-text-body>
+queue = new ActiveMQQueue("TEST.QUEUE?consumer.exclusive=true");
 consumer = session.createConsumer(queue);
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 


[51/51] [abbrv] [partial] activemq-web git commit: Add body.storage type

Posted by dk...@apache.org.
Add body.storage type


Project: http://git-wip-us.apache.org/repos/asf/activemq-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-web/commit/7a7d976c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-web/tree/7a7d976c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-web/diff/7a7d976c

Branch: refs/heads/body.storage
Commit: 7a7d976c58da11b271dc2b10fc3ba157dfa2ecd1
Parents: f24da65
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Dec 14 09:47:08 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Dec 14 09:47:08 2017 -0500

----------------------------------------------------------------------
 ...jca-resource-adapter-coming-along-nicely.xml |    2 +-
 2004/04/13/jxta-support-available.xml           |    2 +-
 ...b-streaming-and-streamlet-demo-available.xml |    6 +-
 2004/06/23/jgroups-and-jrms-support.xml         |    2 +-
 ...cluster-based-applications-with-activemq.xml |    4 +-
 ...on-distributed-queues-and-fast-producers.xml |    6 +-
 2004/08/23/using-activemq-on-net.xml            |    2 +-
 ...th-distributed-queues-and-topics-support.xml |    4 +-
 .../11/02/activemq-and-hermes-startup-movie.xml |    2 +-
 2004/12/20/activemq-15-released.xml             |    2 +-
 2005/02/03/activemq-20-released.xml             |    2 +-
 ...leased-with-high-performance-journalling.xml |    4 +-
 2005/04/11/activemq-30-released.xml             |    6 +-
 ...ing-activemq-with-the-spring-jmstemplate.xml |   22 +-
 ...es-available-for-activemq-and-servicemix.xml |    5 +-
 .../07/13/hermes-jms-messagestores-are-cool.xml |    2 +-
 ...ation-of-the-activemq-broker-into-spring.xml |   12 +-
 .../great-blog-post-on-message-driven-pojos.xml |    4 +-
 ...q-31-released-with-ruby-and-perl-support.xml |    6 +-
 ...mq-integrates-with-openrico-ajax-library.xml |    4 +-
 ...support-for-custom-spring-xml-processing.xml |    4 +-
 ...released-with-stomp-10-and-improved-ajax.xml |    4 +-
 ...0-exclusive-consumers-and-message-groups.xml |    6 +-
 2005/11/23/new-discussion-forum-available.xml   |    2 +-
 ...activemq-4x-codebase-has-moved-to-apache.xml |    2 +-
 ...ew-discussion-forums-available-at-nabble.xml |   13 +-
 .../16/performance-tuning-guide-available.xml   |    2 +-
 2006/11/17/apache-activemq-402-released.xml     |    2 +-
 2007-april.xml                                  |    5 +-
 2007/01/19/activemq-410-released.xml            |    2 +-
 ...-rails-and-activemq-with-activemessaging.xml |    2 +-
 ...l-python-php-ruby-pike-and-now-smalltalk.xml |    2 +-
 ...port-in-springnet-available-for-download.xml |    4 +-
 2007/04/03/activemq-feathercast-available.xml   |    2 +-
 2007/04/03/apache-activemq-411-released.xml     |    2 +-
 ...ple-destinations-using-a-messageproducer.xml |    6 +-
 2007/06/08/integrating-activemq-web-console.xml |    2 +-
 ...pache-activemq-activemessaging-and-rails.xml |    4 +-
 2007/12/15/apache-activemq-500-released.xml     |    6 +-
 2008/04/28/javaone-meetup-2008.xml              |   16 +-
 2008/05/07/activemq-510-released.xml            |    4 +-
 2008/11/21/apache-activemq-520-released.xml     |    2 +-
 ...tivemq-in-action-free-chapters-available.xml |    4 +-
 2009/03/10/40-off-of-activemq-in-action.xml     |    8 +-
 2009/04/17/continuous-integration-server.xml    |    8 +-
 ...ide-kit-from-ttm-solutions-now-available.xml |    4 +-
 2009/10/13/activemq-530-released.xml            |    2 +-
 ...q-530-has-an-official-specjms2007-result.xml |    2 +-
 2010/03/23/activemq-531-released.xml            |    2 +-
 2010/05/11/activemq-532-released.xml            |    2 +-
 2010/05/18/50-off-activemq-in-action.xml        |    8 +-
 .../29/free-excerpt-from-activemq-in-action.xml |    4 +-
 2010/08/17/apache-activemq-540-released.xml     |    2 +-
 ...t-confirms-45-60-performance-improvement.xml |    2 +-
 2010/09/22/apache-activemq-541-released.xml     |    2 +-
 2010/12/02/apache-activemq-542-released.xml     |    2 +-
 2011/04/01/apache-activemq-550-released.xml     |    2 +-
 ...ion-is-now-available-in-print-and-e-book.xml |   10 +-
 .../04/27/activemq-cpp-version-342-released.xml |    2 +-
 2012/05/04/apachenmsactivemq-v155-released.xml  |    2 +-
 2012/05/07/apache-activemq-560-released.xml     |    2 +-
 .../06/02/activemq-cpp-version-343-released.xml |    2 +-
 .../06/29/activemq-cpp-version-344-released.xml |    2 +-
 2012/10/08/apache-activemq-570-released.xml     |    2 +-
 2012/10/12/activemq-cpp-v345-released.xml       |    2 +-
 .../12/21/activemq-cpp-version-350-released.xml |    2 +-
 2013/02/12/apache-activemq-580-released.xml     |    4 +-
 2013/06/10/apachenmsactivemq-v160-released.xml  |    2 +-
 2013/10/21/apache-activemq-590-released.xml     |    2 +-
 2014/06/10/apache-activemq-5100-released.xml    |    2 +-
 2015/01/22/apache-activemq-5101-released.xml    |    2 +-
 2015/02/04/apache-activemq-5110-released.xml    |    2 +-
 2015/02/18/apache-activemq-5102-released.xml    |    2 +-
 2015/02/18/apache-activemq-5111-released.xml    |    2 +-
 2015/08/13/apache-activemq-5112-released.xml    |    2 +-
 2015/08/14/apache-activemq-5120-released.xml    |    2 +-
 2015/10/16/apache-activemq-5121-released.xml    |    2 +-
 2015/11/03/activemq-5113-released.xml           |    2 +-
 2015/12/03/apache-activemq-5130-released.xml    |    2 +-
 2016/01/13/apache-activemq-5122-released.xml    |    2 +-
 2016/02/08/apache-activemq-5131-released.xml    |    2 +-
 2016/03/07/apache-activemq-5132-released.xml    |    2 +-
 2016/05/03/apache-activemq-5133-released.xml    |    2 +-
 2016/07/21/apache-activemq-5134-released.xml    |    2 +-
 2016/08/08/apache-activemq-5140-released.xml    |    2 +-
 2016/10/03/apache-activemq-5141-released.xml    |    2 +-
 2016/12/09/apache-activemq-5142-released.xml    |    2 +-
 2017/03/03/apache-activemq-5144-released.xml    |    2 +-
 2017/04/17/apache-activemq-5145-released.xml    |    2 +-
 2017/07/06/apache-activemq-5150-released.xml    |    2 +-
 2017/10/23/apache-activemq-5152-released.xml    |    2 +-
 40-rc-1-guide.xml                               |   37 +-
 58-migration-guide.xml                          |    7 +-
 59-migration-guide.xml                          |    3 +-
 activation-spec-properties.xml                  |    6 +-
 activemq-11-release.xml                         |   17 +-
 activemq-12-release.xml                         |   19 +-
 activemq-13-release.xml                         |   19 +-
 activemq-14-release.xml                         |   19 +-
 activemq-15-release.xml                         |   19 +-
 activemq-20-release.xml                         |   19 +-
 activemq-21-release.xml                         |   19 +-
 activemq-30-release.xml                         |   19 +-
 activemq-31-release.xml                         |   19 +-
 activemq-32-release.xml                         |   19 +-
 activemq-321-release.xml                        |   17 +-
 activemq-322-release.xml                        |   17 +-
 activemq-40-m4-release.xml                      |   18 +-
 activemq-40-rc2-release.xml                     |   25 +-
 activemq-40-release.xml                         |   51 +-
 activemq-401-release.xml                        |   35 +-
 activemq-402-release.xml                        |   25 +-
 activemq-410-release.xml                        |   39 +-
 activemq-411-release.xml                        |   55 +-
 activemq-412-release.xml                        |   55 +-
 activemq-500-release.xml                        |   43 +-
 activemq-510-release.xml                        |   70 +-
 activemq-5100-release.xml                       |   24 +-
 activemq-5101-release.xml                       |   24 +-
 activemq-5102-release.xml                       |   24 +-
 activemq-5110-release.xml                       |   21 +-
 activemq-5111-release.xml                       |   24 +-
 activemq-5112-release.xml                       |   24 +-
 activemq-5113-release.xml                       |   24 +-
 activemq-5120-release.xml                       |   24 +-
 activemq-5121-release.xml                       |   24 +-
 activemq-5122-release.xml                       |   32 +-
 activemq-5130-release.xml                       |   32 +-
 activemq-5131-release.xml                       |   32 +-
 activemq-5132-release.xml                       |   32 +-
 activemq-5133-release.xml                       |   32 +-
 activemq-5134-release.xml                       |   32 +-
 activemq-5140-release.xml                       |   32 +-
 activemq-5141-release.xml                       |   32 +-
 activemq-5142-release.xml                       |   32 +-
 activemq-5143-release.xml                       |   32 +-
 activemq-5144-release.xml                       |   32 +-
 activemq-5145-release.xml                       |   32 +-
 activemq-5150-release.xml                       |   32 +-
 activemq-5151-release.xml                       |   32 +-
 activemq-5152-release.xml                       |   32 +-
 activemq-520-release.xml                        |   41 +-
 activemq-530-release.xml                        |   35 +-
 activemq-531-release.xml                        |   30 +-
 activemq-532-release.xml                        |   30 +-
 activemq-540-release.xml                        |   37 +-
 activemq-541-release.xml                        |   37 +-
 activemq-542-release.xml                        |   30 +-
 activemq-543-release.xml                        |   30 +-
 activemq-550-release.xml                        |   37 +-
 activemq-551-release.xml                        |   30 +-
 activemq-560-release.xml                        |   32 +-
 activemq-570-release.xml                        |   30 +-
 activemq-580-release.xml                        |   39 +-
 activemq-590-release.xml                        |   33 +-
 activemq-591-release.xml                        |   33 +-
 activemq-artemis-roadmap.xml                    |   58 +-
 activemq-c-clients.xml                          |    5 +-
 activemq-c-development.xml                      |   10 +-
 activemq-command-line-tools-reference.xml       |    2 +-
 activemq-connection-uris.xml                    |   30 +-
 activemq-inactivitymonitor.xml                  |   12 +-
 activemq-message-properties.xml                 |    2 +-
 activemq-performance-module-users-manual.xml    |   20 +-
 activemq-real-time.xml                          |   10 +-
 advisory-message.xml                            |   38 +-
 ajax.xml                                        |  107 +-
 all-forums.xml                                  |    8 +-
 amq-message-store.xml                           |   62 +-
 amqp.xml                                        |   24 +-
 apache-activemq-board-report-200708-august.xml  |    6 +-
 apache-activemq-board-report-200710-october.xml |    6 +-
 apache-activemq-board-report-200801-january.xml |    6 +-
 apache-activemq-board-report-200807-july.xml    |    6 +-
 apache-activemq-board-report-200810-october.xml |    6 +-
 apache-activemq-board-report-200901-january.xml |    8 +-
 apache-activemq-board-report-200904-april.xml   |    6 +-
 apache-activemq-board-report-200907-july.xml    |    6 +-
 apache-activemq-board-report-200910-october.xml |    6 +-
 apache-activemq-board-report-201001-january.xml |    6 +-
 apache-activemq-board-report-201005-may.xml     |    6 +-
 apache-activemq-board-report-201504-april.xml   |    2 +-
 apache-activemq-board-report-201506-june.xml    |    2 +-
 apache-activemq-board-report-201508-august.xml  |    2 +-
 apache-activemq-board-report-201510-october.xml |    2 +-
 ...he-activemq-board-report-201602-february.xml |    2 +-
 apache-activemq-board-report-201604-april.xml   |    2 +-
 apache-activemq-board-report-201605-may.xml     |    2 +-
 apache-activemq-board-report-201607-july.xml    |    2 +-
 apache-activemq-board-report-201610-october.xml |    2 +-
 apache-activemq-board-report-201701-january.xml |    2 +-
 apache-activemq-board-report-201704-april.xml   |    2 +-
 apache-activemq-board-report-201707-july.xml    |    2 +-
 apache-activemq-board-report-201710-october.xml |    2 +-
 apache-activemq-board-report-april-2008.xml     |   10 +-
 apache-activemq-board-reports.xml               |    2 +-
 articles.xml                                    |    2 +-
 async-sends.xml                                 |   14 +-
 audit-logging.xml                               |   24 +-
 auto.xml                                        |   20 +-
 axis-and-cxf-support.xml                        |   12 +-
 banner.xml                                      |   14 +-
 becoming-a-committer.xml                        |    4 +-
 benchmark-tests.xml                             |    9 +-
 blazeds.xml                                     |   28 +-
 blob-messages.xml                               |   47 +-
 board-reports.xml                               |    4 +-
 books.xml                                       |    2 +-
 broadcasting.xml                                |   18 +-
 broker-camel-component.xml                      |   32 +-
 broker-configuration-uri.xml                    |    8 +-
 broker-properties-uri.xml                       |   10 +-
 broker-uri.xml                                  |   25 +-
 broker-xbean-uri.xml                            |   26 +-
 building-activemq-cpp.xml                       |  111 +-
 building.xml                                    |   26 +-
 c-integration-scenarios.xml                     |    8 +-
 c-integration.xml                               |    7 +-
 cache/main.pageCache                            |  Bin 163717 -> 163717 bytes
 cache/nms.pageCache                             |  Bin 32463 -> 32463 bytes
 cached-ldap-authorization-module.xml            |   34 +-
 can-i-get-commercial-support.xml                |    4 +-
 can-i-modify-messages-on-a-queue.xml            |    2 +-
 ...sages-concurrently-on-one-jms-connection.xml |    2 +-
 can-i-send-really-large-files-over-activemq.xml |    9 +-
 can-i-use-activemq-5x-or-later-on-java-14.xml   |   11 +-
 can-two-brokers-share-the-same-database.xml     |    4 +-
 can-you-browse-a-topic.xml                      |    2 +-
 certificateunknown.xml                          |   10 +-
 changes-in-40.xml                               |   25 +-
 ...-diagrams-for-activemq-40-m4-source-code.xml |    6 +-
 clustering.xml                                  |    2 +-
 cms/2007/04/18/activemq-cpp-11-released.xml     |    2 +-
 .../04/18/activemq-cpp-20-rc1-now-available.xml |    2 +-
 cms/2007/04/20/activemq-cpp-20-release.xml      |    2 +-
 .../30/activemq-cpp-201-rc1-now-available.xml   |    2 +-
 cms/2007/04/30/cms-api-10-release.xml           |    2 +-
 cms/2007/05/09/activemq-cpp-201-release.xml     |    2 +-
 cms/2007/07/24/cms-api-11-release.xml           |    2 +-
 cms/2007/07/25/activemq-cpp-21-rc1-release.xml  |    2 +-
 .../07/26/activemq-cpp-21-rc1-now-available.xml |    2 +-
 cms/2007/08/07/activemq-cpp-21-release.xml      |    2 +-
 cms/2007/10/28/cms-api-12-release.xml           |    2 +-
 cms/2007/11/05/activemq-cpp-211-released.xml    |    2 +-
 cms/2007/11/26/solaris-platform.xml             |    2 +-
 cms/2007/11/28/activemq-cpp-212-released.xml    |    2 +-
 cms/2007/12/10/activemq-cpp-213-released.xml    |    2 +-
 cms/2008/06/22/activemq-cpp-22-released.xml     |    2 +-
 cms/2008/09/10/activemq-cpp-221-released.xml    |    2 +-
 cms/2008/11/24/activemq-cpp-222-released.xml    |    2 +-
 cms/2009/01/12/activemq-cpp-223-released.xml    |    2 +-
 cms/2009/02/21/activemq-cpp-224-released.xml    |    2 +-
 cms/2009/03/25/activemq-cpp-225-released.xml    |    2 +-
 cms/2009/05/17/activemq-cpp-226-released.xml    |    2 +-
 cms/2009/06/12/activemq-cpp-30-released.xml     |    2 +-
 cms/2009/07/03/activemq-cpp-301-released.xml    |    2 +-
 .../20/activemq-cpp-310-officially-released.xml |    2 +-
 cms/2010/03/27/activemq-cpp-312-released.xml    |    2 +-
 cms/2010/06/18/activemq-cpp-320-released.xml    |    2 +-
 cms/2010/07/03/activemq-cpp-v321-released.xml   |    2 +-
 cms/2010/09/16/activemq-cpp-v322-released.xml   |    2 +-
 cms/2010/09/16/activemq-cpp-v323-released.xml   |    2 +-
 cms/2010/12/10/activemq-cpp-v324-released.xml   |    2 +-
 cms/2011/03/05/activemq-cpp-v325-released.xml   |    2 +-
 cms/2011/04/15/activemq-cpp-v330-released.xml   |    2 +-
 cms/2011/04/29/activemq-cpp-v340-released.xml   |    2 +-
 .../12/18/activemq-cpp-version-341-released.xml |    2 +-
 .../04/27/activemq-cpp-version-342-released.xml |    2 +-
 .../06/02/activemq-cpp-version-343-released.xml |    2 +-
 .../06/29/activemq-cpp-version-344-released.xml |    2 +-
 cms/2012/10/12/activemq-cpp-v345-released.xml   |    2 +-
 .../12/20/activemq-cpp-version-350-released.xml |    2 +-
 cms/2013/03/08/activemq-cpp-v360-released.xml   |    2 +-
 cms/2013/05/19/activemq-cpp-v370-released.xml   |    2 +-
 cms/2013/09/07/activemq-cpp-v380-released.xml   |    2 +-
 cms/2013/09/19/activemq-cpp-v381-released.xml   |    2 +-
 cms/2013/12/10/activemq-cpp-v382-released.xml   |    2 +-
 cms/2015/08/16/activemq-cpp-v390-released.xml   |    2 +-
 cms/2015/12/04/activemq-cpp-v391-released.xml   |    2 +-
 cms/2016/02/09/activemq-cpp-v392-released.xml   |    2 +-
 cms/2016/04/01/activemq-cpp-v393-released.xml   |    2 +-
 cms/2017/02/24/activemq-cpp-v394-released.xml   |    2 +-
 cms/activemq-cpp-10-release.xml                 |   28 +-
 cms/activemq-cpp-11-release.xml                 |   28 +-
 cms/activemq-cpp-20-release.xml                 |   28 +-
 cms/activemq-cpp-201-release.xml                |   32 +-
 cms/activemq-cpp-21-release.xml                 |   32 +-
 cms/activemq-cpp-211-release.xml                |   30 +-
 cms/activemq-cpp-212-release.xml                |   32 +-
 cms/activemq-cpp-213-release.xml                |   32 +-
 cms/activemq-cpp-22-release.xml                 |   32 +-
 cms/activemq-cpp-221-release.xml                |   32 +-
 cms/activemq-cpp-222-release.xml                |   32 +-
 cms/activemq-cpp-223-release.xml                |   32 +-
 cms/activemq-cpp-224-release.xml                |   32 +-
 cms/activemq-cpp-225-release.xml                |   32 +-
 cms/activemq-cpp-226-release.xml                |   32 +-
 cms/activemq-cpp-30-release.xml                 |   32 +-
 cms/activemq-cpp-301-release.xml                |   32 +-
 cms/activemq-cpp-310-release.xml                |   27 +-
 cms/activemq-cpp-311-release.xml                |   27 +-
 cms/activemq-cpp-312-release.xml                |   27 +-
 cms/activemq-cpp-313-release.xml                |   27 +-
 cms/activemq-cpp-320-release.xml                |   27 +-
 cms/activemq-cpp-321-release.xml                |   27 +-
 cms/activemq-cpp-322-release.xml                |   27 +-
 cms/activemq-cpp-323-release.xml                |   27 +-
 cms/activemq-cpp-324-release.xml                |   27 +-
 cms/activemq-cpp-325-release.xml                |   27 +-
 cms/activemq-cpp-330-release.xml                |   27 +-
 cms/activemq-cpp-340-release.xml                |   27 +-
 cms/activemq-cpp-341-release.xml                |   27 +-
 cms/activemq-cpp-342-release.xml                |   27 +-
 cms/activemq-cpp-343-release.xml                |   27 +-
 cms/activemq-cpp-344-release.xml                |   27 +-
 cms/activemq-cpp-345-release.xml                |   27 +-
 cms/activemq-cpp-350-release.xml                |   27 +-
 cms/activemq-cpp-360-release.xml                |   27 +-
 cms/activemq-cpp-370-release.xml                |   27 +-
 cms/activemq-cpp-371-release.xml                |   26 +-
 cms/activemq-cpp-380-release.xml                |   26 +-
 cms/activemq-cpp-381-release.xml                |   26 +-
 cms/activemq-cpp-382-release.xml                |    6 +-
 cms/activemq-cpp-383-release.xml                |    6 +-
 cms/activemq-cpp-384-release.xml                |    6 +-
 cms/activemq-cpp-390-release.xml                |    6 +-
 cms/activemq-cpp-391-release.xml                |    6 +-
 cms/activemq-cpp-392-release.xml                |    6 +-
 cms/activemq-cpp-393-release.xml                |    6 +-
 cms/activemq-cpp-394-release.xml                |    6 +-
 ...activemq-cpp-libtool-and-packaging-notes.xml |    9 +-
 cms/activemq-cpp-product-version-number.xml     |    7 +-
 cms/activemq-cpp-stomp.xml                      |   10 +-
 cms/activemq-cpp-usage-faqs.xml                 |    2 +-
 cms/api.xml                                     |    2 +-
 cms/are-there-more-faq-entries.xml              |    4 +-
 cms/banner.xml                                  |   16 +-
 cms/building-faqs.xml                           |    2 +-
 cms/building.xml                                |   46 +-
 cms/cms-api-10-release.xml                      |   20 +-
 cms/cms-api-11-release.xml                      |   27 +-
 cms/cms-api-12-release.xml                      |   27 +-
 cms/cms-api-overview.xml                        |  248 +--
 cms/community.xml                               |    2 +-
 cms/configuring.xml                             |   81 +-
 cms/connectivity.xml                            |    3 +-
 cms/creating-distributions.xml                  |   51 +-
 cms/developers.xml                              |    2 +-
 cms/discussion-forums.xml                       |   12 +-
 cms/download.xml                                |    2 +-
 cms/enable-openssl-support-with-autotools.xml   |    7 +-
 ...dla-on-solaris-10-using-the-gnu-compiler.xml |   20 +-
 cms/example.xml                                 |   56 +-
 cms/faq.xml                                     |   23 +-
 cms/general-build-issues.xml                    |    2 +-
 cms/general.xml                                 |    2 +-
 cms/getting-started.xml                         |    5 +-
 cms/handling-advisory-messages.xml              |  204 +-
 ...t-autoconf-from-enabling-openssl-support.xml |    7 +-
 cms/how-do-i-use-the-ssl-transport.xml          |   23 +-
 cms/index.xml                                   |   84 +-
 cms/mailing-lists.xml                           |   10 +-
 cms/navigation.xml                              |   47 +-
 cms/news.xml                                    |  206 +-
 cms/openssl-support.xml                         |    2 +-
 cms/openwire-support.xml                        |    7 +-
 cms/overview.xml                                |    4 +-
 cms/privacy-policy.xml                          |    2 +-
 cms/quicklinks.xml                              |    2 +-
 cms/site.xml                                    |    2 +-
 cms/siteindex.xml                               |  336 +--
 cms/sitemap.xml                                 |    2 +-
 cms/solaris-platform.xml                        |    2 +-
 cms/source.xml                                  |    6 +-
 cms/stomp-support.xml                           |   14 +-
 cms/support.xml                                 |   14 +-
 cms/tutorials.xml                               |    5 +-
 cms/using-activemq-cpp.xml                      |    5 +-
 cms/using-the-solaris-cc-compiler.xml           |    2 +-
 cms/what-is-activemq-cpp.xml                    |    4 +-
 code-overview.xml                               |   84 +-
 command-agent.xml                               |   30 +-
 community.xml                                   |    2 +-
 compile-activemq-with-gcj.xml                   |  124 +-
 ...x-single-broker-configuration-stomp-only.xml |   56 +-
 composite-destinations.xml                      |   25 +-
 configurable-ioexception-handling.xml           |   18 +-
 configuration.xml                               |    2 +-
 configure-startup-destinations.xml              |    2 +-
 configure-version-5-brokers.xml                 |   54 +-
 configuring-activemq-cpp.xml                    |   49 +-
 configuring-brokers.xml                         |   26 +-
 configuring-transports.xml                      |   28 +-
 configuring-version-5-transports.xml            |   30 +-
 configuring-wire-formats.xml                    |   10 +-
 connection-configuration-uri.xml                |   10 +-
 connection-factory-properties.xml               |   12 +-
 connectivity.xml                                |    4 +-
 consumer-dispatch-async.xml                     |   14 +-
 consumer-features.xml                           |    2 +-
 consumer-priority.xml                           |    6 +-
 containers.xml                                  |    2 +-
 contributing.xml                                |   18 +-
 ...ader-for-packet-type-unknown-packet-type.xml |   10 +-
 cross-language-clients.xml                      |    2 +-
 delay-and-schedule-message-delivery.xml         |   30 +-
 delete-inactive-destinations.xml                |   10 +-
 delphi-and-freepascal.xml                       |   12 +-
 design-documents.xml                            |    3 +-
 destination-features.xml                        |    2 +-
 destination-options.xml                         |    6 +-
 destinations-plugin.xml                         |    8 +-
 developer-forum.xml                             |    8 +-
 developer-guide.xml                             |    2 +-
 developers.xml                                  |    2 +-
 developing-activemq.xml                         |    2 +-
 developing-plugins.xml                          |   36 +-
 discovery-transport-reference.xml               |   37 +-
 discovery.xml                                   |   18 +-
 discussion-forums.xml                           |   12 +-
 dispatch-policies.xml                           |    2 +-
 does-activemq-support-clustering.xml            |    2 +-
 does-activemq-support-my-sql-database.xml       |    2 +-
 download-archives.xml                           |    2 +-
 download.xml                                    |   11 +-
 downloading-activemq-cpp.xml                    |   16 +-
 durable-queue-memory-management.xml             |   10 +-
 encrypted-passwords.xml                         |   76 +-
 enterprise-integration-patterns.xml             |   51 +-
 errors.xml                                      |    4 +-
 example-testing-scenario.xml                    |   42 +-
 examples.xml                                    |   34 +-
 exceptions.xml                                  |    2 +-
 exclusive-consumer.xml                          |   16 +-
 failover-transport-reference.xml                |   32 +-
 fanout-transport-reference.xml                  |   45 +-
 faq.xml                                         |   62 +-
 features-overview.xml                           |    2 +-
 features.xml                                    |    2 +-
 general.xml                                     |    2 +-
 geronimo.xml                                    |  113 +-
 getting-started.xml                             |   98 +-
 group-membership.xml                            |   14 +-
 hello-world.xml                                 |   32 +-
 hermes-jms.xml                                  |   22 +-
 hermes-screenshot.xml                           |    2 +-
 how-can-i-add-a-new-type-of-transport.xml       |    6 +-
 ...erialization-of-objects-in-objectmessage.xml |    2 +-
 how-can-i-contribute.xml                        |   17 +-
 how-can-i-enable-detailed-logging.xml           |   22 +-
 ...ist-of-the-topics-and-queues-in-a-broker.xml |   10 +-
 how-can-i-get-help.xml                          |    2 +-
 ...an-i-get-the-source-code-from-subversion.xml |   12 +-
 how-can-i-make-activemq-faster.xml              |    2 +-
 how-can-i-monitor-activemq.xml                  |    2 +-
 ...i-monitor-the-connection-with-the-broker.xml |   11 +-
 how-can-i-see-what-destinations-are-used.xml    |    2 +-
 how-can-i-support-auto-reconnection.xml         |   12 +-
 how-can-i-support-priority-queues.xml           |   44 +-
 how-can-i-use-different-network-protocols.xml   |    2 +-
 how-do-distributed-queues-work.xml              |   27 +-
 how-do-durable-queues-and-topics-work.xml       |    2 +-
 how-do-i-access-activemq-from-c.xml             |    2 +-
 ...-i-access-activemq-from-csharp-or-dotnet.xml |    2 +-
 ...ccess-activemq-from-ruby-perl-python-php.xml |    2 +-
 how-do-i-add-my-own-plugins.xml                 |    2 +-
 ...do-i-avoid-maven-downloading-latest-jars.xml |   12 +-
 how-do-i-bridge-different-jms-providers.xml     |    4 +-
 how-do-i-build-but-disable-the-unit-tests.xml   |   10 +-
 how-do-i-change-dispatch-policy.xml             |   14 +-
 how-do-i-change-the-logging.xml                 |   56 +-
 ...e-store-directory-for-an-embedded-broker.xml |    6 +-
 how-do-i-compile-from-the-source.xml            |    4 +-
 ...0s-of-1000s-of-queues-in-a-single-broker.xml |   11 +-
 ...-hold-100s-of-millions-of-queue-messages.xml |    2 +-
 ...ure-activemq-to-use-aio-server-transport.xml |   22 +-
 how-do-i-configure-automatic-reconnection.xml   |    8 +-
 ...i-configure-distributed-queues-or-topics.xml |   11 +-
 how-do-i-configure-the-queues-i-want.xml        |    4 +-
 ...ct-to-one-of-a-number-of-message-brokers.xml |    8 +-
 how-do-i-consume-a-specific-message.xml         |   10 +-
 how-do-i-create-new-destinations.xml            |   16 +-
 how-do-i-debug-activemq-from-my-ide.xml         |    2 +-
 ...al-address-and-local-port-for-tcp-or-ssl.xml |    6 +-
 how-do-i-delete-a-destination.xml               |   11 +-
 how-do-i-disable-logging.xml                    |    4 +-
 how-do-i-disable-persistence.xml                |    6 +-
 how-do-i-edit-the-website.xml                   |   16 +-
 how-do-i-embed-a-broker-inside-a-connection.xml |  128 +-
 how-do-i-enable-asynchronous-sending.xml        |    6 +-
 how-do-i-enable-debug-logging.xml               |   10 +-
 how-do-i-find-the-size-of-a-queue.xml           |    6 +-
 how-do-i-get-started-with-jms.xml               |    6 +-
 how-do-i-make-messages-durable.xml              |    8 +-
 how-do-i-preserve-order-of-messages.xml         |    3 +-
 how-do-i-purge-a-queue.xml                      |   15 +-
 how-do-i-restart-embedded-broker.xml            |   24 +-
 ...tions-from-creating-new-queues-or-topics.xml |    6 +-
 how-do-i-run-a-broker.xml                       |    4 +-
 how-do-i-run-activemq-under-the-kaffe-jvm.xml   |   16 +-
 ...stinations-from-a-single-messageproducer.xml |    8 +-
 how-do-i-set-the-message-expiration.xml         |    3 +-
 how-do-i-unack-the-message-with-stomp.xml       |   49 +-
 ...do-i-use-activemq-using-in-jvm-messaging.xml |   12 +-
 ...able-subscribers-in-a-network-of-brokers.xml |   16 +-
 how-do-i-use-ivy-with-activemq.xml              |   40 +-
 how-do-i-use-jms-efficiently.xml                |   22 +-
 ...o-i-use-log4j-jms-appender-with-activemq.xml |   44 +-
 how-do-i-use-ssl.xml                            |   68 +-
 how-do-message-groups-compare-to-selectors.xml  |    3 +-
 how-do-multiple-transports-work.xml             |    2 +-
 how-do-transactions-work.xml                    |    2 +-
 how-does-a-queue-compare-to-a-topic.xml         |    4 +-
 how-does-activemq-compare-to-amqp.xml           |    4 +-
 how-does-activemq-compare-to-artemis.xml        |    2 +-
 ...-activemq-compare-to-fuse-message-broker.xml |    2 +-
 how-does-activemq-compare-to-jbossmq.xml        |   14 +-
 how-does-activemq-compare-to-mantaray.xml       |    6 +-
 how-does-activemq-compare-to-mule.xml           |    2 +-
 how-does-activemq-compare-to-spread-toolkit.xml |   10 +-
 ...s-connectionfactory-relate-to-the-broker.xml |    9 +-
 how-does-jms-compare-with-email.xml             |    2 +-
 how-does-openwire-compare-to-stomp.xml          |    4 +-
 how-does-the-journal-work.xml                   |    2 +-
 how-does-the-website-work.xml                   |    6 +-
 how-does-xbean-compare-to-spring-2.xml          |    6 +-
 how-fast-is-activemq.xml                        |   10 +-
 how-lightweight-is-sending-a-message.xml        |    6 +-
 ...ld-i-implement-request-response-with-jms.xml |   74 +-
 ...ge-applications-using-camel-and-activemq.xml |    9 +-
 how-should-i-use-the-vm-transport.xml           |   18 +-
 ...come-a-committer-on-the-activemq-project.xml |    2 +-
 how-to-configure-a-new-database.xml             |   36 +-
 ...-with-large-number-of-threads-in-clients.xml |   20 +-
 ...eploy-activemq-ra-versionrar-to-weblogic.xml |   11 +-
 how-to-disable-auto-destination-creation.xml    |    2 +-
 how-to-disable-multicast-discovery.xml          |   14 +-
 how-to-unit-test-jms-code.xml                   |   42 +-
 how-you-can-help-release.xml                    |    6 +-
 http-and-https-transports-reference.xml         |   21 +-
 ...ing-problems-with-the-spring-jmstemplate.xml |    4 +-
 ...not-receiving-any-messages-what-is-wrong.xml |   14 +-
 i-cannot-connect-to-activemq-from-jconsole.xml  |   12 +-
 ...t-receive-messages-in-my-second-consumer.xml |   15 +-
 i-get-errors-building-the-code-whats-wrong.xml  |    8 +-
 i-see-nc-client-ids-what-does-that-mean.xml     |    2 +-
 ideas.xml                                       |    2 +-
 in-progress.xml                                 |    5 +-
 inbound-communication.xml                       |   54 +-
 index.xml                                       |  104 +-
 initial-configuration.xml                       |    2 +-
 installation.xml                                |   16 +-
 integrating-apache-activemq-with-glassfish.xml  |   20 +-
 integrating-apache-activemq-with-jboss.xml      |  386 +---
 integration-tests.xml                           |   42 +-
 interceptors.xml                                |   46 +-
 ...eption-could-not-find-class-for-resource.xml |   12 +-
 irc.xml                                         |    2 +-
 j2ee.xml                                        |    4 +-
 java-service-wrapper.xml                        |   16 +-
 javadocs.xml                                    |    2 +-
 javaiointerruptedioexception.xml                |    2 +-
 ...rbydb-see-the-next-exception-for-details.xml |   35 +-
 javalangnosuchmethoderror.xml                   |   19 +-
 ...ivemqresourceadaptersetuseembeddedbroker.xml |   10 +-
 javalangoutofmemory.xml                         |   48 +-
 ...imeout-peer-did-not-send-his-wire-format.xml |   22 +-
 ...rap-classloader-but-this-ri-needs-21-api.xml |    3 +-
 ...classloader-but-this-ri-xxx-needs-21-api.xml |    3 +-
 jboss-integration.xml                           |  811 +------
 jca-container.xml                               |   20 +-
 jdbc-master-slave.xml                           |   91 +-
 jdbc-support.xml                                |   32 +-
 jmeter-performance-tests.xml                    |   19 +-
 jmeter-system-tests.xml                         |    7 +-
 jms-and-jdbc-operations-in-one-transaction.xml  |  146 +-
 jms-bridge-with-local-broker.xml                |   32 +-
 jms-bridge-with-oracle-aq.xml                   |   94 +-
 jms-bridge-with-remote-broker.xml               |   32 +-
 jms-bridge-with-remote-tibco-broker.xml         |   32 +-
 jms-streams.xml                                 |   39 +-
 jms-to-jms-bridge.xml                           |  170 +-
 jms.xml                                         |    4 +-
 jmstemplate-gotchas.xml                         |   19 +-
 jmsxuserid.xml                                  |   24 +-
 jmx-support.xml                                 |   13 +-
 jmx.xml                                         |   54 +-
 jndi-support.xml                                |   12 +-
 ...al-is-already-opened-by-this-application.xml |   16 +-
 junit-reports.xml                               |    2 +-
 kaha-persistence.xml                            |   28 +-
 kahadb-replication-experimental.xml             |    4 +-
 kahadb.xml                                      |   40 +-
 known-bad-os-and-jvm-combinations.xml           |    3 +-
 ldap-broker-discovery-mechanism.xml             |  172 +-
 leveldb-store.xml                               |    8 +-
 life-cycle.xml                                  |   38 +-
 load-testing-with-camel.xml                     |    8 +-
 ...n-no-appenders-could-be-found-for-logger.xml |   12 +-
 ...ning-if-you-forget-to-start-a-connection.xml |    9 +-
 logging-interceptor.xml                         |   24 +-
 mailing-lists.xml                               |    2 +-
 manage-durable-subscribers.xml                  |   20 +-
 masterslave.xml                                 |    6 +-
 maven-snapshot-repository-in-your-pom.xml       |   10 +-
 maven2-activemq-broker-plugin.xml               |   34 +-
 mdc-logging.xml                                 |    8 +-
 message-cursors.xml                             |   53 +-
 message-dispatching-features.xml                |    2 +-
 message-features.xml                            |    2 +-
 message-groups.xml                              |   48 +-
 message-redelivery-and-dlq-handling.xml         |   96 +-
 message-transformation.xml                      |   10 +-
 mirrored-queues.xml                             |   33 +-
 monitoring-activemq.xml                         |    2 +-
 mqtt.xml                                        |   24 +-
 multicast-transport-reference.xml               |   33 +-
 multicast-transport.xml                         |    3 +-
 ...rating-system-or-distribution-or-network.xml |   18 +-
 my-producer-blocks.xml                          |   19 +-
 navigation.xml                                  |   22 +-
 networks-of-brokers.xml                         |  182 +-
 new-features-in-41.xml                          |    5 +-
 new-features-in-50.xml                          |    5 +-
 new-features-in-51.xml                          |    7 +-
 new-features-in-511.xml                         |    2 +-
 new-features-in-513.xml                         |    2 +-
 new-features-in-52.xml                          |   10 +-
 new-features-in-53.xml                          |    7 +-
 new-features-in-54.xml                          |    9 +-
 new-features-in-55.xml                          |    7 +-
 new-features-in-56.xml                          |    5 +-
 new-features-in-57.xml                          |    3 +-
 new-features-in-58.xml                          |    3 +-
 new-features-in-59.xml                          |    2 +-
 new-features-in-60.xml                          |    2 +-
 new-features.xml                                |    2 +-
 news.xml                                        |  205 +-
 nio-transport-reference.xml                     |    6 +-
 .../11/18/apachenmsactivemq-v152-released.xml   |    2 +-
 .../01/28/apachenmsactivemq-v153-released.xml   |    2 +-
 .../04/13/apachenmsactivemq-v154-released.xml   |    2 +-
 .../05/04/apachenmsactivemq-v155-released.xml   |    2 +-
 nms/2012/08/31/apachenmsstomp-v153-released.xml |    2 +-
 .../06/10/apachenmsactivemq-v160-released.xml   |    2 +-
 .../10/25/apachenmsactivemq-v161-released.xml   |    2 +-
 nms/activemq-advanced-features.xml              |    2 +-
 nms/activemq-advisory-message-examples.xml      |    2 +-
 nms/activemq-async-sends.xml                    |   35 +-
 nms/activemq-consumer-dispatch-async.xml        |   32 +-
 nms/activemq-consumer-priority.xml              |   14 +-
 ...ivemq-delay-and-schedule-message-feature.xml |   56 +-
 nms/activemq-destination-features.xml           |    2 +-
 nms/activemq-destination-management.xml         |    6 +-
 nms/activemq-destination-options.xml            |    6 +-
 nms/activemq-downloads.xml                      |    2 +-
 ...rate-destination-using-advisory-messages.xml |   48 +-
 nms/activemq-examples.xml                       |    2 +-
 nms/activemq-exclusive-consumers.xml            |   14 +-
 nms/activemq-message-dispatching-features.xml   |    2 +-
 nms/activemq-message-features.xml               |    2 +-
 nms/activemq-mirrored-queues.xml                |   40 +-
 nms/activemq-net-110-release.xml                |   32 +-
 nms/activemq-net-120-release.xml                |   42 +-
 nms/activemq-net-130-release.xml                |   40 +-
 nms/activemq-net-140-release.xml                |   40 +-
 nms/activemq-retroactive-consumers.xml          |   16 +-
 nms/activemq-uri-configuration.xml              |   14 +-
 nms/activemq-virtual-destinations.xml           |    2 +-
 nms/activemq-wildcards.xml                      |    8 +-
 nms/amqp-build-notes.xml                        |    2 +-
 nms/amqp-examples.xml                           |    2 +-
 nms/apachenms-150-release.xml                   |   54 +-
 nms/apachenms-activemq-v110.xml                 |   27 +-
 nms/apachenms-api-v110.xml                      |   22 +-
 nms/apachenms-api-v120.xml                      |   22 +-
 nms/apachenms-api-v130.xml                      |   22 +-
 nms/apachenms-api-v140.xml                      |   22 +-
 nms/apachenms-api-v150.xml                      |   24 +-
 nms/apachenms-api-v151.xml                      |   24 +-
 nms/apachenms-api-v160.xml                      |    6 +-
 nms/apachenms-api-v170.xml                      |    6 +-
 nms/apachenms-api-v171.xml                      |    6 +-
 nms/apachenms-ems-v110.xml                      |    8 +-
 nms/apachenms-msmq-v110.xml                     |   22 +-
 nms/apachenms.xml                               |   10 +-
 nms/apachenmsactivemq-v120.xml                  |   23 +-
 nms/apachenmsactivemq-v130.xml                  |   23 +-
 nms/apachenmsactivemq-v140.xml                  |   27 +-
 nms/apachenmsactivemq-v141.xml                  |   27 +-
 nms/apachenmsactivemq-v150.xml                  |   29 +-
 nms/apachenmsactivemq-v151.xml                  |   24 +-
 nms/apachenmsactivemq-v152.xml                  |   24 +-
 nms/apachenmsactivemq-v153.xml                  |   24 +-
 nms/apachenmsactivemq-v154.xml                  |   24 +-
 nms/apachenmsactivemq-v155.xml                  |   24 +-
 nms/apachenmsactivemq-v156.xml                  |   24 +-
 nms/apachenmsactivemq-v160.xml                  |   24 +-
 nms/apachenmsactivemq-v161.xml                  |    4 +-
 nms/apachenmsactivemq-v162.xml                  |    4 +-
 nms/apachenmsactivemq-v163.xml                  |    4 +-
 nms/apachenmsactivemq-v164.xml                  |    4 +-
 nms/apachenmsactivemq-v165.xml                  |    4 +-
 nms/apachenmsactivemq-v170.xml                  |    4 +-
 nms/apachenmsactivemq-v171.xml                  |    4 +-
 nms/apachenmsactivemq-v172.xml                  |    4 +-
 nms/apachenmsactivemq.xml                       |    4 +-
 nms/apachenmsamqp.xml                           |    2 +-
 nms/apachenmsems.xml                            |    2 +-
 nms/apachenmsmqtt.xml                           |    2 +-
 nms/apachenmsmsmq.xml                           |    2 +-
 nms/apachenmsstomp-v120.xml                     |   27 +-
 nms/apachenmsstomp-v130.xml                     |   27 +-
 nms/apachenmsstomp-v140.xml                     |   27 +-
 nms/apachenmsstomp-v150.xml                     |   29 +-
 nms/apachenmsstomp-v151.xml                     |   29 +-
 nms/apachenmsstomp-v152.xml                     |   27 +-
 nms/apachenmsstomp-v153.xml                     |   27 +-
 nms/apachenmsstomp-v154.xml                     |   26 +-
 nms/apachenmsstomp.xml                          |    4 +-
 nms/apachenmswcf-v110.xml                       |    6 +-
 nms/apachenmswcf.xml                            |    2 +-
 nms/apachenmsxms.xml                            |    2 +-
 nms/are-there-more-faq-entries.xml              |    4 +-
 nms/articles.xml                                |   11 +-
 nms/banner.xml                                  |   14 +-
 nms/building.xml                                |   26 +-
 nms/community.xml                               |    2 +-
 nms/developers.xml                              |    5 +-
 nms/download.xml                                |    2 +-
 nms/ems-downloads.xml                           |    3 +-
 nms/ems-examples.xml                            |    2 +-
 nms/examples.xml                                |   84 +-
 nms/faq.xml                                     |   20 +-
 nms/index.xml                                   |   84 +-
 nms/msmq-downloads.xml                          |    3 +-
 nms/msmq-examples.xml                           |    2 +-
 nms/navigation.xml                              |   41 +-
 nms/nms-api-downloads.xml                       |    2 +-
 nms/nms-api.xml                                 |    9 +-
 nms/nms-examples.xml                            |    2 +-
 nms/nms-providers.xml                           |    2 +-
 ...nms-simple-asynchronous-consumer-example.xml |   46 +-
 nms/nms-simple-synchornous-consumer-example.xml |   46 +-
 nms/nms-uri-configuration.xml                   |   18 +-
 nms/nms.xml                                     |   21 +-
 nms/overview.xml                                |    2 +-
 nms/privacy-policy.xml                          |    2 +-
 nms/quicklinks.xml                              |    2 +-
 nms/should-i-pool-connections.xml               |    4 +-
 nms/site.xml                                    |    2 +-
 nms/siteindex.xml                               |  426 +---
 nms/sitemap.xml                                 |    2 +-
 nms/source.xml                                  |   10 +-
 nms/stomp-advanced-features.xml                 |    2 +-
 ...mp-delayed-and-scheduled-message-feature.xml |   62 +-
 nms/stomp-downloads.xml                         |    3 +-
 nms/stomp-message-features.xml                  |    2 +-
 nms/stomp-uri-configuration.xml                 |   76 +-
 nms/support.xml                                 |   14 +-
 nms/using-nms.xml                               |    5 +-
 nms/wcf-downloads.xml                           |    3 +-
 nms/wcf-examples.xml                            |    2 +-
 nms/what-is-nms.xml                             |    4 +-
 no-suitable-driver.xml                          |   11 +-
 ...nderror-orgspringframeworkcoreioresource.xml |   12 +-
 objectmessage.xml                               |   46 +-
 old-osgi-integration.xml                        |  148 +-
 ...ethod-of-messagelistener-is-never-called.xml |    2 +-
 openwire-c-client.xml                           |    5 +-
 openwire-cpp-client.xml                         |   22 +-
 openwire-version-2-specification.xml            |   42 +-
 openwire.xml                                    |    2 +-
 optimized-acknowledgement.xml                   |   30 +-
 osgi-integration.xml                            |   46 +-
 osgi-support-in-development.xml                 |    2 +-
 outbound-communication.xml                      |  124 +-
 overview.xml                                    |    2 +-
 peer-transport-reference.xml                    |   13 +-
 per-destination-policies.xml                    |   40 +-
 performance-report.xml                          |    6 +-
 performance-tuning.xml                          |    6 +-
 performance.xml                                 |   16 +-
 periodically-checking-disk-limits.xml           |    6 +-
 persistence-questions.xml                       |    2 +-
 persistence.xml                                 |    8 +-
 pluggable-storage-lockers.xml                   |   40 +-
 pmc-templates.xml                               |   29 +-
 privacy-policy.xml                              |    2 +-
 producer-flow-control.xml                       |   42 +-
 projects-using-activemq.xml                     |    3 +-
 proposed-c-client-architecture.xml              |    2 +-
 protocols.xml                                   |    2 +-
 pure-master-slave.xml                           |   58 +-
 quicklinks.xml                                  |    2 +-
 redelivery-policy.xml                           |   10 +-
 release-guide.xml                               |   62 +-
 release-info.xml                                |    5 +-
 release-plans.xml                               |    9 +-
 replicated-leveldb-store.xml                    |   24 +-
 replicated-message-store.xml                    |   21 +-
 ...dapter-does-not-seem-to-pool-connections.xml |    6 +-
 resource-adapter-properties.xml                 |   26 +-
 resource-adapter.xml                            |    2 +-
 rest-protocols.xml                              |   33 +-
 rest.xml                                        |   78 +-
 restful-queue.xml                               |  101 +-
 retroactive-consumer.xml                        |   16 +-
 rss-and-atom.xml                                |   11 +-
 run-broker.xml                                  |   14 +-
 runtime-configuration.xml                       |   10 +-
 sample-camel-routes.xml                         |   96 +-
 sample-report.xml                               |    9 +-
 sandbox.xml                                     |    2 +-
 scaling-queues.xml                              |   12 +-
 scaling-the-depth-of-a-queue.xml                |    2 +-
 security-advisories.xml                         |    2 +-
 security.xml                                    |   22 +-
 seda.xml                                        |    2 +-
 selectors.xml                                   |   39 +-
 setting-up-activemq-with-tomcat-559.xml         |   58 +-
 shared-file-system-master-slave.xml             |   34 +-
 shiro.xml                                       |  144 +-
 ...rns-in-the-broker-or-another-application.xml |   17 +-
 ...oy-the-broker-inside-my-jvm-or-appserver.xml |   13 +-
 ...mq-on-windows-in-a-directory-with-spaces.xml |    2 +-
 should-i-use-transactions.xml                   |    2 +-
 should-i-use-xa.xml                             |   24 +-
 site.xml                                        |    2 +-
 siteindex.xml                                   | 1839 +---------------
 sitemap.xml                                     |   33 +-
 sjsas-with-genericjmsra.xml                     |   85 +-
 slow-consumer-handling.xml                      |   10 +-
 slow-consumers.xml                              |   22 +-
 slow-networks-drop-large-messages.xml           |   26 +-
 source-xref.xml                                 |    3 +-
 source.xml                                      |   12 +-
 sponsorship.xml                                 |    4 +-
 spring-support.xml                              |   52 +-
 sqlserver.xml                                   |   77 +-
 ssl-transport-reference.xml                     |   38 +-
 static-transport-reference.xml                  |   21 +-
 statisticsplugin.xml                            |   38 +-
 stomp.xml                                       |   98 +-
 ...tured-message-properties-and-mapmessages.xml |    7 +-
 subscription-recovery-policy.xml                |    2 +-
 sun-jndi.xml                                    |   18 +-
 support.xml                                     |    2 +-
 supporting-io-streams.xml                       |   11 +-
 svn.xml                                         |   12 +-
 sybase.xml                                      |   30 +-
 tcp-transport-reference.xml                     |   10 +-
 team.xml                                        |    2 +-
 terminology.xml                                 |   31 +-
 test-source-xref.xml                            |    4 +-
 thanks.xml                                      |    2 +-
 the-activeblaze-message-type.xml                |   20 +-
 the-broker-will-not-start.xml                   |    8 +-
 the-jms-connector.xml                           |    2 +-
 the-proxy-connector.xml                         |   19 +-
 ...roker-before-my-configured-broker-starts.xml |   11 +-
 throughput.xml                                  |    2 +-
 timestampplugin.xml                             |    8 +-
 tips-for-getting-help.xml                       |    5 +-
 tomcat.xml                                      |   46 +-
 tomee.xml                                       |   52 +-
 tools.xml                                       |    2 +-
 topologies.xml                                  |   22 +-
 total-ordering.xml                              |   16 +-
 udp-transport-reference.xml                     |   17 +-
 unix-service.xml                                |    2 +-
 unix-shell-script.xml                           |   68 +-
 unix.xml                                        |    2 +-
 uri-protocols.xml                               |   36 +-
 use-cases.xml                                   |   16 +-
 user-forum.xml                                  |    8 +-
 user-submitted-configurations.xml               |    3 +-
 users.xml                                       |    5 +-
 using-activemq-5.xml                            |   10 +-
 using-activemq.xml                              |    2 +-
 using-apache-activemq.xml                       |    2 +-
 verify-downloads.xml                            |   14 +-
 version-5-examples.xml                          |   44 +-
 version-5-getting-started.xml                   |  134 +-
 version-5-hello-world.xml                       |  152 +-
 version-5-initial-configuration.xml             |    2 +-
 version-5-installation.xml                      |   22 +-
 version-5-performance-tuning.xml                |   17 +-
 version-5-run-broker.xml                        |   28 +-
 version-5-topologies.xml                        |   17 +-
 version-5-web-samples.xml                       |    7 +-
 version-5-xml-configuration.xml                 |    4 +-
 virtual-destinations.xml                        |    2 +-
 visualisation-wish-list.xml                     |    3 +-
 visualisation.xml                               |   29 +-
 vm-protocol.xml                                 |    4 +-
 vm-transport-reference.xml                      |   26 +-
 web-console.xml                                 |   32 +-
 web-samples.xml                                 |    4 +-
 weblogic-integration.xml                        |  278 ++-
 websockets.xml                                  |   55 +-
 what-are-administered-objects.xml               |   13 +-
 what-are-those-topics-activemqadvisory.xml      |    2 +-
 ...s-with-a-fast-producer-and-slow-consumer.xml |    2 +-
 ...irtual-topic-and-a-composite-destination.xml |    9 +-
 ...between-discovery-multicast-and-zeroconf.xml |   30 +-
 ...n-persistent-and-non-persistent-delivery.xml |    9 +-
 what-is-the-license.xml                         |    4 +-
 what-is-the-prefetch-limit-for.xml              |   14 +-
 what-jars-do-i-need.xml                         |    4 +-
 ...ration-solution-works-best-with-activemq.xml |    2 +-
 what-platforms-does-activemq-support.xml        |    2 +-
 what-version-should-i-use.xml                   |    2 +-
 ...q-is-there-a-way-to-measure-its-progress.xml |    2 +-
 why-do-i-not-get-all-of-the-messages-i-sent.xml |    4 +-
 ...essages-on-my-durable-topic-subscription.xml |    4 +-
 ...do-kahadb-log-files-remain-after-cleanup.xml |   14 +-
 wildcards.xml                                   |    6 +-
 wire-protocol.xml                               |   26 +-
 ws-notification.xml                             |    4 +-
 wsif.xml                                        |    4 +-
 xbean-xml-reference-41.xml                      |  843 ++++----
 xbean-xml-reference-50.xml                      | 1992 +++++++++---------
 xml-configuration.xml                           |    6 +-
 xml-reference.xml                               |  124 +-
 xmpp.xml                                        |   84 +-
 zeroconf-transport-reference.xml                |   27 +-
 zeroconf.xml                                    |   15 +-
 zos.xml                                         |  168 +-
 929 files changed, 8072 insertions(+), 16022 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/04/13/jca-resource-adapter-coming-along-nicely.xml
----------------------------------------------------------------------
diff --git a/2004/04/13/jca-resource-adapter-coming-along-nicely.xml b/2004/04/13/jca-resource-adapter-coming-along-nicely.xml
index 0737ea8..ae47d17 100644
--- a/2004/04/13/jca-resource-adapter-coming-along-nicely.xml
+++ b/2004/04/13/jca-resource-adapter-coming-along-nicely.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>Hiram has been working hard lately getting the JCA Resource adapter working for ActiveMQ. Take a look at the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/apidocs/org/activemq/ra/package-summary.html" rel="nofollow">ra package</a> for more details.</p></div>
+<p>Hiram has been working hard lately getting the JCA Resource adapter working for ActiveMQ. Take a look at the <a shape="rect" href="http://activemq.codehaus.org/maven/apidocs/org/activemq/ra/package-summary.html">ra package</a> for more details.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/04/13/jxta-support-available.xml
----------------------------------------------------------------------
diff --git a/2004/04/13/jxta-support-available.xml b/2004/04/13/jxta-support-available.xml
index bd7576e..cf89faf 100644
--- a/2004/04/13/jxta-support-available.xml
+++ b/2004/04/13/jxta-support-available.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
 
 
-<p>I've just committed support for JXTA based transports. Its very early days and not yet tested but it allows the reuse of JXTA for NAT / firewall based navigation using <a shape="rect" class="external-link" href="http://p2psockets.jxta.org/" rel="nofollow">p2psockets</a>.</p>
+<p>I've just committed support for JXTA based transports. Its very early days and not yet tested but it allows the reuse of JXTA for NAT / firewall based navigation using <a shape="rect" href="http://p2psockets.jxta.org/">p2psockets</a>.</p>
 
 <p>In addition we've now got SocketFactory and ServerSocketFactory based factories for TransportChannel / TransportServerChannel including a default implementation using SSL.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/05/26/restful-jms-web-streaming-and-streamlet-demo-available.xml
----------------------------------------------------------------------
diff --git a/2004/05/26/restful-jms-web-streaming-and-streamlet-demo-available.xml b/2004/05/26/restful-jms-web-streaming-and-streamlet-demo-available.xml
index 29dcb93..463d48b 100644
--- a/2004/05/26/restful-jms-web-streaming-and-streamlet-demo-available.xml
+++ b/2004/05/26/restful-jms-web-streaming-and-streamlet-demo-available.xml
@@ -1,11 +1,11 @@
 <div class="wiki-content maincontent">
 
 
-<p><a shape="rect" class="external-link" href="http://activemq.codehaus.org" rel="nofollow">ActiveMQ</a> now supports a <a shape="rect" href="../../../rest.xml">RESTful API</a> to the message broker allowing any web capable device to publish and consume messages.</p>
+<p><a shape="rect" href="http://activemq.codehaus.org">ActiveMQ</a> now supports a <link><page ri:content-title="REST"></page><link-body>RESTful API</link-body></link> to the message broker allowing any web capable device to publish and consume messages.</p>
 
-<p>We also support <a shape="rect" href="../../../ajax.xml">Ajax</a> which are a JavaScript mechanism, working with the REST API to provide publish/subscribe based web applications, using the full power of a MOM from inside any web browser.</p>
+<p>We also support <link><page ri:content-title="Ajax"></page></link> which are a JavaScript mechanism, working with the REST API to provide publish/subscribe based web applications, using the full power of a MOM from inside any web browser.</p>
 
-<p>We've now <a shape="rect" href="../../../web-samples.xml">2 demos of using Streamlets</a> in CVS now (a real time stock portfolio and a chat application) along with a simple HTML forms only demo. </p>
+<p>We've now <link><page ri:content-title="Web Samples"></page><link-body>2 demos of using Streamlets</link-body></link> in CVS now (a real time stock portfolio and a chat application) along with a simple HTML forms only demo. </p>
 
 <p>Unfortunately right now there's a bug in the IE JavaScript when using Streamlets so things don't work yet on IE but things work fine on Firefox, Mozilla and Safari. We should have the IE issue fixed real soon.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/06/23/jgroups-and-jrms-support.xml
----------------------------------------------------------------------
diff --git a/2004/06/23/jgroups-and-jrms-support.xml b/2004/06/23/jgroups-and-jrms-support.xml
index 020d393..9273b1f 100644
--- a/2004/06/23/jgroups-and-jrms-support.xml
+++ b/2004/06/23/jgroups-and-jrms-support.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
 
 
-<p>For users who want reliable multicast support when messaging, ActiveMQ now supports both <a shape="rect" class="external-link" href="http://www.jgroups.org/" rel="nofollow">JGroups</a> and <a shape="rect" class="external-link" href="http://www.experimentalstuff.com/Technologies/JRMS/" rel="nofollow">JRMS</a> as pluggable <a shape="rect" href="../../../uri-protocols.xml">transport protocols</a>.</p>
+<p>For users who want reliable multicast support when messaging, ActiveMQ now supports both <a shape="rect" href="http://www.jgroups.org/">JGroups</a> and <a shape="rect" href="http://www.experimentalstuff.com/Technologies/JRMS/">JRMS</a> as pluggable <link><page ri:content-title="URI Protocols"></page><link-body>transport protocols</link-body></link>.</p>
 
 <p>Code is available in CVS and the latest snapshot jar.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/06/25/building-cluster-based-applications-with-activemq.xml
----------------------------------------------------------------------
diff --git a/2004/06/25/building-cluster-based-applications-with-activemq.xml b/2004/06/25/building-cluster-based-applications-with-activemq.xml
index 16602a7..1044cf9 100644
--- a/2004/06/25/building-cluster-based-applications-with-activemq.xml
+++ b/2004/06/25/building-cluster-based-applications-with-activemq.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
 
 
-<p>There's a new lightweight library available called <a shape="rect" class="external-link" href="http://activecluster.codehaus.org/" rel="nofollow">ActiveCluster</a> which provides a simple cluster abstraction on top of some of the core APIs in JMS. This API allows you to monitor nodes in a cluster, watch them come &amp; go or update their state - or send and receive messages, direct to a member of the cluster or as the group as a whole. For more details on the API see this <a shape="rect" class="external-link" href="http://activecluster.codehaus.org/Overview" rel="nofollow">overview</a>.</p>
+<p>There's a new lightweight library available called <a shape="rect" href="http://activecluster.codehaus.org/">ActiveCluster</a> which provides a simple cluster abstraction on top of some of the core APIs in JMS. This API allows you to monitor nodes in a cluster, watch them come &amp; go or update their state - or send and receive messages, direct to a member of the cluster or as the group as a whole. For more details on the API see this <a shape="rect" href="http://activecluster.codehaus.org/Overview">overview</a>.</p>
 
-<p>ActiveCluster can sit neatly on top of ActiveMQ to provide a lightweight, scalable and partitionable cluster communication fabric. See the <a shape="rect" class="external-link" href="http://activecluster.codehaus.org/Examples?refresh=1" rel="nofollow">examples</a> as a quick way to get started.</p></div>
+<p>ActiveCluster can sit neatly on top of ActiveMQ to provide a lightweight, scalable and partitionable cluster communication fabric. See the <a shape="rect" href="http://activecluster.codehaus.org/Examples?refresh=1">examples</a> as a quick way to get started.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/08/17/new-faq-entries-on-distributed-queues-and-fast-producers.xml
----------------------------------------------------------------------
diff --git a/2004/08/17/new-faq-entries-on-distributed-queues-and-fast-producers.xml b/2004/08/17/new-faq-entries-on-distributed-queues-and-fast-producers.xml
index 420eed3..9767edc 100644
--- a/2004/08/17/new-faq-entries-on-distributed-queues-and-fast-producers.xml
+++ b/2004/08/17/new-faq-entries-on-distributed-queues-and-fast-producers.xml
@@ -1,10 +1,10 @@
 <div class="wiki-content maincontent">
 
 
-<p>We did some harvesting of questions on the <a shape="rect" class="external-link" href="http://servlet.uwyn.com/drone/log/hausbot/activemq" rel="nofollow">IRC log</a> and have added a few new entries to the <a shape="rect" href="../../../faq.xml">FAQ</a></p>
+<p>We did some harvesting of questions on the <a shape="rect" href="http://servlet.uwyn.com/drone/log/hausbot/activemq">IRC log</a> and have added a few new entries to the <link><page ri:content-title="FAQ"></page></link></p>
 
-<ul><li><a shape="rect" class="external-link" href="http://activemq.codehaus.org/How+do+distributed+queues+work?refresh=1" rel="nofollow">How do distributed queues work</a></li><li><a shape="rect" class="external-link" href="http://activemq.codehaus.org/What+happens+with+a+fast+producer+and+slow+consumer?refresh=1" rel="nofollow">What happens with a fast producer and slow consumer</a></li></ul>
+<ul><li><a shape="rect" href="http://activemq.codehaus.org/How+do+distributed+queues+work?refresh=1">How do distributed queues work</a></li><li><a shape="rect" href="http://activemq.codehaus.org/What+happens+with+a+fast+producer+and+slow+consumer?refresh=1">What happens with a fast producer and slow consumer</a></li></ul>
 
 
-<p>If you can think of any other questions please mail us on one of the <a shape="rect" class="external-link" href="http://activemq.codehaus.org/maven/mail-lists.html" rel="nofollow">mailing lists</a> or join us on </p><p><a shape="rect" class="external-link" href="irc://irc.codehaus.org/activemq" rel="nofollow">IRC</a></p>  or post a comment to this blog.<p></p></div>
+<p>If you can think of any other questions please mail us on one of the <a shape="rect" href="http://activemq.codehaus.org/maven/mail-lists.html">mailing lists</a> or join us on </p><p><structured-macro ac:macro-id="64b65670-1e24-47a2-a09f-37ecc1f3b01d" ac:name="link" ac:schema-version="1"><parameter ac:name="">IRC</parameter><parameter ac:name="text">IRC</parameter><parameter ac:name="url">irc://irc.codehaus.org/activemq</parameter></structured-macro></p>  or post a comment to this blog.<p></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/08/23/using-activemq-on-net.xml
----------------------------------------------------------------------
diff --git a/2004/08/23/using-activemq-on-net.xml b/2004/08/23/using-activemq-on-net.xml
index 10708d0..3e1d586 100644
--- a/2004/08/23/using-activemq-on-net.xml
+++ b/2004/08/23/using-activemq-on-net.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p><a shape="rect" class="external-link" href="http://dotnetjunkies.com/WebLog/csteen/" rel="nofollow">Christopher Steen</a> describes <a shape="rect" class="external-link" href="http://dotnetjunkies.com/WebLog/csteen/archive/2004/08/20/22813.aspx" rel="nofollow">how to use</a> <a shape="rect" class="external-link" href="http://activemq.codehaus.org/" rel="nofollow">ActiveMQ</a> from .Net / in C# using <a shape="rect" class="external-link" href="http://www.ikvm.net/" rel="nofollow">IKVM</a>. Neat!</p></div>
+<p><a shape="rect" href="http://dotnetjunkies.com/WebLog/csteen/">Christopher Steen</a> describes <a shape="rect" href="http://dotnetjunkies.com/WebLog/csteen/archive/2004/08/20/22813.aspx">how to use</a> <a shape="rect" href="http://activemq.codehaus.org/">ActiveMQ</a> from .Net / in C# using <a shape="rect" href="http://www.ikvm.net/">IKVM</a>. Neat!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/10/07/activemq-11-released-with-distributed-queues-and-topics-support.xml
----------------------------------------------------------------------
diff --git a/2004/10/07/activemq-11-released-with-distributed-queues-and-topics-support.xml b/2004/10/07/activemq-11-released-with-distributed-queues-and-topics-support.xml
index ed59366..2fb414d 100644
--- a/2004/10/07/activemq-11-released-with-distributed-queues-and-topics-support.xml
+++ b/2004/10/07/activemq-11-released-with-distributed-queues-and-topics-support.xml
@@ -1,12 +1,12 @@
 <div class="wiki-content maincontent">
 
 
-<p>I'm very pleased to announce the new 1.1 release of ActiveMQ. You can download it from the <a shape="rect" href="../../../download.xml">usual place</a></p>
+<p>I'm very pleased to announce the new 1.1 release of ActiveMQ. You can download it from the <link><page ri:content-title="Download"></page><link-body>usual place</link-body></link></p>
 
 <p>This release represents a major increase in functionality; the new features in this release are:-</p>
 
 <ul><li>distributed queues and topics and clusters of message brokers</li><li>auto-reconnection of clients across a cluster of brokers</li><li>support for high performance non-durable queues</li><li>wildcard support on queues (as well as topics)</li><li>transaction log and JDBC persistence in addition to JDBM and BDB</li><li>JNDI support for easy integration</li><li>HTTP tunnelling support</li><li>auto-broker discovery using Zeroconf (Apple Rendezvous) for a peer based network using high performance pointcast</li><li>composite destinations support (allowing a publish or subscribe operation on several queues and/or topics in one atomic operation, such as writing to N queues in one operation)</li><li>simpler pure-Java configuration API</li><li>heaps of bug fixes and new test cases</li></ul>
 
 
-<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=10632" rel="nofollow">release notes</a></p></div>
+<p>For a more detailed view of new features and bug fixes, see the <a shape="rect" href="http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10520&amp;styleName=Html&amp;version=10632">release notes</a></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/11/02/activemq-and-hermes-startup-movie.xml
----------------------------------------------------------------------
diff --git a/2004/11/02/activemq-and-hermes-startup-movie.xml b/2004/11/02/activemq-and-hermes-startup-movie.xml
index b0c782c..e56809f 100644
--- a/2004/11/02/activemq-and-hermes-startup-movie.xml
+++ b/2004/11/02/activemq-and-hermes-startup-movie.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
 
 
-<p>Mark Bucayan has kindly submitted a <a shape="rect" class="external-link" href="http://activemq.codehaus.org/HermesAndActiveMQ.html" rel="nofollow">Flash demo</a> showing how to use ActiveMQ inside Hermes. Great stuff!</p></div>
+<p>Mark Bucayan has kindly submitted a <a shape="rect" href="http://activemq.codehaus.org/HermesAndActiveMQ.html">Flash demo</a> showing how to use ActiveMQ inside Hermes. Great stuff!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2004/12/20/activemq-15-released.xml
----------------------------------------------------------------------
diff --git a/2004/12/20/activemq-15-released.xml b/2004/12/20/activemq-15-released.xml
index 140ec68..257a876 100644
--- a/2004/12/20/activemq-15-released.xml
+++ b/2004/12/20/activemq-15-released.xml
@@ -1,7 +1,7 @@
 <div class="wiki-content maincontent">
 
 
-<p>The new <a shape="rect" href="../../../activemq-15-release.xml">1.5</a> release is out, hot on the heels of <a shape="rect" href="../../../activemq-14-release.xml">1.4</a> and <a shape="rect" href="../../../activemq-13-release.xml">1.3</a>. Get it while its hot! <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>The new <link><page ri:content-title="ActiveMQ 1.5 Release"></page><link-body>1.5</link-body></link> release is out, hot on the heels of <link><page ri:content-title="ActiveMQ 1.4 Release"></page><link-body>1.4</link-body></link> and <link><page ri:content-title="ActiveMQ 1.3 Release"></page><link-body>1.3</link-body></link>. Get it while its hot! <emoticon ac:name="smile"></emoticon></p>
 
 <p>We now have integrated support for Geronimo, Spring and now JBoss 4 (thanks for all the hard work Michael!). We should just drop into any other J2EE 1.4 container, thanks to JCA 1.5...</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/02/03/activemq-20-released.xml
----------------------------------------------------------------------
diff --git a/2005/02/03/activemq-20-released.xml b/2005/02/03/activemq-20-released.xml
index 5e60c6b..4e2a539 100644
--- a/2005/02/03/activemq-20-released.xml
+++ b/2005/02/03/activemq-20-released.xml
@@ -1,6 +1,6 @@
 <div class="wiki-content maincontent">
 
-<p>We're proud to announce the new <a shape="rect" href="../../../activemq-20-release.xml">ActiveMQ 2.0 Release</a>. This is a major release including lots of new functionality and performance improvements. A more detailed list of changes is <a shape="rect" class="external-link" href="http://jira.codehaus.org/secure/BrowseProject.jspa?id=10520&amp;report=changelog" rel="nofollow">here</a>.</p>
+<p>We're proud to announce the new <link><page ri:content-title="ActiveMQ 2.0 Release"></page></link>. This is a major release including lots of new functionality and performance improvements. A more detailed list of changes is <a shape="rect" href="http://jira.codehaus.org/secure/BrowseProject.jspa?id=10520&amp;report=changelog">here</a>.</p>
 
 <p>This release includes</p>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/02/25/activemq-21-released-with-high-performance-journalling.xml
----------------------------------------------------------------------
diff --git a/2005/02/25/activemq-21-released-with-high-performance-journalling.xml b/2005/02/25/activemq-21-released-with-high-performance-journalling.xml
index 67f85b3..e6f462d 100644
--- a/2005/02/25/activemq-21-released-with-high-performance-journalling.xml
+++ b/2005/02/25/activemq-21-released-with-high-performance-journalling.xml
@@ -1,10 +1,10 @@
 <div class="wiki-content maincontent">
 
-<p>The new <a shape="rect" href="../../../activemq-21-release.xml">ActiveMQ 2.1 Release</a> is out which includes full support for the high performance journal. </p>
+<p>The new <link><page ri:content-title="ActiveMQ 2.1 Release"></page></link> is out which includes full support for the high performance journal. </p>
 
 <p>Our default persistence mechanism is now the journal for short term persistence and then JDBC (via Apache Derby by default) for long term storage. The journal is regularly checkpointed with the database which gives great high performance while still providing good resiliancy (messages are on disk, not in RAM like some other providers do).</p>
 
 <p>This new release also includes a number of performance enhancements in both durable and non durable messaging as well as a number of bug fixes.</p>
 
-<p>You can get the release from the usual <a shape="rect" href="../../../download.xml">Download</a> page.</p></div>
+<p>You can get the release from the usual <link><page ri:content-title="Download"></page></link> page.</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/04/11/activemq-30-released.xml
----------------------------------------------------------------------
diff --git a/2005/04/11/activemq-30-released.xml b/2005/04/11/activemq-30-released.xml
index 74d0448..4488b5d 100644
--- a/2005/04/11/activemq-30-released.xml
+++ b/2005/04/11/activemq-30-released.xml
@@ -1,9 +1,9 @@
 <div class="wiki-content maincontent">
 
-<p>We're pleased to announce the <a shape="rect" href="../../../download.xml">3.0 release</a> of ActiveMQ. Alot of tuning, testing and fixes have been incorporated into this release. A few notable new features are</p>
+<p>We're pleased to announce the <link><page ri:content-title="Download"></page><link-body>3.0 release</link-body></link> of ActiveMQ. Alot of tuning, testing and fixes have been incorporated into this release. A few notable new features are</p>
 
-<ul><li>a new 'discovery' transport <a shape="rect" href="../../../uri-protocols.xml">protocol</a> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li></ul>
+<ul><li>a new 'discovery' transport <link><page ri:content-title="URI Protocols"></page><link-body>protocol</link-body></link> for a pure client-only peer network - a self discovering cluster which automatically finds the brokers available on the network (as opposed to the 'peer' protocol which is a complete peer based JMS network).</li><li>migrated from the org.activemq to org.activemq package name hierarchy</li><li>improved support for more JDBC databases for persistence</li><li>an optimised wire protocol (which is unfortunately not compatible with 2.x)</li></ul>
 
 
-<p>For more details please see the <a shape="rect" href="../../../activemq-30-release.xml">release notes</a></p></div>
+<p>For more details please see the <link><page ri:content-title="ActiveMQ 3.0 Release"></page><link-body>release notes</link-body></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/06/06/using-activemq-with-the-spring-jmstemplate.xml
----------------------------------------------------------------------
diff --git a/2005/06/06/using-activemq-with-the-spring-jmstemplate.xml b/2005/06/06/using-activemq-with-the-spring-jmstemplate.xml
index 12e05ac..03090b2 100644
--- a/2005/06/06/using-activemq-with-the-spring-jmstemplate.xml
+++ b/2005/06/06/using-activemq-with-the-spring-jmstemplate.xml
@@ -1,17 +1,16 @@
 <div class="wiki-content maincontent">
 <p>Spring supports a useful JMS abstraction called JmsTemplate which makes sending and consuming messages a little simpler than using the JMS APIs directly. The only downside of this abstraction is that each send() will create a connection, session, producer, send the message, then close them all down. This is a really inefficient operation with most JMS providers as each create of a connection, session, producer ends up being an RPC with the broker, if nothing else, for security reasons.</p>
 
-<p>In 3.1-M2 or later of ActiveMQ there's a <a shape="rect" href="../../../spring-support.xml">simple solution</a> using the org.activemq.pool.PooledConnectionFactory which will perform  pooling of JMS resources (connection, session, producer) to make sending messages efficiently. The same thing is true if you wanna use a similar pattern to the JmsTemplate to send messages from inside EJBs.</p>
+<p>In 3.1-M2 or later of ActiveMQ there's a <link><page ri:content-title="Spring Support"></page><link-body>simple solution</link-body></link> using the org.activemq.pool.PooledConnectionFactory which will perform  pooling of JMS resources (connection, session, producer) to make sending messages efficiently. The same thing is true if you wanna use a similar pattern to the JmsTemplate to send messages from inside EJBs.</p>
 
 <p>Here's an example of it in use inside a Spring config file.</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="7b9bb11a-30f0-4e85-aa75-6895f8975cf1" ac:name="code" ac:schema-version="1"><plain-text-body>
   &lt;!-- a pooling based JMS provider --&gt;
-  &lt;bean id=&quot;jmsFactory&quot; class=&quot;org.activemq.pool.PooledConnectionFactory&quot;&gt;
-    &lt;property name=&quot;connectionFactory&quot;&gt;
-      &lt;bean class=&quot;org.activemq.ActiveMQConnectionFactory&quot;&gt;
-        &lt;property name=&quot;brokerURL&quot;&gt;
+  &lt;bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory"&gt;
+    &lt;property name="connectionFactory"&gt;
+      &lt;bean class="org.activemq.ActiveMQConnectionFactory"&gt;
+        &lt;property name="brokerURL"&gt;
           &lt;value&gt;tcp://localhost:61616&lt;/value&gt;
         &lt;/property&gt;
       &lt;/bean&gt;
@@ -19,11 +18,10 @@
   &lt;/bean&gt;
 
   &lt;!-- Spring JMS Template --&gt;
-  &lt;bean id=&quot;myJmsTemplate&quot; class=&quot;org.springframework.jms.core.JmsTemplate&quot;&gt;
-    &lt;property name=&quot;connectionFactory&quot;&gt;
-      &lt;ref local=&quot;jmsFactory&quot;/&gt;
+  &lt;bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate"&gt;
+    &lt;property name="connectionFactory"&gt;
+      &lt;ref local="jmsFactory"/&gt;
     &lt;/property&gt;
   &lt;/bean&gt;
-]]></script>
-</div></div></div>
+</plain-text-body></structured-macro></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/07/04/javaone-jug-slides-available-for-activemq-and-servicemix.xml
----------------------------------------------------------------------
diff --git a/2005/07/04/javaone-jug-slides-available-for-activemq-and-servicemix.xml b/2005/07/04/javaone-jug-slides-available-for-activemq-and-servicemix.xml
index 32b8cd3..16659a7 100644
--- a/2005/07/04/javaone-jug-slides-available-for-activemq-and-servicemix.xml
+++ b/2005/07/04/javaone-jug-slides-available-for-activemq-and-servicemix.xml
@@ -1,5 +1,6 @@
 <div class="wiki-content maincontent">
-<p>We had a great JUG at JavaOne with plenty of beer and a few slides <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)"> It was a fairly brief presentation, giving an overview of <a shape="rect" class="external-link" href="http://activemq.org/" rel="nofollow">ActiveMQ</a> and <a shape="rect" class="external-link" href="http://servicemix.org/" rel="nofollow">ServiceMix</a>. Thanks to all those who attended!</p>
+<p>We had a great JUG at JavaOne with plenty of beer and a few slides <emoticon ac:name="smile"></emoticon> It was a fairly brief presentation, giving an overview of <a shape="rect" href="http://activemq.org/">ActiveMQ</a> and <a shape="rect" href="http://servicemix.org/">ServiceMix</a>. Thanks to all those who attended!</p>
 
-<p>You can browse the slides <a shape="rect" class="external-link" href="http://servicemix.org/docs/JUG-06.28.05.ppt" rel="nofollow">PPT</a> or  <a shape="rect" class="external-link" href="http://servicemix.org/docs/JUG-06.28.05.pdf" rel="nofollow">PDF</a></p></div>
+<p>You can browse the slides <a shape="rect" href="http://servicemix.org/docs/JUG-06.28.05.ppt">PPT</a> or  <a shape="rect" href="http://servicemix.org/docs/JUG-06.28.05.pdf">PDF</a></p>
+</div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/07/13/hermes-jms-messagestores-are-cool.xml
----------------------------------------------------------------------
diff --git a/2005/07/13/hermes-jms-messagestores-are-cool.xml b/2005/07/13/hermes-jms-messagestores-are-cool.xml
index d4e0fc2..1880c14 100644
--- a/2005/07/13/hermes-jms-messagestores-are-cool.xml
+++ b/2005/07/13/hermes-jms-messagestores-are-cool.xml
@@ -1,3 +1,3 @@
 <div class="wiki-content maincontent">
-<p>Here is a <a shape="rect" class="external-link" href="http://hermesjms.com/demos/messagestores.html" rel="nofollow">great demo</a> of how useful the <a shape="rect" class="external-link" href="http://hermesjms.com" rel="nofollow">HermesJms</a> tool can be when working with a JMS provider like <a shape="rect" class="external-link" href="http://activemq.org" rel="nofollow">ActiveMQ</a>. Nice work Colin!</p></div>
+<p>Here is a <a shape="rect" href="http://hermesjms.com/demos/messagestores.html">great demo</a> of how useful the <a shape="rect" href="http://hermesjms.com">HermesJms</a> tool can be when working with a JMS provider like <a shape="rect" href="http://activemq.org">ActiveMQ</a>. Nice work Colin!</p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/07/13/simpler-integration-of-the-activemq-broker-into-spring.xml
----------------------------------------------------------------------
diff --git a/2005/07/13/simpler-integration-of-the-activemq-broker-into-spring.xml b/2005/07/13/simpler-integration-of-the-activemq-broker-into-spring.xml
index 802ab44..349302d 100644
--- a/2005/07/13/simpler-integration-of-the-activemq-broker-into-spring.xml
+++ b/2005/07/13/simpler-integration-of-the-activemq-broker-into-spring.xml
@@ -1,14 +1,12 @@
 <div class="wiki-content maincontent">
 <p>It was often a bit harder than it might be to configure an ActiveMQ broker inside a Spring XML configuration file. We've just added a simple Spring FactoryBean to make this process much simpler...</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="829c32f2-1ea0-485c-b13b-7bc52e046144" ac:name="code" ac:schema-version="1"><parameter ac:name="">xml</parameter><plain-text-body>
   &lt;!-- lets deploy an embedded broker in this spring.xml --&gt;
-  &lt;bean id=&quot;broker&quot; class=&quot;org.activemq.spring.BrokerFactoryBean&quot;&gt;
-    &lt;property name=&quot;config&quot; value=&quot;classpath:foo/bar/broker.xml&quot;/&gt;
+  &lt;bean id="broker" class="org.activemq.spring.BrokerFactoryBean"&gt;
+    &lt;property name="config" value="classpath:foo/bar/broker.xml"/&gt;
   &lt;/bean&gt;
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
 
-<p>See <a shape="rect" href="../../../how-do-i-embed-a-broker-inside-a-connection.xml">more detail</a> or try the <a shape="rect" href="../../../spring-support.xml">Spring Support</a></p></div>
+<p>See <link><page ri:content-title="How do I embed a Broker inside a Connection"></page><link-body>more detail</link-body></link> or try the <link><page ri:content-title="Spring Support"></page></link></p></div>
 

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/2005/07/15/great-blog-post-on-message-driven-pojos.xml
----------------------------------------------------------------------
diff --git a/2005/07/15/great-blog-post-on-message-driven-pojos.xml b/2005/07/15/great-blog-post-on-message-driven-pojos.xml
index bc9d365..3b4a72a 100644
--- a/2005/07/15/great-blog-post-on-message-driven-pojos.xml
+++ b/2005/07/15/great-blog-post-on-message-driven-pojos.xml
@@ -1,5 +1,5 @@
 <div class="wiki-content maincontent">
-<p><a shape="rect" class="external-link" href="http://jroller.com/page/habuma/" rel="nofollow">Craig</a> has a great post on <a shape="rect" class="external-link" href="http://jroller.com/page/habuma/20050715#message_driven_pojos" rel="nofollow">message driven POJOs</a>. If you can make it to the <a shape="rect" class="external-link" href="http://www.nofluffjuststuff.com/show_view.jsp?showId=33" rel="nofollow">LoneStar Software Symposium</a> to see Craig's talk it sounds well worth attending. CoolBeans!</p>
+<p><a shape="rect" href="http://jroller.com/page/habuma/">Craig</a> has a great post on <a shape="rect" href="http://jroller.com/page/habuma/20050715#message_driven_pojos">message driven POJOs</a>. If you can make it to the <a shape="rect" href="http://www.nofluffjuststuff.com/show_view.jsp?showId=33">LoneStar Software Symposium</a> to see Craig's talk it sounds well worth attending. CoolBeans!</p>
 
-<p>Also of interest is a new <a shape="rect" class="external-link" href="http://confluence.atlassian.com/display/JIRAEXT/JMS+Service" rel="nofollow">JIRA plugin for JMS and ActiveMQ</a> - thanks for the heads up <a shape="rect" class="external-link" href="http://blogs.atlassian.com/rebelutionary/" rel="nofollow">Mike</a></p></div>
+<p>Also of interest is a new <a shape="rect" href="http://confluence.atlassian.com/display/JIRAEXT/JMS+Service">JIRA plugin for JMS and ActiveMQ</a> - thanks for the heads up <a shape="rect" href="http://blogs.atlassian.com/rebelutionary/">Mike</a></p></div>