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:55 UTC
[31/51] [abbrv] [partial] activemq-web git commit: Add body.storage
type
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/building-activemq-cpp.xml
----------------------------------------------------------------------
diff --git a/building-activemq-cpp.xml b/building-activemq-cpp.xml
index 9f664a1..49725ca 100644
--- a/building-activemq-cpp.xml
+++ b/building-activemq-cpp.xml
@@ -1,40 +1,36 @@
-<div class="wiki-content maincontent"><h2 id="BuildingActiveMQCPP-Dependencies">Dependencies</h2>
+<div class="wiki-content maincontent"><h2>Dependencies</h2>
-<h3 id="BuildingActiveMQCPP-libuuid">libuuid</h3>
+<h3>libuuid</h3>
-<p>The build requires the <strong>libuuid</strong> library that is part of the e2fsprogs package and is available from <a shape="rect" class="external-link" href="http://e2fsprogs.sourceforge.net/" rel="nofollow">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p>
+<p>The build requires the <strong>libuuid</strong> library that is part of the e2fsprogs package and is available from <a shape="rect" href="http://e2fsprogs.sourceforge.net/">http://e2fsprogs.sourceforge.net/</a> which is not always installed by default.</p>
-<h3 id="BuildingActiveMQCPP-cppunit">cppunit</h3>
+<h3>cppunit</h3>
-<p>The package contains a complete set of cppunit tests. In order for you to build an run the tests, you will need to download and install the cppunit suite. See <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki" rel="nofollow">http://cppunit.sourceforge.net/cppunit-wiki</a></p>
+<p>The package contains a complete set of cppunit tests. In order for you to build an run the tests, you will need to download and install the cppunit suite. See <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki">http://cppunit.sourceforge.net/cppunit-wiki</a></p>
<p>or on Fedora type the following:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="e1010969-446e-40b3-8b0e-6d6fec1fe8ba" ac:name="code" ac:schema-version="1"><plain-text-body>
sudo yum install cppunit
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>Make sure that the paths to the installed cppunit library and includes are visible in your current shell before you try building the tests.</p>
-<p>Windows users will need to build the cppunit library using the CPPUnit MSVC project files.  A discussion of the build process can be found on the CPPUnit wiki under <a shape="rect" class="external-link" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1" rel="nofollow">CPPUnit Platform build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p>
+<p>Windows users will need to build the cppunit library using the CPPUnit MSVC project files.  A discussion of the build process can be found on the CPPUnit wiki under <a shape="rect" href="http://cppunit.sourceforge.net/cppunit-wiki/BuildingCppUnit1">CPPUnit Platform build instructions</a> this covers both MSVC along with many other platforms and tool suites.</p>
-<h3 id="BuildingActiveMQCPP-GNUBuildSystem(forbuildingon*nix)">GNU Build System (for building on *nix)</h3>
+<h3>GNU Build System (for building on *nix)</h3>
<p>To Generate the ./configure script use to create the Makefiles, you need the following software installed:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Tool </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Recommended Version </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> autoconf </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> >= 2.59 <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> automake </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> >= 1.9.6 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> libtool </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> >= 1.5.22 <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table></div>
+<table><tbody><tr><th colspan="1" rowspan="1"><p> Tool </p></th><th colspan="1" rowspan="1"><p> Recommended Version </p></th></tr><tr><td colspan="1" rowspan="1"><p> autoconf </p></td><td colspan="1" rowspan="1"><p> >= 2.59 <br clear="none" class="atl-forced-newline"> </p></td></tr><tr><td colspan="1" rowspan="1"><p> automake </p></td><td colspan="1" rowspan="1"><p> >= 1.9.6 </p></td></tr><tr><td colspan="1" rowspan="1"><p> libtool </p></td><td colspan="1" rowspan="1"><p> >= 1.5.22 <br clear="none" class="atl-forced-newline"> </p></td></tr></tbody></table>
-<h2 id="BuildingActiveMQCPP-Buildingon*nix(Unix/Linux/OSX/Cygwin)">Building on *nix (Unix/Linux/OS X/Cygwin)</h2>
+<h2>Building on *nix (Unix/Linux/OS X/Cygwin)</h2>
<p>This assumes you have all of the project dependencies installed. We're now ready to create the configure script. To do this, run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="73cdd5b7-0cf4-4d99-9c40-50618a8b1dfd" ac:name="code" ac:schema-version="1"><plain-text-body>
./autogen.sh
-]]></script>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+</plain-text-body></structured-macro>
+<structured-macro ac:macro-id="69a5c84d-28fe-446a-8fbe-284d846c1db6" ac:name="info" ac:schema-version="1"><rich-text-body>
<p>You may see the following warnings when running this command:</p>
<p>src/test-integration/Makefile.am:44: `CXXFLAGS' is a user variable, you should not override it;<br clear="none">
@@ -42,96 +38,77 @@ src/test-integration/Makefile.am:44: use `AM_CXXFLAGS' instead.<br clear="none">
src/test/Makefile.am:104: `CXXFLAGS' is a user variable, you should not override it;<br clear="none">
src/test/Makefile.am:104: use `AM_CXXFLAGS' instead.</p>
-<p>These can be ignored. We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></div></div>
+<p>These can be ignored. We override CXXFLAGS in the makefiles for the unit and integration tests in order to suppress compiler warnings.</p></rich-text-body></structured-macro>
<p>This should be run the first time and anytime you change configure.ac or any of the Makefile.am files.</p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Solaris 10 Note</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
+<structured-macro ac:macro-id="80a1c3af-3159-43ce-8138-6ecb3d37b68c" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Solaris 10 Note</parameter><rich-text-body>
<p>CPP_UNIT might not build until you correct the file libstdc++.la to contain the correct data, see this discussion.</p>
-<p><a shape="rect" class="external-link" href="http://forum.sun.com/jive/thread.jspa?threadID=73150" rel="nofollow">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></div></div>
+<p><a shape="rect" href="http://forum.sun.com/jive/thread.jspa?threadID=73150">http://forum.sun.com/jive/thread.jspa?threadID=73150</a></p></rich-text-body></structured-macro>
<p>The configure script will customize the way the software is built and installed into your system along with detecting the available libraries that have been installed. To use the default configuration just run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="205c26b2-1371-4bf8-abbc-41d2eea6f006" ac:name="code" ac:schema-version="1"><plain-text-body>
./configure
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>For more help on how to customize the build configuration, run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="9b6a11a7-08f6-4ac1-99fc-d076a7458244" ac:name="code" ac:schema-version="1"><plain-text-body>
./configure --help
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>Once the configure script has run successfully, you are ready to build. Run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="f50bfe43-4a94-495e-99b0-1ab21f6212dd" ac:name="code" ac:schema-version="1"><plain-text-body>
make
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>This will build all of the core ActiveMQ CPP source code. To build and install the code into the system directories, run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="cf308ba3-9be2-47a4-8d29-ab6abe737c53" ac:name="code" ac:schema-version="1"><plain-text-body>
make install
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>You will have to become the superuser in order to be able to install the files.</p>
-<h2 id="BuildingActiveMQCPP-Doxygen">Doxygen</h2>
+<h2>Doxygen</h2>
<p>To generate the doxygen documentation for the project, just run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="7a959d3b-8ad9-46bd-99e0-c2136169c31d" ac:name="code" ac:schema-version="1"><plain-text-body>
make doxygen-run
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h2 id="BuildingActiveMQCPP-RunningTests">Running Tests</h2>
+<h2>Running Tests</h2>
-<h3 id="BuildingActiveMQCPP-UnitTests">Unit Tests</h3>
+<h3>Unit Tests</h3>
<p>In order to build and run the suite of unit tests, run:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="355a0924-32b9-43e1-af0e-35b2c78acc6f" ac:name="code" ac:schema-version="1"><plain-text-body>
make check
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>This will verify that the library is functioning correctly on the target platform. In addition, it will generate the integration tests binary.</p>
-<h3 id="BuildingActiveMQCPP-IntegrationTests">Integration Tests</h3>
+<h3>Integration Tests</h3>
<p>The library also contains a set of tests that are run against a real AMQ broker. These allow you to validate this distribution of ActiveMQ CPP against your broker. Running these without a broker will result in failed tests. The tests currently hard-code the broker url to be tcp://localhost:61613 for stomp and tcp://localhost:61616 for openwire.</p>
<p>The integration tests are built via "make check". To run them, first start a broker and then</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="84f4a992-211a-4466-b719-5932731f018a" ac:name="code" ac:schema-version="1"><plain-text-body>
cd src/test-integration
./activemq-test-integration
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>This will take quite some time to complete, so be patient.</p>
-<h2 id="BuildingActiveMQCPP-Example">Example</h2>
+<h2>Example</h2>
<p>There is an example application that ships with the distribution in src/examples. The example is compiled by default with the "make" command, but can easily be compiled manually using the command:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="b0fc5b8c-b49c-4a70-9cea-6b7bc430239d" ac:name="code" ac:schema-version="1"><plain-text-body>
g++ -o main -pthread -I ../main main.cpp ../../out/libactivemq-cpp-0_0_2.a -luuid
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
-<h2 id="BuildingActiveMQCPP-NotesforWindowsusers">Notes for Windows users</h2>
+<h2>Notes for Windows users</h2>
<p>We support using the GNU compiler on Windows, using the Cygwin package. However we also support using the MSVC compiler on Windows.</p>
<p>There are a couple or things that you will need to setup to ensure that the MSVC compile succeeds.</p>
<ul><li>You need to download and install the Platform SDK if you don't have it installed already.</li><li>Ensure that the path to you MSVC install is set in the PATH env variable. You can test this by typing cl.exe at the command line, if you get an error complaining that its not found, then you'll need to fix your PATH.</li><li>Set the INCLUDE env variable to include the path to your MSVC includes, and the platform SDK includes. For example:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="1bcf5725-bbc2-4cfe-b378-7abd123ce11a" ac:name="code" ac:schema-version="1"><plain-text-body>
INCLUDE = D:\Program Files\Microsoft Visual Studio 8\VC\include;D:\Program Files\Microsoft Platform SDK\Include\*
-]]></script>
-</div></div></li><li>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For example:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+</plain-text-body></structured-macro></li><li>Set the LIB env variable to include the path to your MSVC libs, and the Platform SDK libs. For example:
+<structured-macro ac:macro-id="9d551a9f-b5d7-4ff7-a8f7-236917531e81" ac:name="code" ac:schema-version="1"><plain-text-body>
LIB = D:\Program Files\Microsoft Visual Studio 8\VC\lib;D:\Program Files\Microsoft Platform SDK\Lib
-]]></script>
-</div></div></li><li>The Project files reference the CPPUnit libraries for the Integration and Unit tests builds.  In order for these to build correctly you must either place the CPPUnit libraries in a directory listed in the project settings, or add a new location for your install of CPPUnit. </li></ul></div>
+</plain-text-body></structured-macro></li><li>The Project files reference the CPPUnit libraries for the Integration and Unit tests builds.  In order for these to build correctly you must either place the CPPUnit libraries in a directory listed in the project settings, or add a new location for your install of CPPUnit. </li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/building.xml
----------------------------------------------------------------------
diff --git a/building.xml b/building.xml
index bc5a02a..5f7c835 100644
--- a/building.xml
+++ b/building.xml
@@ -1,20 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="Building-BuildingActiveMQfromSource">Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <a shape="rect" href="download.xml">Download</a> a distribution or JAR.</p><h3 id="Building-Prequisites">Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <a shape="rect" href="source.xml">Source</a></li><li>JDK (1.6 for version <= 5.10, 1.7 for version > 5.10)</li></ul><h2 id="Building-UsingMaven2(ActiveMQ4.1.xandUp)">Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/download.html">Mav
en 2.0.4</a>.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You should set the MAVEN_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></div></div><h3 id="Building-DoingaQuickBuild">Doing a Quick Build</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[mvn -Dtest=false -DfailIfNoTests=false clean install
-]]></script>
-</div></div><h3 id="Building-UsinganIDE">Using an IDE</h3><p>If you prefer to use an IDE then you can auto-generate the IDE's project files using maven plugins. e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[mvn eclipse:eclipse
-]]></script>
-</div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[mvn idea:idea
-]]></script>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Importing into Eclipse</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you have not already done so, you will need to make Eclipse aware of the Maven repository so that it can build everything. In the preferences, go to Java->Build Path->Classpath and define a new Classpath Variable named M2_REPO that points to your local Maven repository (i.e., <code>~/.m2/repository</code> on Unix and <code>c:\Documents and Settings\<user>\.m2\repository</code> on Windows).</p></div></div><h3 id="Building-OtherMaven2Goals">Other Maven 2 Goals</h3><p>For more details try the <a shape="rect" href="examples.xml">Examples</a> or <a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http:/
/maven.apache.org/plugins/index.html">plugin reference</a> for more details on using them.</p><h2 id="Building-UsingMaven1(ActiveMQ4.0.xandDown)">Using Maven 1 (ActiveMQ 4.0.x and Down)</h2><p>ActiveMQ 4.0.x and down use Maven 1 to Build. We recommend you download and install <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/start/download.html">Maven 1.0.2</a>.</p><h3 id="Building-DoingaQuickBuild.1">Doing a Quick Build</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[maven -Dmaven.test.skip.exec=true
-]]></script>
-</div></div><h3 id="Building-UsinganIDE.1">Using an IDE</h3><p>If you prefer to use an IDE then you can autogenerate the IDE's project files using maven plugins. e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[maven eclipse
-]]></script>
-</div></div><p>or</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[maven idea
-]]></script>
-</div></div><p>etc.</p><h3 id="Building-OtherMaven1Goals">Other Maven 1 Goals</h3><p>For more details try the <a shape="rect" href="examples.xml">Examples</a> or <a shape="rect" href="benchmark-tests.xml">Benchmark Tests</a><br clear="none"> Please refer to the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p></div>
+<div class="wiki-content maincontent"><h2>Building ActiveMQ from Source</h2><p>ActiveMQ uses <a shape="rect" href="http://maven.apache.org/">Maven</a> as its build and management tool. If you don't fancy using Maven you can use your IDE directly or <link><page ri:content-title="Download"></page></link> a distribution or JAR.</p><h3>Prequisites</h3><p><strong>Required:</strong></p><ul><li>Download and <a shape="rect" href="http://maven.apache.org/download.html">install Maven</a>.</li><li>Get the latest <link><page ri:content-title="Source"></page></link></li><li>JDK (1.6 for version <= 5.10, 1.7 for version > 5.10)</li></ul><h2>Using Maven 2 (ActiveMQ 4.1.x and Up)</h2><p>ActiveMQ 4.1.x and up use Maven 2 to Build. We recommend you download and install <a shape="rect" href="http://maven.apache.org/download.html">Maven 2.0.4</a>.</p><structured-macro ac:macro-id="fe89bdbf-e735-4288-8e2a-70788b5be12e" ac:name="note" ac:schema-version="1"><rich-text-body><p>You should set the MAVE
N_OPTS environment variable to -Xmx800m. There are portions of the ActiveMQ build that are very memory intensive. Increase the maven memory limit so that the build does not fail for you.</p></rich-text-body></structured-macro><h3>Doing a Quick Build</h3><structured-macro ac:macro-id="97386c09-3915-4735-b982-67ff64289026" ac:name="code" ac:schema-version="1"><plain-text-body>mvn -Dtest=false -DfailIfNoTests=false clean install
+</plain-text-body></structured-macro><h3>Using an IDE</h3><p>If you prefer to use an IDE then you can auto-generate the IDE's project files using maven plugins. e.g.</p><structured-macro ac:macro-id="6a740a84-8959-4edd-b7d3-62fcc971a9e3" ac:name="code" ac:schema-version="1"><plain-text-body>mvn eclipse:eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="379bb966-063b-42b0-9cc6-adbaa22ea3a3" ac:name="code" ac:schema-version="1"><plain-text-body>mvn idea:idea
+</plain-text-body></structured-macro><structured-macro ac:macro-id="bec970c7-9d56-430f-a4d3-6071f7806eff" ac:name="info" ac:schema-version="1"><parameter ac:name="title">Importing into Eclipse</parameter><rich-text-body><p>If you have not already done so, you will need to make Eclipse aware of the Maven repository so that it can build everything. In the preferences, go to Java->Build Path->Classpath and define a new Classpath Variable named M2_REPO that points to your local Maven repository (i.e., <code>~/.m2/repository</code> on Unix and <code>c:\Documents and Settings\<user>\.m2\repository</code> on Windows).</p></rich-text-body></structured-macro><h3>Other Maven 2 Goals</h3><p>For more details try the <link><page ri:content-title="Examples"></page></link> or <link><page ri:content-title="Benchmark Tests"></page></link><br clear="none"> Please refer to the <a shape="rect" href="http://maven.apache.org/plugins/index.html">plugin reference</a> for more details on using t
hem.</p><h2>Using Maven 1 (ActiveMQ 4.0.x and Down)</h2><p>ActiveMQ 4.0.x and down use Maven 1 to Build. We recommend you download and install <a shape="rect" href="http://maven.apache.org/maven-1.x/start/download.html">Maven 1.0.2</a>.</p><h3>Doing a Quick Build</h3><structured-macro ac:macro-id="4d8fe143-c9c1-416f-b21f-3c0a2129f4b7" ac:name="code" ac:schema-version="1"><plain-text-body>maven -Dmaven.test.skip.exec=true
+</plain-text-body></structured-macro><h3>Using an IDE</h3><p>If you prefer to use an IDE then you can autogenerate the IDE's project files using maven plugins. e.g.</p><structured-macro ac:macro-id="7949995d-1204-4b55-b057-187381772c30" ac:name="code" ac:schema-version="1"><plain-text-body>maven eclipse
+</plain-text-body></structured-macro><p>or</p><structured-macro ac:macro-id="33270868-4ce7-4dba-ab5c-2fa84338c4f5" ac:name="code" ac:schema-version="1"><plain-text-body>maven idea
+</plain-text-body></structured-macro><p>etc.</p><h3>Other Maven 1 Goals</h3><p>For more details try the <link><page ri:content-title="Examples"></page></link> or <link><page ri:content-title="Benchmark Tests"></page></link><br clear="none"> Please refer to the <a shape="rect" href="http://maven.apache.org/maven-1.x/plugins/bundled/">plugin reference</a> for more details on using them.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/c-integration-scenarios.xml
----------------------------------------------------------------------
diff --git a/c-integration-scenarios.xml b/c-integration-scenarios.xml
index f73d187..898574d 100644
--- a/c-integration-scenarios.xml
+++ b/c-integration-scenarios.xml
@@ -1,11 +1,11 @@
<div class="wiki-content maincontent">
-<h2 id="Cintegrationscenarios-OnewayandRPCwithCservices">One way and RPC with C services</h2>
+<h2>One way and RPC with C services</h2>
<p>Its common for the C services to be the back end services. The 2 common use cases are</p>
<ul><li>we send a message one-way to a C service</li><li>we send a message to a C-service and wait for the result, then reply back to the originator the result</li></ul>
-<h3 id="Cintegrationscenarios-Makingone-waysreliable">Making one-ways reliable</h3>
+<h3>Making one-ways reliable</h3>
<p>If we assume that the C-service is fairly atomic, it works or it doesn't and does not partially work, then for one-way handling we just need some code to...</p>
@@ -23,7 +23,7 @@
<p>Another approach could be for the C service to say whether or not it has successfully processed the message before. This just pushes the problem inside the C code requiring that it persists when things are invoked and when things complete so that it can know when duplicate messages are delivered.</p>
-<h3 id="Cintegrationscenarios-makingRPCreliable">making RPC reliable</h3>
+<h3>making RPC reliable</h3>
<p>This scenario is as above but rather than just acknowledge the inbound message we wish to send a reply and acknowledge the inbound message. So this could be regarded as a small JMS transaction.</p>
@@ -32,7 +32,7 @@
<p>Again if the C service is capable of knowing if it has seen the message before then we can avoiid step 3.</p>
-<h3 id="Cintegrationscenarios-connectivitytoC">connectivity to C</h3>
+<h3>connectivity to C</h3>
<p>We can link C into a Java process and invoke it directly via JNI. Another option is to wrap the C code as an Apache module and perform a HTTP POST to invoke a C service and extract the results of the service.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/c-integration.xml
----------------------------------------------------------------------
diff --git a/c-integration.xml b/c-integration.xml
index 372a018..1d83404 100644
--- a/c-integration.xml
+++ b/c-integration.xml
@@ -1,10 +1,11 @@
<div class="wiki-content maincontent"><p>It is very common for an organisation to have lots of legacy C code which needs integration into the message bus. The current available solutions are</p>
-<ul><li><a shape="rect" class="unresolved" href="#">CMS</a> is an easy-to-use JMS 1.1-like API for C++. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</li><li>use the <a shape="rect" href="openwire-c-client.xml">OpenWire C Client</a> which is only available in ActiveMQ 4.x or later.</li><li>we are working on the <a shape="rect" href="openwire-cpp-client.xml">OpenWire CPP Client</a></li></ul>
+<ul><li><link><page ri:content-title="CMS"></page></link> is an easy-to-use JMS 1.1-like API for C++. Our implementation of CMS is called ActiveMQ-CPP, the architecture for which supports pluggable transport protocols, very much like the ActiveMQ broker itself.</li><li>use the <link><page ri:content-title="OpenWire C Client"></page></link> which is only available in ActiveMQ 4.x or later.</li><li>we are working on the <link><page ri:content-title="OpenWire CPP Client"></page></link></li></ul>
-<ul><li>use the <a shape="rect" class="external-link" href="http://stomp.codehaus.org/C" rel="nofollow">Stomp C Client</a> for any version of ActiveMQ from 3.1 onwards. You can also use <a shape="rect" class="external-link" href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a> from many other languages like .Net, Python, Ruby, Perl etc.</li></ul>
+<ul><li>use the <a shape="rect" href="http://stomp.codehaus.org/C">Stomp C Client</a> for any version of ActiveMQ from 3.1 onwards. You can also use <a shape="rect" href="http://stomp.codehaus.org/">Stomp</a> from many other languages like .Net, Python, Ruby, Perl etc.</li></ul>
<p>Other alternative mechanisms to communicate using.</p>
-<ul><li>use the <a shape="rect" href="rest.xml">REST</a> API</li><li>use <a shape="rect" class="external-link" href="http://servicemix.org/WS+Notification" rel="nofollow">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <a shape="rect" href="how-do-i-access-activemq-from-csharp-or-dotnet.xml">.Net or Mono</a> to use ActiveMQ insided .Net</li><li><a shape="rect" href="compile-activemq-with-gcj.xml">Compile ActiveMQ with GCJ</a> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <a shape="rect" href="xmpp.xml">XMPP</a> protocol</li></ul></div>
+<ul><li>use the <link><page ri:content-title="REST"></page></link> API</li><li>use <a shape="rect" href="http://servicemix.org/WS+Notification">WS-Notification</a> and generate C bindings to WS-Notification using a SOAP stack</li><li>use <link><page ri:content-title="How do I access ActiveMQ from CSharp or dotNet"></page><link-body>.Net or Mono</link-body></link> to use ActiveMQ insided .Net</li><li><link><page ri:content-title="Compile ActiveMQ with GCJ"></page></link> to get a native C/C++ library</li><li>link to the ActiveMQ Java client using JNI</li><li>Use a Jabber client to talk to the ActiveMQ broker via the <link><page ri:content-title="xmpp"></page><link-body>XMPP</link-body></link> protocol</li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cache/main.pageCache
----------------------------------------------------------------------
diff --git a/cache/main.pageCache b/cache/main.pageCache
index 300292a..826056c 100644
Binary files a/cache/main.pageCache and b/cache/main.pageCache differ
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cache/nms.pageCache
----------------------------------------------------------------------
diff --git a/cache/nms.pageCache b/cache/nms.pageCache
index 477bacd..41cc4c1 100644
Binary files a/cache/nms.pageCache and b/cache/nms.pageCache differ
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/cached-ldap-authorization-module.xml
----------------------------------------------------------------------
diff --git a/cached-ldap-authorization-module.xml b/cached-ldap-authorization-module.xml
index 5c60b0a..b7c5e3e 100644
--- a/cached-ldap-authorization-module.xml
+++ b/cached-ldap-authorization-module.xml
@@ -1,33 +1,25 @@
-<div class="wiki-content maincontent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Available since 5.6</p></div></div><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2 id="CachedLDAPAuthorizationModule-Initializing">Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" class="external-link" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we
use in embedded mode for testing. For an example on how to initialize the embedded ApacheDS with this ldif file take a look at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" class="external-link" href="http://www.openldap.org/" rel="nofollow">OpenLDAP</a> (<a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for ent
ries, so the configuration similar to the one shown in the following snippet</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[suffix "dc=activemq,dc=apache,dc=org"
-rootdn "cn=admin,dc=activemq,dc=apache,dc=org"
+<div class="wiki-content maincontent"><structured-macro ac:macro-id="428fbf5e-bb76-474f-9ebf-7d962d8b39f9" ac:name="info" ac:schema-version="1"><parameter ac:name="">Availability</parameter><rich-text-body><p>Available since 5.6</p></rich-text-body></structured-macro><p>Cached LDAP authorization module is an implementation of an default authorization module that initializes and updates data from LDAP. It supports all standard features like defining wildcard policy entries and entry for temporary destinations.</p><h2>Initializing</h2><p>We provide two ldif files for easy starting. The first one is for <a shape="rect" href="http://directory.apache.org/">Apache Directory Server</a> (<a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif">ldif</a>), which we use in embedded mode for testing. For an example on how to initialize the embedded ApacheDS with this ldif file take a look at
<a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java">CachedLDAPSecurityTest</a></p><p>The other one is for <a shape="rect" href="http://www.openldap.org/">OpenLDAP</a> (<a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif">ldif</a>)</p><structured-macro ac:macro-id="1bb9490d-a48f-437d-a0b4-864149b309f8" ac:name="info" ac:schema-version="1"><parameter ac:name=""> Configuring OpenLDAP</parameter><rich-text-body><p>The provided ldif and examples assume <code>dc=activemq,dc=apache,dc=org</code> suffix to be used for entries, so the configuration similar to the one shown in the following snippet</p><structured-macro ac:macro-id="3c8fa317-f914-445c-ae79-cf54e77d755e" ac:name="code" ac:schema-version="1"><plain-text-body>suffix "dc=activemq,dc=apache,dc=org"
+rootdn "cn=admin,dc=activemq,dc=apache,dc=org"
# Cleartext passwords, especially for the rootdn, should
# be avoid. See slappasswd(8) and slapd.conf(5) for details.
# Use of strong authentication encouraged.
rootpw {SSHA}lfAYn54xCFghgQv5B2Kqn3d3eLojqxtS
-]]></script>
-</div></div><p>should be put into your <code>slapd.conf</code></p></div></div><p>To initialize your (properly configured) OpenLDAP do something like</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[ldapadd -x -D "cn=admin,dc=activemq,dc=apache,dc=org" -w sunflower -f activemq-openldap.ldif]]></script>
-</div></div><h2 id="CachedLDAPAuthorizationModule-Configuring">Configuring</h2><p>Once entries are in LDAP, you can configure the module to load entries from there. A default values are adapted for embedded Apache DS server, so all you have to do in that case is add your plugin to the broker xml conf</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[<authorizationPlugin>
+</plain-text-body></structured-macro><p>should be put into your <code>slapd.conf</code></p></rich-text-body></structured-macro><p>To initialize your (properly configured) OpenLDAP do something like</p><structured-macro ac:macro-id="c4fef04d-25ba-4e17-82a3-03b478d81086" ac:name="code" ac:schema-version="1"><plain-text-body>ldapadd -x -D "cn=admin,dc=activemq,dc=apache,dc=org" -w sunflower -f activemq-openldap.ldif</plain-text-body></structured-macro><h2>Configuring</h2><p>Once entries are in LDAP, you can configure the module to load entries from there. A default values are adapted for embedded Apache DS server, so all you have to do in that case is add your plugin to the broker xml conf</p><structured-macro ac:macro-id="13b9c7ce-4de5-4687-8bc0-4f99739c7add" ac:name="code" ac:schema-version="1"><plain-text-body><authorizationPlugin>
<map>
<cachedLDAPAuthorizationMap/>
</map>
-</authorizationPlugin>]]></script>
-</div></div><p>For the OpenLDAP case, you should define more parameters</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[<authorizationPlugin>
+</authorizationPlugin></plain-text-body></structured-macro><p>For the OpenLDAP case, you should define more parameters</p><structured-macro ac:macro-id="569c3055-be0d-40f9-bcbd-fc7d0e0cf39e" ac:name="code" ac:schema-version="1"><plain-text-body><authorizationPlugin>
<map>
<cachedLDAPAuthorizationMap
- connectionURL="ldap://localhost:389"
- connectionUsername="cn=admin,dc=activemq,dc=apache,dc=org"
- connectionPassword="sunflower"
- queueSearchBase="ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
- topicSearchBase="ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
- tempSearchBase="ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
- refreshInterval="300000"
- legacyGroupMapping="false"
+ connectionURL="ldap://localhost:389"
+ connectionUsername="cn=admin,dc=activemq,dc=apache,dc=org"
+ connectionPassword="sunflower"
+ queueSearchBase="ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+ topicSearchBase="ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+ tempSearchBase="ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org"
+ refreshInterval="300000"
+ legacyGroupMapping="false"
/>
</map>
-</authorizationPlugin>]]></script>
-</div></div><p>Full examples of configurations for <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>property</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>default value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>description</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>version</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionURL</p></td><td colspan="1" rowspan="1" class="co
nfluenceTd"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionUsername</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionPassword</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>secret</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>connectionProtocol</p></td><td colspan="1" rowspan="1" class="co
nfluenceTd"><p>s</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>authentication</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>simple</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>queueSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>topicSearchBase</p></td><
td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tempSearchBase</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>refreshInterval</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>-1</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Interval (in milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1" c
lass="confluenceTd"><p> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>5.7 and later</p></td></tr></tbody></table></div><h2 id="CachedLDAPAuthorizationModule-Updates">Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately app
lied)</p></div>
+</authorizationPlugin></plain-text-body></structured-macro><p>Full examples of configurations for <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml">Apache DS</a> and <a shape="rect" href="https://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/activemq-openldap.xml">OpenLDAP</a></p><p>The list of all properties for <code>cachedLDAPAuthorizationMap</code></p><table><tbody><tr><th colspan="1" rowspan="1"><p>property</p></th><th colspan="1" rowspan="1"><p>default value</p></th><th colspan="1" rowspan="1"><p>description</p></th><td colspan="1" rowspan="1"><p>version</p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionURL</p></td><td colspan="1" rowspan="1"><p>ldap://localhost:1024</p></td><td colspan="1" rowspan="1"><p>LDAP Server connection address</p></td><td colspan="1" rowspan="1"><p> </p></td></tr
><tr><td colspan="1" rowspan="1"><p>connectionUsername</p></td><td colspan="1" rowspan="1"><p>uid=admin,ou=system</p></td><td colspan="1" rowspan="1"><p>Dn to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p> </p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionPassword</p></td><td colspan="1" rowspan="1"><p>secret</p></td><td colspan="1" rowspan="1"><p>Password to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p> </p></td></tr><tr><td colspan="1" rowspan="1"><p>connectionProtocol</p></td><td colspan="1" rowspan="1"><p>s</p></td><td colspan="1" rowspan="1"><p>Connection protocol to be used for connecting to the server</p></td><td colspan="1" rowspan="1"><p> </p></td></tr><tr><td colspan="1" rowspan="1"><p>authentication</p></td><td colspan="1" rowspan="1"><p>simple</p></td><td colspan="1" rowspan="1"><p>Authentication method to be used when connecting to the server</p></td><td colspan="1" rowspan="1"><p> 
;</p></td></tr><tr><td colspan="1" rowspan="1"><p>queueSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Queue,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of queue related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>topicSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Topic,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of topic related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>tempSearchBase</p></td><td colspan="1" rowspan="1"><p>ou=Temp,ou=Destination,ou=ActiveMQ,ou=system</p></td><td colspan="1" rowspan="1"><p>Base dn of temporary destinations related entries</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr><tr><td colspan="1" rowspan="1"><p>refreshInterval</p></td><td colspan="1" rowspan="1"><p>-1</p></td><td colspan="1" rowspan="1"><p>Interval (in
milliseconds) of pulling changes from the server, -1 means pulling is off, see #Updates for more info</p></td><td colspan="1" rowspan="1"><p> </p></td></tr><tr><td colspan="1" rowspan="1"><p>legacyGroupMapping</p></td><td colspan="1" rowspan="1"><p>true</p></td><td colspan="1" rowspan="1"><p>Should permission group members be configured as CN and not a full DN</p></td><td colspan="1" rowspan="1"><p>5.7 and later</p></td></tr></tbody></table><h2>Updates</h2><p>Many LDAP servers supports so called "persistent search" feature which allows applications to receive changes in LDAP in a "push" manner. By default this plugin assumes that LDAP server supports this feature and will "register" to get live updates.</p><p>For servers that doesn't support this yet (like OpenLDAP), we provide "pull" updates. In this case you need to set <code>refreshInterval</code> property, which will define the update period for the plugin (so in this case, updates will not be immediately applied)</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-get-commercial-support.xml
----------------------------------------------------------------------
diff --git a/can-i-get-commercial-support.xml b/can-i-get-commercial-support.xml
index 6faeb61..2eda5e6 100644
--- a/can-i-get-commercial-support.xml
+++ b/can-i-get-commercial-support.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="CanIgetcommercialsupport-CanIgetcommercialsupport?">Can I get commercial support? </h2>
+<div class="wiki-content maincontent"><h2>Can I get commercial support? </h2>
-<p>Absolutely, see our <a shape="rect" href="support.xml">Support</a> page for more details</p></div>
+<p>Absolutely, see our <link><page ri:content-title="Support"></page></link> page for more details</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-modify-messages-on-a-queue.xml
----------------------------------------------------------------------
diff --git a/can-i-modify-messages-on-a-queue.xml b/can-i-modify-messages-on-a-queue.xml
index 186d6ea..d956225 100644
--- a/can-i-modify-messages-on-a-queue.xml
+++ b/can-i-modify-messages-on-a-queue.xml
@@ -1,4 +1,4 @@
-<div class="wiki-content maincontent"><h2 id="CanImodifymessagesonaqueue-CanImodifymessagesonaqueue?">Can I modify messages on a queue?</h2>
+<div class="wiki-content maincontent"><h2>Can I modify messages on a queue?</h2>
<p>The short answer is no. In JMS messages are immutable once they have been sent. If you find you need to modify messages its recommended that you create a consumer with some selector which matches the messages you wish to update, consume them and send new modified messages, either to another queue or if you are careful, back to the original queue. (If you are using the same queue, be careful not to get into a loop where your selector matches messages you are sending yourself - you may wish to use some JMS header to avoid this loop).</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
----------------------------------------------------------------------
diff --git a/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml b/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
index efd4cb9..5e4a60f 100644
--- a/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
+++ b/can-i-send-and-receive-messages-concurrently-on-one-jms-connection.xml
@@ -4,5 +4,5 @@
<p>For concurrent consumption create a session per consumer - as all messages are dispatched to a session in a single thread - but you can have as many sessions as you like per connection.</p>
-<p>To further help with concurrent consuming of JMS you can use <a shape="rect" class="external-link" href="http://jencks.codehaus.org/Message+Driven+POJOs" rel="nofollow">Message Driven POJOs</a></p></div>
+<p>To further help with concurrent consuming of JMS you can use <a shape="rect" href="http://jencks.codehaus.org/Message+Driven+POJOs">Message Driven POJOs</a></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-send-really-large-files-over-activemq.xml
----------------------------------------------------------------------
diff --git a/can-i-send-really-large-files-over-activemq.xml b/can-i-send-really-large-files-over-activemq.xml
index d0f397d..9c4df4d 100644
--- a/can-i-send-really-large-files-over-activemq.xml
+++ b/can-i-send-really-large-files-over-activemq.xml
@@ -1,10 +1,11 @@
-<div class="wiki-content maincontent"><h2 id="CanIsendreallylargefilesoverActiveMQ-CanIsendreallylargefilesoverActiveMQ">Can I send really large files over ActiveMQ</h2>
+<div class="wiki-content maincontent"><h2>Can I send really large files over ActiveMQ</h2>
<p>The answer is yes. </p>
-<p>If you are using ActiveMQ 4.2 or later we highly recommend you use <a shape="rect" href="blob-messages.xml">Blob Messages</a> which implements an out of band transport of the messages; it allows the files to be hosted on external http/ftp sites if required and can support either direct publisher <-> subscriber communication or publisher -> broker/file server -> consumer messaging.</p>
+<p>If you are using ActiveMQ 4.2 or later we highly recommend you use <link><page ri:content-title="Blob Messages"></page></link> which implements an out of band transport of the messages; it allows the files to be hosted on external http/ftp sites if required and can support either direct publisher <-> subscriber communication or publisher -> broker/file server -> consumer messaging.</p>
-<p>For 4.1 or ealier large file transfer is achieved using <a shape="rect" href="jms-streams.xml">JMS Streams</a>. </p>
+<p>For 4.1 or ealier large file transfer is achieved using <link><page ri:content-title="JMS Streams"></page></link>. </p>
-<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <a shape="rect" href="blob-messages.xml">Blob Messages</a> or <a shape="rect" href="jms-streams.xml">JMS Streams</a> allows you to send and receive arbitrarily large files with very low RAM overhead.</p></div>
+<p>Normally the JMS API expects the entire JMS messsage to reside in the client side memory; however using <link><page ri:content-title="Blob Messages"></page></link> or <link><page ri:content-title="JMS Streams"></page></link> allows you to send and receive arbitrarily large files with very low RAM overhead.</p>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-i-use-activemq-5x-or-later-on-java-14.xml
----------------------------------------------------------------------
diff --git a/can-i-use-activemq-5x-or-later-on-java-14.xml b/can-i-use-activemq-5x-or-later-on-java-14.xml
index 2bc086c..e991763 100644
--- a/can-i-use-activemq-5x-or-later-on-java-14.xml
+++ b/can-i-use-activemq-5x-or-later-on-java-14.xml
@@ -1,12 +1,13 @@
-<div class="wiki-content maincontent"><h2 id="CanIuseActiveMQ5.xorlateronJava1.4-CanIuseActiveMQ5.0orlateronJava1.4?">Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
+<div class="wiki-content maincontent"><h2>Can I use ActiveMQ 5.0 or later on Java 1.4?</h2>
<p>Apache ActiveMQ 5.x or later is developed to run on Java 5 or later to take advantage of the new language features together with the major fact that on Java 5 the new concurrency code is faster & less buggy and requires less dependencies.</p>
-<p>We may get around to creating a sepate distro of retrotranslated jars for 1.4 <a shape="rect" href="contributing.xml">particularly if someone helps</a>.</p>
+<p>We may get around to creating a sepate distro of retrotranslated jars for 1.4 <link><page ri:content-title="Contributing"></page><link-body>particularly if someone helps</link-body></link>.</p>
-<p>Until then you can just <a shape="rect" class="external-link" href="http://retrotranslator.sourceforge.net/#jit" rel="nofollow">install the retrotranslator JIT in your JVM</a> which will auto-swizzle all Java 5 bytecode to be complaint Java 1.4 bytecode using backport-util-concurrent instead of Java 5 concurrency code.</p>
+<p>Until then you can just <a shape="rect" href="http://retrotranslator.sourceforge.net/#jit">install the retrotranslator JIT in your JVM</a> which will auto-swizzle all Java 5 bytecode to be complaint Java 1.4 bytecode using backport-util-concurrent instead of Java 5 concurrency code.</p>
-<h2 id="CanIuseActiveMQ5.xorlateronJava1.4-SeeAlso">See Also</h2>
+<h2>See Also</h2>
-<ul><li><a shape="rect" href="what-platforms-does-activemq-support.xml">What platforms does ActiveMQ support</a></li></ul></div>
+<ul><li><link><page ri:content-title="What platforms does ActiveMQ support"></page></link></li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-two-brokers-share-the-same-database.xml
----------------------------------------------------------------------
diff --git a/can-two-brokers-share-the-same-database.xml b/can-two-brokers-share-the-same-database.xml
index 7b0c5ce..2f1da10 100644
--- a/can-two-brokers-share-the-same-database.xml
+++ b/can-two-brokers-share-the-same-database.xml
@@ -1,8 +1,8 @@
-<div class="wiki-content maincontent"><h2 id="Cantwobrokerssharethesamedatabase-Cantwobrokerssharethesamedatabase">Can two brokers share the same database</h2>
+<div class="wiki-content maincontent"><h2>Can two brokers share the same database</h2>
<p>The short answer is no; 2 brokers cannot operate on the same sets of database tables concurrently. ActiveMQ is designed for high performance so we want to minimise the amount of pessimistic locking; each broker is designed to work with its own persistent database.</p>
<p>If you want to share the same physical database server across two brokers to simplify your installation & backup procedures then just create 2 different logins for each broker so that they get their own sets of database tables within the same physical database. (i.e. each broker gets its own logical database within the same physical database server).</p>
-<p>Also if you want to only have one database but many possible brokers (for HA) then just use <a shape="rect" href="jdbc-master-slave.xml">JDBC Master Slave</a></p></div>
+<p>Also if you want to only have one database but many possible brokers (for HA) then just use <link><page ri:content-title="JDBC Master Slave"></page></link></p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/can-you-browse-a-topic.xml
----------------------------------------------------------------------
diff --git a/can-you-browse-a-topic.xml b/can-you-browse-a-topic.xml
index 20fcf62..cbae1c0 100644
--- a/can-you-browse-a-topic.xml
+++ b/can-you-browse-a-topic.xml
@@ -4,5 +4,5 @@
<p>i.e. browsing is necessary on queues as you wanna see what messages there are without removing them. For topics, everyone who's interested gets a copy of the message so just do a regular subscribe.</p>
-<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" class="external-link" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p></div>
+<p>One nice to have feature would be to expose durable subscriptions as a logical queue, so you could browse outstanding messages on a durable subscription as if it were a queue (see <a shape="rect" href="https://issues.apache.org/activemq/browse/AMQ-25">AMQ-25</a> to track this feature request)but its not in any way standard JMS.</p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/certificateunknown.xml
----------------------------------------------------------------------
diff --git a/certificateunknown.xml b/certificateunknown.xml
index f05f240..b3184a3 100644
--- a/certificateunknown.xml
+++ b/certificateunknown.xml
@@ -1,7 +1,6 @@
<div class="wiki-content maincontent"><p>If you get an error something like this...</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<structured-macro ac:macro-id="0708482b-8175-421f-9fe9-85a126b5b52c" ac:name="code" ac:schema-version="1"><plain-text-body>
javax.jms.JMSException: start failed: Received fatal alert: certificate_unknown
at org.activemq.transport.tcp.TcpTransportChannel.start(TcpTransportChannel.java:200)
at org.activemq.broker.impl.BrokerConnectorImpl.addClient(BrokerConnectorImpl.java:308)
@@ -17,12 +16,11 @@ Caused by: javax.net.ssl.SSLHandshakeException: Received fatal alert: certificat
at com.sun.net.ssl.internal.ssl.SSLSocketImpl.readDataRecord(Unknown Source)
at com.sun.net.ssl.internal.ssl.AppInputStream.read(Unknown Source)
at java.io.BufferedInputStream.fill(Unknown Source)
-]]></script>
-</div></div>
+</plain-text-body></structured-macro>
<p>when you are trying to use SSL to connect to ActiveMQ then the "certificate_unknown" error shows on the broker when the client doesn't trust the broker's certificate. On the client, I would see an error as well: "No trusted certificate found". </p>
-<h3 id="certificate_unknown-Fix">Fix</h3>
+<h3>Fix</h3>
-<p>Make sure that you exported the broker's certificate (step 2 in <a shape="rect" href="how-do-i-use-ssl.xml">How do I use SSL</a>) and imported it on the client into a truststore (step 4). If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p></div>
+<p>Make sure that you exported the broker's certificate (step 2 in <link><page ri:content-title="How do I use SSL"></page></link>) and imported it on the client into a truststore (step 4). If you did those, did you specify the javax.net.ssl.trustStore system property when you started your client VM? </p></div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/changes-in-40.xml
----------------------------------------------------------------------
diff --git a/changes-in-40.xml b/changes-in-40.xml
index f71100c..25afee2 100644
--- a/changes-in-40.xml
+++ b/changes-in-40.xml
@@ -1,24 +1,23 @@
-<div class="wiki-content maincontent"><h3 id="Changesin4.0-NewFeaturesin4.0">New Features in 4.0</h3>
+<div class="wiki-content maincontent"><h3>New Features in 4.0</h3>
-<ul><li><a shape="rect" href="masterslave.xml">MasterSlave</a> provides support for continuous availability and fault tolerance of brokers to be able to handle catastrophic hardware failure and not loose a message (or get duplicates).</li><li>A new <a shape="rect" href="exclusive-consumer.xml">Exclusive Consumer</a> feature allows you to pin message processing to a single consumer in a cluser of consumers.</li><li>A new <a shape="rect" href="message-groups.xml">Message Groups</a> feaure allows you load balance messages accross a set of consumers but also garantee the message order for messages within a message group.</li><li>A new <a shape="rect" href="total-ordering.xml">Total Ordering</a> feature to allow all consumers on a topic to see messages in the same order.</li><li>New <a shape="rect" href="how-can-i-monitor-activemq.xml">JMX Management</a> and monitoring capabilities. You can now see statistics for each broker, destination, connector and connection!</li><li>Improved <a sha
pe="rect" href="security.xml">Security</a> plugin which provides JAAS support for authentication along with a pluggable strategy for authorization together with a default XML based implementation.</li><li>A new <a shape="rect" href="openwire-c-client.xml">OpenWire C Client</a> is now available. This client talks the same wire protocol that the standard java client uses so every messaging broker feature available to the java client is available to the c client.</li><li>An experimental <a shape="rect" href="nms/index.html">OpenWire dotNet</a> is available, written in pure C# along with a JMS-like API for working on the .Net platform with ActiveMQ</li><li>Queues can now be loaded up with persistent messages without locking up the broker. Persistent messages are now swapped out of memory when no consumer needs it soon.</li><li>A new <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> feature allows you to build location affinity by assignin a priority to consumers. The br
oker can then dispatch messages to higher priority consumers before dispatching to lower priority consumers.</li><li>A configurable per <a shape="rect" href="consumer-dispatch-async.xml">Consumer Dispatch Async</a> flag which allows you to configure how messages are sent by the broker to a consumer. This controls if the broker uses <a shape="rect" href="seda.xml">SEDA</a> or <a shape="rect" class="unresolved" href="#">STP</a> style dispaching.</li><li>A new plug-able topic <a shape="rect" href="subscription-recovery-policy.xml">Subscription Recovery Policy</a> which allows you to configure how many transient messages are replayed when a <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a> is created.</li><li>A new <a shape="rect" href="retroactive-consumer.xml">Retroactive Consumer</a> feature allows topic consumers to "go back in time" so that it receives old messages when the subscription is activated. If the consumer is a durable consumer, he recover all the
messages that are still in the persistent store.</li><li><a shape="rect" href="per-destination-policies.xml">Per Destination Policies</a> allow you configure the behavior of destinations.</li><li>The broker now supports per destination plugable <a shape="rect" href="dispatch-policies.xml">Dispatch Policies</a> so that you can choose the distribution algorithm used to send messages to a consumer.</li><li>The broker now supports two new types of connectors:
- <ul><li><a shape="rect" href="the-jms-connector.xml">The JMS Connector</a> is used to establish connection to external JMS providers so that messages can be bridged between the system.</li><li><a shape="rect" href="the-proxy-connector.xml">The Proxy Connector</a>. Is used to proxy connections to another broker.</li></ul>
- </li><li><a shape="rect" href="slow-consumer-handling.xml">Slow Consumer Handling</a> allows you to discard old messages for slow consumers on non-durable topics to avoid slowing down fast consumers</li><li>You can now specify <a shape="rect" href="destination-options.xml">Destination Options</a> that allow you to do extend configuration of consumers.</li><li>Conumsers now use <a shape="rect" href="optimized-acknowledgement.xml">Optimized Acknowledgement</a> by default to which results in increased performance.</li></ul>
+<ul><li><link><page ri:content-title="MasterSlave"></page></link> provides support for continuous availability and fault tolerance of brokers to be able to handle catastrophic hardware failure and not loose a message (or get duplicates).</li><li>A new <link><page ri:content-title="Exclusive Consumer"></page></link> feature allows you to pin message processing to a single consumer in a cluser of consumers.</li><li>A new <link><page ri:content-title="Message Groups"></page></link> feaure allows you load balance messages accross a set of consumers but also garantee the message order for messages within a message group.</li><li>A new <link><page ri:content-title="Total Ordering"></page></link> feature to allow all consumers on a topic to see messages in the same order.</li><li>New <link><page ri:content-title="How can I monitor ActiveMQ"></page><link-body>JMX Management</link-body></link> and monitoring capabilities. You can now see statistics for each broker, destination, connector and
connection!</li><li>Improved <link><page ri:content-title="Security"></page></link> plugin which provides JAAS support for authentication along with a pluggable strategy for authorization together with a default XML based implementation.</li><li>A new <link><page ri:content-title="OpenWire C Client"></page></link> is now available. This client talks the same wire protocol that the standard java client uses so every messaging broker feature available to the java client is available to the c client.</li><li>An experimental <link><space ri:space-key="NMS"></space><link-body>OpenWire dotNet</link-body></link> is available, written in pure C# along with a JMS-like API for working on the .Net platform with ActiveMQ</li><li>Queues can now be loaded up with persistent messages without locking up the broker. Persistent messages are now swapped out of memory when no consumer needs it soon.</li><li>A new <link><page ri:content-title="Consumer Priority"></page></link> feature allows you to bui
ld location affinity by assignin a priority to consumers. The broker can then dispatch messages to higher priority consumers before dispatching to lower priority consumers.</li><li>A configurable per <link><page ri:content-title="Consumer Dispatch Async"></page></link> flag which allows you to configure how messages are sent by the broker to a consumer. This controls if the broker uses <link><page ri:content-title="SEDA"></page></link> or <link><page ri:content-title="STP"></page></link> style dispaching.</li><li>A new plug-able topic <link><page ri:content-title="Subscription Recovery Policy"></page></link> which allows you to configure how many transient messages are replayed when a <link><page ri:content-title="Retroactive Consumer"></page></link> is created.</li><li>A new <link><page ri:content-title="Retroactive Consumer"></page></link> feature allows topic consumers to "go back in time" so that it receives old messages when the subscription is activated. If the consumer is a
durable consumer, he recover all the messages that are still in the persistent store.</li><li><link><page ri:content-title="Per Destination Policies"></page></link> allow you configure the behavior of destinations.</li><li>The broker now supports per destination plugable <link><page ri:content-title="Dispatch Policies"></page></link> so that you can choose the distribution algorithm used to send messages to a consumer.</li><li>The broker now supports two new types of connectors:
+ <ul><li><link><page ri:content-title="The JMS Connector"></page></link> is used to establish connection to external JMS providers so that messages can be bridged between the system.</li><li><link><page ri:content-title="The Proxy Connector"></page></link>. Is used to proxy connections to another broker.</li></ul>
+ </li><li><link><page ri:content-title="Slow Consumer Handling"></page></link> allows you to discard old messages for slow consumers on non-durable topics to avoid slowing down fast consumers</li><li>You can now specify <link><page ri:content-title="Destination Options"></page></link> that allow you to do extend configuration of consumers.</li><li>Conumsers now use <link><page ri:content-title="Optimized Acknowledgement"></page></link> by default to which results in increased performance.</li></ul>
-<h3 id="Changesin4.0-API/Configurationchanages">API/Configuration chanages</h3>
+<h3>API/Configuration chanages</h3>
-<ul><li>as part of the move to Apache, the package name is now <strong>org.apache.activemq</strong> and not <strong>org.activemq</strong>.</li><li>the <a shape="rect" href="xml-configuration.xml">Xml Configuration</a> has changed a little; mostly its now in the ActiveMQ namespace and has a generated XSD and documentation.</li><li>the <em>reliable</em> transport has been renamed to <em>failover</em> to make it more clear what it does; we're working on a separate DR mechanism to provide data centre resilliance. So if you wish to connect to one of a number of URIs try
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+<ul><li>as part of the move to Apache, the package name is now <strong>org.apache.activemq</strong> and not <strong>org.activemq</strong>.</li><li>the <link><page ri:content-title="Xml Configuration"></page></link> has changed a little; mostly its now in the ActiveMQ namespace and has a generated XSD and documentation.</li><li>the <em>reliable</em> transport has been renamed to <em>failover</em> to make it more clear what it does; we're working on a separate DR mechanism to provide data centre resilliance. So if you wish to connect to one of a number of URIs try
+<structured-macro ac:macro-id="67446eff-165c-41df-a0ae-fbb115d9644a" ac:name="code" ac:schema-version="1"><plain-text-body>
failover:tcp://host1:port1,tcp://host2:port2
-]]></script>
-</div></div></li><li>The configuration options of transports have changed. See <a shape="rect" href="activemq-connection-uris.xml">ActiveMQ Connection URIs</a> for a detailed guide of of all the options.</li><li>The spring package has gone; we now use <a shape="rect" class="external-link" href="http://xbean.org" rel="nofollow">XBean</a> to configure ActiveMQ. See the org.activemq.xbean.BrokerFactoryBean if you want a factory bean to use in regular spring instead of the org.activemq.spring.BrokerFactoryBean. See <a shape="rect" href="configuring-brokers.xml">Configuring Brokers</a> for more information on the new XML syntax.</li><li>ActiveMQTopic and ActiveMQQueue are now in the org.activemq.command package.</li><li>If you were creating a broker in Java code, the BrokerContainer has been replaced with BrokerService which is easier to use now.</li><li>The connection URL options have changed slightly to provided more persise configuration options of the transport and wireformat and to
allow validation of the options.</li><li><a shape="rect" href="message-redelivery-and-dlq-handling.xml">Message Redelivery and DLQ Handling</a> has been re-implemnted. Currently all messages sent poison messages are sent to a single DQL.</li><li>The <a shape="rect" href="jms-streams.xml">JMS Streams</a> API has changed.</li></ul>
+</plain-text-body></structured-macro></li><li>The configuration options of transports have changed. See <link><page ri:content-title="ActiveMQ Connection URIs"></page></link> for a detailed guide of of all the options.</li><li>The spring package has gone; we now use <a shape="rect" href="http://xbean.org">XBean</a> to configure ActiveMQ. See the org.activemq.xbean.BrokerFactoryBean if you want a factory bean to use in regular spring instead of the org.activemq.spring.BrokerFactoryBean. See <link><page ri:content-title="Configuring Brokers"></page></link> for more information on the new XML syntax.</li><li>ActiveMQTopic and ActiveMQQueue are now in the org.activemq.command package.</li><li>If you were creating a broker in Java code, the BrokerContainer has been replaced with BrokerService which is easier to use now.</li><li>The connection URL options have changed slightly to provided more persise configuration options of the transport and wireformat and to allow validation of the opt
ions.</li><li><link><page ri:content-title="Message Redelivery and DLQ Handling"></page></link> has been re-implemnted. Currently all messages sent poison messages are sent to a single DQL.</li><li>The <link><page ri:content-title="JMS Streams"></page></link> API has changed.</li></ul>
-<h3 id="Changesin4.0-GeneralChanges">General Changes</h3>
+<h3>General Changes</h3>
-<ul><li>The JDBC persistence adapter now uses JDBC statement batching to increase it's performance with the database. This should reduce the amount of time a checkpoint takes.</li><li>QueueBrowsers now play nicely with a queue that is currently being consumed from. It gives you a true snapshot of what the queue looked like when you created the browser and it does not affect the dispatching of messages to active consumers.</li><li>we no longer have hand-crafted marshalling code any more; its all based on <a shape="rect" href="openwire.xml">OpenWire</a> and autogenerated from the open wire commands in the org.activemq.command package</li><li>The network bridges used for broker to broker messaging now use a lower level ActiveMQ command and transport API instead of the JMS API, this allows them to use more optimizations and have a lower per bridge resource consumption while letting the JMS client API implementation reduce it's complexity.</li><li>Two types of network bridges are now sup
ported:
+<ul><li>The JDBC persistence adapter now uses JDBC statement batching to increase it's performance with the database. This should reduce the amount of time a checkpoint takes.</li><li>QueueBrowsers now play nicely with a queue that is currently being consumed from. It gives you a true snapshot of what the queue looked like when you created the browser and it does not affect the dispatching of messages to active consumers.</li><li>we no longer have hand-crafted marshalling code any more; its all based on <link><page ri:content-title="OpenWire"></page></link> and autogenerated from the open wire commands in the org.activemq.command package</li><li>The network bridges used for broker to broker messaging now use a lower level ActiveMQ command and transport API instead of the JMS API, this allows them to use more optimizations and have a lower per bridge resource consumption while letting the JMS client API implementation reduce it's complexity.</li><li>Two types of network bridges are n
ow supported:
<ul><li>A simple forwardng bridge - sends all messages as soon as possible to the remote broker. Great you know the usage patterns up front and allways want to do store and forward to a central broker.</li><li>A demand based forwarding bridge (same type of bridge that was using in ActiveMQ 3.x) which detects consumer demand on the remote broker and only forwards messages as needed.</li></ul>
- </li><li>The demand based forwarding bridge now take advantage of the <a shape="rect" href="consumer-priority.xml">Consumer Priority</a> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <a shape="rect" href="jms-streams.xml">JMS Streams</a>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul></div>
+ </li><li>The demand based forwarding bridge now take advantage of the <link><page ri:content-title="Consumer Priority"></page></link> to avoid forwarding messages to a remote broker if there is a local consumer consuming it's messages.</li><li>Message fragmentation is no longer done. Fragmented messages add yet another level of complexity when you introduce broker networks. Large objects/streams should be transfered using the <link><page ri:content-title="JMS Streams"></page></link>.</li><li>JMS clients marshall fewer messages on the wire on for a rollback.</li><li>JMS clients marshall fewer messages when sessions/consumers/producers are closed.</li><li>The client and the broker make more extensive use of Thread Pools to avoid allocating idle threads that are not being used.</li></ul>
+</div>
http://git-wip-us.apache.org/repos/asf/activemq-web/blob/7a7d976c/class-diagrams-for-activemq-40-m4-source-code.xml
----------------------------------------------------------------------
diff --git a/class-diagrams-for-activemq-40-m4-source-code.xml b/class-diagrams-for-activemq-40-m4-source-code.xml
index 92cfcc1..2ec20f9 100644
--- a/class-diagrams-for-activemq-40-m4-source-code.xml
+++ b/class-diagrams-for-activemq-40-m4-source-code.xml
@@ -3,11 +3,11 @@
<p>These diagrams cover the bulk of the source code and are in EMF format. </p>
-<p><a shape="rect" class="external-link" href="http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip" rel="nofollow">http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip</a></p>
+<p><a shape="rect" href="http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip">http://docs.codehaus.org/download/attachments/50288/Class+Diagrams+activemq-4.0-M4.zip</a></p>
-<p>Note about conversion to other formats:  Some files when converted to something like JPG or PNG will be quite large.  If your system doesn't have enough RAM you will get an error or in some cases the converting program will just scale to fit which usually will mangle the image.  For the larger file conversions you will need  1GB of RAM.  A free program I came across for converting is IrfanView (<a shape="rect" class="external-link" href="http://www.irfanview.com/" rel="nofollow">http://www.irfanview.com/</a>).  I found it much better than Windows Image Viewer, but you still need an appropriate amount of memory. </p>
+<p>Note about conversion to other formats:  Some files when converted to something like JPG or PNG will be quite large.  If your system doesn't have enough RAM you will get an error or in some cases the converting program will just scale to fit which usually will mangle the image.  For the larger file conversions you will need  1GB of RAM.  A free program I came across for converting is IrfanView (<a shape="rect" href="http://www.irfanview.com/">http://www.irfanview.com/</a>).  I found it much better than Windows Image Viewer, but you still need an appropriate amount of memory. </p>
-<p>Note about printing: Adobe In Design works well for printing if you want a large print but don't have access to an oversized/wide format ink jet (<a shape="rect" class="external-link" href="http://www.adobe.com/products/tryadobe/main.jsp#product=31" rel="nofollow">http://www.adobe.com/products/tryadobe/main.jsp#product=31</a>).  Set up the page dimensions first, for example,  normal letter size page is measured in pts, 51p0 width, 66p0 height.  So for a wider than long oversized diagram you might go to File->Document Setup... and set Page Size to "Custom" and width to 255p0 (5 8 1/2" letter pages in width), and height to 112p0 (2 11" letter pages in height).  Next go to File->Place... to import the EMF. Using the Scale tool (smaller box with an arrow pointing into larger box) size the image to fit inside the page (hold down shift key while sizing to keep proportions), and position it using the Selection tool (arrow).</p>
+<p>Note about printing: Adobe In Design works well for printing if you want a large print but don't have access to an oversized/wide format ink jet (<a shape="rect" href="http://www.adobe.com/products/tryadobe/main.jsp#product=31">http://www.adobe.com/products/tryadobe/main.jsp#product=31</a>).  Set up the page dimensions first, for example,  normal letter size page is measured in pts, 51p0 width, 66p0 height.  So for a wider than long oversized diagram you might go to File->Document Setup... and set Page Size to "Custom" and width to 255p0 (5 8 1/2" letter pages in width), and height to 112p0 (2 11" letter pages in height).  Next go to File->Place... to import the EMF. Using the Scale tool (smaller box with an arrow pointing into larger box) size the image to fit inside the page (hold down shift key while sizing to keep proportions), and position it using the Selection tool (arrow).</p>
<p>Then go to File->Print..., select "Setup" and check the "Tile" option.  The "Tile" dropdown setting should be "Auto" and Overlap 4p0.  Then set the Scale option to a percentage that maximizes the image coverage (there is a visual thumbnail that will indicate the coverage).  Then Print.  This should yield a nice large image printed out in tiled format on letter size pages.  Each page will be properly numbered so you know their positions, and there will be marks for trimming and taping the pages together.  A page cutter is neccessary.  Just trim the right and bottom overlap on each page, then align and tape.</p></div>