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

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

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>