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:39 UTC
[15/51] [abbrv] [partial] activemq-web git commit: Add body.storage
type
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> </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> </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> </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> </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 </h2>
+<h2>Checking out from SVN </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>$/^&</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>$/^&</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[<bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
- <property name="algorithm" value="PBEWithMD5AndDES" />
- <property name="passwordEnvName" value="ACTIVEMQ_ENCRYPTION_PASSWORD" />
+</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><bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
+ <property name="algorithm" value="PBEWithMD5AndDES" />
+ <property name="passwordEnvName" value="ACTIVEMQ_ENCRYPTION_PASSWORD" />
</bean>
-<bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
- <property name="config" ref="environmentVariablesConfiguration" />
+<bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+ <property name="config" ref="environmentVariablesConfiguration" />
</bean>
-<bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
- <constructor-arg ref="configurationEncryptor" />
- <property name="location" value="file:${activemq.base}/conf/credentials-enc.properties"/>
-</bean>]]></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[<bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
- <property name="algorithm" value="PBEWithMD5AndDES"/>
- <property name="password" value="activemq"/>
-</bean>]]></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[<simpleAuthenticationPlugin>
+<bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
+ <constructor-arg ref="configurationEncryptor" />
+ <property name="location" value="file:${activemq.base}/conf/credentials-enc.properties"/>
+</bean></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><bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+ <property name="algorithm" value="PBEWithMD5AndDES"/>
+ <property name="password" value="activemq"/>
+</bean></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><simpleAuthenticationPlugin>
<users>
- <authenticationUser username="system" password="${activemq.password}"
- groups="users,admins"/>
- <authenticationUser username="user" password="${guest.password}"
- groups="users"/>
- <authenticationUser username="guest" password="${guest.password}" groups="guests"/>
+ <authenticationUser username="system" password="${activemq.password}"
+ groups="users,admins"/>
+ <authenticationUser username="user" password="${guest.password}"
+ groups="users"/>
+ <authenticationUser username="guest" password="${guest.password}" groups="guests"/>
</users>
-</simpleAuthenticationPlugin>]]></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[<bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
- <property name="username" value="activemq"/>
- <property name="password" value="${jdbc.password}"/>
- <property name="maxActive" value="200"/>
- <property name="poolPreparedStatements" value="true"/>
-</bean>]]></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>
+</simpleAuthenticationPlugin></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><bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
+ <property name="username" value="activemq"/>
+ <property name="password" value="${jdbc.password}"/>
+ <property name="maxActive" value="200"/>
+ <property name="poolPreparedStatements" value="true"/>
+</bean></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&search-type=ss&index=books&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&search-type=ss&index=books&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&search-type=ss&index=books&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&search-type=ss&index=books&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[
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+<structured-macro ac:macro-id="08391332-f1a6-460a-bfe5-58a3b1d4cc39" ac:name="code" ac:schema-version="1"><plain-text-body>
+<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<package>org.acme.cheese</package>
</camelContext>
-]]></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 <camelContext> 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 <camelContext> 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[
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+<structured-macro ac:macro-id="a14e2d08-d3c4-484d-8b0c-71443cb4ef06" ac:name="code" ac:schema-version="1"><plain-text-body>
+<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="activemq:com.acme.MyQueue"/>
- <to uri="activemq:com.acme.SomeOtherQueue"/>
+ <from uri="activemq:com.acme.MyQueue"/>
+ <to uri="activemq:com.acme.SomeOtherQueue"/>
</route>
</camelContext>
-]]></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("broker", "");
- buildQueue.start("consumer", "--messageCount=1000");
- buildQueue.start("producer", "--messageCount=1000");
+ buildQueue.start("broker", "");
+ buildQueue.start("consumer", "--messageCount=1000");
+ buildQueue.start("producer", "--messageCount=1000");
buildQueue.join(5 * MINUTES);
}
public void testLargeMessages() {
- buildQueue.start("broker", "");
- buildQueue.start("consumer", "--messageCount=1000 --messageSize=1M");
- buildQueue.start("producer", "--messageCount=1000 --messageSize=1M");
+ 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);"> </span></p><p>Before running the examples you should try <a shape="rect" href="run-broker.xml">running a JMS broker</a> on your machine. Follow the <a shape="rect" href="installation.xml">Installation</a> 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);"> </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);"> </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> </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> </p><h2 id="Examples-Options">Options</h2><p>For all options on the commands, run them with <code>--help</code> parameter. The up to date, options for <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 <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 "My message" --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 <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("TEST.QUEUE?consumer.exclusive=true");
+<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>